This is an automated email from the ASF dual-hosted git repository.
larsfrancke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
The following commit(s) were added to refs/heads/master by this push:
new 2f873f6 Origin/site updates (#8)
2f873f6 is described below
commit 2f873f6facbde8cd38600030e1aec92f4bc980fd
Author: Justin Mclean <[email protected]>
AuthorDate: Sun May 12 18:01:46 2019 +1000
Origin/site updates (#8)
* Add MIT license to LICENSE.
* generate date and all people are cool
* Fix a few minor issues.
* remove references to PLC4X
* add myself to the team page
* escape &'s
* escape question marks
* better way to escape links
* sync with web site changes
* Update site/src/site/asciidoc/developers/team.adoc
Co-Authored-By: Lars Francke <[email protected]>
* fix up team page and add my photo
* add place holder logo
---
README.md | 26 ++++++++++-----------
site/src/site/asciidoc/developers/building.adoc | 16 ++++++-------
site/src/site/asciidoc/developers/ci.adoc | 4 ++--
.../src/site/asciidoc/developers/contributing.adoc | 24 +++++++++----------
site/src/site/asciidoc/developers/decisions.adoc | 4 ++--
site/src/site/asciidoc/developers/issues.adoc | 2 +-
site/src/site/asciidoc/developers/team.adoc | 6 +++++
site/src/site/asciidoc/developers/website.adoc | 24 +++++++++----------
site/src/site/asciidoc/index.adoc | 20 ++++++++--------
.../site/resources/images/apache_training_logo.png | Bin 0 -> 2412 bytes
site/src/site/resources/images/team/jmclean.jpg | Bin 0 -> 62175 bytes
site/src/site/site.xml | 4 ++--
.../src/main/theme/apache.css | 2 +-
13 files changed, 69 insertions(+), 63 deletions(-)
diff --git a/README.md b/README.md
index b80a4ab..68b9062 100644
--- a/README.md
+++ b/README.md
@@ -2,50 +2,50 @@ Apache Training (incubating)
============================
### Purpose
-The purpose of the Training project is to create high-quality training
material for various projects in an open source form. Up until now everyone who
wants to offer a Training course for one of the Apache projects needs to create
her or his own slides/labs and keep them up-to-date. This is a significant
investment of time and money. This project aims to spread that burden and help
all Apache projects as we can create shared resources and we can also create
cross-project trainings.
+The purpose of the Training project is to create high-quality training
material for various projects in an open source form. Up until now everyone who
wants to offer a Training course for one of the Apache projects needs to create
her or his own slides/labs and keep them up-to-date. This is a significant
investment of time and money. This project aims to spread that burden and help
all Apache projects as we can create shared resources and we can also create
cross-project training resources.
To sum up, the main goals for this project:
-- Develop shared material that can be used for trainings
+- Develop shared material that can be used for training
- Specifically create material about the ASF, how it works and how best to
contribute
- Cross-project
- - Focused on Apache but also 3rd party projects where it makes sense
- - Develop “labs” or “hands-on” exercises
+ - Focused on Apache but also 3rd party projects where it makes sense
+ - Develop “labs” or “hands-on” exercises
- Develop or document an infrastructure that can be used for those labs
- Potentially develop tools to manage the material (e.g. a “slide” repository
that contains “modules” that can be easily reused and combined)
These are non-goals for this project:
- Some kind of official “Apache Training Program” with certifications etc.
- - Based on feedback and future developments this may change but we believe
it’s out of scope initially
+ - Based on feedback and future developments this may change but we believe
it’s out of scope initially
- Project documentation
-- The training material we develop is not necessarily self-explanatory. It
still benefits from an experienced instructor but it will enable talented
people without the time or resources for developing and maintaining material to
provide trainings.
+- The training material we develop is not necessarily self-explanatory. It
still benefits from an experienced instructor but it will enable talented
people without the time or resources for developing and maintaining material to
provide training.
### Rationale
-There are tons of companies offering training for and around the Apache
ecosystem. From our experience everyone is building a very similar set of
slides and labs (there’s only so many ways you can explain a concept). This
project aims to create and use synergies. By also bringing these resources
closer to their origin we hope to improve quality, freshness of the content and
versatility (e.g. more language options).
+There are tons of companies offering training for and around the Apache
ecosystem. From our experience, everyone is building a very similar set of
slides and labs (there’s only so many ways you can explain a concept). This
project aims to create and use synergies. By also bringing these resources
closer to their origin we hope to improve quality, the freshness of the content
and versatility (e.g. more language options).
It is the mission of the Apache foundation “to provide software for the public
good” and we believe this project can help with that mission by making the
software more accessible for a broader audience.
### Next steps
The initial goal for the first few weeks or months is to have discussions and
agreements on various scoping and technical issues as well as integrating
existing donated material.
-After that we want to start building a library of content.
+From there we want to start building a library of content.
### Getting involved
-The main resource for any discussion around this project is the dev mailing
list (see below). If you have any specific question or want to get involved in
any way, by all means do reach out and say hi!
+The main resource for any discussion around this project is the dev mailing
list (see below). If you have any specific question or want to get involved in
any way, by all means, do so and reach out and say hi!
The following resources are currently being used by the project:
-Dev Mailing List:
[Archive](https://lists.apache.org/[email protected]) -
[Subscribe](mailto:[email protected])
+Dev Mailing List:
[Archive](https://lists.apache.org/list.html\[email protected]) -
[Subscribe](mailto:[email protected])
-Issues Mailing List:
[Archive](https://lists.apache.org/[email protected]) -
[Subscribe](mailto:[email protected])
+Issues Mailing List:
[Archive](https://lists.apache.org/list.html\[email protected]) -
[Subscribe](mailto:[email protected])
-Commits Mailing List:
[Archive](https://lists.apache.org/[email protected]) -
[Subscribe](mailto:[email protected])
+Commits Mailing List:
[Archive](https://lists.apache.org/list.html\[email protected]) -
[Subscribe](mailto:[email protected])
Wiki:
[https://cwiki.apache.org/confluence/display/TRAINING](https://cwiki.apache.org/confluence/display/TRAINING)
Jira:
[https://issues.apache.org/jira/browse/TRAINING](https://issues.apache.org/jira/browse/TRAINING)
-Git: [Apache
Repo](https://gitbox.apache.org/repos/asf?p=incubator-training.git) - [Github
Mirror](https://github.com/apache/incubator-training)
\ No newline at end of file
+Git: [Apache
Repo](https://gitbox.apache.org/repos/asf\?p=incubator-training.git) - [Github
Mirror](https://github.com/apache/incubator-training)
\ No newline at end of file
diff --git a/site/src/site/asciidoc/developers/building.adoc
b/site/src/site/asciidoc/developers/building.adoc
index 4ead72e..1e7d867 100644
--- a/site/src/site/asciidoc/developers/building.adoc
+++ b/site/src/site/asciidoc/developers/building.adoc
@@ -19,21 +19,21 @@
The Apache Training Website is built with `Apache Maven` and we have tried to
make the build as simple as possible.
-For your convenience we also have provided a `Maven-Wrapper`, that should
allow building with only `Java 8` or greater as requirement.
+For your convenience we also have provided a `Maven-Wrapper`, that should
allow building with `Java 8` or greater as a requirement.
=== Requirements
-The only requirements to building the Apache Training website should be:
+The only requirements for building the Apache Training website should be:
* Java 8 JDK (or newer)
* Apache Maven (3.1.0 or newer) *(Optional)*
=== Using the Maven-Wrapper
-The so-called `Maven-Wrapper` is used by calling the Maven-Wrapper scripts
`mvnw` (Mac & Linux) or `mvnw.cmd` (Windows) instead of the default Maven
commands `mvn` and `mvn.cmd`.
+The so-called `Maven-Wrapper` is used by calling the Maven-Wrapper scripts
`mvnw` (Mac & Linux) or `mvnw.cmd` (Windows) instead of the default Maven
commands `mvn` and `mvn.cmd`.
These helpers ensure Maven is available in at least the version defined in
`.mvn/maven-wrapper.properties`.
-If no suitable version can be found, it is automatically downloaded and
installed alongside the project (So it doesn't have to be downloaded every time
and every project can have it's own Maven version)
+If no suitable version can be found, it is automatically downloaded and
installed alongside the project (So it doesn't have to be downloaded every time
and every project can have its own Maven version)
After the script has ensured a suitable Maven version is available, this is
used and all arguments and parameters are transparently forwarded to this.
So simply adding the additional `w` to each of the Maven commands, there
should be no difference to using a pre-installed Maven version.
@@ -43,7 +43,7 @@ So simply adding the additional `w` to each of the Maven
commands, there should
This document can't provide you with all the details needed to get started
with `Maven` itself.
But there is a lot of good documentation out there.
-Justin McLean and Christofer Dutz even recorded a not quite 2 hour Maven
training Video some time ago for another Apache project.
+Justin Mclean and Christofer Dutz even recorded a not quite 2 hour Maven
training Video some time ago for another Apache project.
It should handle all the details needed to get a general understanding of
Maven and how it works.
@@ -52,13 +52,13 @@ video::167857327[vimeo,width=640,height=420]
=== Building the Apache Training Website with Maven
-The PLC4X Website is also part of the same GIT repository that contains the
code and it is built by Maven as well.
+The Training Website is also part of the same GIT repository that contains the
code and it is built by Maven as well.
In order to build the website the following command should be sufficient:
mvn site
-However this will generate the website for each module inside it's
`target/site` directory.
+However, this will generate the website for each module inside it's
`target/site` directory.
Opening this in a browser and navigating from pages of one module to another
will not work as these links expect a different directory structure.
In order to create a fully navigatable version of the Website, the following
command should be sufficient:
@@ -68,4 +68,4 @@ This will generate an additional `target/staging` directory
which contains the f
A lot of documentation on Maven suggests to use the `site:site` goal directly
instead of calling the `site` phase, but in case of Apache Training there is
more than just the site generation that has to be executed.
-This is just a quick-start version of the site generation, for a fully
detailed documentation please read the
http://training.apache.org/developers/website.html[Website] documentation page.
+This is just a quick-start version of the site generation, for fully detailed
documentation please read the
http://training.apache.org/developers/website.html[Website] documentation page.
diff --git a/site/src/site/asciidoc/developers/ci.adoc
b/site/src/site/asciidoc/developers/ci.adoc
index da4cf84..39b25e0 100644
--- a/site/src/site/asciidoc/developers/ci.adoc
+++ b/site/src/site/asciidoc/developers/ci.adoc
@@ -20,7 +20,7 @@
We are currently using only Apache Jenkins for building.
-- Apache's Jenkins at: https://builds.apache.org/view/S-Z/job/Training/
+- Apache's Jenkins at https://builds.apache.org/view/S-Z/job/Training/
Only build jobs on Apache's Jenkins are allowed to publish SNAPSHOT versions
of the Maven artifacts to Apaches Nexus as well as auto publish generated
websites to production.
@@ -28,6 +28,6 @@ Only build jobs on Apache's Jenkins are allowed to publish
SNAPSHOT versions of
We are using the Jenkins `multi-branch pipeline plugin` to automatically setup
build for branches based upon the build definition in the `Jenkinsfile` in the
root of the project.
-In general it decides between building of the `master` branch and all others.
+In general, it decides between building the `master` branch and all others.
When building `master` the build not only builds the project itself, it also
deploys the generated site content to the `asf-site` branch which deploys the
website.
diff --git a/site/src/site/asciidoc/developers/contributing.adoc
b/site/src/site/asciidoc/developers/contributing.adoc
index e743769..0516f15 100644
--- a/site/src/site/asciidoc/developers/contributing.adoc
+++ b/site/src/site/asciidoc/developers/contributing.adoc
@@ -32,11 +32,11 @@ These usually are, but are not limited to:
=== Pull-Requests
-The simplest way to submit code changes, is via a GitHub pull-request.
+The simplest way to submit code changes is via a GitHub pull-request.
-In order to do this first create a GitHub account and sign into you account.
+In order to do this first create a GitHub account and sign into your account.
-After that's done, please to to our
https://github.com/apache/incubator-training[GitHub site] and create a
so-called `Fork`.
+After that's done, please go to our
https://github.com/apache/incubator-training[GitHub site] and create a
so-called `Fork`.
image::contributing-github-fork.png[]
@@ -62,13 +62,13 @@ If you click on this, we will receive a notification on
your changes and can rev
As we are continuously working on Training and you created a copy of our repo,
this will become out-of-date pretty soon.
-In order get the changes we introduced in the official repo you have to tell
git about that.
+In order to get the changes we introduced in the official repo you have to
tell git about that.
-You do this locally by adding a new so-called `remote`. Per default the remote
you cloned from is called `origin`.
+You do this locally by adding a new so-called `remote`. Per default, the
remote you cloned from is called `origin`.
-Usually you will call the second remote `upstream` but in general you can call
it whatever you like.
+Usually you will call the second remote `upstream` but in general, you can
call it whatever you like.
-Add the remote on the commandline (or your git gui of choice):
+Add the remote on the command line (or your git gui of choice):
git remote add upstream https://github.com/apache/incubator-training.git
@@ -83,9 +83,9 @@ It should output something like this:
upstream https://github.com/apache/incubator-training.git (fetch)
upstream https://github.com/apache/incubator-training.git (push)
-If that's so, you're fine to continue, if not ... well you could ask for
assistance on our dev-list.
+If that's so, you're fine to continue, if not ... well, you could ask for
assistance on our dev-list.
-In order to get all changes of our upstream-repository, just execute the
following command:
+In order to get all changes in our upstream-repository, just execute the
following command:
git pull upstream
@@ -97,13 +97,13 @@ This will get all changed from upstream and merge them
locally. In order to upda
=== Bug Reports
-We use https://issues.apache.org/jira/projects/TRAINING[JIRA] as our Bug &
Issue Tracker.
+We use https://issues.apache.org/jira/projects/TRAINING[JIRA] as our Bug &
Issue Tracker.
Feel free to submit `feature requests`, `bug reports`, `patches`, `comment on
issues`, ...
In order to be able to do so, you need to create an account first.
-Currently Apache has a separate login system for JIRA and all other services,
this might change in the future, but right now it's the way things are.
+Currently, Apache has a separate login system for JIRA and all other services,
this might change in the future, but right now it's the way things are.
So if you are considering to contribute more than just a one-time-patch,
please choose a username that hasn't been used by an existing
http://people.apache.org/committer-index.html[Apache committer] as this will
simplify things if we invite you to become part of the team.
@@ -111,7 +111,7 @@ If you want to be assigned to an issue because you want to
work on it, please re
=== Documentation
-As our documentation and website are generated as a side-product of our build,
contributing to this technically the same as contributing to the code.
+As our documentation and website are generated as a side-product of our build,
contributing to this technically is the same as contributing to the code.
All our content is written in Asciidoctor and is located in
`src/site/asciidoc` directories. For a reference of the Asciidoctor syntax
please have a look at the
https://asciidoctor.org/docs/user-manual/#introduction-to-asciidoctor[Asciidoctor
documentation].
diff --git a/site/src/site/asciidoc/developers/decisions.adoc
b/site/src/site/asciidoc/developers/decisions.adoc
index bdb6f89..cf2373a 100644
--- a/site/src/site/asciidoc/developers/decisions.adoc
+++ b/site/src/site/asciidoc/developers/decisions.adoc
@@ -57,8 +57,8 @@ Different decisions require different forms of approval but
community consensus
|Change chair |PMC |Consensus Approval |private list
|Yes 3)
|===
-1. http://www.apache.org/dev/pmc.html#notice_period[Notice] must be given to
board.
-2. Except PMC member in question. Only the board can
http://www.apache.org/dev/pmc.html#pmc-removal[remove PMC members].
+1. http://www.apache.org/dev/pmc.html#notice_period[Notice] must be given to
the board.
+2. Except for the PMC member in question. Only the board can
http://www.apache.org/dev/pmc.html#pmc-removal[remove PMC members].
3. Need to be http://www.apache.org/dev/pmc.html#newchair[approved by the
board] at the next board meeting.
diff --git a/site/src/site/asciidoc/developers/issues.adoc
b/site/src/site/asciidoc/developers/issues.adoc
index e9b5ac9..333eb7d 100644
--- a/site/src/site/asciidoc/developers/issues.adoc
+++ b/site/src/site/asciidoc/developers/issues.adoc
@@ -15,6 +15,6 @@
// limitations under the License.
//
-== Bug & Issue Tracker
+== Bug & Issue Tracker
https://issues.apache.org/jira/projects/TRAINING
\ No newline at end of file
diff --git a/site/src/site/asciidoc/developers/team.adoc
b/site/src/site/asciidoc/developers/team.adoc
index 4106238..8d6b5b3 100644
--- a/site/src/site/asciidoc/developers/team.adoc
+++ b/site/src/site/asciidoc/developers/team.adoc
@@ -32,3 +32,9 @@ Sorted by first name:
Frankfurt |Likes to swim outside the mainstream. He is really passionate
about walking new paths. His first email to an Apache list on file was to the
Cocoon project back in the year 2000. His direct involvement started in 2012
when he was elected to become an Apache Flex committer. Since then he became
involved with a lot of Apache-internal groups and committees and was elected to
become a Member of the Apache Software Foundation in 2015 and recently has
taken up the role of mentoring [...]
+| *Justin Mclean*
+
+Trainer and Consultant
+
+Various |Justin Mclean has been teaching for 10+ years and now splits his time
between that and software development. He runs his own consulting company Class
Software for 25+ years and has spoken at numerous conferences in his home of
Australia and overseas. He's heavily involved in open source hardware and
software, and runs the IoT meetup in Sydney. He currently teaches at an online
college and is a casual academic at a university. |
a|image::team/jmclean.jpg[jmclean, 200, 200]
+
diff --git a/site/src/site/asciidoc/developers/website.adoc
b/site/src/site/asciidoc/developers/website.adoc
index 69c2ac7..a7fb9bd 100644
--- a/site/src/site/asciidoc/developers/website.adoc
+++ b/site/src/site/asciidoc/developers/website.adoc
@@ -17,9 +17,9 @@
== Generating the Website
-We are currently using the normal `Maven` build to not only generate the
project artifacts, but also the projects website.
+We are currently using the normal `Maven` build to not only generate the
project artifacts, but also the project's website.
-In order to provide content, every module can have a `src/site` directory.
This content will be generated to that modules site-part.
+In order to provide content, every module can have a `src/site` directory.
This content will be generated to those modules site-part.
The `skin` being used to generate the site is none of the default `Maven`
skins, but a more up-to-date looking skin using:
@@ -34,17 +34,17 @@ The site content itself is generated from `asciidoc` files
(ending `.adoc`) whic
Beyond the basic goodies, the build is also configured to generate images from
ASCII data using the `asciidoctor-diagram` plugin.
-This allows us to generate images like the ones on the
http://plc4x.apache.org/protocols/s7/index.html[S7 Protocol Description page]
+This allows us to generate images like the ones on the
http://4x.apache.org/protocols/s7/index.html[S7 Protocol Description page]
=== Providing new content
-Within the `src/site` directory there is a file `site.xml` which generally
controls the menu and the look of the site.
+Within the `src/site` directory, there is a file `site.xml` which generally
controls the menu and the look of the site.
-Most setting are inherited from the `training` parent module. That's also why
this is more complicated than the others.
+Most settings are inherited from the `training` parent module. That's also why
this is more complicated than the others.
The `site.xml` file is optional. Even if this is not available a site will be
generated however no additional content will be linked from any of the
navigation menus.
-So if we wanted to add a new page on some (hopefully non existent) `Cool
content`, we would create a file called:
+So if we wanted to add a new page on some (hopefully non-existent) `Cool
content`, we would create a file called:
`index.adoc` in the `src/site/asciidoc/content/cool` directory.
@@ -83,7 +83,7 @@ The simplest form would probably be something like this:
limitations under the License.
-->
-<project name="PLC4J">
+<project name="Training">
<body>
<menu name="content">
@@ -120,7 +120,7 @@ If you want to insert the menu somewhere else, you will
have to re-define the en
limitations under the License.
-->
-<project name="PLC4J">
+<project name="Training">
<body>
@@ -144,16 +144,16 @@ The `menu ref` items hereby reference standard menus
provided by the `Maven` bui
The Apache Training project uses Apache `gitpubsub` system for maintaining the
website.
-In general all content in a repos `asf-site` branch is copied to the
Webservers, if that repo is registered for it.
+In general, all content in a repos `asf-site` branch is copied to the web
servers, if that repo is registered for it.
The content in this branch is generated and maintained during the `Maven`
build as part of the `site` generation if the `site-deploy` phase is executed.
-The build system needs to check-in content to the `asf-site` branch and
usually ASF Jenkins nodes don't have the permissions to do that.
+The build system needs to check-in content to the `asf-site` branch and
usually the ASF Jenkins nodes don't have the permissions to do that.
In order to be able to push to the `asf-site` GIT branch, a dedicated build
job is configured to build on nodes with the Jenkins label `git-websites`.
Only on these machines are jobs allowed to push changes to a Git repo and here
only to a branch named `asf-site`.
-See https://builds.apache.org/view/M-R/job/PLC4X/job/PLC4X%20Site/ for details
on the PLC4X Jenkins Website build job.
+See https://builds.apache.org/view/M-R/job/4X/job/PLC4X%20Site/ for details on
the PLC4X Jenkins Website build job.
-As soon as content is updated in the `asf-site` the `gitpubsub` mechanism will
make those changes available at https://training.apache.org
+As soon as the content is updated in the `asf-site` the `gitpubsub` mechanism
will make those changes available at https://training.apache.org
diff --git a/site/src/site/asciidoc/index.adoc
b/site/src/site/asciidoc/index.adoc
index e94d20b..13ed95b 100644
--- a/site/src/site/asciidoc/index.adoc
+++ b/site/src/site/asciidoc/index.adoc
@@ -20,11 +20,11 @@
== Apache Training™ (Incubating)
=== Purpose
-The purpose of the Training project is to create high-quality training
material for various projects in an open source form. Up until now everyone who
wants to offer a Training course for one of the Apache projects needs to create
her or his own slides/labs and keep them up-to-date. This is a significant
investment of time and money. This project aims to spread that burden and help
all Apache projects as we can create shared resources and we can also create
cross-project trainings.
+The purpose of the Training project is to create high-quality training
material for various projects in an open source form. Up until now everyone who
wants to offer a Training course for one of the Apache projects needs to create
her or his own slides/labs and keep them up-to-date. This is a significant
investment of time and money. This project aims to spread that burden and help
all Apache projects as we can create shared resources and we can also create
cross-project training resources.
To sum up, the main goals for this project:
-- Develop shared material that can be used for trainings
+- Develop shared material that can be used for training
- Cross-project
- Focused on Apache but also 3rd party projects where it makes sense
- Develop “labs” or “hands-on” exercises
@@ -39,27 +39,27 @@ These are non-goals for this project:
- The training material we develop is not necessarily self-explanatory. It
still benefits from an experienced instructor but it will make it possible for
talented people without the time and resources to develop material to still
train others.
=== Rationale
-There are tons of companies offering training for and around the Apache
ecosystem. From our experience everyone is building a very similar set of
slides and labs (there’s only so many ways you can explain a concept). This
project aims to create and use synergies. By also bringing these resources
closer to their origin we hope to improve quality, freshness of the content and
versatility (e.g. more language options).
+There are tons of companies offering training for and around the Apache
ecosystem. From our experience, everyone is building a very similar set of
slides and labs (there’s only so many ways you can explain a concept). This
project aims to create and use synergies. By also bringing these resources
closer to their origin we hope to improve quality, the freshness of the content
and versatility (e.g. more language options).
It is the mission of the Apache foundation “to provide software for the public
good” and we believe this project can help with that mission by making the
software more accessible for a broader audience.
=== Next steps
The initial goal for the first few weeks or months is to have discussions and
agreements on various scoping and technical issues as well as integrating
existing donated material.
-After that we want to start building a library of content.
+From there we want to start building a library of content.
=== Getting involved
-The main resource for any discussion around this project is the dev mailing
list (see below). If you have any specific question or want to get involved in
any way, by all means do reach out and say hi!
+The main resource for any discussion around this project is the dev mailing
list (see below). If you have any specific question or want to get involved in
any way, by all means, do so and reach out and say hi!
The following resources are currently being used by the project:
-Dev Mailing List:
[Archive](https://lists.apache.org/[email protected]) -
[Subscribe](mailto:[email protected])
+Dev Mailing List:
link:++https://lists.apache.org/[email protected]++[Archive]
- mailto:[email protected][Subscribe]
-Issues Mailing List:
[Archive](https://lists.apache.org/[email protected]) -
[Subscribe](mailto:[email protected])
+Issues Mailing List:
link:++https://lists.apache.org/[email protected]++[Archive]
- mailto:[email protected][Subscribe]
-Commits Mailing List:
[Archive](https://lists.apache.org/[email protected]) -
[Subscribe](mailto:[email protected])
+Commits Mailing List:
link:++https://lists.apache.org/[email protected]++[Archive]
- mailto:[email protected][Subscribe]
-Wiki:
[https://cwiki.apache.org/confluence/display/TRAINING](https://cwiki.apache.org/confluence/display/TRAINING)
+Wiki: https://cwiki.apache.org/confluence/display/TRAINING
-Jira:
[https://issues.apache.org/jira/browse/TRAINING](https://issues.apache.org/jira/browse/TRAINING)
+Jira: https://issues.apache.org/jira/browse/TRAINING
\ No newline at end of file
diff --git a/site/src/site/resources/images/apache_training_logo.png
b/site/src/site/resources/images/apache_training_logo.png
new file mode 100644
index 0000000..4059787
Binary files /dev/null and
b/site/src/site/resources/images/apache_training_logo.png differ
diff --git a/site/src/site/resources/images/team/jmclean.jpg
b/site/src/site/resources/images/team/jmclean.jpg
new file mode 100644
index 0000000..904a031
Binary files /dev/null and b/site/src/site/resources/images/team/jmclean.jpg
differ
diff --git a/site/src/site/site.xml b/site/src/site/site.xml
index fb6ef10..fad985f 100644
--- a/site/src/site/site.xml
+++ b/site/src/site/site.xml
@@ -38,7 +38,7 @@
<reflowSkin>
<localResources>true</localResources>
<absoluteResourceURL>https://training.apache.org/</absoluteResourceURL>
- <titleTemplate>Apache Training� (Incubating) - %2$s</titleTemplate>
+ <titleTemplate>Apache Training™ (Incubating) - %2$s</titleTemplate>
<slogan position="bannerLeft">Training material for Apache
projects</slogan>
<showApacheEvents>true</showApacheEvents>
<toc>top</toc>
@@ -73,7 +73,7 @@
<bannerLeft>
<name>Apache Training (incubating)</name>
- <src>https://training.apache.org/images/apache_training_logo.png</src>
+ <src>/images/apache_training_logo.png</src>
<href>https://training.apache.org/</href>
</bannerLeft>
diff --git a/tools/maven-revealjs-asciidoctor-templte/src/main/theme/apache.css
b/tools/maven-revealjs-asciidoctor-templte/src/main/theme/apache.css
index 919ce6f..65ab331 100644
--- a/tools/maven-revealjs-asciidoctor-templte/src/main/theme/apache.css
+++ b/tools/maven-revealjs-asciidoctor-templte/src/main/theme/apache.css
@@ -344,6 +344,6 @@ body {
right: 5px;
width: 306px;
height: 100px;
- background-image: url("../../../images/logo-plc4x.png");
+ background-image: url("../../../images/logo-training.png");
}*/
