diff --git a/cargo/Adding+TLD+support+to+the+Jetty+container.html b/cargo/Adding+TLD+support+to+the+Jetty+container.html
index 4ad84654c6..0a87e08095 100644
--- a/cargo/Adding+TLD+support+to+the+Jetty+container.html
+++ b/cargo/Adding+TLD+support+to+the+Jetty+container.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Adding+a+JMS+resource+to+Resin3x.html b/cargo/Adding+a+JMS+resource+to+Resin3x.html
index 3d3c4a0613..5026d25a60 100644
--- a/cargo/Adding+a+JMS+resource+to+Resin3x.html
+++ b/cargo/Adding+a+JMS+resource+to+Resin3x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Adding+a+Samples+Test.html b/cargo/Adding+a+Samples+Test.html
index 9e4d940170..db36d2f084 100644
--- a/cargo/Adding+a+Samples+Test.html
+++ b/cargo/Adding+a+Samples+Test.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Adding+a+container.html b/cargo/Adding+a+container.html
index aa324f7b86..8f03976a42 100644
--- a/cargo/Adding+a+container.html
+++ b/cargo/Adding+a+container.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Announcing+Codehaus+Cargo+1.7.16.html b/cargo/Announcing+Codehaus+Cargo+1.7.16.html
index 4d0ae6d505..487df95bd6 100644
--- a/cargo/Announcing+Codehaus+Cargo+1.7.16.html
+++ b/cargo/Announcing+Codehaus+Cargo+1.7.16.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Another+jump+in+Codehaus+Cargo+s+history+version+1.8.0+is+here.html b/cargo/Another+jump+in+Codehaus+Cargo+s+history+version+1.8.0+is+here.html
index c0668eca09..238cef9883 100644
--- a/cargo/Another+jump+in+Codehaus+Cargo+s+history+version+1.8.0+is+here.html
+++ b/cargo/Another+jump+in+Codehaus+Cargo+s+history+version+1.8.0+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Ant+Tasks+Reference+Guide.html b/cargo/Ant+Tasks+Reference+Guide.html
index 601dc0e966..9b26896dbd 100644
--- a/cargo/Ant+Tasks+Reference+Guide.html
+++ b/cargo/Ant+Tasks+Reference+Guide.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Ant+support.html b/cargo/Ant+support.html
index 5f64148a61..4935fd5ff1 100644
--- a/cargo/Ant+support.html
+++ b/cargo/Ant+support.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Application+Classpath.html b/cargo/Application+Classpath.html
index 839c485791..e261edf86d 100644
--- a/cargo/Application+Classpath.html
+++ b/cargo/Application+Classpath.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Architecture.html b/cargo/Architecture.html
index 47fbcb667a..5f9822e410 100644
--- a/cargo/Architecture.html
+++ b/cargo/Architecture.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Archived+Downloads.html b/cargo/Archived+Downloads.html
index 59d583dce8..037dea3849 100644
--- a/cargo/Archived+Downloads.html
+++ b/cargo/Archived+Downloads.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Articles.html b/cargo/Articles.html
index 3505617506..a3d769dc0b 100644
--- a/cargo/Articles.html
+++ b/cargo/Articles.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/As+the+year+slowly+comes+to+an+end+please+welcome+Codehaus+Cargo+1.7.8.html b/cargo/As+the+year+slowly+comes+to+an+end+please+welcome+Codehaus+Cargo+1.7.8.html
index 8f0ec8a6b6..4459191e0c 100644
--- a/cargo/As+the+year+slowly+comes+to+an+end+please+welcome+Codehaus+Cargo+1.7.8.html
+++ b/cargo/As+the+year+slowly+comes+to+an+end+please+welcome+Codehaus+Cargo+1.7.8.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Be+secure+-+Upgrade+to+Codehaus+Cargo+1.8.1.html b/cargo/Be+secure+-+Upgrade+to+Codehaus+Cargo+1.8.1.html
index 6cf532f6af..d0d5126cbf 100644
--- a/cargo/Be+secure+-+Upgrade+to+Codehaus+Cargo+1.8.1.html
+++ b/cargo/Be+secure+-+Upgrade+to+Codehaus+Cargo+1.8.1.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Before+we+say+goodbye+to+2020+time+to+say+hello+to+Codehaus+Cargo+1.8.3.html b/cargo/Before+we+say+goodbye+to+2020+time+to+say+hello+to+Codehaus+Cargo+1.8.3.html
index 0c9f871575..4a2a0dee4a 100644
--- a/cargo/Before+we+say+goodbye+to+2020+time+to+say+hello+to+Codehaus+Cargo+1.8.3.html
+++ b/cargo/Before+we+say+goodbye+to+2020+time+to+say+hello+to+Codehaus+Cargo+1.8.3.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Building.html b/cargo/Building.html
index 3235c0060a..b69f7790eb 100644
--- a/cargo/Building.html
+++ b/cargo/Building.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.0.1+is+now+available.html b/cargo/CARGO+1.0.1+is+now+available.html
index 0b8022a0f7..de766f4639 100644
--- a/cargo/CARGO+1.0.1+is+now+available.html
+++ b/cargo/CARGO+1.0.1+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.0.2+released.html b/cargo/CARGO+1.0.2+released.html
index 92baf21361..5fe67731d5 100644
--- a/cargo/CARGO+1.0.2+released.html
+++ b/cargo/CARGO+1.0.2+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.0.3+now+available.html b/cargo/CARGO+1.0.3+now+available.html
index 2cd81b8f62..836fe11199 100644
--- a/cargo/CARGO+1.0.3+now+available.html
+++ b/cargo/CARGO+1.0.3+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.0.4+released.html b/cargo/CARGO+1.0.4+released.html
index 2e7ec1794c..c7e2bcdeb5 100644
--- a/cargo/CARGO+1.0.4+released.html
+++ b/cargo/CARGO+1.0.4+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.0.5+now+available.html b/cargo/CARGO+1.0.5+now+available.html
index 48aae5a1fc..53bcb356dd 100644
--- a/cargo/CARGO+1.0.5+now+available.html
+++ b/cargo/CARGO+1.0.5+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.0.6+is+now+available.html b/cargo/CARGO+1.0.6+is+now+available.html
index 0b04601365..24af58156f 100644
--- a/cargo/CARGO+1.0.6+is+now+available.html
+++ b/cargo/CARGO+1.0.6+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.1.0.html b/cargo/CARGO+1.1.0.html
index b4e2fb76ba..f780ded488 100644
--- a/cargo/CARGO+1.1.0.html
+++ b/cargo/CARGO+1.1.0.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.1.1+is+here.html b/cargo/CARGO+1.1.1+is+here.html
index e1ed918fbf..c2f3298644 100644
--- a/cargo/CARGO+1.1.1+is+here.html
+++ b/cargo/CARGO+1.1.1+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.1.2+now+available.html b/cargo/CARGO+1.1.2+now+available.html
index a4c4ea9c1a..459f65913b 100644
--- a/cargo/CARGO+1.1.2+now+available.html
+++ b/cargo/CARGO+1.1.2+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.1.3+now+available.html b/cargo/CARGO+1.1.3+now+available.html
index 38915e6490..3b74a9613d 100644
--- a/cargo/CARGO+1.1.3+now+available.html
+++ b/cargo/CARGO+1.1.3+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.1.4+now+available.html b/cargo/CARGO+1.1.4+now+available.html
index 7d75d1aa68..63980272d3 100644
--- a/cargo/CARGO+1.1.4+now+available.html
+++ b/cargo/CARGO+1.1.4+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.2.0+now+available.html b/cargo/CARGO+1.2.0+now+available.html
index fcf3c6d582..20266e538e 100644
--- a/cargo/CARGO+1.2.0+now+available.html
+++ b/cargo/CARGO+1.2.0+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.2.1+is+now+available+and+is+not+an+April+fool.html b/cargo/CARGO+1.2.1+is+now+available+and+is+not+an+April+fool.html
index 1723e1f8c1..bd31d9c086 100644
--- a/cargo/CARGO+1.2.1+is+now+available+and+is+not+an+April+fool.html
+++ b/cargo/CARGO+1.2.1+is+now+available+and+is+not+an+April+fool.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.2.2+available.html b/cargo/CARGO+1.2.2+available.html
index 0fec32a3da..1a225581f0 100644
--- a/cargo/CARGO+1.2.2+available.html
+++ b/cargo/CARGO+1.2.2+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.2.3+is+now+available.html b/cargo/CARGO+1.2.3+is+now+available.html
index 9161caca40..5ea1418651 100644
--- a/cargo/CARGO+1.2.3+is+now+available.html
+++ b/cargo/CARGO+1.2.3+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.2.4+is+now+available.html b/cargo/CARGO+1.2.4+is+now+available.html
index d5ad5f9ad8..ad9b288adb 100644
--- a/cargo/CARGO+1.2.4+is+now+available.html
+++ b/cargo/CARGO+1.2.4+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.3.0+is+now+available.html b/cargo/CARGO+1.3.0+is+now+available.html
index 9874efc524..f727a9cfb0 100644
--- a/cargo/CARGO+1.3.0+is+now+available.html
+++ b/cargo/CARGO+1.3.0+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.3.1+is+available.html b/cargo/CARGO+1.3.1+is+available.html
index a9e3e986df..99ca7d58ee 100644
--- a/cargo/CARGO+1.3.1+is+available.html
+++ b/cargo/CARGO+1.3.1+is+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.3.3+is+here.html b/cargo/CARGO+1.3.3+is+here.html
index 63b7295178..9d2ad4871f 100644
--- a/cargo/CARGO+1.3.3+is+here.html
+++ b/cargo/CARGO+1.3.3+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.0+is+here.html b/cargo/CARGO+1.4.0+is+here.html
index 6cc27ab858..21e3955cc9 100644
--- a/cargo/CARGO+1.4.0+is+here.html
+++ b/cargo/CARGO+1.4.0+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.10+is+now+available.html b/cargo/CARGO+1.4.10+is+now+available.html
index 3d18bee6cb..2229fcaf83 100644
--- a/cargo/CARGO+1.4.10+is+now+available.html
+++ b/cargo/CARGO+1.4.10+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.12+is+ready.html b/cargo/CARGO+1.4.12+is+ready.html
index ff8149fd41..f67cad85d0 100644
--- a/cargo/CARGO+1.4.12+is+ready.html
+++ b/cargo/CARGO+1.4.12+is+ready.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.3+is+here.html b/cargo/CARGO+1.4.3+is+here.html
index 529f246d71..70ba1b1b27 100644
--- a/cargo/CARGO+1.4.3+is+here.html
+++ b/cargo/CARGO+1.4.3+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.4+is+now+available.html b/cargo/CARGO+1.4.4+is+now+available.html
index 42382c8857..4f29093f31 100644
--- a/cargo/CARGO+1.4.4+is+now+available.html
+++ b/cargo/CARGO+1.4.4+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.5+is+here.html b/cargo/CARGO+1.4.5+is+here.html
index 32826ae953..ec56a13138 100644
--- a/cargo/CARGO+1.4.5+is+here.html
+++ b/cargo/CARGO+1.4.5+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.6+is+here.html b/cargo/CARGO+1.4.6+is+here.html
index 2ad154b8bb..990674e347 100644
--- a/cargo/CARGO+1.4.6+is+here.html
+++ b/cargo/CARGO+1.4.6+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.7+-+Now+available.html b/cargo/CARGO+1.4.7+-+Now+available.html
index 65bbee1f80..4b84dac37f 100644
--- a/cargo/CARGO+1.4.7+-+Now+available.html
+++ b/cargo/CARGO+1.4.7+-+Now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.8+-+Not+an+April+fool.html b/cargo/CARGO+1.4.8+-+Not+an+April+fool.html
index 6b1090d5a2..aa20a90850 100644
--- a/cargo/CARGO+1.4.8+-+Not+an+April+fool.html
+++ b/cargo/CARGO+1.4.8+-+Not+an+April+fool.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+1.4.9+is+ready.html b/cargo/CARGO+1.4.9+is+ready.html
index 030e29b855..db0b4ffeb5 100644
--- a/cargo/CARGO+1.4.9+is+ready.html
+++ b/cargo/CARGO+1.4.9+is+ready.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/CARGO+Maven2+plugin+1.0.1+SR+1+released.html b/cargo/CARGO+Maven2+plugin+1.0.1+SR+1+released.html
index 3fcf8a777c..7074039f6d 100644
--- a/cargo/CARGO+Maven2+plugin+1.0.1+SR+1+released.html
+++ b/cargo/CARGO+Maven2+plugin+1.0.1+SR+1+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.1+on+TheServerSide.html b/cargo/Cargo+0.1+on+TheServerSide.html
index f65846a380..4979fdd3a8 100644
--- a/cargo/Cargo+0.1+on+TheServerSide.html
+++ b/cargo/Cargo+0.1+on+TheServerSide.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.1+released.html b/cargo/Cargo+0.1+released.html
index 6c44bdbdfc..f7794389ef 100644
--- a/cargo/Cargo+0.1+released.html
+++ b/cargo/Cargo+0.1+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.2+released.html b/cargo/Cargo+0.2+released.html
index 80e92870ae..a43d2c371b 100644
--- a/cargo/Cargo+0.2+released.html
+++ b/cargo/Cargo+0.2+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.3+released.html b/cargo/Cargo+0.3+released.html
index ce338ffc1c..2227676b74 100644
--- a/cargo/Cargo+0.3+released.html
+++ b/cargo/Cargo+0.3+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.4+released.html b/cargo/Cargo+0.4+released.html
index 317ba2a4bd..9f28ecc396 100644
--- a/cargo/Cargo+0.4+released.html
+++ b/cargo/Cargo+0.4+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.5+released.html b/cargo/Cargo+0.5+released.html
index f83d1f79a1..7c6bccfdc1 100644
--- a/cargo/Cargo+0.5+released.html
+++ b/cargo/Cargo+0.5+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.6+released.html b/cargo/Cargo+0.6+released.html
index ba652b35c2..776df6617d 100644
--- a/cargo/Cargo+0.6+released.html
+++ b/cargo/Cargo+0.6+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.7+released.html b/cargo/Cargo+0.7+released.html
index 74afec0413..608a4277a1 100644
--- a/cargo/Cargo+0.7+released.html
+++ b/cargo/Cargo+0.7+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.8+released.html b/cargo/Cargo+0.8+released.html
index 96f0db7569..930bbe87a1 100644
--- a/cargo/Cargo+0.8+released.html
+++ b/cargo/Cargo+0.8+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+0.9+Released+March+2007.html b/cargo/Cargo+0.9+Released+March+2007.html
index 943089c182..ef65122674 100644
--- a/cargo/Cargo+0.9+Released+March+2007.html
+++ b/cargo/Cargo+0.9+Released+March+2007.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+1.0+Release+Soon.html b/cargo/Cargo+1.0+Release+Soon.html
index 4cb31738d8..b8c9acde21 100644
--- a/cargo/Cargo+1.0+Release+Soon.html
+++ b/cargo/Cargo+1.0+Release+Soon.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+1.0+Released.html b/cargo/Cargo+1.0+Released.html
index a20fbd087b..1dcab49a4e 100644
--- a/cargo/Cargo+1.0+Released.html
+++ b/cargo/Cargo+1.0+Released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+Code+Style.html b/cargo/Cargo+Code+Style.html
index 4d9082250e..cc2d52e31c 100644
--- a/cargo/Cargo+Code+Style.html
+++ b/cargo/Cargo+Code+Style.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+Daemon.html b/cargo/Cargo+Daemon.html
index 7956e9d2e4..a9e88fb1a3 100644
--- a/cargo/Cargo+Daemon.html
+++ b/cargo/Cargo+Daemon.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+Gradle+plugin.html b/cargo/Cargo+Gradle+plugin.html
index f9c01498bb..b4638c6ecc 100644
--- a/cargo/Cargo+Gradle+plugin.html
+++ b/cargo/Cargo+Gradle+plugin.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+Maven2+plugin+v0.2+released.html b/cargo/Cargo+Maven2+plugin+v0.2+released.html
index fe25742e76..ea5c143928 100644
--- a/cargo/Cargo+Maven2+plugin+v0.2+released.html
+++ b/cargo/Cargo+Maven2+plugin+v0.2+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+is+born.html b/cargo/Cargo+is+born.html
index 7733672083..98cc735ba2 100644
--- a/cargo/Cargo+is+born.html
+++ b/cargo/Cargo+is+born.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cargo+to+be+featured+in+Spring+Live.html b/cargo/Cargo+to+be+featured+in+Spring+Live.html
index 6119db4ddb..9cc706b735 100644
--- a/cargo/Cargo+to+be+featured+in+Spring+Live.html
+++ b/cargo/Cargo+to+be+featured+in+Spring+Live.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.10.1+is+here+featuring+API+and+dependency+modernisations.html b/cargo/Codehaus+Cargo+1.10.1+is+here+featuring+API+and+dependency+modernisations.html
index 509a98a7d3..df00e279ae 100644
--- a/cargo/Codehaus+Cargo+1.10.1+is+here+featuring+API+and+dependency+modernisations.html
+++ b/cargo/Codehaus+Cargo+1.10.1+is+here+featuring+API+and+dependency+modernisations.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.10.2+is+here.html b/cargo/Codehaus+Cargo+1.10.2+is+here.html
index ab3b5496b5..7ed28e1331 100644
--- a/cargo/Codehaus+Cargo+1.10.2+is+here.html
+++ b/cargo/Codehaus+Cargo+1.10.2+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.10.4+is+here.html b/cargo/Codehaus+Cargo+1.10.4+is+here.html
index 2f9340453a..79b32df4dd 100644
--- a/cargo/Codehaus+Cargo+1.10.4+is+here.html
+++ b/cargo/Codehaus+Cargo+1.10.4+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.10.6+is+here.html b/cargo/Codehaus+Cargo+1.10.6+is+here.html
index a83b1f5275..44cbd7cc6b 100644
--- a/cargo/Codehaus+Cargo+1.10.6+is+here.html
+++ b/cargo/Codehaus+Cargo+1.10.6+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.10.8+is+here.html b/cargo/Codehaus+Cargo+1.10.8+is+here.html
index 61ea741b96..f437e28a15 100644
--- a/cargo/Codehaus+Cargo+1.10.8+is+here.html
+++ b/cargo/Codehaus+Cargo+1.10.8+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.4.16+-+Now+available.html b/cargo/Codehaus+Cargo+1.4.16+-+Now+available.html
index 8a7632f323..1669611268 100644
--- a/cargo/Codehaus+Cargo+1.4.16+-+Now+available.html
+++ b/cargo/Codehaus+Cargo+1.4.16+-+Now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.4.19+is+now+available.html b/cargo/Codehaus+Cargo+1.4.19+is+now+available.html
index 4269bd10ea..8d99338424 100644
--- a/cargo/Codehaus+Cargo+1.4.19+is+now+available.html
+++ b/cargo/Codehaus+Cargo+1.4.19+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.5.0+-+At+your+service.html b/cargo/Codehaus+Cargo+1.5.0+-+At+your+service.html
index 5551400964..aac23ee558 100644
--- a/cargo/Codehaus+Cargo+1.5.0+-+At+your+service.html
+++ b/cargo/Codehaus+Cargo+1.5.0+-+At+your+service.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.5.1+is+ready+-+Our+last+version+to+support+Java+5.html b/cargo/Codehaus+Cargo+1.5.1+is+ready+-+Our+last+version+to+support+Java+5.html
index 7de4610ec7..1c01ef4abc 100644
--- a/cargo/Codehaus+Cargo+1.5.1+is+ready+-+Our+last+version+to+support+Java+5.html
+++ b/cargo/Codehaus+Cargo+1.5.1+is+ready+-+Our+last+version+to+support+Java+5.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.6.0+is+now+here+-+With+the+switch+to+Java+6.html b/cargo/Codehaus+Cargo+1.6.0+is+now+here+-+With+the+switch+to+Java+6.html
index 71d009dc57..ae0b8026b0 100644
--- a/cargo/Codehaus+Cargo+1.6.0+is+now+here+-+With+the+switch+to+Java+6.html
+++ b/cargo/Codehaus+Cargo+1.6.0+is+now+here+-+With+the+switch+to+Java+6.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.6.1+is+here.html b/cargo/Codehaus+Cargo+1.6.1+is+here.html
index d78b55682f..b1c2a6729f 100644
--- a/cargo/Codehaus+Cargo+1.6.1+is+here.html
+++ b/cargo/Codehaus+Cargo+1.6.1+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.6.11+-+Our+last+release+with+Java+6+compatibility.html b/cargo/Codehaus+Cargo+1.6.11+-+Our+last+release+with+Java+6+compatibility.html
index c50e293c41..64e14b18a3 100644
--- a/cargo/Codehaus+Cargo+1.6.11+-+Our+last+release+with+Java+6+compatibility.html
+++ b/cargo/Codehaus+Cargo+1.6.11+-+Our+last+release+with+Java+6+compatibility.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.6.3+is+here.html b/cargo/Codehaus+Cargo+1.6.3+is+here.html
index 35e5915f3a..37786b7fd8 100644
--- a/cargo/Codehaus+Cargo+1.6.3+is+here.html
+++ b/cargo/Codehaus+Cargo+1.6.3+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.6.5+is+here.html b/cargo/Codehaus+Cargo+1.6.5+is+here.html
index 5f87117747..b5978fd5ae 100644
--- a/cargo/Codehaus+Cargo+1.6.5+is+here.html
+++ b/cargo/Codehaus+Cargo+1.6.5+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.6.7+is+here.html b/cargo/Codehaus+Cargo+1.6.7+is+here.html
index ab08a8e3da..504e300fab 100644
--- a/cargo/Codehaus+Cargo+1.6.7+is+here.html
+++ b/cargo/Codehaus+Cargo+1.6.7+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.6.8+is+here.html b/cargo/Codehaus+Cargo+1.6.8+is+here.html
index 6d101b67ab..8d5f5ecd42 100644
--- a/cargo/Codehaus+Cargo+1.6.8+is+here.html
+++ b/cargo/Codehaus+Cargo+1.6.8+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.6.9+is+here.html b/cargo/Codehaus+Cargo+1.6.9+is+here.html
index 25cf469e49..8ac47afa02 100644
--- a/cargo/Codehaus+Cargo+1.6.9+is+here.html
+++ b/cargo/Codehaus+Cargo+1.6.9+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.0+is+here.html b/cargo/Codehaus+Cargo+1.7.0+is+here.html
index 74d2da8d34..8b6e5ca7bb 100644
--- a/cargo/Codehaus+Cargo+1.7.0+is+here.html
+++ b/cargo/Codehaus+Cargo+1.7.0+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.1+is+here.html b/cargo/Codehaus+Cargo+1.7.1+is+here.html
index a5699a66c8..0015e6c8af 100644
--- a/cargo/Codehaus+Cargo+1.7.1+is+here.html
+++ b/cargo/Codehaus+Cargo+1.7.1+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.11+is+now+available.html b/cargo/Codehaus+Cargo+1.7.11+is+now+available.html
index 2cee612386..2a31a77d35 100644
--- a/cargo/Codehaus+Cargo+1.7.11+is+now+available.html
+++ b/cargo/Codehaus+Cargo+1.7.11+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.12+is+here.html b/cargo/Codehaus+Cargo+1.7.12+is+here.html
index 6b44018642..0fff3dc037 100644
--- a/cargo/Codehaus+Cargo+1.7.12+is+here.html
+++ b/cargo/Codehaus+Cargo+1.7.12+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.14+is+here.html b/cargo/Codehaus+Cargo+1.7.14+is+here.html
index f16cbbbce3..676c9130a2 100644
--- a/cargo/Codehaus+Cargo+1.7.14+is+here.html
+++ b/cargo/Codehaus+Cargo+1.7.14+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.2+is+here.html b/cargo/Codehaus+Cargo+1.7.2+is+here.html
index bbc71ca395..e463c3f797 100644
--- a/cargo/Codehaus+Cargo+1.7.2+is+here.html
+++ b/cargo/Codehaus+Cargo+1.7.2+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.3+is+now+available.html b/cargo/Codehaus+Cargo+1.7.3+is+now+available.html
index d1074b942d..7698dcba5a 100644
--- a/cargo/Codehaus+Cargo+1.7.3+is+now+available.html
+++ b/cargo/Codehaus+Cargo+1.7.3+is+now+available.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.4+is+here.html b/cargo/Codehaus+Cargo+1.7.4+is+here.html
index f387f4e43d..e94efe3136 100644
--- a/cargo/Codehaus+Cargo+1.7.4+is+here.html
+++ b/cargo/Codehaus+Cargo+1.7.4+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.5+is+here.html b/cargo/Codehaus+Cargo+1.7.5+is+here.html
index 6588d3e827..c69e5ff6d2 100644
--- a/cargo/Codehaus+Cargo+1.7.5+is+here.html
+++ b/cargo/Codehaus+Cargo+1.7.5+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.7.6+is+here.html b/cargo/Codehaus+Cargo+1.7.6+is+here.html
index 57c2535c2b..c54a26f2e7 100644
--- a/cargo/Codehaus+Cargo+1.7.6+is+here.html
+++ b/cargo/Codehaus+Cargo+1.7.6+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.8.2+is+here.html b/cargo/Codehaus+Cargo+1.8.2+is+here.html
index 95139c905b..55d3b2c492 100644
--- a/cargo/Codehaus+Cargo+1.8.2+is+here.html
+++ b/cargo/Codehaus+Cargo+1.8.2+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.8.5+is+here.html b/cargo/Codehaus+Cargo+1.8.5+is+here.html
index 7d7c300172..d57abc265e 100644
--- a/cargo/Codehaus+Cargo+1.8.5+is+here.html
+++ b/cargo/Codehaus+Cargo+1.8.5+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.9.0+is+here+with+a+new+era+for+our+Maven+support.html b/cargo/Codehaus+Cargo+1.9.0+is+here+with+a+new+era+for+our+Maven+support.html
index 9371c2de77..65ac8d9f8d 100644
--- a/cargo/Codehaus+Cargo+1.9.0+is+here+with+a+new+era+for+our+Maven+support.html
+++ b/cargo/Codehaus+Cargo+1.9.0+is+here+with+a+new+era+for+our+Maven+support.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.9.1+is+here.html b/cargo/Codehaus+Cargo+1.9.1+is+here.html
index 7fcfd5e9c1..0977c2b784 100644
--- a/cargo/Codehaus+Cargo+1.9.1+is+here.html
+++ b/cargo/Codehaus+Cargo+1.9.1+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.9.10+is+here.html b/cargo/Codehaus+Cargo+1.9.10+is+here.html
index 7d697cfda1..da137ce015 100644
--- a/cargo/Codehaus+Cargo+1.9.10+is+here.html
+++ b/cargo/Codehaus+Cargo+1.9.10+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.9.11+is+ready+for+action.html b/cargo/Codehaus+Cargo+1.9.11+is+ready+for+action.html
index 594e8b8a58..f58e40e0bc 100644
--- a/cargo/Codehaus+Cargo+1.9.11+is+ready+for+action.html
+++ b/cargo/Codehaus+Cargo+1.9.11+is+ready+for+action.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.9.12+is+here.html b/cargo/Codehaus+Cargo+1.9.12+is+here.html
index 4399215071..439c51002e 100644
--- a/cargo/Codehaus+Cargo+1.9.12+is+here.html
+++ b/cargo/Codehaus+Cargo+1.9.12+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.9.3+is+here.html b/cargo/Codehaus+Cargo+1.9.3+is+here.html
index d94d194920..6565654328 100644
--- a/cargo/Codehaus+Cargo+1.9.3+is+here.html
+++ b/cargo/Codehaus+Cargo+1.9.3+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.9.4+A+small+step+from+the+outside+big+changes+behind+the+scenes.html b/cargo/Codehaus+Cargo+1.9.4+A+small+step+from+the+outside+big+changes+behind+the+scenes.html
index 2bcc9d18e7..a772d1e5a5 100644
--- a/cargo/Codehaus+Cargo+1.9.4+A+small+step+from+the+outside+big+changes+behind+the+scenes.html
+++ b/cargo/Codehaus+Cargo+1.9.4+A+small+step+from+the+outside+big+changes+behind+the+scenes.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.9.5+is+here.html b/cargo/Codehaus+Cargo+1.9.5+is+here.html
index 925e977263..cd7ce29b88 100644
--- a/cargo/Codehaus+Cargo+1.9.5+is+here.html
+++ b/cargo/Codehaus+Cargo+1.9.5+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+1.9.6+is+here.html b/cargo/Codehaus+Cargo+1.9.6+is+here.html
index f4036de7c2..983de49f06 100644
--- a/cargo/Codehaus+Cargo+1.9.6+is+here.html
+++ b/cargo/Codehaus+Cargo+1.9.6+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Codehaus+Cargo+s+new+Web+site+is+ready+-+So+is+version+1.4.14.html b/cargo/Codehaus+Cargo+s+new+Web+site+is+ready+-+So+is+version+1.4.14.html
index 387c2e5279..35cf187b80 100644
--- a/cargo/Codehaus+Cargo+s+new+Web+site+is+ready+-+So+is+version+1.4.14.html
+++ b/cargo/Codehaus+Cargo+s+new+Web+site+is+ready+-+So+is+version+1.4.14.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Coding+Tips.html b/cargo/Coding+Tips.html
index 9af919906d..01851b1d2c 100644
--- a/cargo/Coding+Tips.html
+++ b/cargo/Coding+Tips.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Community.html b/cargo/Community.html
index fc052b7cc8..d7ec5a59e9 100644
--- a/cargo/Community.html
+++ b/cargo/Community.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Configuration+files+option.html b/cargo/Configuration+files+option.html
index 7712d86d1d..c492ca2846 100644
--- a/cargo/Configuration+files+option.html
+++ b/cargo/Configuration+files+option.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Configuration+properties.html b/cargo/Configuration+properties.html
index 2481f5a3b2..76db1af066 100644
--- a/cargo/Configuration+properties.html
+++ b/cargo/Configuration+properties.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Configuration.html b/cargo/Configuration.html
index fc89a5198e..d3231ff5a5 100644
--- a/cargo/Configuration.html
+++ b/cargo/Configuration.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Configuring+HTTP+2+for+Tomcat+8.5+and+above.html b/cargo/Configuring+HTTP+2+for+Tomcat+8.5+and+above.html
index 38ade75723..8297ee8a2a 100644
--- a/cargo/Configuring+HTTP+2+for+Tomcat+8.5+and+above.html
+++ b/cargo/Configuring+HTTP+2+for+Tomcat+8.5+and+above.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Container+Classpath.html b/cargo/Container+Classpath.html
index 433f6b3e32..0c380da004 100644
--- a/cargo/Container+Classpath.html
+++ b/cargo/Container+Classpath.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Container+Client+Interface+on+TheServerSide.html b/cargo/Container+Client+Interface+on+TheServerSide.html
index e9285825a6..991e9143c6 100644
--- a/cargo/Container+Client+Interface+on+TheServerSide.html
+++ b/cargo/Container+Client+Interface+on+TheServerSide.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Container+Instantiation.html b/cargo/Container+Instantiation.html
index 8f512f114d..26db438027 100644
--- a/cargo/Container+Instantiation.html
+++ b/cargo/Container+Instantiation.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Container+Start.html b/cargo/Container+Start.html
index 58b91dd2da..8780fb5fc1 100644
--- a/cargo/Container+Start.html
+++ b/cargo/Container+Start.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Container+Stop.html b/cargo/Container+Stop.html
index b7a35f463e..86acbf5982 100644
--- a/cargo/Container+Stop.html
+++ b/cargo/Container+Stop.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Container+Timeout.html b/cargo/Container+Timeout.html
index d9c6ff72b0..6677ab93f4 100644
--- a/cargo/Container+Timeout.html
+++ b/cargo/Container+Timeout.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Container.html b/cargo/Container.html
index 9089664b62..578e656493 100644
--- a/cargo/Container.html
+++ b/cargo/Container.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Containers+with+DataSource+and+Resource+support.html b/cargo/Containers+with+DataSource+and+Resource+support.html
index efe555b027..e43dd5b1e8 100644
--- a/cargo/Containers+with+DataSource+and+Resource+support.html
+++ b/cargo/Containers+with+DataSource+and+Resource+support.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Containers.html b/cargo/Containers.html
index cae9c4f287..3355850322 100644
--- a/cargo/Containers.html
+++ b/cargo/Containers.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Contributing.html b/cargo/Contributing.html
index da1b300dd1..bd28f981c5 100644
--- a/cargo/Contributing.html
+++ b/cargo/Contributing.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Cookies.html b/cargo/Cookies.html
index 30101488dc..43b94cdd70 100644
--- a/cargo/Cookies.html
+++ b/cargo/Cookies.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Credits.html b/cargo/Credits.html
index 83511b2a77..e6301ba5fa 100644
--- a/cargo/Credits.html
+++ b/cargo/Credits.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Custom+Configuration.html b/cargo/Custom+Configuration.html
index bf4c4bdd40..d4eb9162e0 100644
--- a/cargo/Custom+Configuration.html
+++ b/cargo/Custom+Configuration.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Custom+File+Configurations.html b/cargo/Custom+File+Configurations.html
index 940388b0e9..e709fa4343 100644
--- a/cargo/Custom+File+Configurations.html
+++ b/cargo/Custom+File+Configurations.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/DataSource+and+Resource+Support.html b/cargo/DataSource+and+Resource+Support.html
index 11e0ae5f6f..d05ed50ea8 100644
--- a/cargo/DataSource+and+Resource+Support.html
+++ b/cargo/DataSource+and+Resource+Support.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Debugging.html b/cargo/Debugging.html
index a5f8421de6..962fcfaeb7 100644
--- a/cargo/Debugging.html
+++ b/cargo/Debugging.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Deployable.html b/cargo/Deployable.html
index e944d25b30..062d2c4198 100644
--- a/cargo/Deployable.html
+++ b/cargo/Deployable.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Deployer.html b/cargo/Deployer.html
index 6a00a05986..22caf86d59 100644
--- a/cargo/Deployer.html
+++ b/cargo/Deployer.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Deploying+to+a+running+container.html b/cargo/Deploying+to+a+running+container.html
index eaf093a961..349d7e9468 100644
--- a/cargo/Deploying+to+a+running+container.html
+++ b/cargo/Deploying+to+a+running+container.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Deployment.html b/cargo/Deployment.html
index 2777ec3e7e..60a4c87b00 100644
--- a/cargo/Deployment.html
+++ b/cargo/Deployment.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Developers.html b/cargo/Developers.html
index c5f3483a54..d979d50cd6 100644
--- a/cargo/Developers.html
+++ b/cargo/Developers.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Downloads.html b/cargo/Downloads.html
index 8c0e742d3d..258ca782c4 100644
--- a/cargo/Downloads.html
+++ b/cargo/Downloads.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Embedded+Container.html b/cargo/Embedded+Container.html
index a1cf67ee23..b7243356f3 100644
--- a/cargo/Embedded+Container.html
+++ b/cargo/Embedded+Container.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Example+.m2+settings.xml.html b/cargo/Example+.m2+settings.xml.html
index 13af7e424f..4c4460ef86 100644
--- a/cargo/Example+.m2+settings.xml.html
+++ b/cargo/Example+.m2+settings.xml.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Existing+Local+Configuration.html b/cargo/Existing+Local+Configuration.html
index 901760ddcf..023c657550 100644
--- a/cargo/Existing+Local+Configuration.html
+++ b/cargo/Existing+Local+Configuration.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Extensions.html b/cargo/Extensions.html
index 44b73d6294..1bd5271eee 100644
--- a/cargo/Extensions.html
+++ b/cargo/Extensions.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Features.html b/cargo/Features.html
index f167f71d57..99354a4c07 100644
--- a/cargo/Features.html
+++ b/cargo/Features.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
@@ -297,28 +285,49 @@ <h3 class="heading3">RSS Feeds</h3>
         </tr>
         <tr valign="top">
          <td class="rightColumn">
