You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@training.apache.org by cd...@apache.org on 2022/09/20 09:32:12 UTC
[incubator-training] branch develop updated: chore(conferences/acna): Merged Justin's changes.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
The following commit(s) were added to refs/heads/develop by this push:
new ab1e2c2 chore(conferences/acna): Merged Justin's changes.
ab1e2c2 is described below
commit ab1e2c2febda2579db7fb244ee4f776158e027fc
Author: Christofer Dutz <ch...@rivian.com>
AuthorDate: Tue Sep 20 11:32:03 2022 +0200
chore(conferences/acna): Merged Justin's changes.
---
content/Conferences/ApacheCon/NOTICE | 4 ++--
content/Conferences/ApacheCon/src/main/asciidoc/index_en.adoc | 10 +++++-----
site/mvnw | 0
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/content/Conferences/ApacheCon/NOTICE b/content/Conferences/ApacheCon/NOTICE
index eb1e9ac..bf3a420 100644
--- a/content/Conferences/ApacheCon/NOTICE
+++ b/content/Conferences/ApacheCon/NOTICE
@@ -1,5 +1,5 @@
-ASF and the Apache Way
-Copyright 2019 The Apache Software Foundation
+ApacheCon slide deck
+Copyright 2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/content/Conferences/ApacheCon/src/main/asciidoc/index_en.adoc b/content/Conferences/ApacheCon/src/main/asciidoc/index_en.adoc
index 65b0e67..d56e04a 100644
--- a/content/Conferences/ApacheCon/src/main/asciidoc/index_en.adoc
+++ b/content/Conferences/ApacheCon/src/main/asciidoc/index_en.adoc
@@ -25,7 +25,7 @@
:conference_na: APACHECON NA
:conference_asia: APACHECON ASIA
:conference_home: APACHECON @Home
-:dates: Oct 3rd - 9th
+:dates: Oct 3rd - 6th
:year: 2022
[%notitle]
@@ -62,7 +62,7 @@ image::NewOrleans.jpg[canvas]
--
[.conferenceName]
-{conference_home} +
+{conference_na} +
{dates}
[.year]
@@ -82,7 +82,7 @@ image::NewOrleansII.jpg[canvas]
--
[.conferenceName]
-{conference_home} +
+{conference_na} +
{dates}
[.year]
@@ -102,7 +102,7 @@ image::NewOrleansIII.jpg[canvas]
--
[.conferenceName]
-{conference_home} +
+{conference_na} +
{dates}
[.year]
@@ -122,7 +122,7 @@ image::NewOrleansIV.jpg[canvas]
--
[.conferenceName]
-{conference_home} +
+{conference_na} +
{dates}
[.year]
diff --git a/site/mvnw b/site/mvnw
old mode 100644
new mode 100755