This is an automated email from the ASF dual-hosted git repository.

jmclean pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-training.git

commit fee39527cb334f84c1e73c4d9aaa7698b7d29d49
Author: jenkins <[email protected]>
AuthorDate: Sun May 12 08:02:33 2019 +0000

    Site checkin for project Training: Website
---
 dependency-info.html            |   4 ++--
 developers/building.html        |  18 +++++++++---------
 developers/ci.html              |   8 ++++----
 developers/contributing.html    |  26 +++++++++++++-------------
 developers/decisions.html       |   8 ++++----
 developers/issues.html          |   4 ++--
 developers/team.html            |  17 +++++++++++++++--
 developers/website.html         |  28 ++++++++++++++--------------
 developers/wiki.html            |   4 ++--
 distribution-management.html    |   4 ++--
 images/apache_training_logo.png | Bin 0 -> 2412 bytes
 images/team/jmclean.jpg         | Bin 0 -> 62175 bytes
 index.html                      |  24 ++++++++++++------------
 issue-management.html           |   4 ++--
 licenses.html                   |   4 ++--
 mailing-lists.html              |   4 ++--
 plugin-management.html          |   4 ++--
 plugins.html                    |   4 ++--
 project-info.html               |   4 ++--
 scm.html                        |   4 ++--
 sitemap.html                    |   4 ++--
 summary.html                    |   4 ++--
 22 files changed, 97 insertions(+), 84 deletions(-)

diff --git a/dependency-info.html b/dependency-info.html
index 5138700..a247997 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Dependency Information</title>
+    <title>Apache Training™ (Incubating) - Dependency Information</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/developers/building.html b/developers/building.html
index 3d99bd3..21c54e5 100644
--- a/developers/building.html
+++ b/developers/building.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Building Training Website</title>
+    <title>Apache Training™ (Incubating) - Building Training Website</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="../images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
@@ -133,12 +133,12 @@
    <p>The Apache Training Website is built with <code>Apache Maven</code> and 
we have tried to make the build as simple as possible.</p> 
   </div> 
   <div class="paragraph"> 
-   <p>For your convenience we also have provided a <code>Maven-Wrapper</code>, 
that should allow building with only <code>Java 8</code> or greater as 
requirement.</p> 
+   <p>For your convenience we also have provided a <code>Maven-Wrapper</code>, 
that should allow building with <code>Java 8</code> or greater as a 
requirement.</p> 
   </div> 
   <div class="sect2"> 
    <h3 id="_toc_requirements1">Requirements</h3> 
    <div class="paragraph"> 
-    <p>The only requirements to building the Apache Training website should 
be:</p> 
+    <p>The only requirements for building the Apache Training website should 
be:</p> 
    </div> 
    <div class="ulist"> 
     <ul> 
@@ -153,7 +153,7 @@
     <p>The so-called <code>Maven-Wrapper</code> is used by calling the 
Maven-Wrapper scripts <code>mvnw</code> (Mac &amp; Linux) or 
<code>mvnw.cmd</code> (Windows) instead of the default Maven commands 
<code>mvn</code> and <code>mvn.cmd</code>.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>These helpers ensure Maven is available in at least the version defined 
in <code>.mvn/maven-wrapper.properties</code>. 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)</p> 
+    <p>These helpers ensure Maven is available in at least the version defined 
in <code>.mvn/maven-wrapper.properties</code>. 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)</p> 
    </div> 
    <div class="paragraph"> 
     <p>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 <code>w</code> to each of the Maven 
commands, there should be no difference to using a pre-installed Maven 
version.</p> 
@@ -165,7 +165,7 @@
     <p>This document can’t provide you with all the details needed to get 
started with <code>Maven</code> itself. But there is a lot of good 
documentation out there.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>Justin McLean and Christofer Dutz even recorded a not quite 2 hour 
Maven training Video some time ago for another Apache project.</p> 
+    <p>Justin Mclean and Christofer Dutz even recorded a not quite 2 hour 
Maven training Video some time ago for another Apache project.</p> 
    </div> 
    <div class="paragraph"> 
     <p>It should handle all the details needed to get a general understanding 
