You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2019/06/18 12:01:28 UTC

svn commit: r1046504 [2/5] - in /websites/production/turbine/content: ./ common/ common/status/ events/ further-reading/ reports/ turbine/

Modified: websites/production/turbine/content/contact.html
==============================================================================
--- websites/production/turbine/content/contact.html (original)
+++ websites/production/turbine/content/contact.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/contact.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/contact.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -16,21 +16,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href="./" id="bannerLeft"><img src="images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href="./" title="Turbine">Turbine</a> |
-<a href="fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -53,11 +53,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -69,10 +69,11 @@
      <li class="none"><a href="turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -454,7 +455,7 @@ The Apache Turbine PMC can be reached at
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/download.html
==============================================================================
--- websites/production/turbine/content/download.html (original)
+++ websites/production/turbine/content/download.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/download.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/download.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href="./" id="bannerLeft"><img src="images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href="./" title="Turbine">Turbine</a> |
-<a href="fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -127,7 +128,9 @@
   
 <p>
     The best way to get started with Turbine is to use the
-    Maven Archetypes, find it on <a class="externalLink" href="https://github.com/apache/turbine-archetypes" title="Turbine Maven Archetype on GitHub">GitHub</a>. You might interested in the <a class="externalLink" href="https://github.com/apache/turbine-archetypes/tree/docker">Docker branch (in development)</a> as well. See also the <a class="externalLink" href="https://blogs.apache.org/turbine/entry/maven_archetypes_for_apache_turbine">blog post</a>
+    Maven Archetypes, find it on <a class="externalLink" href="https://github.com/apache/turbine-archetypes" title="Turbine Maven Archetype on GitHub">GitHub</a>. 
+    You might interested in the <a class="externalLink" href="https://github.com/apache/turbine-archetypes/tree/docker">Docker branch (in development)</a> as well. 
+    See also the <a class="externalLink" href="https://blogs.apache.org/turbine/entry/maven_archetypes_for_apache_turbine">blog post</a>
     in the <a class="externalLink" href="https://blogs.apache.org/turbine/">Turbine Blog</a> for
     usage information. 
   </p>
@@ -195,7 +198,7 @@
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/events/apachecon-eu2005.html
==============================================================================
--- websites/production/turbine/content/events/apachecon-eu2005.html (original)
+++ websites/production/turbine/content/events/apachecon-eu2005.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/events\apachecon-eu2005.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/events\apachecon-eu2005.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href=".././" id="bannerLeft"><img src="../images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="../images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href=".././" title="Turbine">Turbine</a> |
-<a href="../fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="../turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="../turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="../turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="../turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="../turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="../turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -149,7 +150,7 @@ We are looking forward to meet you at Ap
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/events/apachecon2004.html
==============================================================================
--- websites/production/turbine/content/events/apachecon2004.html (original)
+++ websites/production/turbine/content/events/apachecon2004.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/events\apachecon2004.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/events\apachecon2004.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href=".././" id="bannerLeft"><img src="../images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="../images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href=".././" title="Turbine">Turbine</a> |
-<a href="../fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="../turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="../turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="../turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="../turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="../turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="../turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -149,7 +150,7 @@ We are looking forward to meet you at fa
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/examples.html
==============================================================================
--- websites/production/turbine/content/examples.html (original)
+++ websites/production/turbine/content/examples.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/examples.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/examples.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href="./" id="bannerLeft"><img src="images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href="./" title="Turbine">Turbine</a> |
-<a href="fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -124,14 +125,14 @@
 
 <div class="section">
 <h2><a name="Example_Apps"></a>Example Apps</h2>
-These are some example apps you can download to learn how to work with Turbine.
+These are example apps you can download to learn how to work with Turbine.
 
 
 <div class="section">
 <h3><a name="Turbine_Webapp"></a>Turbine Webapp</h3>
 	
 <p>With 