+          <p></p>
           <ul class="childpages-macro conf-macro output-block">
-           <li><a href="Extensions.html">Extensions</a> — <span class="smalltext">Extensions are additions to the Cargo core Java API such as build tool plugins, IDE plugins, etc</span>
+           <li><a href="Configuration.html">Configuration</a> — <span class="smalltext">A Configuration specifies how the container is configured (logging, security, data sources, location where to put deployables, etc).</span>
             <ul class="childpages-macro">
-             <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><a href="Configuration+properties.html">Configuration properties</a> — <span class="smalltext">Properties to configure a container (request port, shutdown port, logging level, threads, etc)</span></li>
+             <li><a href="Custom+Configuration.html">Custom Configuration</a> — <span class="smalltext">A user-provided configuration to use instead of the default Cargo-provided ones</span></li>
+             <li><a href="Local+Configuration.html">Local Configuration</a> — <span class="smalltext">A configuration for a container that is running on the local machine where Cargo is executing</span>
               <ul class="childpages-macro">
-               <li><a href="Maven+3+Archetypes.html">Maven 3 Archetypes</a></li>
-               <li><a href="Maven+3+Plugin+Getting+Started.html">Maven 3 Plugin Getting Started</a>
+               <li><a href="Custom+File+Configurations.html">Custom File Configurations</a></li>
+               <li><a href="Existing+Local+Configuration.html">Existing Local Configuration</a> — <span class="smalltext">Re-use an existing container installation</span></li>
+               <li><a href="Standalone+Local+Configuration.html">Standalone Local Configuration</a> — <span class="smalltext">Configures your container in a specific directory</span>
                 <ul class="childpages-macro">