of Maven and how it works.</p> 
@@ -182,7 +182,7 @@
   <div class="sect2"> 
    <h3 id="_toc_building_the_apache_training_website_with_maven1">Building the 
Apache Training Website with Maven</h3> 
    <div class="paragraph"> 
-    <p>The PLC4X Website is also part of the same GIT repository that contains 
the code and it is built by Maven as well.</p> 
+    <p>The Training Website is also part of the same GIT repository that 
contains the code and it is built by Maven as well.</p> 
    </div> 
    <div class="paragraph"> 
     <p>In order to build the website the following command should be 
sufficient:</p> 
@@ -193,7 +193,7 @@
     </div> 
    </div> 
    <div class="paragraph"> 
-    <p>However this will generate the website for each module inside it’s 
<code>target/site</code> 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:</p> 
+    <p>However, this will generate the website for each module inside it’s 
<code>target/site</code> 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:</p> 
    </div> 
    <div class="literalblock"> 
     <div class="content"> 
@@ -207,7 +207,7 @@
     <p>A lot of documentation on Maven suggests to use the 
<code>site:site</code> goal directly instead of calling the <code>site</code> 
phase, but in case of Apache Training there is more than just the site 
generation that has to be executed.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>This is just a quick-start version of the site generation, for a fully 
detailed documentation please read the <a 
href="http://training.apache.org/developers/website.html";>Website</a> 
documentation page.</p> 
+    <p>This is just a quick-start version of the site generation, for fully 
detailed documentation please read the <a 
href="http://training.apache.org/developers/website.html";>Website</a> 
documentation page.</p> 
    </div> 
   </div> 
  </div> 
diff --git a/developers/ci.html b/developers/ci.html
index 024d43d..24bcfbf 100644
--- a/developers/ci.html
+++ b/developers/ci.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Continuous Integration</title>
+    <title>Apache Training™ (Incubating) - Continuous Integration</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="../images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
@@ -131,7 +131,7 @@
   </div> 
   <div class="ulist"> 
    <ul> 
-    <li> <p>Apache’s Jenkins at: <a 
href="https://builds.apache.org/view/S-Z/job/Training/"; 
class="bare">https://builds.apache.org/view/S-Z/job/Training/</a></p> </li> 
+    <li> <p>Apache’s Jenkins at <a 
href="https://builds.apache.org/view/S-Z/job/Training/"; 
class="bare">https://builds.apache.org/view/S-Z/job/Training/</a></p> </li> 
    </ul> 
   </div> 
   <div class="paragraph"> 
@@ -143,7 +143,7 @@
     <p>We are using the Jenkins <code>multi-branch pipeline plugin</code> to 
automatically setup build for branches based upon the build definition in the 
<code>Jenkinsfile</code> in the root of the project.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>In general it decides between building of the <code>master</code> 
branch and all others.</p> 
+    <p>In general, it decides between building the <code>master</code> branch 
and all others.</p> 
    </div> 
    <div class="paragraph"> 
     <p>When building <code>master</code> the build not only builds the project 
itself, it also deploys the generated site content to the <code>asf-site</code> 
branch which deploys the website.</p> 
diff --git a/developers/contributing.html b/developers/contributing.html
index db3be29..24598ce 100644
--- a/developers/contributing.html
+++ b/developers/contributing.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Contributing</title>
+    <title>Apache Training™ (Incubating) - Contributing</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="../images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
@@ -158,13 +158,13 @@
   <div class="sect2"> 
    <h3 id="_toc_pull-requests">Pull-Requests</h3> 
    <div class="paragraph"> 
-    <p>The simplest way to submit code changes, is via a GitHub 
pull-request.</p> 
+    <p>The simplest way to submit code changes is via a GitHub 
pull-request.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>In order to do this first create a GitHub account and sign into you 
account.</p> 
+    <p>In order to do this first create a GitHub account and sign into your 
account.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>After that’s done, please to to our <a 
href="https://github.com/apache/incubator-training";>GitHub site</a> and create 
a so-called <code>Fork</code>.</p> 
+    <p>After that’s done, please go to our <a 
href="https://github.com/apache/incubator-training";>GitHub site</a> and create 
a so-called <code>Fork</code>.</p> 
    </div> 
    <div class="imageblock"> 
     <div class="content"> 
