diff --git a/cargo/Community.html b/cargo/Community.html
index f31965b72a..caec5e5512 100644
--- a/cargo/Community.html
+++ b/cargo/Community.html
@@ -287,9 +287,9 @@ <h3 class="heading3">RSS Feeds</h3>
         <tr valign="top">
          <td class="rightColumn">
           <ul class="childpages-macro conf-macro output-block">
-           <li><a href="Mailing+Lists.html">Mailing Lists</a></li>
-           <li><a href="License.html">License</a></li>
            <li><a href="Credits.html">Credits</a></li>
+           <li><a href="License.html">License</a></li>
+           <li><a href="Mailing+Lists.html">Mailing Lists</a></li>
           </ul>
           <script type="text/javascript">
   // Google Ads code
diff --git a/cargo/Container+Instantiation.html b/cargo/Container+Instantiation.html
index 2b174038dd..1add00d5b5 100644
--- a/cargo/Container+Instantiation.html
+++ b/cargo/Container+Instantiation.html
@@ -436,8 +436,8 @@ <h3 id="ContainerInstantiation-JavaAPI">Java API</h3>
            <li><a href="WildFly+26.x.html">WildFly 26.x</a></li>
            <li><a href="WildFly+27.x.html">WildFly 27.x</a></li>
            <li><a href="WildFly+28.x.html">WildFly 28.x</a></li>
-           <li><a href="WildFly+30.x.html">WildFly 30.x</a></li>
            <li><a href="WildFly+29.x.html">WildFly 29.x</a></li>
+           <li><a href="WildFly+30.x.html">WildFly 30.x</a></li>
            <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
           </ul>
           <p></p>
diff --git a/cargo/Deployer.html b/cargo/Deployer.html
index 741db4c415..c0c4ef4f42 100644
--- a/cargo/Deployer.html
+++ b/cargo/Deployer.html
@@ -309,8 +309,8 @@ <h3 id="Deployer-Explanation">Explanation</h3>
           <h3 id="Deployer-Deployerfeatures">Deployer features</h3>
           <p></p>
           <ul class="childpages-macro conf-macro output-block">
-           <li><a href="Remote+Deployer.html">Remote Deployer</a> — <span class="smalltext">Performs a hot deployment of a Deployable on a container running on a remote machine</span></li>
            <li><a href="Local+Deployer.html">Local Deployer</a> — <span class="smalltext">Performs a hot deployment of a Deployable on a locally installed container</span></li>
+           <li><a href="Remote+Deployer.html">Remote Deployer</a> — <span class="smalltext">Performs a hot deployment of a Deployable on a container running on a remote machine</span></li>
           </ul>
           <p></p>
           <h3 id="Deployer-ExampleusingtheJavaAPI">Example using the Java API</h3>
diff --git a/cargo/Developers.html b/cargo/Developers.html
index 64b615e2ff..af925ac5fb 100644
--- a/cargo/Developers.html
+++ b/cargo/Developers.html
@@ -287,18 +287,18 @@ <h3 class="heading3">RSS Feeds</h3>
         <tr valign="top">
          <td class="rightColumn">
           <ul class="childpages-macro conf-macro output-block">
-           <li><a href="Contributing.html">Contributing</a></li>
-           <li><a href="Resource+and+DataSource+Implementation.html">Resource and DataSource Implementation</a></li>
+           <li><a href="Adding+a+container.html">Adding a container</a></li>
+           <li><a href="Adding+a+Samples+Test.html">Adding a Samples Test</a></li>
+           <li><a href="Building.html">Building</a></li>
            <li><a href="Cargo+Code+Style.html">Cargo Code Style</a></li>
+           <li><a href="Coding+Tips.html">Coding Tips</a></li>
+           <li><a href="Contributing.html">Contributing</a></li>
+           <li><a href="Example+.m2+settings.xml.html">Example .m2 settings.xml</a></li>
+           <li><a href="Importing+sources.html">Importing sources</a></li>
+           <li><a href="Project+Structure.html">Project Structure</a></li>
            <li><a href="Release+procedure.html">Release procedure</a></li>