-                 <li><a href="Starting+and+stopping+a+container.html">Starting and stopping a container</a></li>
-                 <li><a href="Merging+WAR+files.html">Merging WAR files</a></li>
-                 <li><a href="Generating+a+container+configuration+deployment+structure.html">Generating a container configuration deployment structure</a></li>
-                 <li><a href="Deploying+to+a+running+container.html">Deploying to a running container</a></li>
+                 <li><a href="Configuration+files+option.html">Configuration files option</a> — <span class="smalltext">The configuration files are the files to add to your container's configuration. It is internally used by some containers and is accessible for you can to add extra files.</span></li>
+                 <li><a href="DataSource+and+Resource+Support.html">DataSource and Resource Support</a>
+                  <ul class="childpages-macro">
+                   <li><a href="Containers+with+DataSource+and+Resource+support.html">Containers with DataSource and Resource support</a></li>
+                  </ul></li>
+                 <li><a href="XML+replacements.html">XML replacements</a> — <span class="smalltext">The XML replacements option allows you to modify XML files of your container's configuration using XPath statements.</span></li>
                 </ul></li>
-               <li><a href="Maven+3+Plugin+Installation.html">Maven 3 Plugin Installation</a></li>
-               <li><a href="Maven+3+Plugin+Reference+Guide.html">Maven 3 Plugin Reference Guide</a></li>
-               <li><a href="Maven+3+Plugin+Tips.html">Maven 3 Plugin Tips</a></li>
               </ul></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><a href="Runtime+Configuration.html">Runtime Configuration</a> — <span class="smalltext">A configuration for a container that is already started</span></li>
+            </ul></li>
+           <li><a href="Container.html">Container</a> — <span class="smalltext">A top level interface wrapping a real physical container</span>
+            <ul class="childpages-macro">
+             <li><a href="Container+Instantiation.html">Container Instantiation</a> — <span class="smalltext">Create a container instance</span></li>
+             <li><a href="Local+Container.html">Local Container</a> — <span class="smalltext">A container executing on the machine where Cargo executes</span>
               <ul class="childpages-macro">
-               <li><a href="Ant+Tasks+Reference+Guide.html">Ant Tasks Reference Guide</a></li>
+               <li><a href="Container+Classpath.html">Container Classpath</a> — <span class="smalltext">How to configure the executing container's classpath</span>
+                <ul class="childpages-macro">
+                 <li><a href="Application+Classpath.html">Application Classpath</a> — <span class="smalltext">How to configure the classpath of the application without changing the container's own classpath</span></li>
+                 <li><a href="JBoss+7.x+onwards+and+WildFly+container+classpath.html">JBoss 7.x onwards and WildFly container classpath</a></li>
+                </ul></li>
+               <li><a href="Container+Start.html">Container Start</a> — <span class="smalltext">Start a container that is not already running</span></li>
+               <li><a href="Container+Stop.html">Container Stop</a> — <span class="smalltext">Stop a running container</span></li>
+               <li><a href="Container+Timeout.html">Container Timeout</a> — <span class="smalltext">Timeout after which the container start/stop is deemed failed</span></li>
+               <li><a href="Embedded+Container.html">Embedded Container</a> — <span class="smalltext">A container executing in the same JVM where Cargo is running</span></li>
+               <li><a href="Installed+Container.html">Installed Container</a> — <span class="smalltext">A container installed on the machine where Cargo executes.</span>
+                <ul class="childpages-macro">
+                 <li><a href="Installer.html">Installer</a> — <span class="smalltext">Installs a container</span></li>
+                 <li><a href="Passing+system+properties.html">Passing system properties</a> — <span class="smalltext">How to pass system properties that will be available to the container while executing</span></li>
+                </ul></li>
               </ul></li>
+             <li><a href="Remote+Container.html">Remote Container</a> — <span class="smalltext">A container that is already running on some machine (local or remote)</span></li>
             </ul></li>
            <li><a href="Debugging.html">Debugging</a> — <span class="smalltext">Explain how to perform debugging when something doesn't work in Cargo</span></li>
            <li><a href="Deployment.html">Deployment</a> — <span class="smalltext">How to deploy components to a container</span>
@@ -335,61 +344,42 @@ <h3 class="heading3">RSS Feeds</h3>
               </ul></li>
              <li><a href="Hot+Deployment.html">Hot Deployment</a> — <span class="smalltext">Ability to deploy/undeploy Deployables into a running container</span></li>
              <li><a href="JSR88.html">JSR88</a> — <span class="smalltext">JSR88-compliant containers support</span></li>
+             <li><a href="Remote+deployments+to+GlassFish+6.x+onwards+and+to+recent+Payara+versions.html">Remote deployments to GlassFish 6.x onwards and to recent Payara versions</a> — <span class="smalltext">How to perform deployments to a remote GlassFish 6.x and later containers, as well as to recent versions of Payara</span></li>
              <li><a href="Static+Deployment.html">Static Deployment</a>
               <ul class="childpages-macro">
-               <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+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>
+               <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+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+WAR.html">Static deployment of WAR</a> — <span class="smalltext">Deploy a WAR that will be started when the container starts</span></li>
               </ul></li>
-             <li><a href="Remote+deployments+to+GlassFish+6.x+onwards+and+to+recent+Payara+versions.html">Remote deployments to GlassFish 6.x onwards and to recent Payara versions</a> — <span class="smalltext">How to perform deployments to a remote GlassFish 6.x and later containers, as well as to recent versions of Payara</span></li>
             </ul></li>
-           <li><a href="Module+API.html">Module API</a> — <span class="smalltext">API to manipulate J2EE archives, including vendor-specific deployment descriptors</span></li>
-           <li><a href="Container.html">Container</a> — <span class="smalltext">A top level interface wrapping a real physical container</span>
+           <li><a href="Extensions.html">Extensions</a> — <span class="smalltext">Extensions are additions to the Cargo core Java API such as build tool plugins, IDE plugins, etc</span>
             <ul class="childpages-macro">
-             <li><a href="Container+Instantiation.html">Container Instantiation</a> — <span class="smalltext">Create a container instance</span></li>
-             <li><a href="Remote+Container.html">Remote Container</a> — <span class="smalltext">A container that is already running on some machine (local or remote)</span></li>
-             <li><a href="Local+Container.html">Local Container</a> — <span class="smalltext">A container executing on the machine where Cargo executes</span>
+             <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>
               <ul class="childpages-macro">