@@ -208,16 +208,16 @@
      <p>As we are continuously working on Training and you created a copy of 
our repo, this will become out-of-date pretty soon.</p> 
     </div> 
     <div class="paragraph"> 
-     <p>In order get the changes we introduced in the official repo you have 
to tell git about that.</p> 
+     <p>In order to get the changes we introduced in the official repo you 
have to tell git about that.</p> 
     </div> 
     <div class="paragraph"> 
-     <p>You do this locally by adding a new so-called <code>remote</code>. Per 
default the remote you cloned from is called <code>origin</code>.</p> 
+     <p>You do this locally by adding a new so-called <code>remote</code>. Per 
default, the remote you cloned from is called <code>origin</code>.</p> 
     </div> 
     <div class="paragraph"> 
-     <p>Usually you will call the second remote <code>upstream</code> but in 
general you can call it whatever you like.</p> 
+     <p>Usually you will call the second remote <code>upstream</code> but in 
general, you can call it whatever you like.</p> 
     </div> 
     <div class="paragraph"> 
-     <p>Add the remote on the commandline (or your git gui of choice):</p> 
+     <p>Add the remote on the command line (or your git gui of choice):</p> 
     </div> 
     <div class="literalblock"> 
      <div class="content"> 
@@ -244,10 +244,10 @@ upstream    
https://github.com/apache/incubator-training.git (push)</pre>
      </div> 
     </div> 
     <div class="paragraph"> 
-     <p>If that’s so, you’re fine to continue, if not …​ well you could ask 
for assistance on our dev-list.</p> 
+     <p>If that’s so, you’re fine to continue, if not …​ well, you could ask 
for assistance on our dev-list.</p> 
     </div> 
     <div class="paragraph"> 
-     <p>In order to get all changes of our upstream-repository, just execute 
the following command:</p> 
+     <p>In order to get all changes in our upstream-repository, just execute 
the following command:</p> 
     </div> 
     <div class="literalblock"> 
      <div class="content"> 
@@ -279,7 +279,7 @@ upstream    
https://github.com/apache/incubator-training.git (push)</pre>
     <p>In order to be able to do so, you need to create an account first.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>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.</p> 
+    <p>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.</p> 
    </div> 
    <div class="paragraph"> 
     <p>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 
<a href="http://people.apache.org/committer-index.html";>Apache committer</a> as 
this will simplify things if we invite you to become part of the team.</p> 
@@ -291,7 +291,7 @@ upstream    
https://github.com/apache/incubator-training.git (push)</pre>
   <div class="sect2"> 
    <h3 id="_toc_documentation1">Documentation</h3> 
    <div class="paragraph"> 
-    <p>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.</p> 
+    <p>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.</p> 
    </div> 
    <div class="paragraph"> 
     <p>All our content is written in Asciidoctor and is located in 
<code>src/site/asciidoc</code> directories. For a reference of the Asciidoctor 
syntax please have a look at the <a 
href="https://asciidoctor.org/docs/user-manual/#introduction-to-asciidoctor";>Asciidoctor
 documentation</a>.</p> 
diff --git a/developers/decisions.html b/developers/decisions.html
index ee52af5..84610f0 100644
--- a/developers/decisions.html
+++ b/developers/decisions.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Decision Making</title>
+    <title>Apache Training™ (Incubating) - Decision Making</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="../images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
@@ -248,8 +248,8 @@
    </table> 
    <div class="olist arabic"> 
     <ol class="arabic"> 