-	<a class="externalLink" href="https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0">Turbine Webapp Archetype</a> one can build fast an example app that demonstrates how to use Turbine. It also demonstrates Torque integration, Fulcrum Security and Fulcrum Intake, Fulcrum Json.
+	<a class="externalLink" href="https://gitbox.apache.org/repos/asf/turbine-archetypes.git">Turbine Webapp Archetype on Gitbox</a> (<a class="externalLink" href="https://github.com/apache/turbine-archetypes">on GitHub</a>) one can build fast an example app that demonstrates how to use Turbine. It also demonstrates Torque integration, Fulcrum Security and Fulcrum Intake, Fulcrum Json.
   Find more information in the <a class="externalLink" href="https://blogs.apache.org/turbine/">blog</a> in the <a class="externalLink" href="https://blogs.apache.org/turbine/entry/maven_archetypes_for_apache_turbine">blog entry &quot;Maven archetypes for Apache Turbine applications - easier startup with Turbine&quot;</a>.
 	</p>
 </div>
@@ -140,7 +141,7 @@ These are some example apps you can down
 <div class="section">
 <h3><a name="Antelope"></a>Antelope</h3>
 	
-<p>
+<p>(TODO: remove or update)
 	<a class="externalLink" href="http://zebra.tigris.org">Antelope</a> is an example app that demonstrates how
 	to use the Zebra workflow engine with Turbine.  It also demonstrates Hibernate integration,
 	Fulcrum Security, and a form processing engine similar to Intake.
@@ -150,7 +151,7 @@ These are some example apps you can down
 <div class="section">
 <h3><a name="OSWorkflow_Example"></a>OSWorkflow Example</h3>
 	
-<p>
+<p>TODO: remove or update)
 	<a class="externalLink" href="http://turbine.apache.org/fulcrum/fulcrum-osworkflow-example/index.html">This</a>
 	example app shows how to integrate the <a class="externalLink" href="http://www.opensymphony.com/">OSWorkflow</a> engine
 	into Turbine.  You can click through the various screens following the progress of your workflow.
@@ -170,7 +171,7 @@ These are some example apps you can down
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/fsd.html
==============================================================================
--- websites/production/turbine/content/fsd.html (original)
+++ websites/production/turbine/content/fsd.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/fsd.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/fsd.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href="./" id="bannerLeft"><img src="images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href="./" title="Turbine">Turbine</a> |
-<a href="fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -569,7 +570,10 @@ that all you need to do is get an instan
 connection and go. There is no need to pass around a Connection object. Turbine
 comes with pool implementations for many of the most popular databases. Creating
 your own is quite simple as well, all you need to do is look at the existing
-code and create your own. If you need help or want someone to create one for
+code and create your own. By default <a class="externalLink" href="https://db.apache.org/torque/torque-4.0/index.html">Torque</a> 
+is used as ORM-Mapper, find more info 
+<a class="externalLink" href="https://db.apache.org/torque/torque-4.0/documentation/orm-reference/index.html">here</a>.
+If you need help or want someone to create one for
 your database, simply ask on the mailing list.
 </p>
 
@@ -585,7 +589,7 @@ good example of this methodology in use.
 
 
 <p>
-The ParameterParser class takes all of the GET/POST/PATH_INFO data and parses it
+The <b>ParameterParser</b> class takes all of the GET/POST/PATH_INFO data and parses it
 into a hashtable where it can be easily retrieved in a number of forms with the
 provided get* methods. This is how you can have access to form data that has
 been posted by a users web browser.
@@ -602,13 +606,6 @@ because it will allow you to easily add
 
 
 <p>
-The DateSelector class generates Html popup menus for month/day/year. The beauty
-of this class is that you can provide a date for it to start with and it will
-automaticially generate the Html popups with that date.
-</p>
-
-
-<p>
 The Mail classes make it easy to send email via the JavaMail API's. These
 classes are just very simple classes and there is not a huge amount of
 functionality here. Essentially they allow you to get the job done and that is