-               <li><a href="Container+Classpath.html">Container Classpath</a> — <span class="smalltext">How to configure the executing container's classpath</span>
-                <ul class="childpages-macro">
-                 <li><a href="JBoss+7.x+onwards+and+WildFly+container+classpath.html">JBoss 7.x onwards and WildFly container classpath</a></li>
-                 <li><a href="Application+Classpath.html">Application Classpath</a> — <span class="smalltext">How to configure the classpath of the application without changing the container's own classpath</span></li>
-                </ul></li>
-               <li><a href="Embedded+Container.html">Embedded Container</a> — <span class="smalltext">A container executing in the same JVM where Cargo is running</span></li>
-               <li><a href="Container+Timeout.html">Container Timeout</a> — <span class="smalltext">Timeout after which the container start/stop is deemed failed</span></li>
-               <li><a href="Container+Stop.html">Container Stop</a> — <span class="smalltext">Stop a running container</span></li>
-               <li><a href="Container+Start.html">Container Start</a> — <span class="smalltext">Start a container that is not already running</span></li>
-               <li><a href="Installed+Container.html">Installed Container</a> — <span class="smalltext">A container installed on the machine where Cargo executes.</span>
-                <ul class="childpages-macro">
-                 <li><a href="Installer.html">Installer</a> — <span class="smalltext">Installs a container</span></li>
-                 <li><a href="Passing+system+properties.html">Passing system properties</a> — <span class="smalltext">How to pass system properties that will be available to the container while executing</span></li>
-                </ul></li>
+               <li><a href="Ant+Tasks+Reference+Guide.html">Ant Tasks Reference Guide</a></li>
               </ul></li>
-            </ul></li>
-           <li><a href="Configuration.html">Configuration</a> — <span class="smalltext">A Configuration specifies how the container is configured (logging, security, data sources, location where to put deployables, etc).</span>
-            <ul class="childpages-macro">
-             <li><a href="Configuration+properties.html">Configuration properties</a> — <span class="smalltext">Properties to configure a container (request port, shutdown port, logging level, threads, etc)</span></li>
-             <li><a href="Custom+Configuration.html">Custom Configuration</a> — <span class="smalltext">A user-provided configuration to use instead of the default Cargo-provided ones</span></li>
-             <li><a href="Local+Configuration.html">Local Configuration</a> — <span class="smalltext">A configuration for a container that is running on the local machine where Cargo is executing</span>
+             <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>
               <ul class="childpages-macro">
-               <li><a href="Custom+File+Configurations.html">Custom File Configurations</a></li>
-               <li><a href="Existing+Local+Configuration.html">Existing Local Configuration</a> — <span class="smalltext">Re-use an existing container installation</span></li>
-               <li><a href="Standalone+Local+Configuration.html">Standalone Local Configuration</a> — <span class="smalltext">Configures your container in a specific directory</span>
+               <li><a href="Maven+3+Archetypes.html">Maven 3 Archetypes</a></li>
+               <li><a href="Maven+3+Plugin+Getting+Started.html">Maven 3 Plugin Getting Started</a>
                 <ul class="childpages-macro">
-                 <li><a href="Configuration+files+option.html">Configuration files option</a> — <span class="smalltext">The configuration files are the files to add to your container's configuration. It is internally used by some containers and is accessible for you can to add extra files.</span></li>
-                 <li><a href="XML+replacements.html">XML replacements</a> — <span class="smalltext">The XML replacements option allows you to modify XML files of your container's configuration using XPath statements.</span></li>
-                 <li><a href="DataSource+and+Resource+Support.html">DataSource and Resource Support</a>
-                  <ul class="childpages-macro">
-                   <li><a href="Containers+with+DataSource+and+Resource+support.html">Containers with DataSource and Resource support</a></li>
-                  </ul></li>
+                 <li><a href="Deploying+to+a+running+container.html">Deploying to a running container</a></li>
+                 <li><a href="Generating+a+container+configuration+deployment+structure.html">Generating a container configuration deployment structure</a></li>
+                 <li><a href="Merging+WAR+files.html">Merging WAR files</a></li>
+                 <li><a href="Starting+and+stopping+a+container.html">Starting and stopping a container</a></li>
                 </ul></li>
+               <li><a href="Maven+3+Plugin+Installation.html">Maven 3 Plugin Installation</a></li>
+               <li><a href="Maven+3+Plugin+Reference+Guide.html">Maven 3 Plugin Reference Guide</a></li>
+               <li><a href="Maven+3+Plugin+Tips.html">Maven 3 Plugin Tips</a></li>
               </ul></li>
-             <li><a href="Runtime+Configuration.html">Runtime Configuration</a> — <span class="smalltext">A configuration for a container that is already started</span></li>
             </ul></li>
+           <li><a href="Module+API.html">Module API</a> — <span class="smalltext">API to manipulate J2EE archives, including vendor-specific deployment descriptors</span></li>
           </ul>
+          <p></p>
           <script type="text/javascript">
   // Google Ads code
   google_ad_client = "ca-pub-7996505557003356";
diff --git a/cargo/Functional+testing.html b/cargo/Functional+testing.html
index 41a35b1ead..679642be24 100644
--- a/cargo/Functional+testing.html
+++ b/cargo/Functional+testing.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Generating+a+container+configuration+deployment+structure.html b/cargo/Generating+a+container+configuration+deployment+structure.html
index c94f403e70..0a56c97ea6 100644
--- a/cargo/Generating+a+container+configuration+deployment+structure.html
+++ b/cargo/Generating+a+container+configuration+deployment+structure.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Geronimo+1.x.html b/cargo/Geronimo+1.x.html
index 7b13b7ea29..84e5870848 100644
--- a/cargo/Geronimo+1.x.html
+++ b/cargo/Geronimo+1.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Geronimo+2.x.html b/cargo/Geronimo+2.x.html
index ccde85c4aa..e1e2d90d97 100644
--- a/cargo/Geronimo+2.x.html
+++ b/cargo/Geronimo+2.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Geronimo+3.x.html b/cargo/Geronimo+3.x.html
index 58a57e08e0..aebe98eeae 100644
--- a/cargo/Geronimo+3.x.html
+++ b/cargo/Geronimo+3.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Give+a+warm+welcome+to+CARGO+1.3.2.html b/cargo/Give+a+warm+welcome+to+CARGO+1.3.2.html
index 5a8a8aa40a..8528db94e3 100644
--- a/cargo/Give+a+warm+welcome+to+CARGO+1.3.2.html
+++ b/cargo/Give+a+warm+welcome+to+CARGO+1.3.2.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Give+a+warm+welcome+to+CARGO+1.4.2.html b/cargo/Give+a+warm+welcome+to+CARGO+1.4.2.html
index 77048e2dbc..81a6c9d61e 100644
--- a/cargo/Give+a+warm+welcome+to+CARGO+1.4.2.html
+++ b/cargo/Give+a+warm+welcome+to+CARGO+1.4.2.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.10.3.html b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.10.3.html
index 80a387678d..cb331cca07 100644
--- a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.10.3.html
+++ b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.10.3.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.10.9.html b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.10.9.html
index 4a65048170..8937899191 100644
--- a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.10.9.html
+++ b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.10.9.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.7.7.html b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.7.7.html
index f5bc9df8d9..edf2da5fe8 100644
--- a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.7.7.html
+++ b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.7.7.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.9.2.html b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.9.2.html
index 49ee76146a..4580797ebc 100644
--- a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.9.2.html
+++ b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.9.2.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.9.7.html b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.9.7.html
index 72b8bfbe92..b86b692ebd 100644
--- a/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.9.7.html
+++ b/cargo/Give+a+warm+welcome+to+Codehaus+Cargo+1.9.7.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/GlassFish+2.x.html b/cargo/GlassFish+2.x.html
index 843962c016..f1033af598 100644
--- a/cargo/GlassFish+2.x.html
+++ b/cargo/GlassFish+2.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/GlassFish+3.x.html b/cargo/GlassFish+3.x.html
index 58d49da1ed..eb1d6250df 100644
--- a/cargo/GlassFish+3.x.html
+++ b/cargo/GlassFish+3.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/GlassFish+4.x.html b/cargo/GlassFish+4.x.html
index ce72885eb0..6ed29b1435 100644
--- a/cargo/GlassFish+4.x.html
+++ b/cargo/GlassFish+4.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/GlassFish+5.x.html b/cargo/GlassFish+5.x.html
index 49bb62a873..47506069ed 100644
--- a/cargo/GlassFish+5.x.html
+++ b/cargo/GlassFish+5.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/GlassFish+6.x.html b/cargo/GlassFish+6.x.html
index 567cbfc79d..8f2230c9a8 100644
--- a/cargo/GlassFish+6.x.html
+++ b/cargo/GlassFish+6.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/GlassFish+7.x.html b/cargo/GlassFish+7.x.html
index 693c96097c..fd63b3a58b 100644
--- a/cargo/GlassFish+7.x.html
+++ b/cargo/GlassFish+7.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Greet+Codehaus+Cargo+1.4.15.html b/cargo/Greet+Codehaus+Cargo+1.4.15.html
index 6575ada565..b37cee3bd0 100644
--- a/cargo/Greet+Codehaus+Cargo+1.4.15.html
+++ b/cargo/Greet+Codehaus+Cargo+1.4.15.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Happy+new+year+-+And+a+warm+welcome+to+Codehaus+Cargo+1.6.2.html b/cargo/Happy+new+year+-+And+a+warm+welcome+to+Codehaus+Cargo+1.6.2.html
index 768760f791..d1c3ee570a 100644
--- a/cargo/Happy+new+year+-+And+a+warm+welcome+to+Codehaus+Cargo+1.6.2.html
+++ b/cargo/Happy+new+year+-+And+a+warm+welcome+to+Codehaus+Cargo+1.6.2.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Hello+2020+-+And+hello+Codehaus+Cargo+1.7.10.html b/cargo/Hello+2020+-+And+hello+Codehaus+Cargo+1.7.10.html
index 4fb723fdd4..7999a4ff15 100644
--- a/cargo/Hello+2020+-+And+hello+Codehaus+Cargo+1.7.10.html
+++ b/cargo/Hello+2020+-+And+hello+Codehaus+Cargo+1.7.10.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Hello+2021+and+hello+Jakarta+EE+support+with+Codehaus+Cargo+1.8.4.html b/cargo/Hello+2021+and+hello+Jakarta+EE+support+with+Codehaus+Cargo+1.8.4.html
index 90bc010e23..fbd5a36eee 100644
--- a/cargo/Hello+2021+and+hello+Jakarta+EE+support+with+Codehaus+Cargo+1.8.4.html
+++ b/cargo/Hello+2021+and+hello+Jakarta+EE+support+with+Codehaus+Cargo+1.8.4.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Ho+ho+ho+Codehaus+Cargo+1.9.9+is+here.html b/cargo/Ho+ho+ho+Codehaus+Cargo+1.9.9+is+here.html
index 1ae5e88470..96fcf80367 100644
--- a/cargo/Ho+ho+ho+Codehaus+Cargo+1.9.9+is+here.html
+++ b/cargo/Ho+ho+ho+Codehaus+Cargo+1.9.9+is+here.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Home.html b/cargo/Home.html
index a00b0c51a3..c442e5b4c1 100644
--- a/cargo/Home.html
+++ b/cargo/Home.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Hot+Deployment.html b/cargo/Hot+Deployment.html
index f938061160..173bda10bd 100644
--- a/cargo/Hot+Deployment.html
+++ b/cargo/Hot+Deployment.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/How+to+use+Cargo+for+functional+testing.html b/cargo/How+to+use+Cargo+for+functional+testing.html
index 91a0787776..4726fa281c 100644
--- a/cargo/How+to+use+Cargo+for+functional+testing.html
+++ b/cargo/How+to+use+Cargo+for+functional+testing.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Importing+sources.html b/cargo/Importing+sources.html
index 86d42c0f00..8886db6cee 100644
--- a/cargo/Importing+sources.html
+++ b/cargo/Importing+sources.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Installation.html b/cargo/Installation.html
index 5eb1f708ec..a37a0acb8b 100644
--- a/cargo/Installation.html
+++ b/cargo/Installation.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Installed+Container.html b/cargo/Installed+Container.html
index 61b7546739..90769d7e8c 100644
--- a/cargo/Installed+Container.html
+++ b/cargo/Installed+Container.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Installer.html b/cargo/Installer.html
index b2d86bc4c8..3e8d2c016d 100644
--- a/cargo/Installer.html
+++ b/cargo/Installer.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+3.x.html b/cargo/JBoss+3.x.html
index a2e7ecaa2a..403bba959a 100644
--- a/cargo/JBoss+3.x.html
+++ b/cargo/JBoss+3.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+4.2.x.html b/cargo/JBoss+4.2.x.html
index f4302c24ba..a257806d77 100644
--- a/cargo/JBoss+4.2.x.html
+++ b/cargo/JBoss+4.2.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+4.x.html b/cargo/JBoss+4.x.html
index 455d0f80ff..ec1267584d 100644
--- a/cargo/JBoss+4.x.html
+++ b/cargo/JBoss+4.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+5.1.x.html b/cargo/JBoss+5.1.x.html
index 0430cc6f44..c696e5a9d1 100644
--- a/cargo/JBoss+5.1.x.html
+++ b/cargo/JBoss+5.1.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+5.x.html b/cargo/JBoss+5.x.html
index 58d2a40b96..e4f8db040d 100644
--- a/cargo/JBoss+5.x.html
+++ b/cargo/JBoss+5.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+6.1.x.html b/cargo/JBoss+6.1.x.html
index 2cd5efced9..1a86a97838 100644
--- a/cargo/JBoss+6.1.x.html
+++ b/cargo/JBoss+6.1.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+6.x.html b/cargo/JBoss+6.x.html
index b302d08a87..bf516ac809 100644
--- a/cargo/JBoss+6.x.html
+++ b/cargo/JBoss+6.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+7.1.x.html b/cargo/JBoss+7.1.x.html
index e098b675a0..cb0998e972 100644
--- a/cargo/JBoss+7.1.x.html
+++ b/cargo/JBoss+7.1.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+7.2.x.html b/cargo/JBoss+7.2.x.html
index a5db7c2767..5ae983e851 100644
--- a/cargo/JBoss+7.2.x.html
+++ b/cargo/JBoss+7.2.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+7.3.x.html b/cargo/JBoss+7.3.x.html
index b17f3ed9f8..573ad2a503 100644
--- a/cargo/JBoss+7.3.x.html
+++ b/cargo/JBoss+7.3.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+7.4.x.html b/cargo/JBoss+7.4.x.html
index 69c7252a0a..74d5973f64 100644
--- a/cargo/JBoss+7.4.x.html
+++ b/cargo/JBoss+7.4.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+7.5.x.html b/cargo/JBoss+7.5.x.html
index e8dd652bb2..ea0de1a53f 100644
--- a/cargo/JBoss+7.5.x.html
+++ b/cargo/JBoss+7.5.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+7.x+onwards+and+WildFly+container+classpath.html b/cargo/JBoss+7.x+onwards+and+WildFly+container+classpath.html
index b53e585948..8ae0f5c2ac 100644
--- a/cargo/JBoss+7.x+onwards+and+WildFly+container+classpath.html
+++ b/cargo/JBoss+7.x+onwards+and+WildFly+container+classpath.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+7.x.html b/cargo/JBoss+7.x.html
index fd0fceee4d..6f31fbfa49 100644
--- a/cargo/JBoss+7.x.html
+++ b/cargo/JBoss+7.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JBoss+Remote+Deployer.html b/cargo/JBoss+Remote+Deployer.html
index 4d0cbe53e3..17184be2f9 100644
--- a/cargo/JBoss+Remote+Deployer.html
+++ b/cargo/JBoss+Remote+Deployer.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JOnAS+4.x.html b/cargo/JOnAS+4.x.html
index d128f68385..7f0a0a7e0b 100644
--- a/cargo/JOnAS+4.x.html
+++ b/cargo/JOnAS+4.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JOnAS+5.x.html b/cargo/JOnAS+5.x.html
index 04aee5d8c2..7ff1fd3d57 100644
--- a/cargo/JOnAS+5.x.html
+++ b/cargo/JOnAS+5.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JRun+4.x.html b/cargo/JRun+4.x.html
index ceb70f3cf0..e5203ec2dc 100644
--- a/cargo/JRun+4.x.html
+++ b/cargo/JRun+4.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/JSR88.html b/cargo/JSR88.html
index 015e434fe2..0d4ff04452 100644
--- a/cargo/JSR88.html
+++ b/cargo/JSR88.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Javadocs.html b/cargo/Javadocs.html
index 9d0920a922..43bc04dc54 100644
--- a/cargo/Javadocs.html
+++ b/cargo/Javadocs.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Jetty+10.x.html b/cargo/Jetty+10.x.html
index 9fca748ac5..2544e27619 100644
--- a/cargo/Jetty+10.x.html
+++ b/cargo/Jetty+10.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Jetty+11.x.html b/cargo/Jetty+11.x.html
index 0528a4dbb4..8af36a7216 100644
--- a/cargo/Jetty+11.x.html
+++ b/cargo/Jetty+11.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Jetty+12.x.html b/cargo/Jetty+12.x.html
index 86804f8c83..9fbfc21e65 100644
--- a/cargo/Jetty+12.x.html
+++ b/cargo/Jetty+12.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Jetty+5.x.html b/cargo/Jetty+5.x.html
index 7000db2b09..a2557fddb4 100644
--- a/cargo/Jetty+5.x.html
+++ b/cargo/Jetty+5.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Jetty+6.x.html b/cargo/Jetty+6.x.html
index c8c96cdd54..b9a5403439 100644
--- a/cargo/Jetty+6.x.html
+++ b/cargo/Jetty+6.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Jetty+7.x.html b/cargo/Jetty+7.x.html
index 31f958af4c..fa5eb30f9a 100644
--- a/cargo/Jetty+7.x.html
+++ b/cargo/Jetty+7.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Jetty+8.x.html b/cargo/Jetty+8.x.html
index 79c6a13844..3cc1a18517 100644
--- a/cargo/Jetty+8.x.html
+++ b/cargo/Jetty+8.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Jetty+9.x.html b/cargo/Jetty+9.x.html
index 8a1e6cb064..ca987a055a 100644
--- a/cargo/Jetty+9.x.html
+++ b/cargo/Jetty+9.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Jetty+Remote+Deployer.html b/cargo/Jetty+Remote+Deployer.html
index 0b4afac77f..67d88018ce 100644
--- a/cargo/Jetty+Remote+Deployer.html
+++ b/cargo/Jetty+Remote+Deployer.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Just+before+summer+holidays+-+Say+hello+to+Codehaus+Cargo+1.6.4.html b/cargo/Just+before+summer+holidays+-+Say+hello+to+Codehaus+Cargo+1.6.4.html
index f2c744705e..411c2b462d 100644
--- a/cargo/Just+before+summer+holidays+-+Say+hello+to+Codehaus+Cargo+1.6.4.html
+++ b/cargo/Just+before+summer+holidays+-+Say+hello+to+Codehaus+Cargo+1.6.4.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Let+s+make+some+noise.html b/cargo/Let+s+make+some+noise.html
index 01f2457f0e..d5655448e0 100644
--- a/cargo/Let+s+make+some+noise.html
+++ b/cargo/Let+s+make+some+noise.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/License.html b/cargo/License.html
index e5e22a5cfc..44171e679c 100644
--- a/cargo/License.html
+++ b/cargo/License.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Local+Configuration.html b/cargo/Local+Configuration.html
index cfa5b82102..8ea120614f 100644
--- a/cargo/Local+Configuration.html
+++ b/cargo/Local+Configuration.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Local+Container.html b/cargo/Local+Container.html
index 91ad4c44c2..1cb0424a56 100644
--- a/cargo/Local+Container.html
+++ b/cargo/Local+Container.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Local+Deployer.html b/cargo/Local+Deployer.html
index afa1f646f7..bf40f8d0cb 100644
--- a/cargo/Local+Deployer.html
+++ b/cargo/Local+Deployer.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Lots+of+new+Cargo+committers.html b/cargo/Lots+of+new+Cargo+committers.html
index e51eaf3279..06501f4936 100644
--- a/cargo/Lots+of+new+Cargo+committers.html
+++ b/cargo/Lots+of+new+Cargo+committers.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Mailing+Lists.html b/cargo/Mailing+Lists.html
index 4c3e1585da..3936c5ae0f 100644
--- a/cargo/Mailing+Lists.html
+++ b/cargo/Mailing+Lists.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Matt+Raible+talks+about+Cargo.html b/cargo/Matt+Raible+talks+about+Cargo.html
index 32847848c6..d8f893dd7e 100644
--- a/cargo/Matt+Raible+talks+about+Cargo.html
+++ b/cargo/Matt+Raible+talks+about+Cargo.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Maven+3+Archetypes.html b/cargo/Maven+3+Archetypes.html
index 2d7e821a3c..2d04ff4e5d 100644
--- a/cargo/Maven+3+Archetypes.html
+++ b/cargo/Maven+3+Archetypes.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Maven+3+Plugin+Getting+Started.html b/cargo/Maven+3+Plugin+Getting+Started.html
index fd559947ae..e5413473a2 100644
--- a/cargo/Maven+3+Plugin+Getting+Started.html
+++ b/cargo/Maven+3+Plugin+Getting+Started.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Maven+3+Plugin+Installation.html b/cargo/Maven+3+Plugin+Installation.html
index 16e1e2625f..f4d15b2f95 100644
--- a/cargo/Maven+3+Plugin+Installation.html
+++ b/cargo/Maven+3+Plugin+Installation.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Maven+3+Plugin+Reference+Guide.html b/cargo/Maven+3+Plugin+Reference+Guide.html
index 968b562b14..91fac0a231 100644
--- a/cargo/Maven+3+Plugin+Reference+Guide.html
+++ b/cargo/Maven+3+Plugin+Reference+Guide.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Maven+3+Plugin+Tips.html b/cargo/Maven+3+Plugin+Tips.html
index c9a25777dc..8f986ee5ed 100644
--- a/cargo/Maven+3+Plugin+Tips.html
+++ b/cargo/Maven+3+Plugin+Tips.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Maven+3+Plugin.html b/cargo/Maven+3+Plugin.html
index d10a42f089..0e6c634593 100644
--- a/cargo/Maven+3+Plugin.html
+++ b/cargo/Maven+3+Plugin.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Maven2+plugin+v0.1+released.html b/cargo/Maven2+plugin+v0.1+released.html
index 46d775fba8..625d0c632d 100644
--- a/cargo/Maven2+plugin+v0.1+released.html
+++ b/cargo/Maven2+plugin+v0.1+released.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Merging+WAR+files.html b/cargo/Merging+WAR+files.html
index abb63f506e..4dbfe12747 100644
--- a/cargo/Merging+WAR+files.html
+++ b/cargo/Merging+WAR+files.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Merry+Christmas+-+And+give+a+warm+welcome+to+Codehaus+Cargo+1.6.6.html b/cargo/Merry+Christmas+-+And+give+a+warm+welcome+to+Codehaus+Cargo+1.6.6.html
index 9e4d43d40e..7a2fbe8b8a 100644
--- a/cargo/Merry+Christmas+-+And+give+a+warm+welcome+to+Codehaus+Cargo+1.6.6.html
+++ b/cargo/Merry+Christmas+-+And+give+a+warm+welcome+to+Codehaus+Cargo+1.6.6.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Module+API.html b/cargo/Module+API.html
index 431c100d05..144735f196 100644
--- a/cargo/Module+API.html
+++ b/cargo/Module+API.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Navigation.html b/cargo/Navigation.html
index 73d281098c..c1a6fa95e6 100644
--- a/cargo/Navigation.html
+++ b/cargo/Navigation.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
@@ -299,45 +287,34 @@ <h3 class="heading3">RSS Feeds</h3>
          <td class="rightColumn">
           <h3 id="Navigation-QuickLinks">Quick Links</h3>
           <ul class="alternate">