-     <li> <p><a 
href="http://www.apache.org/dev/pmc.html#notice_period";>Notice</a> must be 
given to board.</p> </li> 
-     <li> <p>Except PMC member in question. Only the board can <a 
href="http://www.apache.org/dev/pmc.html#pmc-removal";>remove PMC 
members</a>.</p> </li> 
+     <li> <p><a 
href="http://www.apache.org/dev/pmc.html#notice_period";>Notice</a> must be 
given to the board.</p> </li> 
+     <li> <p>Except for the PMC member in question. Only the board can <a 
href="http://www.apache.org/dev/pmc.html#pmc-removal";>remove PMC 
members</a>.</p> </li> 
      <li> <p>Need to be <a 
href="http://www.apache.org/dev/pmc.html#newchair";>approved by the board</a> at 
the next board meeting.</p> </li> 
     </ol> 
    </div> 
diff --git a/developers/issues.html b/developers/issues.html
index d1c0203..003fa83 100644
--- a/developers/issues.html
+++ b/developers/issues.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Bug & Issue Tracker</title>
+    <title>Apache Training™ (Incubating) - Bug & Issue Tracker</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="../images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/developers/team.html b/developers/team.html
index f22dfc7..2f862be 100644
--- a/developers/team.html
+++ b/developers/team.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Team</title>
+    <title>Apache Training™ (Incubating) - Team</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="../images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
@@ -157,6 +157,19 @@
        </div> 
       </div></td> 
     </tr> 
+    <tr> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock"><strong>Justin Mclean</strong></p> <p 
class="tableblock">Trainer and Consultant</p> <p 
class="tableblock">Various</p></td> 
+     <td class="tableblock halign-left valign-top"><p 
class="tableblock">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 u [...]
+     <td class="tableblock halign-left valign-top"></td> 
+     <td class="tableblock halign-left valign-top"> 
+      <div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <img src="../images/team/jmclean.jpg" alt="jmclean" width="200" 
height="200" class="img-responsive"> 
+        </div> 
+       </div> 
+      </div></td> 
+    </tr> 
    </tbody> 
   </table> 
  </div> 
diff --git a/developers/website.html b/developers/website.html
index 448d66a..67d21a3 100644
--- a/developers/website.html
+++ b/developers/website.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Generating the Website</title>
+    <title>Apache Training™ (Incubating) - Generating the Website</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="../images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
@@ -129,10 +129,10 @@
  </div> 
  <div class="sectionbody"> 
   <div class="paragraph"> 
-   <p>We are currently using the normal <code>Maven</code> build to not only 
generate the project artifacts, but also the projects website.</p> 
+   <p>We are currently using the normal <code>Maven</code> build to not only 
generate the project artifacts, but also the project’s website.</p> 
   </div> 
   <div class="paragraph"> 
-   <p>In order to provide content, every module can have a 
<code>src/site</code> directory. This content will be generated to that modules 
site-part.</p> 
+   <p>In order to provide content, every module can have a 
<code>src/site</code> directory. This content will be generated to those 
modules site-part.</p> 
   </div> 
   <div class="paragraph"> 
    <p>The <code>skin</code> being used to generate the site is none of the 
default <code>Maven</code> skins, but a more up-to-date looking skin using:</p> 
@@ -154,21 +154,21 @@
    <p>Beyond the basic goodies, the build is also configured to generate 
images from ASCII data using the <code>asciidoctor-diagram</code> plugin.</p> 
   </div> 
   <div class="paragraph"> 
-   <p>This allows us to generate images like the ones on the <a 
href="http://plc4x.apache.org/protocols/s7/index.html";>S7 Protocol Description 
page</a></p> 
+   <p>This allows us to generate images like the ones on the <a 
href="http://4x.apache.org/protocols/s7/index.html";>S7 Protocol Description 
page</a></p> 
   </div> 
   <div class="sect2"> 
    <h3 id="_toc_providing_new_content1">Providing new content</h3> 
    <div class="paragraph"> 