-           <li><a href="Building.html">Building</a></li>
+           <li><a href="Resource+and+DataSource+Implementation.html">Resource and DataSource Implementation</a></li>
            <li><a href="Source+code.html">Source code</a></li>
-           <li><a href="Adding+a+Samples+Test.html">Adding a Samples Test</a></li>
-           <li><a href="Adding+a+container.html">Adding a container</a></li>
-           <li><a href="Project+Structure.html">Project Structure</a></li>
-           <li><a href="Importing+sources.html">Importing sources</a></li>
-           <li><a href="Example+.m2+settings.xml.html">Example .m2 settings.xml</a></li>
-           <li><a href="Coding+Tips.html">Coding Tips</a></li>
           </ul>
           <script type="text/javascript">
   // Google Ads code
diff --git a/cargo/Extensions.html b/cargo/Extensions.html
index 32a134ee4b..9d010ff673 100644
--- a/cargo/Extensions.html
+++ b/cargo/Extensions.html
@@ -291,9 +291,9 @@ <h3 id="Extensions-Definition">Definition</h3>
           <h3 id="Extensions-Explanation">Explanation</h3>
           <p>Cargo's core provides a Java API to manipulate containers. In addition the Cargo project also provides extensions to the Cargo's core that make using Cargo easy from your preferred tools. Namely those are:</p>
           <ul class="childpages-macro conf-macro output-block">
+           <li><a href="Ant+support.html">Ant support</a> — <span class="smalltext">Cargo provides Ant tasks to perform all the operations available from the Java API. The minimum supported version is Ant 1.9.15.</span></li>
            <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
            <li><a href="Maven+3+Plugin.html">Maven 3 Plugin</a> — <span class="smalltext">A Maven 3 plugin that wraps the Cargo Java API. Though there are no minimum version requirements, all building, continous testing and release activities are performed using Maven 3.2.5 and onwards so we would recommend you have that installed.</span></li>
-           <li><a href="Ant+support.html">Ant support</a> — <span class="smalltext">Cargo provides Ant tasks to perform all the operations available from the Java API. The minimum supported version is Ant 1.9.15.</span></li>
           </ul>
           <script type="text/javascript">
   // Google Ads code
diff --git a/cargo/Source+code.html b/cargo/Source+code.html
index b92666dec7..3c3fa7d44a 100644
--- a/cargo/Source+code.html
+++ b/cargo/Source+code.html
@@ -286,7 +286,7 @@ <h3 class="heading3">RSS Feeds</h3>
         </tr>
         <tr valign="top">
          <td class="rightColumn">
-          <p>For general information see the <a href="https://github.com/">Github main page</a>.</p>
+          <p><span style="text-decoration: none;" class="legacy-color-text-blue3">Codehaus Cargo is 100% open source, copyrighted Vincent Massol and Ali Tokmen (see the <a href="License.html">license</a> page</span><span style="text-decoration: none;" class="legacy-color-text-blue3"> for details) under the Apache Software License, except for the </span><a style="text-decoration: none;" href="WebSphere+Liberty.html">WebSphere Liberty</a><span style="text-decoration: none;" class="legacy-color-text-blue3"> container which has been released under the MIT License.</span></p>
           <h2 id="Sourcecode-RepositorybrowsingordownloadingthecodeasaZIPfile">Repository browsing or downloading the code as a ZIP file</h2>
           <p>The <a href="https://github.com/codehaus-cargo/cargo">Github browser on the Codehaus Cargo main page</a> lets you browse the source code with ease.</p>
           <p>It also has a facility to download versions as ZIP files, without requiring any extra software or command.</p>
@@ -309,7 +309,7 @@ <h2 id="Sourcecode-Codeaccess">Code access</h2>
   </script>
           </center>
           <h2 id="Sourcecode-Contributing">Contributing</h2>
-          <p>Codehaus Cargo is open to contributions. For more details read the <a href="Contributing.html">Contributing</a> page.</p></td>
+          <p>Codehaus Cargo is open to contributions. For more details read the <a href="Contributing.html">contributing</a> page.</p></td>
         </tr>
        </tbody>
       </table></td>