-           <li><a href="Home.html">Home</a></li>
-           <li><a href="Downloads.html">Downloads</a></li>
-           <li><a href="Quick+start.html">Quick start</a></li>
-           <li><a href="Contributing.html">How to contribute?</a>
-            <ul class="alternate">
-             <li><a href="Adding+a+container.html">Adding a container</a></li>
-            </ul></li>
-          </ul>
-          <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-          <ul class="alternate">
-           <li>Overview<br>
-            <ul class="alternate">
+           <li><a href="Home.html">Home</a>
+            <ul>
              <li><a href="Architecture.html">Architecture</a></li>
              <li><a href="Features.html">Features</a></li>
+             <li><a href="License.html">License</a></li>
+             <li><a href="Credits.html">Credits</a></li>
             </ul></li>
-           <li><a href="Installation.html">Installation</a></li>
-           <li>Usage<br>
-            <ul class="alternate">
+           <li>Installation
+            <ul>
+             <li><a href="Downloads.html">Downloads</a></li>
+             <li><a href="Installation.html">Installation</a></li>
+            </ul></li>
+           <li>Usage
+            <ul>
+             <li><a href="Quick+start.html">Quick start</a></li>
              <li><a href="Javadocs.html">Java API</a></li>
              <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
              <li><a href="Ant+support.html">Ant tasks</a></li>
              <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
              <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
             </ul></li>
-           <li><a href="Articles.html">Articles</a></li>
-           <li><a href="License.html">License</a></li>
-           <li><a href="Credits.html">Credits</a></li>
+           <li>Getting help
+            <ul>
+             <li><a href="Articles.html">Articles</a></li>
+             <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+             <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+            </ul></li>
           </ul>
-          <script type="text/javascript">
-  // Google Ads code
-  google_ad_client = "ca-pub-7996505557003356";
-  google_ad_slot = "5363897989";
-  google_ad_width = 728;
-  google_ad_height = 90;
-</script>
-          <center style="padding-bottom: 1mm; margin-bottom: 2mm; border: 1px solid #eee">
-           <script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js">
-  </script>
-          </center>
           <h3 id="Navigation-Containers">Containers</h3>
           <ul class="alternate">
            <li>Geronimo
@@ -500,37 +477,36 @@ <h3 id="Navigation-Containers">Containers</h3>
              <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
             </ul></li>
           </ul>
-          <h3 id="Navigation-Extensions">Extensions</h3>
-          <ul class="alternate">
-           <li><a href="Ant+support.html">Ant tasks</a></li>
-           <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-           <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-          </ul>
-          <p>Independent extensions:</p>
+          <script type="text/javascript">
+  // Google Ads code
+  google_ad_client = "ca-pub-7996505557003356";
+  google_ad_slot = "5363897989";
+  google_ad_width = 728;
+  google_ad_height = 90;
+</script>
+          <center style="padding-bottom: 1mm; margin-bottom: 2mm; border: 1px solid #eee">
+           <script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js">
+  </script>
+          </center>
+          <h3 id="Navigation-Independentextensions">Independent extensions</h3>
           <ul class="alternate">
            <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
            <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
           </ul>
-          <h3 id="Navigation-ProjectInfo">Project Info</h3>
-          <ul class="alternate">
-           <li><a href="Roadmap.html">Roadmap</a></li>
-           <li><a href="News.html">News</a></li>
-           <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-           <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-           <li><a href="Source+code.html">Source code</a></li>
-           <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>
-          </ul>
           <h3 id="Navigation-Development">Development</h3>
           <ul class="alternate">
            <li><a href="Project+Structure.html">Project structure</a></li>
+           <li><a href="Roadmap.html">Roadmap</a></li>
+           <li><a href="Source+code.html">Source code</a></li>
            <li><a href="Importing+sources.html">Importing sources</a></li>
            <li><a href="Building.html">Building</a></li>
-           <li><a href="Cargo+Code+Style.html">Code style</a></li>
-           <li><a href="Contributing.html">Contributing</a></li>
-           <li><a href="Release+procedure.html">Release procedure</a></li>
+           <li><a href="Contributing.html">Contributing</a>
+            <ul>
+             <li><a href="Cargo+Code+Style.html">Code style</a></li>
+             <li><a href="Adding+a+container.html">Adding a container</a></li>
+            </ul></li>
            <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+           <li><a href="Release+procedure.html">Release procedure</a></li>
           </ul></td>
         </tr>
        </tbody>
diff --git a/cargo/News.html b/cargo/News.html
index e9ba3d4b25..753324c02f 100644
--- a/cargo/News.html
+++ b/cargo/News.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Oc4J+9.x.html b/cargo/Oc4J+9.x.html
index 766e64329d..53ca4ac341 100644
--- a/cargo/Oc4J+9.x.html
+++ b/cargo/Oc4J+9.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Oc4j+10.x.html b/cargo/Oc4j+10.x.html
index f953674e6b..e94776274f 100644
--- a/cargo/Oc4j+10.x.html
+++ b/cargo/Oc4j+10.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Passing+system+properties.html b/cargo/Passing+system+properties.html
index 6fc8542743..93468e5964 100644
--- a/cargo/Passing+system+properties.html
+++ b/cargo/Passing+system+properties.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Payara.html b/cargo/Payara.html
index e1f394ebc0..6c4b6ef43f 100644
--- a/cargo/Payara.html
+++ b/cargo/Payara.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Project+Structure.html b/cargo/Project+Structure.html
index 8f56703941..dedb84cac7 100644
--- a/cargo/Project+Structure.html
+++ b/cargo/Project+Structure.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Quick+start.html b/cargo/Quick+start.html
index abb74903c4..9d1cdccead 100644
--- a/cargo/Quick+start.html
+++ b/cargo/Quick+start.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
@@ -325,7 +313,8 @@ <h3 class="heading3">RSS Feeds</h3>
             </ul>
            </div>
           </div>