-    <p>Within the <code>src/site</code> directory there is a file 
<code>site.xml</code> which generally controls the menu and the look of the 
site.</p> 
+    <p>Within the <code>src/site</code> directory, there is a file 
<code>site.xml</code> which generally controls the menu and the look of the 
site.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>Most setting are inherited from the <code>training</code> parent 
module. That’s also why this is more complicated than the others.</p> 
+    <p>Most settings are inherited from the <code>training</code> parent 
module. That’s also why this is more complicated than the others.</p> 
    </div> 
    <div class="paragraph"> 
     <p>The <code>site.xml</code> 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.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>So if we wanted to add a new page on some (hopefully non existent) 
<code>Cool content</code>, we would create a file called:</p> 
+    <p>So if we wanted to add a new page on some (hopefully non-existent) 
<code>Cool content</code>, we would create a file called:</p> 
    </div> 
    <div class="paragraph"> 
     <p><code>index.adoc</code> in the 
<code>src/site/asciidoc/content/cool</code> directory.</p> 
@@ -213,7 +213,7 @@ Here comes some extremely cool content.</code></pre>
  limitations under the License.
 
  --&gt;
-&lt;project name="PLC4J"&gt;
+&lt;project name="Training"&gt;
 
   &lt;body&gt;
     &lt;menu name="content"&gt;
@@ -254,7 +254,7 @@ Here comes some extremely cool content.</code></pre>
  limitations under the License.
 
  --&gt;
-&lt;project name="PLC4J"&gt;
+&lt;project name="Training"&gt;
 
   &lt;body&gt;
 
@@ -282,13 +282,13 @@ Here comes some extremely cool content.</code></pre>
     <p>The Apache Training project uses Apache <code>gitpubsub</code> system 
for maintaining the website.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>In general all content in a repos <code>asf-site</code> branch is 
copied to the Webservers, if that repo is registered for it.</p> 
+    <p>In general, all content in a repos <code>asf-site</code> branch is 
copied to the web servers, if that repo is registered for it.</p> 
    </div> 
    <div class="paragraph"> 
     <p>The content in this branch is generated and maintained during the 
<code>Maven</code> build as part of the <code>site</code> generation if the 
<code>site-deploy</code> phase is executed.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>The build system needs to check-in content to the <code>asf-site</code> 
branch and usually ASF Jenkins nodes don’t have the permissions to do that.</p> 
+    <p>The build system needs to check-in content to the <code>asf-site</code> 
branch and usually the ASF Jenkins nodes don’t have the permissions to do 
that.</p> 
    </div> 
    <div class="paragraph"> 
     <p>In order to be able to push to the <code>asf-site</code> GIT branch, a 
dedicated build job is configured to build on nodes with the Jenkins label 
<code>git-websites</code>.</p> 
@@ -297,10 +297,10 @@ Here comes some extremely cool content.</code></pre>
     <p>Only on these machines are jobs allowed to push changes to a Git repo 
and here only to a branch named <code>asf-site</code>.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>See <a 
href="https://builds.apache.org/view/M-R/job/PLC4X/job/PLC4X%20Site/"; 
class="bare">https://builds.apache.org/view/M-R/job/PLC4X/job/PLC4X%20Site/</a> 
for details on the PLC4X Jenkins Website build job.</p> 
+    <p>See <a 
href="https://builds.apache.org/view/M-R/job/4X/job/PLC4X%20Site/"; 
class="bare">https://builds.apache.org/view/M-R/job/4X/job/PLC4X%20Site/</a> 
for details on the PLC4X Jenkins Website build job.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>As soon as content is updated in the <code>asf-site</code> the 
<code>gitpubsub</code> mechanism will make those changes available at <a 
href="https://training.apache.org"; 
class="bare">https://training.apache.org</a></p> 
+    <p>As soon as the content is updated in the <code>asf-site</code> the 
<code>gitpubsub</code> mechanism will make those changes available at <a 
href="https://training.apache.org"; 
class="bare">https://training.apache.org</a></p> 
    </div> 
   </div> 
  </div> 