@@ -626,7 +623,7 @@ about it. Contributions to improve these
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/further-reading/index.html
==============================================================================
--- websites/production/turbine/content/further-reading/index.html (original)
+++ websites/production/turbine/content/further-reading/index.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/further-reading\index.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/further-reading\index.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href=".././" id="bannerLeft"><img src="../images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="../images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href=".././" title="Turbine">Turbine</a> |
-<a href="../fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="../turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="../turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="../turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="../turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="../turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="../turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -237,7 +238,7 @@
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/further-reading/j2ee-integration.html
==============================================================================
--- websites/production/turbine/content/further-reading/j2ee-integration.html (original)
+++ websites/production/turbine/content/further-reading/j2ee-integration.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/further-reading\j2ee-integration.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/further-reading\j2ee-integration.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href=".././" id="bannerLeft"><img src="../images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="../images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href=".././" title="Turbine">Turbine</a> |
-<a href="../fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="../turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="../turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="../turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="../turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="../turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="../turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -355,7 +356,7 @@ above.
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/further-reading/model2+1.html
==============================================================================
--- websites/production/turbine/content/further-reading/model2+1.html (original)
+++ websites/production/turbine/content/further-reading/model2+1.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/further-reading\model2+1.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/further-reading\model2+1.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href=".././" id="bannerLeft"><img src="../images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="../images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href=".././" title="Turbine">Turbine</a> |
-<a href="../fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="../turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="../turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="../turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="../turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="../turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="../turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -252,7 +253,7 @@ Understanding JavaServer Pages Model 2 a
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/further-reading/pullmodel.html
==============================================================================
--- websites/production/turbine/content/further-reading/pullmodel.html (original)
+++ websites/production/turbine/content/further-reading/pullmodel.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/further-reading\pullmodel.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/further-reading\pullmodel.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href=".././" id="bannerLeft"><img src="../images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="../images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href=".././" title="Turbine">Turbine</a> |
-<a href="../fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="../turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="../turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="../turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="../turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="../turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="../turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -268,7 +269,7 @@ Comments are appreciated. Please post th
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/getinvolved.html
==============================================================================
--- websites/production/turbine/content/getinvolved.html (original)
+++ websites/production/turbine/content/getinvolved.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/getinvolved.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/getinvolved.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href="./" id="bannerLeft"><img src="images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href="./" title="Turbine">Turbine</a> |
-<a href="fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -137,7 +138,7 @@
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/how-it-works.html
==============================================================================
--- websites/production/turbine/content/how-it-works.html (original)
+++ websites/production/turbine/content/how-it-works.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/how-it-works.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/how-it-works.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -16,21 +16,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href="./" id="bannerLeft"><img src="images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href="./" title="Turbine">Turbine</a> |
-<a href="fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -53,11 +53,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -69,10 +69,11 @@
      <li class="none"><a href="turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -200,7 +201,7 @@ discussed on the Turbine general mailing
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/how-to-help.html
==============================================================================
--- websites/production/turbine/content/how-to-help.html (original)
+++ websites/production/turbine/content/how-to-help.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/how-to-help.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/how-to-help.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href="./" id="bannerLeft"><img src="images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href="./" title="Turbine">Turbine</a> |
-<a href="fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="turbine/development/turbine-5.1/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -169,7 +170,7 @@
         </li>
         
 <li>
-            The <a class="externalLink" href="http://wiki.apache.org/turbine/">Turbine
+            The <a class="externalLink" href="https://cwiki.apache.org/confluence/display/TURBINE/">Turbine
             Wiki</a> another repository of documentation for the project.  It
             contains development information, user documentation, how-to documents,
             discussion of new features, etc.  Anyone can add new pages and edit existing
@@ -211,7 +212,7 @@
 <p>
     You can also contribute to the project by enhancing existing functionality and/or
     adding new functionality.  There is a current list of requested features on the
-    <a class="externalLink" href="http://wiki.apache.org/turbine/Turbine2/WishList">
+    <a class="externalLink" href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+WishList">
     Apache Wiki</a>.  Everyone is encouraged to take part in the discussion, design, and
     implementation.
 </p>
@@ -227,7 +228,7 @@
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>

Modified: websites/production/turbine/content/index.html
==============================================================================
--- websites/production/turbine/content/index.html (original)
+++ websites/production/turbine/content/index.html Tue Jun 18 12:01:28 2019
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/index.xml at 27 November 2018 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from xdocs/index.xml at 18 June 2019 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15,21 +15,21 @@
   </head>
   <body class="composite">
     <div id="banner">