-          <p>The following examples demonstrate how to configure Resin 3.0.15 to start in <code>target/resin3x</code> and deploy a WAR located in <code>path/to/simple.war</code> using the Java API. The default port is 8080. Please note that the <code>container.start()</code> and <code>container.stop()</code> methods wait until the container is fully started and fully stopped before continuing. Thus, for any action you are executing after, you are assured the container is completely operational.</p>
+          <p>The following examples demonstrate how to configure Tomcat 9.0.78 to start with a standalone local configuration in <code>target/tomcat9x</code> and deploy a WAR located in <code>path/to/simple.war</code> using the Java API. The default port is <code>8080</code>.</p>
+          <p>Please note that the <code>container.start()</code> and <code>container.stop()</code> methods wait until the container is fully started and fully stopped before continuing. Thus, for any action you are executing after, you are assured the container is completely operational.</p>
           <h3 id="Quickstart-Staticdeployment">Static deployment</h3>
           <p>Static deployment means that the <a href="Deployable.html">Deployable</a> is deployed before the container is started. Here's an example using the strongly typed Java API:</p>
           <div class="code panel pdl conf-macro output-block" style="border-width: 1px;">
@@ -333,12 +322,12 @@ <h3 id="Quickstart-Staticdeployment">Static deployment</h3>
             <pre class="syntaxhighlighter-pre">Deployable war = new WAR("path/to/simple.war");
 
 LocalConfiguration configuration =
-    new Resin3xStandaloneLocalConfiguration("target/myresin3x");
+    new Tomcat9xStandaloneLocalConfiguration("target/tomcat9x");
 configuration.addDeployable(war);
 
 InstalledLocalContainer container =
-    new Resin3xInstalledLocalContainer(configuration);
-container.setHome("c:/apps/resin-3.0.18");
+    new Tomcat9xInstalledLocalContainer(configuration);
+container.setHome("c:/apps/tomcat-9.0.78");
 
 container.start();
 // Here you are assured the container is started.
@@ -351,19 +340,20 @@ <h3 id="Quickstart-Staticdeployment">Static deployment</h3>
           <div class="code panel pdl conf-macro output-block" style="border-width: 1px;">
            <div class="codeContent panelContent pdl">
             <pre class="syntaxhighlighter-pre">Deployable war = new DefaultDeployableFactory().createDeployable(
-    "resin3x", "path/to/simple.war", DeployableType.WAR);
+    "tomcat9x", "path/to/simple.war", DeployableType.WAR);
 
 ConfigurationFactory configurationFactory =
     new DefaultConfigurationFactory();
 LocalConfiguration configuration =
     (LocalConfiguration) configurationFactory.createConfiguration(
-"resin3x", ContainerType.INSTALLED, ConfigurationType.STANDALONE);
+        "tomcat9x", ContainerType.INSTALLED,
+            ConfigurationType.STANDALONE, "target/tomcat9x");
 configuration.addDeployable(war);
 
 InstalledLocalContainer container =
     (InstalledLocalContainer) new DefaultContainerFactory().createContainer(
-"resin3x", ContainerType.INSTALLED, configuration);
-container.setHome("c:/apps/resin-3.0.18");
+        "tomcat9x", ContainerType.INSTALLED, configuration);
+container.setHome("c:/apps/tomcat-9.0.78");
 
 container.start();
 // Here you are assured the container is started.
@@ -377,23 +367,22 @@ <h3 id="Quickstart-Hotdeployment">Hot deployment</h3>
           <p><a href="Hot+Deployment.html">Hot deployment</a> means that the Deployable is deployed after the container is started.</p>
           <div class="code panel pdl conf-macro output-block" style="border-width: 1px;">
            <div class="codeContent panelContent pdl">
-            <pre class="syntaxhighlighter-pre">InstalledLocalContainer container = new Resin3xInstalledLocalContainer(
-    new Resin3xStandaloneLocalConfiguration("target/myresin3x"));
-container.setHome("c:/apps/resin-3.0.18");
+            <pre class="syntaxhighlighter-pre">InstalledLocalContainer container = new Tomcat9xInstalledLocalContainer(
+    new Tomcat9StandaloneLocalConfiguration("target/tomcat9x"));
+container.setHome("c:/apps/tomcat-9.0.78");
 
 container.start();
 // Here you are assured the container is started.
 
 Deployable war = new WAR("path/to/simple.war");
-Deployer deployer = new ResinInstalledLocalDeployer(container);
-deployer.deploy(war);
+Deployer deployer = new TomcatCopyingInstalledLocalDeployer(container);
 
-// Here you are NOT sure the WAR has finished deploying. To be sure you
-// need to use a DeployableMonitor to monitor the deployment. For example
-// the following code deploys the WAR and wait until it is available to
-// serve requests (the URL should point to a resource inside your WAR):
+// To be sure that the deployable is deployed, we can use a DeployableMonitor
+// to monitor the deployment. The following code deploys the WAR and waits until
+// it is available to serve requests (i.e., the URL specified returns an HTTP
+// code 2xx or 3xx and, in our example, the text connection-ok in the body)
 deployer.deploy(war, new URLDeployableMonitor(
-    new URL("http://server:port/some/url")));
+    new URL("http://localhost:8080/simple/jsp-status"), "connection-ok"));
 
 container.stop();
 // Here you are assured the container is stopped.</pre>
diff --git a/cargo/Release+notes+for+Cargo+0.5.html b/cargo/Release+notes+for+Cargo+0.5.html
index 379a35fe51..2fd4759c9d 100644
--- a/cargo/Release+notes+for+Cargo+0.5.html
+++ b/cargo/Release+notes+for+Cargo+0.5.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Release+notes+for+Cargo+0.6.html b/cargo/Release+notes+for+Cargo+0.6.html
index ac2b3f8647..cbbc76b8bc 100644
--- a/cargo/Release+notes+for+Cargo+0.6.html
+++ b/cargo/Release+notes+for+Cargo+0.6.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Release+notes+for+Cargo+0.7.html b/cargo/Release+notes+for+Cargo+0.7.html
index 11b54f1970..1e6619cd3b 100644
--- a/cargo/Release+notes+for+Cargo+0.7.html
+++ b/cargo/Release+notes+for+Cargo+0.7.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Release+notes+for+Cargo+0.8.html b/cargo/Release+notes+for+Cargo+0.8.html
index c9028ace6f..a13edaa66b 100644
--- a/cargo/Release+notes+for+Cargo+0.8.html
+++ b/cargo/Release+notes+for+Cargo+0.8.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Release+notes+for+Cargo+Core+0.9.html b/cargo/Release+notes+for+Cargo+Core+0.9.html
index 456420bd08..411d945b2d 100644
--- a/cargo/Release+notes+for+Cargo+Core+0.9.html
+++ b/cargo/Release+notes+for+Cargo+Core+0.9.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Release+notes+for+IntelliJ+IDEA+Plugin+0.1.html b/cargo/Release+notes+for+IntelliJ+IDEA+Plugin+0.1.html
index 530e28769d..292013831a 100644
--- a/cargo/Release+notes+for+IntelliJ+IDEA+Plugin+0.1.html
+++ b/cargo/Release+notes+for+IntelliJ+IDEA+Plugin+0.1.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Release+notes+for+Maven2+plugin+0.1.html b/cargo/Release+notes+for+Maven2+plugin+0.1.html
index 3276f26380..bd30fca59d 100644
--- a/cargo/Release+notes+for+Maven2+plugin+0.1.html
+++ b/cargo/Release+notes+for+Maven2+plugin+0.1.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Release+notes+for+Maven2+plugin+0.2.html b/cargo/Release+notes+for+Maven2+plugin+0.2.html
index 10e5ede60c..cc0b4ac1e2 100644
--- a/cargo/Release+notes+for+Maven2+plugin+0.2.html
+++ b/cargo/Release+notes+for+Maven2+plugin+0.2.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Release+procedure.html b/cargo/Release+procedure.html
index f6f75f596d..51f05a4983 100644
--- a/cargo/Release+procedure.html
+++ b/cargo/Release+procedure.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
@@ -335,7 +323,7 @@ <h3 id="Releaseprocedure-Beforeyoustart">Before you start</h3>
             <ol>
              <li>Open the CI page and click on the latest build</li>
              <li>First, check if the overall status is <strong><span style="color: rgb(51,153,102);">PASSED</span></strong></li>
-             <li>Then, click on the build and check for the command with <code>cat core/samples/java/containers.log</code> in it (on all CI jobs for the last build, as we split the container tests into multiple parallel jobs to reduce the total time required for integration testing). It should indicate status <code>0</code> for all containers:<br><br><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" loading="lazy" src="attachments/Semaphore%20container%20log.png"></span><br><br></li>
+             <li>Then, click on the build and check for the command with <code>cat core/samples/java/containers.log</code> in it (on all CI jobs for the last build, as we split the container tests into multiple parallel jobs to reduce the total time required for integration testing). It should indicate status <code>0</code> for all containers:<br><br><span class="confluence-embedded-file-wrapper confluence-embedded-manual-size"><img class="confluence-embedded-image" height="250" loading="lazy" src="attachments/Semaphore%20container%20log.png" srcset="https://codehaus-cargo.atlassian.net/wiki/download/thumbnails/491632/Semaphore%20container%20log.png?version=2&amp;modificationDate=1691490611846&amp;cacheVersion=1&amp;api=v2&amp;width=486&amp;height=500 2x, https://codehaus-cargo.atlassian.net/wiki/download/thumbnails/491632/Semaphore%20container%20log.png?version=2&amp;modificationDate=1691490611846&amp;cacheVersion=1&amp;api=v2&amp;width=243&amp;height=250 1x"></span><br><br></li>
             </ol></li>
            <li>For non-publicly-downloadable containers,&nbsp;tests need to be done on your computer. These include:
             <ul>