diff --git a/cargo/Static+Deployment.html b/cargo/Static+Deployment.html
index babe22c7e4..664656f9b5 100644
--- a/cargo/Static+Deployment.html
+++ b/cargo/Static+Deployment.html
@@ -287,12 +287,12 @@ <h3 class="heading3">RSS Feeds</h3>
         <tr valign="top">
          <td class="rightColumn">
           <ul class="childpages-macro conf-macro output-block">
-           <li><a href="Static+deployment+of+EJB.html">Static deployment of EJB</a> — <span class="smalltext">Deploy an EJB (any version) that will be started when the container starts</span></li>
-           <li><a href="Static+deployment+of+RAR.html">Static deployment of RAR</a> — <span class="smalltext">Deploy a Java EE resource adapter (RAR) that will be started when the container starts</span></li>
            <li><a href="Static+deployment+of+EAR.html">Static deployment of EAR</a> — <span class="smalltext">Deploy an EAR that will be started when the container starts</span></li>
+           <li><a href="Static+deployment+of+EJB.html">Static deployment of EJB</a> — <span class="smalltext">Deploy an EJB (any version) that will be started when the container starts</span></li>
+           <li><a href="Static+deployment+of+expanded+WAR.html">Static deployment of expanded WAR</a> — <span class="smalltext">Deploy an expanded WAR that will be started when the container starts</span></li>
            <li><a href="Static+deployment+of+OSGi+Bundles.html">Static deployment of OSGi Bundles</a> — <span class="smalltext">Deploy an OSGi bundle that will be started when the container starts</span></li>
+           <li><a href="Static+deployment+of+RAR.html">Static deployment of RAR</a> — <span class="smalltext">Deploy a Java EE resource adapter (RAR) that will be started when the container starts</span></li>
            <li><a href="Static+deployment+of+WAR.html">Static deployment of WAR</a> — <span class="smalltext">Deploy a WAR that will be started when the container starts</span></li>
-           <li><a href="Static+deployment+of+expanded+WAR.html">Static deployment of expanded WAR</a> — <span class="smalltext">Deploy an expanded WAR that will be started when the container starts</span></li>
           </ul>
           <script type="text/javascript">
   // Google Ads code
diff --git a/cargo/TomEE+8.x.html b/cargo/TomEE+8.x.html
index d4646fc593..56eebe1c6f 100644
--- a/cargo/TomEE+8.x.html
+++ b/cargo/TomEE+8.x.html
@@ -1415,7 +1415,7 @@ <h5 id="TomEE8.x-Forremotecontainero.c.c.c.tomee.Tomee8xRemoteContainer">For rem
           </div>
           <h3 id="TomEE8.x-TestedOn">Tested On</h3>
           <p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.<br>
-           The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomee/apache-tomee/8.0.15/apache-tomee-8.0.15-plus.zip">https://repo.maven.apache.org/maven2/org/apache/tomee/apache-tomee/8.0.15/apache-tomee-8.0.15-plus.zip</a></p></td>
+           The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/org/apache/tomee/apache-tomee/8.0.16/apache-tomee-8.0.16-plus.zip">https://repo.maven.apache.org/maven2/org/apache/tomee/apache-tomee/8.0.16/apache-tomee-8.0.16-plus.zip</a></p></td>
         </tr>
        </tbody>
       </table></td>
diff --git a/cargo/WebSphere+Liberty.html b/cargo/WebSphere+Liberty.html
index 6ce87889c7..add10faa6a 100644
--- a/cargo/WebSphere+Liberty.html
+++ b/cargo/WebSphere+Liberty.html
@@ -884,7 +884,7 @@ <h5 id="WebSphereLiberty-Forinstalledcontainero.c.c.c.liberty.LibertyInstalledLo
           </div>
           <h3 id="WebSphereLiberty-TestedOn">Tested On</h3>
           <p>This container is automatically tested by the <a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous Integration system</a> every time there is a code change.<br>
-           The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/23.0.0.10/wlp-javaee8-23.0.0.10.zip">https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/23.0.0.10/wlp-javaee8-23.0.0.10.zip</a></p></td>
+           The server used for tests is downloaded from: <a href="https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/23.0.0.11/wlp-javaee8-23.0.0.11.zip">https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/23.0.0.11/wlp-javaee8-23.0.0.11.zip</a></p></td>
         </tr>
        </tbody>
       </table></td>