-<a href="./" id="bannerLeft"><img src="images/turbine-project.png"  alt="Apache Turbine"/></a>
+<a href="http://turbine.apache.org/" id="bannerLeft"><img src="http://turbine.apache.org/images/turbine-project.png"  alt="Apache Turbine"/></a>
 <div id="bannerRight">
-<img src="images/logo.gif"  alt=""/></div>
+<img src="http://turbine.apache.org/images/logo.gif"  alt=""/></div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
       <div class="xleft">
-        <span id="publishDate">Last Published: 27 November 2018</span>
-          &nbsp;| <span id="projectVersion">Version: 4.0</span>
+        <span id="publishDate">Last Published: 18 June 2019</span>
+          &nbsp;| <span id="projectVersion">Version: 5.0</span>
       </div>
       <div class="xright"><a href="http://www.apache.org" class="externalLink" title="Apache">Apache</a> |
-<a href="./" title="Turbine">Turbine</a> |
-<a href="fulcrum/" title="Fulcrum">Fulcrum</a>      </div>
+<a href="http://turbine.apache.org/" class="externalLink" title="Turbine">Turbine</a> |
+<a href="http://turbine.apache.org/fulcrum/" class="externalLink" title="Fulcrum">Fulcrum</a>      </div>
       <div class="clear">
         <hr/>
       </div>
@@ -52,11 +52,11 @@
        <h5>Shortcuts to Turbine Documentation</h5>
     <ul>
      <li class="none"><a href="https://blogs.apache.org/turbine/" class="externalLink" title="Turbine Blog">Turbine Blog</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
-     <li class="none"><a href="http://wiki.apache.org/turbine/Turbine2/UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
-     <li class="none"><a href="https://wiki.apache.org/turbine/Turbine5" class="externalLink" title="Development">Development</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/" class="externalLink" title="Turbine Wiki Home">Turbine Wiki Home</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ" class="externalLink" title="Frequently Asked Questions (FAQ)">Frequently Asked Questions (FAQ)</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial" class="externalLink" title="Tutorial">Tutorial</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide" class="externalLink" title="User's Guide">User's Guide</a></li>
+     <li class="none"><a href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5" class="externalLink" title="Development">Development</a></li>
     </ul>
        <h5>Events</h5>
     <ul>
@@ -68,10 +68,11 @@
      <li class="none"><a href="turbine/turbine-2.3.3/index.html" title="Turbine 2.3.3">Turbine 2.3.3</a></li>
      <li class="none"><a href="turbine/turbine-4.0-M2/index.html" title="Turbine 4.0-M2">Turbine 4.0-M2</a></li>
      <li class="none"><a href="turbine/turbine-4.0/index.html" title="Turbine 4.0">Turbine 4.0</a></li>
+     <li class="none"><a href="turbine/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
     </ul>
        <h5>Turbine Development</h5>
     <ul>
-     <li class="none"><a href="turbine/development/turbine-5.0/index.html" title="Turbine 5.0">Turbine 5.0</a></li>
+     <li class="none"><a href="turbine/development/turbine-5.1/index.html" title="Turbine 5.1">Turbine 5.1</a></li>
     </ul>
        <h5>Turbine Sub Projects</h5>
     <ul>
@@ -136,7 +137,7 @@
   
 <p>
     Turbine is a matured and well established framework that is used as