diff --git a/cargo/Remote+Container.html b/cargo/Remote+Container.html
index 75791803c4..17880b7466 100644
--- a/cargo/Remote+Container.html
+++ b/cargo/Remote+Container.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Remote+Deployer.html b/cargo/Remote+Deployer.html
index 96cd6d6396..e089309503 100644
--- a/cargo/Remote+Deployer.html
+++ b/cargo/Remote+Deployer.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Remote+deployments+to+GlassFish+6.x+onwards+and+to+recent+Payara+versions.html b/cargo/Remote+deployments+to+GlassFish+6.x+onwards+and+to+recent+Payara+versions.html
index d34fb308a4..5175e25876 100644
--- a/cargo/Remote+deployments+to+GlassFish+6.x+onwards+and+to+recent+Payara+versions.html
+++ b/cargo/Remote+deployments+to+GlassFish+6.x+onwards+and+to+recent+Payara+versions.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Resin+3.1.x.html b/cargo/Resin+3.1.x.html
index 68cdf4921b..4842a2519a 100644
--- a/cargo/Resin+3.1.x.html
+++ b/cargo/Resin+3.1.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Resin+3.x.html b/cargo/Resin+3.x.html
index 990aaf4914..18a097eec0 100644
--- a/cargo/Resin+3.x.html
+++ b/cargo/Resin+3.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Resin+4.x.html b/cargo/Resin+4.x.html
index cdf487460a..3e6e3ccbc7 100644
--- a/cargo/Resin+4.x.html
+++ b/cargo/Resin+4.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Resource+and+DataSource+Implementation.html b/cargo/Resource+and+DataSource+Implementation.html
index 7cbb9b3250..fb638c72d6 100644
--- a/cargo/Resource+and+DataSource+Implementation.html
+++ b/cargo/Resource+and+DataSource+Implementation.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Roadmap.html b/cargo/Roadmap.html
index 4a26eece72..07be57fdba 100644
--- a/cargo/Roadmap.html
+++ b/cargo/Roadmap.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Runtime+Configuration.html b/cargo/Runtime+Configuration.html
index 2e24e882d9..8736fd25e5 100644
--- a/cargo/Runtime+Configuration.html
+++ b/cargo/Runtime+Configuration.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Santa+Claus+presents+...+Codehaus+Cargo+1.4.17.html b/cargo/Santa+Claus+presents+...+Codehaus+Cargo+1.4.17.html
index b3053e7aa3..a133e1f9d2 100644
--- a/cargo/Santa+Claus+presents+...+Codehaus+Cargo+1.4.17.html
+++ b/cargo/Santa+Claus+presents+...+Codehaus+Cargo+1.4.17.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Say+hello+to+CARGO+1.4.11.html b/cargo/Say+hello+to+CARGO+1.4.11.html
index 5542a912d6..86275ee5b7 100644
--- a/cargo/Say+hello+to+CARGO+1.4.11.html
+++ b/cargo/Say+hello+to+CARGO+1.4.11.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Say+hello+to+CARGO+1.4.13.html b/cargo/Say+hello+to+CARGO+1.4.13.html
index dddd22625c..85a78b9f26 100644
--- a/cargo/Say+hello+to+CARGO+1.4.13.html
+++ b/cargo/Say+hello+to+CARGO+1.4.13.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Say+hello+to+Codehaus+Cargo+1.6.10.html b/cargo/Say+hello+to+Codehaus+Cargo+1.6.10.html
index cca31d8926..3eb3a3258e 100644
--- a/cargo/Say+hello+to+Codehaus+Cargo+1.6.10.html
+++ b/cargo/Say+hello+to+Codehaus+Cargo+1.6.10.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/ScratchWiki.html b/cargo/ScratchWiki.html
deleted file mode 100644
index c8310e7008..0000000000
--- a/cargo/ScratchWiki.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<!--?xml version="1.0" encoding="utf-8"?-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
- <head profile="http://www.w3.org/2000/08/w3c-synd/#">
-  <meta charset="UTF-8">
-  <meta http-equiv="x-ua-compatible" content="IE=Edge">
-  <link rel="stylesheet" href="attachments/site.css" type="text/css">
-  <link rel="shortcut icon" href="attachments/favicon.ico">
-  <link rel="icon" type="image/x-icon" href="attachments/favicon.ico">
-  <title>Codehaus Cargo - ScratchWiki</title><!-- Global site tag (gtag.js) - Google Analytics -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=G-MYCEY8S1MG"></script>
-  <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('js', new Date());
-    gtag('config', 'G-MYCEY8S1MG');
-  </script><!-- Google Ads -->
-  <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-  <script>
-    (adsbygoogle = window.adsbygoogle || []).push({
-      google_ad_client: "ca-pub-7996505557003356",
-      enable_page_level_ads: true
-    });
-  </script>
- </head>
- <body>
-  <table class="layout" style="border-collapse:collapse;position:absolute;width:100%;height:100%" border="none">
-   <tbody>
-    <tr style="height:83px">
-     <td colspan="2" style="padding:0px">
-      <div style="position:fixed;width:100%;top:0;border-bottom:1px solid #39434F;z-index:2">
-       <table class="banner" style="padding:0px;width:100%;background-image:url('attachments/cargo-banner-center.png')">
-        <tbody>
-         <tr>
-          <td align="left" valign="middle" style="padding:0px"><img src="attachments/cargo-banner-left.png"></td>
-          <td align="right" valign="middle" style="padding:0px"><img src="attachments/cargo-banner-right.png"></td>
-         </tr>
-        </tbody>
-       </table>
-      </div></td>
-    </tr>
-    <tr valign="top">
-     <td class="leftColumn" valign="top" style="padding-top:0px">
-      <h3 id="Navigation-QuickLinks">Quick Links</h3>
-      <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
-         <li><a href="Architecture.html">Architecture</a></li>
-         <li><a href="Features.html">Features</a></li>
-        </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
-         <li><a href="Javadocs.html">Java API</a></li>
-         <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
-         <li><a href="Ant+support.html">Ant tasks</a></li>
-         <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-         <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-        </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
-      </ul>
-      <h3 id="Navigation-Containers">Containers</h3>
-      <ul class="alternate">
-       <li>Geronimo
-        <ul class="alternate">
-         <li><a href="Geronimo+1.x.html">Geronimo 1.x</a></li>
-         <li><a href="Geronimo+2.x.html">Geronimo 2.x</a></li>
-         <li><a href="Geronimo+3.x.html">Geronimo 3.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>GlassFish
-        <ul class="alternate">
-         <li><a href="GlassFish+2.x.html">GlassFish 2.x</a></li>
-         <li><a href="GlassFish+3.x.html">GlassFish 3.x</a></li>
-         <li><a href="GlassFish+4.x.html">GlassFish 4.x</a></li>
-         <li><a href="GlassFish+5.x.html">GlassFish 5.x</a></li>
-         <li><a href="GlassFish+6.x.html">GlassFish 6.x</a></li>
-         <li><a href="GlassFish+7.x.html">GlassFish 7.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>JBoss
-        <ul class="alternate">
-         <li><a href="JBoss+3.x.html">JBoss 3.x</a></li>
-         <li><a href="JBoss+4.x.html">JBoss 4.x</a></li>
-         <li><a href="JBoss+4.2.x.html">JBoss 4.2.x</a></li>
-         <li><a href="JBoss+5.x.html">JBoss 5.x</a></li>
-         <li><a href="JBoss+5.1.x.html">JBoss 5.1.x</a></li>
-         <li><a href="JBoss+6.x.html">JBoss 6.x</a></li>
-         <li><a href="JBoss+6.1.x.html">JBoss 6.1.x</a></li>
-         <li><a href="JBoss+7.x.html">JBoss 7.x</a></li>
-         <li><a href="JBoss+7.1.x.html">JBoss 7.1.x</a></li>
-         <li><a href="JBoss+7.2.x.html">JBoss 7.2.x</a></li>
-         <li><a href="JBoss+7.3.x.html">JBoss 7.3.x</a></li>
-         <li><a href="JBoss+7.4.x.html">JBoss 7.4.x</a></li>
-         <li><a href="JBoss+7.5.x.html">JBoss 7.5.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>Jetty
-        <ul class="alternate">
-         <li><a href="Jetty+5.x.html">Jetty 5.x</a></li>
-         <li><a href="Jetty+6.x.html">Jetty 6.x</a></li>
-         <li><a href="Jetty+7.x.html">Jetty 7.x</a></li>
-         <li><a href="Jetty+8.x.html">Jetty 8.x</a></li>
-         <li><a href="Jetty+9.x.html">Jetty 9.x</a></li>
-         <li><a href="Jetty+10.x.html">Jetty 10.x</a></li>
-         <li><a href="Jetty+11.x.html">Jetty 11.x</a></li>
-         <li><a href="Jetty+12.x.html">Jetty 12.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>Jo!
-        <ul class="alternate">
-         <li><a href="jo+1.x.html">jo 1.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>JOnAS
-        <ul class="alternate">
-         <li><a href="JOnAS+4.x.html">JOnAS 4.x</a></li>
-         <li><a href="JOnAS+5.x.html">JOnAS 5.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>JRun
-        <ul class="alternate">
-         <li><a href="JRun+4.x.html">JRun 4.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>Orion/OC4J
-        <ul class="alternate">
-         <li><a href="Oc4J+9.x.html">Oc4J 9.x</a></li>
-         <li><a href="Oc4j+10.x.html">Oc4j 10.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>Payara
-        <ul>
-         <li><a href="Payara.html">Payara</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>Resin
-        <ul class="alternate">
-         <li><a href="Resin+3.x.html">Resin 3.x</a></li>
-         <li><a href="Resin+3.1.x.html">Resin 3.1.x</a></li>
-         <li><a href="Resin+4.x.html">Resin 4.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>Tomcat
-        <ul class="alternate">
-         <li><a href="Tomcat+4.x.html">Tomcat 4.x</a></li>
-         <li><a href="Tomcat+5.x.html">Tomcat 5.x</a></li>
-         <li><a href="Tomcat+6.x.html">Tomcat 6.x</a></li>
-         <li><a href="Tomcat+7.x.html">Tomcat 7.x</a></li>
-         <li><a href="Tomcat+8.x.html">Tomcat 8.x</a></li>
-         <li><a href="Tomcat+9.x.html">Tomcat 9.x</a></li>
-         <li><a href="Tomcat+10.x.html">Tomcat 10.x</a></li>
-         <li><a href="Tomcat+11.x.html">Tomcat 11.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>TomEE
-        <ul class="alternate">
-         <li><a href="TomEE+1.x.html">TomEE 1.x</a></li>
-         <li><a href="TomEE+7.x.html">TomEE 7.x</a></li>
-         <li><a href="TomEE+8.x.html">TomEE 8.x</a></li>
-         <li><a href="TomEE+9.x.html">TomEE 9.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>WebLogic<br>
-        <ul class="alternate">
-         <li><a href="WebLogic+8.x.html">WebLogic 8.x</a></li>
-         <li><a href="WebLogic+9.x.html">WebLogic 9.x</a></li>
-         <li><a href="WebLogic+10.x.html">WebLogic 10.x</a></li>
-         <li><a href="WebLogic+10.3.x.html">WebLogic 10.3.x</a></li>
-         <li><a href="WebLogic+12.x.html">WebLogic 12.x</a></li>
-         <li><a href="WebLogic+12.1.x.html">WebLogic 12.1.x</a></li>
-         <li><a href="WebLogic+12.2.x.html">WebLogic 12.2.x</a></li>
-         <li><a href="WebLogic+14.x.html">WebLogic 14.x</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>WebSphere<br>
-        <ul class="alternate">
-         <li><a href="WebSphere+8.5.x.html">WebSphere 8.5.x</a></li>
-         <li><a href="WebSphere+9.x.html">WebSphere 9.x</a></li>
-         <li><a href="WebSphere+Liberty.html">WebSphere Liberty</a></li>
-        </ul></li>
-      </ul>
-      <ul class="alternate">
-       <li>WildFly<br>
-        <ul class="alternate">
-         <li><a href="WildFly+8.x.html">WildFly 8.x</a></li>
-         <li><a href="WildFly+9.x.html">WildFly 9.x</a></li>
-         <li><a href="WildFly+10.x.html">WildFly 10.x</a></li>
-         <li><a href="WildFly+11.x.html">WildFly 11.x</a></li>
-         <li><a href="WildFly+12.x.html">WildFly 12.x</a></li>
-         <li><a href="WildFly+13.x.html">WildFly 13.x</a></li>
-         <li><a href="WildFly+14.x.html">WildFly 14.x</a></li>
-         <li><a href="WildFly+15.x.html">WildFly 15.x</a></li>
-         <li><a href="WildFly+16.x.html">WildFly 16.x</a></li>
-         <li><a href="WildFly+17.x.html">WildFly 17.x</a></li>
-         <li><a href="WildFly+18.x.html">WildFly 18.x</a></li>
-         <li><a href="WildFly+19.x.html">WildFly 19.x</a></li>
-         <li><a href="WildFly+20.x.html">WildFly 20.x</a></li>
-         <li><a href="WildFly+21.x.html">WildFly 21.x</a></li>
-         <li><a href="WildFly+22.x.html">WildFly 22.x</a></li>
-         <li><a href="WildFly+23.x.html">WildFly 23.x</a></li>
-         <li><a href="WildFly+24.x.html">WildFly 24.x</a></li>
-         <li><a href="WildFly+25.x.html">WildFly 25.x</a></li>
-         <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+29.x.html">WildFly 29.x</a></li>
-         <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
-        </ul></li>
-      </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
-      <ul class="alternate">
-       <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
-       <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
-      </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
-      <h3 id="Navigation-Development">Development</h3>
-      <ul class="alternate">
-       <li><a href="Project+Structure.html">Project structure</a></li>
-       <li><a href="Importing+sources.html">Importing sources</a></li>
-       <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
-       <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
-      </ul>
-      <h3 class="heading3">RSS Feeds</h3>
-      <table border="0" cellspacing="4px">
-       <tbody>
-        <tr>
-         <td align="right"><a href="https://codehaus-cargo.atlassian.net/wiki/spaces/createrssfeed.action?types=page,blogpost&amp;spaces=CARGO&amp;maxResults=50&amp;timeSpan=300&amp;title=Codehaus+Cargo+-+Documentation+and+Blog+posts"><img src="attachments/rss.gif" border="0"></a><br></td>
-         <td align="left"><a href="https://codehaus-cargo.atlassian.net/wiki/spaces/createrssfeed.action?types=page,blogpost&amp;spaces=CARGO&amp;maxResults=50&amp;timeSpan=300&amp;title=Codehaus+Cargo+-+Documentation+and+Blog+posts">Pages and Blog posts</a></td>
-        </tr>
-        <tr>
-         <td align="right"><a href="https://groups.google.com/forum/feed/codehaus-cargo/msgs/rss.xml"><img src="attachments/rss.gif" border="0"></a></td>
-         <td align="left"><a href="https://groups.google.com/forum/feed/codehaus-cargo/msgs/rss.xml">Mailing list</a></td>
-        </tr>
-       </tbody>
-      </table></td>
-     <td style="padding:0px">
-      <table style="border-collapse:collapse;width:100%;height:100%">
-       <tbody>
-        <tr style="height:38px">
-         <td class="breadcrumbs">
-          <table style="border-collapse:collapse;width:100%;height:100%">
-           <tbody>
-            <tr valign="middle">
-             <td align="left"><b><a href="Home.html">Codehaus Cargo</a> &gt; ScratchWiki</b></td>
-             <td align="right" style="width:350px">
-              <form method="GET" action="Search.html">
-               <input type="text" size="30" name="q" id="search_query"> &nbsp; <input type="submit" value="Search">
-              </form></td>
-            </tr>
-           </tbody>
-          </table></td>
-        </tr>
-        <tr valign="top">
-         <td class="rightColumn">
-          <p>Testing 123</p>
-          <script type="text/javascript">
-  // Google Ads code
-  google_ad_client = "ca-pub-7996505557003356";
-  google_ad_slot = "5363897989";
-  google_ad_width = 728;
-  google_ad_height = 90;
-</script>
-          <center style="padding-bottom: 1mm; margin-bottom: 2mm; border: 1px solid #eee">
-           <script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js">
-  </script>
-          </center></td>
-        </tr>
-       </tbody>
-      </table></td>
-    </tr>
-    <tr height="23">
-     <td colspan="2" style="padding:0px">
-      <div style="position:fixed;width:100%;height:23px;bottom:0;border-top:1px solid #39434F;z-index:2;background-color:#FFFFFF">
-       <table style="width:100%">
-        <tbody>
-         <tr valign="top">
-          <td align="left">Copyright 2004-2023. All rights reserved unless otherwise noted.<br></td>
-          <td align="right"><a href="Cookies.html">Click here to read our privacy and cookie policy</a></td>
-         </tr>
-        </tbody>
-       </table>
-      </div></td>
-    </tr>
-   </tbody>
-  </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/cargo/Search.html b/cargo/Search.html
index 86296c34fd..f0f8396eb3 100644
--- a/cargo/Search.html
+++ b/cargo/Search.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Source+code.html b/cargo/Source+code.html
index 2743bd0784..0560ccf39a 100644
--- a/cargo/Source+code.html
+++ b/cargo/Source+code.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Standalone+Local+Configuration.html b/cargo/Standalone+Local+Configuration.html
index 13ad1a5e8d..f31ff9745a 100644
--- a/cargo/Standalone+Local+Configuration.html
+++ b/cargo/Standalone+Local+Configuration.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Starting+and+stopping+a+container.html b/cargo/Starting+and+stopping+a+container.html
index 908f4004f8..2744d74142 100644
--- a/cargo/Starting+and+stopping+a+container.html
+++ b/cargo/Starting+and+stopping+a+container.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Static+Deployment.html b/cargo/Static+Deployment.html
index ab780a7678..da2a585859 100644
--- a/cargo/Static+Deployment.html
+++ b/cargo/Static+Deployment.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Static+deployment+of+EAR.html b/cargo/Static+deployment+of+EAR.html
index 8b296127bb..a9a4ce7fbc 100644
--- a/cargo/Static+deployment+of+EAR.html
+++ b/cargo/Static+deployment+of+EAR.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Static+deployment+of+EJB.html b/cargo/Static+deployment+of+EJB.html
index a4f60a76ea..7eff89431f 100644
--- a/cargo/Static+deployment+of+EJB.html
+++ b/cargo/Static+deployment+of+EJB.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Static+deployment+of+OSGi+Bundles.html b/cargo/Static+deployment+of+OSGi+Bundles.html
index 79ef89904b..55965f488e 100644
--- a/cargo/Static+deployment+of+OSGi+Bundles.html
+++ b/cargo/Static+deployment+of+OSGi+Bundles.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Static+deployment+of+RAR.html b/cargo/Static+deployment+of+RAR.html
index 5a84c2caf4..1499a31006 100644
--- a/cargo/Static+deployment+of+RAR.html
+++ b/cargo/Static+deployment+of+RAR.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Static+deployment+of+WAR.html b/cargo/Static+deployment+of+WAR.html
index 1e287acc94..302f6ef8e6 100644
--- a/cargo/Static+deployment+of+WAR.html
+++ b/cargo/Static+deployment+of+WAR.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Static+deployment+of+expanded+WAR.html b/cargo/Static+deployment+of+expanded+WAR.html
index 7f15aa7b69..c1b051964e 100644
--- a/cargo/Static+deployment+of+expanded+WAR.html
+++ b/cargo/Static+deployment+of+expanded+WAR.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/TomEE+1.x.html b/cargo/TomEE+1.x.html
index 9d2fc4c414..4b2b9aa2d2 100644
--- a/cargo/TomEE+1.x.html
+++ b/cargo/TomEE+1.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/TomEE+7.x.html b/cargo/TomEE+7.x.html
index 0ce7186bd9..c0d09a5d44 100644
--- a/cargo/TomEE+7.x.html
+++ b/cargo/TomEE+7.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/TomEE+8.x.html b/cargo/TomEE+8.x.html
index ed4482d399..4cbeab19e8 100644
--- a/cargo/TomEE+8.x.html
+++ b/cargo/TomEE+8.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/TomEE+9.x.html b/cargo/TomEE+9.x.html
index 9f6e357afd..781d296584 100644
--- a/cargo/TomEE+9.x.html
+++ b/cargo/TomEE+9.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Tomcat+10.x.html b/cargo/Tomcat+10.x.html
index a85fb5383e..10420d8559 100644
--- a/cargo/Tomcat+10.x.html
+++ b/cargo/Tomcat+10.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Tomcat+11.x.html b/cargo/Tomcat+11.x.html
index 62d587b2a2..a9893da56c 100644
--- a/cargo/Tomcat+11.x.html
+++ b/cargo/Tomcat+11.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Tomcat+4.x.html b/cargo/Tomcat+4.x.html
index 0e61e5d0ff..532f9e9169 100644
--- a/cargo/Tomcat+4.x.html
+++ b/cargo/Tomcat+4.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Tomcat+5.x.html b/cargo/Tomcat+5.x.html
index 8187724ebf..b35fb7c891 100644
--- a/cargo/Tomcat+5.x.html
+++ b/cargo/Tomcat+5.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Tomcat+6.x.html b/cargo/Tomcat+6.x.html
index ae581a6d1e..b358c6c45b 100644
--- a/cargo/Tomcat+6.x.html
+++ b/cargo/Tomcat+6.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Tomcat+7.x.html b/cargo/Tomcat+7.x.html
index c40c97bc16..b41262d7cb 100644
--- a/cargo/Tomcat+7.x.html
+++ b/cargo/Tomcat+7.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Tomcat+8.x.html b/cargo/Tomcat+8.x.html
index 943881bd29..e044019fac 100644
--- a/cargo/Tomcat+8.x.html
+++ b/cargo/Tomcat+8.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Tomcat+9.x.html b/cargo/Tomcat+9.x.html
index 28396aa694..dfee18659f 100644
--- a/cargo/Tomcat+9.x.html
+++ b/cargo/Tomcat+9.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebLogic+10.3.x.html b/cargo/WebLogic+10.3.x.html
index 36d7a1ce9f..ec8c9e5586 100644
--- a/cargo/WebLogic+10.3.x.html
+++ b/cargo/WebLogic+10.3.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebLogic+10.x.html b/cargo/WebLogic+10.x.html
index 1c830be27c..1f0072ea22 100644
--- a/cargo/WebLogic+10.x.html
+++ b/cargo/WebLogic+10.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebLogic+12.1.x.html b/cargo/WebLogic+12.1.x.html
index 6b97c3902e..b1cf761eae 100644
--- a/cargo/WebLogic+12.1.x.html
+++ b/cargo/WebLogic+12.1.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebLogic+12.2.x.html b/cargo/WebLogic+12.2.x.html
index c8c2be1325..fd0e0af406 100644
--- a/cargo/WebLogic+12.2.x.html
+++ b/cargo/WebLogic+12.2.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebLogic+12.x.html b/cargo/WebLogic+12.x.html
index 8ffd0994a1..559e865cf1 100644
--- a/cargo/WebLogic+12.x.html
+++ b/cargo/WebLogic+12.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebLogic+14.x.html b/cargo/WebLogic+14.x.html
index 5b34b83974..c23d12a02a 100644
--- a/cargo/WebLogic+14.x.html
+++ b/cargo/WebLogic+14.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebLogic+8.x.html b/cargo/WebLogic+8.x.html
index 7b6a205aff..4c0ee966e9 100644
--- a/cargo/WebLogic+8.x.html
+++ b/cargo/WebLogic+8.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebLogic+9.x.html b/cargo/WebLogic+9.x.html
index 25b30dd4b8..8582ad5bdc 100644
--- a/cargo/WebLogic+9.x.html
+++ b/cargo/WebLogic+9.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebSphere+8.5.x.html b/cargo/WebSphere+8.5.x.html
index bf80a9f63c..748fe9fbb2 100644
--- a/cargo/WebSphere+8.5.x.html
+++ b/cargo/WebSphere+8.5.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebSphere+9.x.html b/cargo/WebSphere+9.x.html
index 464b320683..17cbb8d6cf 100644
--- a/cargo/WebSphere+9.x.html
+++ b/cargo/WebSphere+9.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WebSphere+Liberty.html b/cargo/WebSphere+Liberty.html
index 091ba19451..49eec0abc5 100644
--- a/cargo/WebSphere+Liberty.html
+++ b/cargo/WebSphere+Liberty.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Welcome+2016+-+With+Codehaus+Cargo+1.4.18.html b/cargo/Welcome+2016+-+With+Codehaus+Cargo+1.4.18.html
index 24aa165b63..2d57d0431c 100644
--- a/cargo/Welcome+2016+-+With+Codehaus+Cargo+1.4.18.html
+++ b/cargo/Welcome+2016+-+With+Codehaus+Cargo+1.4.18.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/Welcome+2023+and+welcome+Codehaus+Cargo+1.10.5.html b/cargo/Welcome+2023+and+welcome+Codehaus+Cargo+1.10.5.html
index f8ac88d912..65d8ecf4ae 100644
--- a/cargo/Welcome+2023+and+welcome+Codehaus+Cargo+1.10.5.html
+++ b/cargo/Welcome+2023+and+welcome+Codehaus+Cargo+1.10.5.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+10.x.html b/cargo/WildFly+10.x.html
index 5d0a790f34..c67afa0536 100644
--- a/cargo/WildFly+10.x.html
+++ b/cargo/WildFly+10.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+11.x.html b/cargo/WildFly+11.x.html
index 000ee8240e..7380d9566a 100644
--- a/cargo/WildFly+11.x.html
+++ b/cargo/WildFly+11.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+12.x.html b/cargo/WildFly+12.x.html
index e67371f912..7af2dbe4d3 100644
--- a/cargo/WildFly+12.x.html
+++ b/cargo/WildFly+12.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+13.x.html b/cargo/WildFly+13.x.html
index 1371d8138a..788ed5f602 100644
--- a/cargo/WildFly+13.x.html
+++ b/cargo/WildFly+13.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+14.x.html b/cargo/WildFly+14.x.html
index 8da4552a60..d081a29b9c 100644
--- a/cargo/WildFly+14.x.html
+++ b/cargo/WildFly+14.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+15.x.html b/cargo/WildFly+15.x.html
index 7a013f1640..6f710dc072 100644
--- a/cargo/WildFly+15.x.html
+++ b/cargo/WildFly+15.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+16.x.html b/cargo/WildFly+16.x.html
index 9353085112..f100b33965 100644
--- a/cargo/WildFly+16.x.html
+++ b/cargo/WildFly+16.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+17.x.html b/cargo/WildFly+17.x.html
index 0f00002640..693c903134 100644
--- a/cargo/WildFly+17.x.html
+++ b/cargo/WildFly+17.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+18.x.html b/cargo/WildFly+18.x.html
index 8256d961c0..d11b4e56aa 100644
--- a/cargo/WildFly+18.x.html
+++ b/cargo/WildFly+18.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+19.x.html b/cargo/WildFly+19.x.html
index 1f1003c42e..37cdfd1a64 100644
--- a/cargo/WildFly+19.x.html
+++ b/cargo/WildFly+19.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+20.x.html b/cargo/WildFly+20.x.html
index b16bf2406d..08c901a420 100644
--- a/cargo/WildFly+20.x.html
+++ b/cargo/WildFly+20.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+21.x.html b/cargo/WildFly+21.x.html
index cf5038c7bc..3998122161 100644
--- a/cargo/WildFly+21.x.html
+++ b/cargo/WildFly+21.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+22.x.html b/cargo/WildFly+22.x.html
index d1f6868788..512183fc09 100644
--- a/cargo/WildFly+22.x.html
+++ b/cargo/WildFly+22.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+23.x.html b/cargo/WildFly+23.x.html
index 0029a28a2a..2a9c39dc3a 100644
--- a/cargo/WildFly+23.x.html
+++ b/cargo/WildFly+23.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+24.x.html b/cargo/WildFly+24.x.html
index 1171ce7f0a..98786f6af0 100644
--- a/cargo/WildFly+24.x.html
+++ b/cargo/WildFly+24.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+25.x.html b/cargo/WildFly+25.x.html
index 90a1d8980e..b04dcc7ca2 100644
--- a/cargo/WildFly+25.x.html
+++ b/cargo/WildFly+25.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+26.x.html b/cargo/WildFly+26.x.html
index c60567c762..3e0a156782 100644
--- a/cargo/WildFly+26.x.html
+++ b/cargo/WildFly+26.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+27.x.html b/cargo/WildFly+27.x.html
index 6f8b17adc5..3d6f564c1f 100644
--- a/cargo/WildFly+27.x.html
+++ b/cargo/WildFly+27.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+28.x.html b/cargo/WildFly+28.x.html
index 443d428357..e40dfd079d 100644
--- a/cargo/WildFly+28.x.html
+++ b/cargo/WildFly+28.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+29.x.html b/cargo/WildFly+29.x.html
index 4d3018b9d9..c7c9f6e8fb 100644
--- a/cargo/WildFly+29.x.html
+++ b/cargo/WildFly+29.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+8.x.html b/cargo/WildFly+8.x.html
index 4c33f2ff87..6e22922ca2 100644
--- a/cargo/WildFly+8.x.html
+++ b/cargo/WildFly+8.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+9.x.html b/cargo/WildFly+9.x.html
index 9fbb054ade..fe1bba3160 100644
--- a/cargo/WildFly+9.x.html
+++ b/cargo/WildFly+9.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/WildFly+Swarm.html b/cargo/WildFly+Swarm.html
index c622e8fd33..4a907393cb 100644
--- a/cargo/WildFly+Swarm.html
+++ b/cargo/WildFly+Swarm.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/XML+replacements.html b/cargo/XML+replacements.html
index 4c1947f912..f764d14d9c 100644
--- a/cargo/XML+replacements.html
+++ b/cargo/XML+replacements.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">
diff --git a/cargo/attachments/Semaphore container log.png b/cargo/attachments/Semaphore container log.png
index 57f0cacd9e..b940d5cca3 100644
Binary files a/cargo/attachments/Semaphore container log.png and b/cargo/attachments/Semaphore container log.png differ
diff --git a/cargo/jo+1.x.html b/cargo/jo+1.x.html
index 262069b10b..4ddb6f4ba9 100644
--- a/cargo/jo+1.x.html
+++ b/cargo/jo+1.x.html
@@ -43,33 +43,33 @@
      <td class="leftColumn" valign="top" style="padding-top:0px">
       <h3 id="Navigation-QuickLinks">Quick Links</h3>
       <ul class="alternate">