diff --git a/developers/wiki.html b/developers/wiki.html
index 9fd106f..b49fc5f 100644
--- a/developers/wiki.html
+++ b/developers/wiki.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - WIKI</title>
+    <title>Apache Training™ (Incubating) - WIKI</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="../images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/distribution-management.html b/distribution-management.html
index a188d55..699a108 100644
--- a/distribution-management.html
+++ b/distribution-management.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Project Distribution 
Management</title>
+    <title>Apache Training™ (Incubating) - Project Distribution 
Management</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/images/apache_training_logo.png b/images/apache_training_logo.png
new file mode 100644
index 0000000..4059787
Binary files /dev/null and b/images/apache_training_logo.png differ
diff --git a/images/team/jmclean.jpg b/images/team/jmclean.jpg
new file mode 100644
index 0000000..904a031
Binary files /dev/null and b/images/team/jmclean.jpg differ
diff --git a/index.html b/index.html
index 3cb69e1..6671a9b 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Apache Training™ 
(Incubating)</title>
+    <title>Apache Training™ (Incubating) - Apache Training™ 
(Incubating)</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
@@ -132,14 +132,14 @@
   <div class="sect2"> 
    <h3 id="_toc_purpose1">Purpose</h3> 
    <div class="paragraph"> 
-    <p>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.</p> 
+    <p>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  [...]
    </div> 
    <div class="paragraph"> 
     <p>To sum up, the main goals for this project:</p> 
    </div> 
    <div class="ulist"> 
     <ul> 
-     <li> <p>Develop shared material that can be used for trainings</p> </li> 
+     <li> <p>Develop shared material that can be used for training</p> </li> 
      <li> <p>Cross-project</p> </li> 
      <li> <p>Focused on Apache but also 3rd party projects where it makes 
sense</p> </li> 
      <li> <p>Develop “labs” or “hands-on” exercises</p> </li> 
@@ -162,7 +162,7 @@
   <div class="sect2"> 
    <h3 id="_toc_rationale1">Rationale</h3> 
    <div class="paragraph"> 
-    <p>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).</p> 
+    <p>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).</p> 
    </div> 
    <div class="paragraph"> 
     <p>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.</p> 
@@ -174,31 +174,31 @@
     <p>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.</p> 
    </div> 
    <div class="paragraph"> 
-    <p>After that we want to start building a library of content.</p> 
+    <p>From there we want to start building a library of content.</p> 
    </div> 
   </div> 
   <div class="sect2"> 
    <h3 id="_toc_getting_involved1">Getting involved</h3> 
    <div class="paragraph"> 
-    <p>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!</p> 
+    <p>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!</p> 
    </div> 
    <div class="paragraph"> 
     <p>The following resources are currently being used by the project:</p> 
    </div> 
    <div class="paragraph"> 
-    <p>Dev Mailing List: [Archive](<a 
href="https://lists.apache.org/list.html?<a href=" 
mailto:[email protected]";>[email protected]</a>" 
class="bare"&gt;https://lists.apache.org/list.html?<a 
href="mailto:[email protected]";>[email protected]</a>) - 
[Subscribe](mailto:[email protected])</p> 
+    <p>Dev Mailing List: <a 
href="https://lists.apache.org/[email protected]";>Archive</a> 
- <a href="mailto:[email protected]";>Subscribe</a></p> 
    </div> 
    <div class="paragraph"> 
-    <p>Issues Mailing List: [Archive](<a 
href="https://lists.apache.org/list.html?<a href=" 
mailto:[email protected]";>[email protected]</a>" 
class="bare"&gt;https://lists.apache.org/list.html?<a 
href="mailto:[email protected]";>[email protected]</a>) - 
[Subscribe](mailto:[email protected])</p> 
+    <p>Issues Mailing List: <a 
href="https://lists.apache.org/[email protected]";>Archive</a>
 - <a href="mailto:[email protected]";>Subscribe</a></p> 
    </div> 
    <div class="paragraph"> 