-    the base of many other projects (like e.g. the excellent <a class="externalLink" href="http://portals.apache.org/jetspeed-1/">Jetspeed 1</a>
+    the base of many other projects (like e.g. the excellent <a class="externalLink" href="https://portals.apache.org/jetspeed-1/">Jetspeed 1</a>
     Portals framework.
   </p>
 
@@ -145,7 +146,7 @@
     Turbine is an excellent choice for developing applications that make use of a
     services-oriented architecture. Some of the functionality
     provided with Turbine includes a security management system (decoupled in Fulcrum Security), a
-    scheduling service, XML-defined form validation server (Fulcrum Intake),
+    scheduling service (decoupled in Fulcrum Quartz), XML-defined form validation server (Fulcrum Intake),
     and an XML-RPC service for web services.  It is a
     simple task to create new services particular to your application.
   </p>
@@ -159,7 +160,7 @@
     existing JSP tag libraries, Turbine offers support for the Sun standard.
     <b>Velocity</b> is the favorite view technology of most users of the Turbine
     framework; try it out and see if Velocity can help you develop your
-    web applications faster and work more easily with non-programming designers.
+    web applications faster and work more easily with non-programming designers.   
   </p>
 
   
@@ -171,6 +172,20 @@
     participate in this open development project.  To learn more about getting
     involved, <a href="how-to-help.html">look at our &quot;How to Help&quot; pages</a>.
   </p>
+  
+  
+<div class="section">
+<h3><a name="Integration_Hints:_JS.2C_JSON.2C_REST"></a>Integration Hints: JS, JSON, REST</h3>
+   
+<p> Modelling on the client side with JS-frameworks like KnockoutJS or Vue.JS is supported of course. You may use the provided XML-RPC service,
+    simple Velocity context or Fulcrum JSON utilities.
+    You may even want to skip (almost) the entire (server) view part and decide to use just REST-API libraries (Javax.ws.rs, Jersey). 
+    As an example consider registering an JSON Fulcrum service returning a default (Jackson) ObjectMapper object, which may be resolved by a
+    javax.ws.rs context Provider.
+    For now no custom security integration is yet provided, but this may be done with web-token or any other token based authentification system 
+    or annotation based.
+    </p>
+  </div>
 
 </div>
 
@@ -179,23 +194,23 @@
 <h2><a name="Turbine_Versions"></a>Turbine Versions</h2>
   
 <p>
-    Turbine comes in two shapes which both have their advantages:
-
+    Turbine is since version 4.0 developed in a single master/branch.
   </p>
 <ul>
+   
+<li><b><a href="turbine/development/turbine-5.1/">Turbine 5.1</a></b> is
+    the current development master. Download it from one of the <a class="externalLink" href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-5.1/">Apache Mirrors</a>.
+    </li>
+   
     
-<li><b><a href="turbine/turbine-2.3.3/">Turbine 2.3.3</a></b> is 
-    the version you should use when migrating from an older version of
-    Turbine.  The <a href="turbine/development/turbine-2.3/">2.3 branch</a>
-    of Turbine has been switched to maintenance mode, however. 
-    You can download Turbine 2.3.3 from one of the 
-    <a class="externalLink" href="http://www.apache.org/dyn/closer.cgi/turbine/turbine-2.3.3/">Apache Mirrors</a></li>
-
+<li><b><a href="turbine/turbine-5.0/">Turbine 5.0</a></b> is using Servlet 3.1, Java 8, Log4J2, Velocity 2. It is already used in some live applications,
+     download it from one of the <a class="externalLink" href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-5.0/">Apache Mirrors</a>.
+    </li>
+   
     
-<li><b><a href="turbine/turbine-4.0/">Turbine 4.0</a></b> should be the used, if starting a project based 
-    on a release version of the Turbine framework. 
-    Download it from one of the 
-    <a class="externalLink" href="http://www.apache.org/dyn/closer.cgi/turbine/turbine-4.0/">Apache Mirrors</a>.
+<li><b><a href="turbine/turbine-4.0/">Turbine 4.0</a></b> should be used only, if starting a project restricted 
+    with Java 7. Download it from one of the 
+    <a class="externalLink" href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-4.0/">Apache Mirrors</a>.
     Turbine 4.0 uses technologies like an <a class="externalLink" href="http://avalon.apache.org/">
     Avalon-based</a> container and decoupled components from the
     <b><a href="fulcrum/">Fulcrum</a></b> sub-project of Turbine (most of the benefits of
@@ -205,10 +220,14 @@
     via <b>XML</b> all the stages for processing a request.
     </li>
     
-  
-<li><b><a href="turbine/development/turbine-5.0/">Turbine 5.0</a></b> is
-    the shape of things to come, which is currently in development: Servlet 3.1, Java 8, Log4J2, Velocity 2 ...
-    </li>
+    
+<li><b><a href="turbine/turbine-2.3.3/">Turbine 2.3.3</a></b> is 
+    the version you should use when migrating from an older version of
+    Turbine.  The <a href="turbine/development/turbine-2.3/">2.3 branch</a>
+    of Turbine has been switched to maintenance mode, however. 
+    You can download Turbine 2.3.3 from one of the 
+    <a class="externalLink" href="https://www.apache.org/dyn/closer.cgi/turbine/turbine-2.3.3/">Apache Mirrors</a></li>
+    
   </ul>
   
 </div>
@@ -225,7 +244,7 @@
 <li>
     <a href="/fulcrum/">Fulcrum</a> components are by default in use since Turbine 4.x. It is a collection of services originally
     developed as part of Turbine, but now decoupled and usable in any environment
-    that supports <a class="externalLink" href="http://wiki.apache.org/excalibur/AvalonFramework">Avalon</a> components. 
+    that supports <a class="externalLink" href="https://attic.apache.org/projects/avalon.html">Avalon</a> components. 
   </li>
 </ul>
 </div>
@@ -236,30 +255,32 @@
 
 
 <p>
- As a longtime, but now ex-member of the <a class="externalLink" href="http://jakarta.apache.org/">Apache Jakarta Project</a>, 
- Turbine has influenced quite a number of projects:
+ As a longtime, but now ex-member of the <a class="externalLink" href="http://attic.apache.org/projects/jakarta.html">Apache Jakarta Project (before 2018)</a> 
+ (<a class="externalLink" href="https://jakarta.apache.org/">old address</a>*), Turbine has influenced quite a number of projects:
 </p>
 
 <ul>
   
 <li>
-    <a class="externalLink" href="http://db.apache.org/torque/">Torque</a> is a persistence
+    <a class="externalLink" href="https://db.apache.org/torque/">Torque</a> is a persistence
     layer originally developed as part of Turbine.  Torque is now
     decoupled and part of the <a class="externalLink" href="http://db.apache.org/">Apache Database Project</a>.
   </li>
   
 <li>
-    <a class="externalLink" href="http://maven.apache.org/">Maven</a> is an advanced Java
+    <a class="externalLink" href="https://maven.apache.org/">Maven</a> is an advanced Java
     Project Management tool originally developed out of the frustration with the
-    Turbine build process. Maven is now a toplevel Apache project, residing at <a class="externalLink" href="http://maven.apache.org/">maven.apache.org</a>.
+    Turbine build process. Maven is now a toplevel Apache project, residing at <a class="externalLink" href="https://maven.apache.org/">maven.apache.org</a>.
   </li>
   
 <li>
     In addition, Turbine has spawned a number of <a class="externalLink" href="http://commons.apache.org/">Commons</a>
-    components like <a class="externalLink" href="http://commons.apache.org/configuration/">Commons configuration</a> or
-    <a class="externalLink" href="http://commons.apache.org/email/">Commons EMail</a>.
+    components like <a class="externalLink" href="https://commons.apache.org/configuration/">Commons configuration</a> or
+    <a class="externalLink" href="https://commons.apache.org/email/">Commons EMail</a>.
   </li>
 </ul>
+* Note: Be aware, that <a class="externalLink" href="https://jakarta.ee/about/">Jakarta EE</a> is since 2019 
+ used as a brand label for the Java EE Cloud Native project.
 </div>
 
 
@@ -267,7 +288,7 @@
 <h2><a name="The_Apache_Software_Foundation"></a>The Apache Software Foundation</h2>
 
 <p>
-The <a class="externalLink" href="http://www.apache.org">Apache Software Foundation</a> provides support for the 
+The <a class="externalLink" href="https://www.apache.org">Apache Software Foundation</a> provides support for the 
 Apache community of open-source software projects. The Apache projects are defined by 
 collaborative consensus based processes, an open, pragmatic software license and a desire 
 to create high quality software that leads the way in its field.
@@ -292,7 +313,7 @@ owners.
     </div>
     <div id="footer">
       <div class="xright">
-        Copyright &#169;      2000&#x2013;2018 <a href="http://turbine.apache.org/">Apache Software Foundation</a>.
+        Copyright &#169;      2000&#x2013;2019 <a href="https://turbine.apache.org/">Apache Software Foundation</a>.
 All rights reserved.      </div>
       <div class="clear">
         <hr/>