-       <li><a href="Home.html">Home</a></li>
-       <li><a href="Downloads.html">Downloads</a></li>
-       <li><a href="Quick+start.html">Quick start</a></li>
-       <li><a href="Contributing.html">How to contribute?</a>
-        <ul class="alternate">
-         <li><a href="Adding+a+container.html">Adding a container</a></li>
-        </ul></li>
-      </ul>
-      <h3 class="confluence-link" id="Navigation-Documentation">Documentation</h3>
-      <ul class="alternate">
-       <li>Overview<br>
-        <ul class="alternate">
+       <li><a href="Home.html">Home</a>
+        <ul>
          <li><a href="Architecture.html">Architecture</a></li>
          <li><a href="Features.html">Features</a></li>
+         <li><a href="License.html">License</a></li>
+         <li><a href="Credits.html">Credits</a></li>
         </ul></li>
-       <li><a href="Installation.html">Installation</a></li>
-       <li>Usage<br>
-        <ul class="alternate">
+       <li>Installation
+        <ul>
+         <li><a href="Downloads.html">Downloads</a></li>
+         <li><a href="Installation.html">Installation</a></li>
+        </ul></li>
+       <li>Usage
+        <ul>
+         <li><a href="Quick+start.html">Quick start</a></li>
          <li><a href="Javadocs.html">Java API</a></li>
          <li><a href="Functional+testing.html">Functional testing with JUnit</a></li>
          <li><a href="Ant+support.html">Ant tasks</a></li>
          <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
          <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
         </ul></li>
-       <li><a href="Articles.html">Articles</a></li>
-       <li><a href="License.html">License</a></li>
-       <li><a href="Credits.html">Credits</a></li>
+       <li>Getting help
+        <ul>
+         <li><a href="Articles.html">Articles</a></li>
+         <li><a href="Mailing+Lists.html">Mailing lists</a></li>
+         <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
+        </ul></li>
       </ul>
       <h3 id="Navigation-Containers">Containers</h3>
       <ul class="alternate">
@@ -233,37 +233,25 @@ <h3 id="Navigation-Containers">Containers</h3>
          <li><a href="WildFly+Swarm.html">WildFly Swarm</a></li>
         </ul></li>
       </ul>
-      <h3 id="Navigation-Extensions">Extensions</h3>
-      <ul class="alternate">
-       <li><a href="Ant+support.html">Ant tasks</a></li>
-       <li><a href="Cargo+Daemon.html">Cargo Daemon</a></li>
-       <li><a href="Maven+3+Plugin.html">Maven 3 plugin</a></li>
-      </ul>
-      <p>Independent extensions:</p>
+      <h3 id="Navigation-Independentextensions">Independent extensions</h3>
       <ul class="alternate">
        <li><a href="https://github.com/bmuschko/gradle-cargo-plugin">Gradle</a></li>
        <li><a href="https://github.com/mulesoft/cargo-mule-container">Mule container</a></li>
       </ul>
-      <h3 id="Navigation-ProjectInfo">Project Info</h3>
-      <ul class="alternate">
-       <li><a href="Roadmap.html">Roadmap</a></li>
-       <li><a href="News.html">News</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO/issues">Issues</a></li>
-       <li><a href="https://codehaus-cargo.atlassian.net/projects/CARGO?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page">Change log</a></li>
-       <li><a href="Source+code.html">Source code</a></li>
-       <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>
-      </ul>
       <h3 id="Navigation-Development">Development</h3>
       <ul class="alternate">
        <li><a href="Project+Structure.html">Project structure</a></li>
+       <li><a href="Roadmap.html">Roadmap</a></li>
+       <li><a href="Source+code.html">Source code</a></li>
        <li><a href="Importing+sources.html">Importing sources</a></li>
        <li><a href="Building.html">Building</a></li>
-       <li><a href="Cargo+Code+Style.html">Code style</a></li>
-       <li><a href="Contributing.html">Contributing</a></li>
-       <li><a href="Release+procedure.html">Release procedure</a></li>
+       <li><a href="Contributing.html">Contributing</a>
+        <ul>
+         <li><a href="Cargo+Code+Style.html">Code style</a></li>
+         <li><a href="Adding+a+container.html">Adding a container</a></li>
+        </ul></li>
        <li><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo">Continous integration</a><br><a href="https://codehaus-cargo.semaphoreci.com/projects/cargo"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="https://codehaus-cargo.semaphoreci.com/badges/cargo/branches/master.svg?style=shields&amp;key=484e5796-4095-4461-a2d6-f75968daf739" loading="lazy"></span></a></li>
+       <li><a href="Release+procedure.html">Release procedure</a></li>
       </ul>
       <h3 class="heading3">RSS Feeds</h3>
       <table border="0" cellspacing="4px">