-    <p>Commits Mailing List: [Archive](<a 
href="https://lists.apache.org/list.html?<a href=" 
mailto:[email protected]";>[email protected]</a>" 
class="bare"&gt;https://lists.apache.org/list.html?<a 
href="mailto:[email protected]";>[email protected]</a>) - 
[Subscribe](mailto:[email protected])</p> 
+    <p>Commits Mailing List: <a 
href="https://lists.apache.org/[email protected]";>Archive</a>
 - <a href="mailto:[email protected]";>Subscribe</a></p> 
    </div> 
    <div class="paragraph"> 
-    <p>Wiki: [<a href="https://cwiki.apache.org/confluence/display/TRAINING"; 
class="bare">https://cwiki.apache.org/confluence/display/TRAINING</a>](<a 
href="https://cwiki.apache.org/confluence/display/TRAINING"; 
class="bare">https://cwiki.apache.org/confluence/display/TRAINING</a>)</p> 
+    <p>Wiki: <a href="https://cwiki.apache.org/confluence/display/TRAINING"; 
class="bare">https://cwiki.apache.org/confluence/display/TRAINING</a></p> 
    </div> 
    <div class="paragraph"> 
-    <p>Jira: [<a href="https://issues.apache.org/jira/browse/TRAINING"; 
class="bare">https://issues.apache.org/jira/browse/TRAINING</a>](<a 
href="https://issues.apache.org/jira/browse/TRAINING"; 
class="bare">https://issues.apache.org/jira/browse/TRAINING</a>)</p> 
+    <p>Jira: <a href="https://issues.apache.org/jira/browse/TRAINING"; 
class="bare">https://issues.apache.org/jira/browse/TRAINING</a></p> 
    </div> 
   </div> 
  </div> 
diff --git a/issue-management.html b/issue-management.html
index ad89224..bcefd83 100644
--- a/issue-management.html
+++ b/issue-management.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Issue Management</title>
+    <title>Apache Training™ (Incubating) - Issue Management</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/licenses.html b/licenses.html
index ea79a7b..b6fbb93 100644
--- a/licenses.html
+++ b/licenses.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Project Licenses</title>
+    <title>Apache Training™ (Incubating) - Project Licenses</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/mailing-lists.html b/mailing-lists.html
index 1e546ce..1aae415 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Project Mailing Lists</title>
+    <title>Apache Training™ (Incubating) - Project Mailing Lists</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/plugin-management.html b/plugin-management.html
index fdc1828..1cf8656 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Project Plugin Management</title>
+    <title>Apache Training™ (Incubating) - Project Plugin Management</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/plugins.html b/plugins.html
index cfa4adf..ef454a8 100644
--- a/plugins.html
+++ b/plugins.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Project Plugins</title>
+    <title>Apache Training™ (Incubating) - Project Plugins</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/project-info.html b/project-info.html
index 1504ff4..bbdb2a1 100644
--- a/project-info.html
+++ b/project-info.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Project Information</title>
+    <title>Apache Training™ (Incubating) - Project Information</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/scm.html b/scm.html
index f7280fb..b488922 100644
--- a/scm.html
+++ b/scm.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Source Code Management</title>
+    <title>Apache Training™ (Incubating) - Source Code Management</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/sitemap.html b/sitemap.html
index 7ef79a6..2220538 100644
--- a/sitemap.html
+++ b/sitemap.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Sitemap</title>
+    <title>Apache Training™ (Incubating) - Sitemap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>
diff --git a/summary.html b/summary.html
index 6aafdff..f663384 100644
--- a/summary.html
+++ b/summary.html
@@ -9,7 +9,7 @@
           
         <head>
     <meta charset="UTF-8" />
-    <title>Apache Training® (Incubating) - Project Summary</title>
+    <title>Apache Training™ (Incubating) - Project Summary</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="" />
       <meta http-equiv="content-language" content="en" />
@@ -83,7 +83,7 @@
       <div class="col-md-12">
         <div class="pull-left">
                                       <a href="https://training.apache.org/"; 
id="bannerLeft">
-                    <img 
src="https://training.apache.org/images/apache_training_logo.png";
+                    <img src="images/apache_training_logo.png"
                  alt='"'Apache Training (incubating)'"'
  />            </a>
                     <p class="lead">Training material for Apache projects</p>

Reply via email to