You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by gi...@apache.org on 2021/07/02 05:19:54 UTC

[james-site] branch asf-staging updated: Site checkin for project Apache James: Jenkins Tools

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

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/james-site.git


The following commit(s) were added to refs/heads/asf-staging by this push:
     new 8234432  Site checkin for project Apache James: Jenkins Tools
8234432 is described below

commit 8234432a75ab0d30f5bb57b63c8c7ae05ec70a57
Author: jenkins <bu...@apache.org>
AuthorDate: Fri Jul 2 05:19:50 2021 +0000

    Site checkin for project Apache James: Jenkins Tools
---
 404.html                                           |   3 +
 _/img/close.svg                                    |   1 +
 james-project/3.6.0/community/contributing.html    |  16 +-
 james-project/3.6.0/community/download.html        |  16 +-
 james-project/3.6.0/community/guidelines.html      |  16 +-
 james-project/3.6.0/community/index.html           |  16 +-
 james-project/3.6.0/community/mailing-lists.html   |  16 +-
 james-project/3.6.0/community/release.html         | 314 +----------
 james-project/3.6.0/community/support.html         |  16 +-
 james-project/3.6.0/community/website.html         |  16 +-
 james-project/3.6.0/concepts/configuration.html    |  16 +-
 james-project/3.6.0/concepts/glossary.html         |  16 +-
 james-project/3.6.0/concepts/index.html            |  16 +-
 james-project/3.6.0/concepts/mail/index.html       |  16 +-
 james-project/3.6.0/concepts/messages/imf.html     |  16 +-
 james-project/3.6.0/concepts/messages/index.html   |  16 +-
 james-project/3.6.0/concepts/messages/mime.html    |  16 +-
 james-project/3.6.0/concepts/processing/index.html |  16 +-
 james-project/3.6.0/concepts/protocols/esmtp.html  |  16 +-
 james-project/3.6.0/concepts/protocols/imap.html   |  16 +-
 james-project/3.6.0/concepts/protocols/index.html  |  16 +-
 james-project/3.6.0/concepts/protocols/jmap.html   |  16 +-
 james-project/3.6.0/concepts/protocols/lmtp.html   |  16 +-
 james-project/3.6.0/concepts/protocols/pop.html    |  16 +-
 james-project/3.6.0/concepts/protocols/smtp.html   |  16 +-
 james-project/3.6.0/concepts/storage/index.html    |  16 +-
 james-project/3.6.0/concepts/storage/mailbox.html  |  16 +-
 james-project/3.6.0/concepts/storage/users.html    |  16 +-
 james-project/3.6.0/concepts/user/index.html       |  16 +-
 james-project/3.6.0/customization/index.html       |  16 +-
 james-project/3.6.0/development/index.html         |  16 +-
 james-project/3.6.0/development/logging.html       |  16 +-
 james-project/3.6.0/index.html                     |  28 +-
 james-project/3.6.0/servers/15-minute-demo.html    |  53 +-
 james-project/3.6.0/servers/5-minute-demo.html     |  53 +-
 .../3.6.0/servers/basic/architecture.html          |  16 +-
 james-project/3.6.0/servers/basic/concepts.html    |  16 +-
 james-project/3.6.0/servers/basic/conf/index.html  |  16 +-
 james-project/3.6.0/servers/basic/context.html     |  16 +-
 james-project/3.6.0/servers/basic/help.html        |  16 +-
 james-project/3.6.0/servers/basic/index.html       |  16 +-
 james-project/3.6.0/servers/basic/objectives.html  |  16 +-
 james-project/3.6.0/servers/demo.html              |  16 +-
 james-project/3.6.0/servers/distributed.html       |  18 +-
 .../architecture/consistency-model.html            |  16 +-
 .../servers/distributed/architecture/index.html    |  30 +-
 .../architecture/specialized-instances.html        |  38 +-
 .../servers/distributed/configure/batchsizes.html  |  18 +-
 .../servers/distributed/configure/blobstore.html   |  76 +--
 .../servers/distributed/configure/cassandra.html   |  48 +-
 .../distributed/configure/collecting-contacts.html |  16 +-
 .../distributed/configure/collecting-events.html   |  16 +-
 .../3.6.0/servers/distributed/configure/dns.html   |  18 +-
 .../servers/distributed/configure/domainlist.html  |  18 +-
 .../3.6.0/servers/distributed/configure/dsn.html   |  16 +-
 .../distributed/configure/elasticsearch.html       |  33 +-
 .../servers/distributed/configure/extensions.html  |  16 +-
 .../servers/distributed/configure/healthcheck.html |  18 +-
 .../3.6.0/servers/distributed/configure/imap.html  |  18 +-
 .../3.6.0/servers/distributed/configure/index.html |  64 ++-
 .../3.6.0/servers/distributed/configure/jmap.html  |  34 +-
 .../3.6.0/servers/distributed/configure/jmx.html   |  18 +-
 .../servers/distributed/configure/listeners.html   |  18 +-
 .../distributed/configure/mailetcontainer.html     |  32 +-
 .../servers/distributed/configure/mailets.html     |  16 +-
 .../distributed/configure/mailrepositorystore.html |  18 +-
 .../servers/distributed/configure/matchers.html    |  19 +-
 .../3.6.0/servers/distributed/configure/pop3.html  |  18 +-
 .../servers/distributed/configure/rabbitmq.html    |  26 +-
 .../configure/recipientrewritetable.html           |  20 +-
 .../configure/remote-delivery-error-handling.html  |  16 +-
 .../servers/distributed/configure/smtp-hooks.html  |  16 +-
 .../3.6.0/servers/distributed/configure/smtp.html  |  71 +--
 .../3.6.0/servers/distributed/configure/spam.html  |  16 +-
 .../3.6.0/servers/distributed/configure/ssl.html   |  16 +-
 .../3.6.0/servers/distributed/configure/tika.html  |  16 +-
 .../distributed/configure/usersrepository.html     |  24 +-
 .../3.6.0/servers/distributed/configure/vault.html |  18 +-
 .../servers/distributed/configure/webadmin.html    |  18 +-
 .../3.6.0/servers/distributed/extending/index.html |  21 +-
 .../distributed/extending/mail-processing.html     |  16 +-
 .../distributed/extending/mailbox-listeners.html   |  16 +-
 .../servers/distributed/extending/smtp-hooks.html  |  16 +-
 .../distributed/extending/webadmin-routes.html     |  16 +-
 .../3.6.0/servers/distributed/objectives.html      |  16 +-
 .../distributed/operate/cassandra-migration.html   |  31 +-
 .../3.6.0/servers/distributed/operate/cli.html     |  16 +-
 .../3.6.0/servers/distributed/operate/guide.html   |  24 +-
 .../3.6.0/servers/distributed/operate/index.html   |  69 +--
 .../3.6.0/servers/distributed/operate/logging.html |  16 +-
 .../3.6.0/servers/distributed/operate/metrics.html | 197 +------
 .../servers/distributed/operate/migrating.html     |  16 +-
 .../servers/distributed/operate/webadmin.html      |  59 +--
 .../3.6.0/servers/distributed/run-docker.html      |  22 +-
 james-project/3.6.0/servers/distributed/run.html   |  53 +-
 james-project/3.6.0/servers/extendable.html        |  16 +-
 james-project/3.6.0/servers/index.html             |  16 +-
 james-project/3.6.0/servers/run.html               |  16 +-
 james-project/3.6.0/servers/test.html              |  16 +-
 .../3.7.0-SNAPSHOT/community/contributing.html     |  10 +
 .../3.7.0-SNAPSHOT/community/download.html         |  10 +
 .../3.7.0-SNAPSHOT/community/guidelines.html       |  10 +
 james-project/3.7.0-SNAPSHOT/community/index.html  |  10 +
 .../3.7.0-SNAPSHOT/community/mailing-lists.html    |  10 +
 .../3.7.0-SNAPSHOT/community/release.html          |  10 +
 .../3.7.0-SNAPSHOT/community/support.html          |  10 +
 .../3.7.0-SNAPSHOT/community/website.html          |  10 +
 .../3.7.0-SNAPSHOT/concepts/configuration.html     |  10 +
 .../3.7.0-SNAPSHOT/concepts/glossary.html          |  10 +
 james-project/3.7.0-SNAPSHOT/concepts/index.html   |  10 +
 .../3.7.0-SNAPSHOT/concepts/mail/index.html        |  10 +
 .../3.7.0-SNAPSHOT/concepts/messages/imf.html      |  10 +
 .../3.7.0-SNAPSHOT/concepts/messages/index.html    |  10 +
 .../3.7.0-SNAPSHOT/concepts/messages/mime.html     |  10 +
 .../3.7.0-SNAPSHOT/concepts/processing/index.html  |  10 +
 .../3.7.0-SNAPSHOT/concepts/protocols/esmtp.html   |  10 +
 .../3.7.0-SNAPSHOT/concepts/protocols/imap.html    |  10 +
 .../3.7.0-SNAPSHOT/concepts/protocols/index.html   |  10 +
 .../3.7.0-SNAPSHOT/concepts/protocols/jmap.html    |  10 +
 .../3.7.0-SNAPSHOT/concepts/protocols/lmtp.html    |  10 +
 .../3.7.0-SNAPSHOT/concepts/protocols/pop.html     |  10 +
 .../3.7.0-SNAPSHOT/concepts/protocols/smtp.html    |  10 +
 .../3.7.0-SNAPSHOT/concepts/storage/index.html     |  10 +
 .../3.7.0-SNAPSHOT/concepts/storage/mailbox.html   |  10 +
 .../3.7.0-SNAPSHOT/concepts/storage/users.html     |  10 +
 .../3.7.0-SNAPSHOT/concepts/user/index.html        |  10 +
 .../3.7.0-SNAPSHOT/customization/index.html        |  10 +
 .../3.7.0-SNAPSHOT/development/index.html          |  10 +
 .../3.7.0-SNAPSHOT/development/logging.html        |  10 +
 james-project/3.7.0-SNAPSHOT/index.html            |  10 +
 .../3.7.0-SNAPSHOT/servers/15-minute-demo.html     |  10 +
 .../3.7.0-SNAPSHOT/servers/5-minute-demo.html      |  10 +
 .../3.7.0-SNAPSHOT/servers/basic/architecture.html |  10 +
 .../3.7.0-SNAPSHOT/servers/basic/concepts.html     |  10 +
 .../3.7.0-SNAPSHOT/servers/basic/conf/index.html   |  10 +
 .../3.7.0-SNAPSHOT/servers/basic/context.html      |  10 +
 .../3.7.0-SNAPSHOT/servers/basic/help.html         |  10 +
 .../3.7.0-SNAPSHOT/servers/basic/index.html        |  10 +
 .../3.7.0-SNAPSHOT/servers/basic/objectives.html   |  10 +
 james-project/3.7.0-SNAPSHOT/servers/demo.html     |  10 +
 .../3.7.0-SNAPSHOT/servers/distributed.html        |  10 +
 .../architecture/consistency-model.html            |  10 +
 .../servers/distributed/architecture/index.html    |  10 +
 .../architecture/specialized-instances.html        |  10 +
 .../servers/distributed/configure/batchsizes.html  |  10 +
 .../servers/distributed/configure/blobstore.html   |  10 +
 .../servers/distributed/configure/cassandra.html   |  10 +
 .../distributed/configure/collecting-contacts.html |  10 +
 .../distributed/configure/collecting-events.html   |  10 +
 .../servers/distributed/configure/dns.html         |  10 +
 .../servers/distributed/configure/domainlist.html  |  10 +
 .../servers/distributed/configure/dsn.html         |  10 +
 .../distributed/configure/elasticsearch.html       |  10 +
 .../servers/distributed/configure/extensions.html  |  10 +
 .../servers/distributed/configure/healthcheck.html |  10 +
 .../servers/distributed/configure/imap.html        |  10 +
 .../servers/distributed/configure/index.html       |  10 +
 .../servers/distributed/configure/jmap.html        |  10 +
 .../servers/distributed/configure/jmx.html         |  10 +
 .../servers/distributed/configure/listeners.html   |  10 +
 .../distributed/configure/mailetcontainer.html     |  10 +
 .../servers/distributed/configure/mailets.html     |  10 +
 .../distributed/configure/mailrepositorystore.html |  10 +
 .../servers/distributed/configure/matchers.html    |  10 +
 .../servers/distributed/configure/pop3.html        |  10 +
 .../servers/distributed/configure/rabbitmq.html    |  10 +
 .../configure/recipientrewritetable.html           |  10 +
 .../configure/remote-delivery-error-handling.html  |  10 +
 .../servers/distributed/configure/smtp-hooks.html  |  10 +
 .../servers/distributed/configure/smtp.html        |  10 +
 .../servers/distributed/configure/spam.html        |  10 +
 .../servers/distributed/configure/ssl.html         |  10 +
 .../servers/distributed/configure/tika.html        |  10 +
 .../distributed/configure/usersrepository.html     |  10 +
 .../servers/distributed/configure/vault.html       |  10 +
 .../servers/distributed/configure/webadmin.html    |  10 +
 .../servers/distributed/extending/index.html       |  10 +
 .../distributed/extending/mail-processing.html     |  10 +
 .../distributed/extending/mailbox-listeners.html   |  10 +
 .../servers/distributed/extending/smtp-hooks.html  |  10 +
 .../distributed/extending/webadmin-routes.html     |  10 +
 .../servers/distributed/objectives.html            |  10 +
 .../distributed/operate/cassandra-migration.html   |  10 +
 .../servers/distributed/operate/cli.html           |  10 +
 .../servers/distributed/operate/guide.html         |  10 +
 .../servers/distributed/operate/index.html         |  10 +
 .../servers/distributed/operate/logging.html       |  10 +
 .../servers/distributed/operate/metrics.html       |  10 +
 .../servers/distributed/operate/migrating.html     |  10 +
 .../servers/distributed/operate/webadmin.html      |  10 +
 .../servers/distributed/run-docker.html            |  10 +
 .../3.7.0-SNAPSHOT/servers/distributed/run.html    |  10 +
 .../3.7.0-SNAPSHOT/servers/extendable.html         |  10 +
 james-project/3.7.0-SNAPSHOT/servers/index.html    |  10 +
 james-project/3.7.0-SNAPSHOT/servers/run.html      |  10 +
 james-project/3.7.0-SNAPSHOT/servers/test.html     |  10 +
 james-project/3.7.0/community/contributing.html    |  10 +
 james-project/3.7.0/community/download.html        |  10 +
 james-project/3.7.0/community/guidelines.html      |  10 +
 james-project/3.7.0/community/index.html           |  10 +
 james-project/3.7.0/community/mailing-lists.html   |  10 +
 james-project/3.7.0/community/release.html         |  10 +
 james-project/3.7.0/community/support.html         |  10 +
 james-project/3.7.0/community/website.html         |  10 +
 james-project/3.7.0/concepts/configuration.html    |  10 +
 james-project/3.7.0/concepts/glossary.html         |  10 +
 james-project/3.7.0/concepts/index.html            |  10 +
 james-project/3.7.0/concepts/mail/index.html       |  10 +
 james-project/3.7.0/concepts/messages/imf.html     |  10 +
 james-project/3.7.0/concepts/messages/index.html   |  10 +
 james-project/3.7.0/concepts/messages/mime.html    |  10 +
 james-project/3.7.0/concepts/processing/index.html |  10 +
 james-project/3.7.0/concepts/protocols/esmtp.html  |  10 +
 james-project/3.7.0/concepts/protocols/imap.html   |  10 +
 james-project/3.7.0/concepts/protocols/index.html  |  10 +
 james-project/3.7.0/concepts/protocols/jmap.html   |  10 +
 james-project/3.7.0/concepts/protocols/lmtp.html   |  10 +
 james-project/3.7.0/concepts/protocols/pop.html    |  10 +
 james-project/3.7.0/concepts/protocols/smtp.html   |  10 +
 james-project/3.7.0/concepts/storage/index.html    |  10 +
 james-project/3.7.0/concepts/storage/mailbox.html  |  10 +
 james-project/3.7.0/concepts/storage/users.html    |  10 +
 james-project/3.7.0/concepts/user/index.html       |  10 +
 james-project/3.7.0/customization/index.html       |  10 +
 james-project/3.7.0/development/index.html         |  10 +
 james-project/3.7.0/development/logging.html       |  10 +
 james-project/3.7.0/index.html                     |  10 +
 james-project/3.7.0/servers/15-minute-demo.html    |  10 +
 james-project/3.7.0/servers/5-minute-demo.html     |  10 +
 .../3.7.0/servers/basic/architecture.html          |  10 +
 james-project/3.7.0/servers/basic/concepts.html    |  10 +
 james-project/3.7.0/servers/basic/conf/index.html  |  10 +
 james-project/3.7.0/servers/basic/context.html     |  10 +
 james-project/3.7.0/servers/basic/help.html        |  10 +
 james-project/3.7.0/servers/basic/index.html       |  10 +
 james-project/3.7.0/servers/basic/objectives.html  |  10 +
 james-project/3.7.0/servers/demo.html              |  10 +
 james-project/3.7.0/servers/distributed.html       |  10 +
 .../architecture/consistency-model.html            |  10 +
 .../servers/distributed/architecture/index.html    |  10 +
 .../architecture/specialized-instances.html        |  10 +
 .../servers/distributed/configure/batchsizes.html  |  10 +
 .../servers/distributed/configure/blobstore.html   |  10 +
 .../servers/distributed/configure/cassandra.html   |  10 +
 .../distributed/configure/collecting-contacts.html |  10 +
 .../distributed/configure/collecting-events.html   |  10 +
 .../3.7.0/servers/distributed/configure/dns.html   |  10 +
 .../servers/distributed/configure/domainlist.html  |  10 +
 .../3.7.0/servers/distributed/configure/dsn.html   |  10 +
 .../distributed/configure/elasticsearch.html       |  10 +
 .../servers/distributed/configure/extensions.html  |  10 +
 .../servers/distributed/configure/healthcheck.html |  10 +
 .../3.7.0/servers/distributed/configure/imap.html  |  10 +
 .../3.7.0/servers/distributed/configure/index.html |  10 +
 .../3.7.0/servers/distributed/configure/jmap.html  |  10 +
 .../3.7.0/servers/distributed/configure/jmx.html   |  10 +
 .../servers/distributed/configure/listeners.html   |  10 +
 .../distributed/configure/mailetcontainer.html     |  10 +
 .../servers/distributed/configure/mailets.html     |  10 +
 .../distributed/configure/mailrepositorystore.html |  10 +
 .../servers/distributed/configure/matchers.html    |  10 +
 .../3.7.0/servers/distributed/configure/pop3.html  |  10 +
 .../servers/distributed/configure/rabbitmq.html    |  10 +
 .../configure/recipientrewritetable.html           |  10 +
 .../configure/remote-delivery-error-handling.html  |  10 +
 .../servers/distributed/configure/smtp-hooks.html  |  10 +
 .../3.7.0/servers/distributed/configure/smtp.html  |  10 +
 .../3.7.0/servers/distributed/configure/spam.html  |  10 +
 .../3.7.0/servers/distributed/configure/ssl.html   |  10 +
 .../3.7.0/servers/distributed/configure/tika.html  |  10 +
 .../distributed/configure/usersrepository.html     |  10 +
 .../3.7.0/servers/distributed/configure/vault.html |  10 +
 .../servers/distributed/configure/webadmin.html    |  10 +
 .../3.7.0/servers/distributed/extending/index.html |  10 +
 .../distributed/extending/mail-processing.html     |  10 +
 .../distributed/extending/mailbox-listeners.html   |  10 +
 .../servers/distributed/extending/smtp-hooks.html  |  10 +
 .../distributed/extending/webadmin-routes.html     |  10 +
 .../3.7.0/servers/distributed/objectives.html      |  10 +
 .../distributed/operate/cassandra-migration.html   |  10 +
 .../3.7.0/servers/distributed/operate/cli.html     |  10 +
 .../3.7.0/servers/distributed/operate/guide.html   |  10 +
 .../3.7.0/servers/distributed/operate/index.html   |  10 +
 .../3.7.0/servers/distributed/operate/logging.html |  10 +
 .../3.7.0/servers/distributed/operate/metrics.html |  10 +
 .../servers/distributed/operate/migrating.html     |  10 +
 .../servers/distributed/operate/webadmin.html      |  10 +
 .../3.7.0/servers/distributed/run-docker.html      |  10 +
 james-project/3.7.0/servers/distributed/run.html   |  10 +
 james-project/3.7.0/servers/extendable.html        |  10 +
 james-project/3.7.0/servers/index.html             |  10 +
 james-project/3.7.0/servers/run.html               |  10 +
 james-project/3.7.0/servers/test.html              |  10 +
 james-site/latest/homepage.html                    |   3 +
 james-site/latest/index.html                       |   3 +
 jdkim/0.3-SNAPSHOT/index.html                      | 156 ++++++
 jsieve/0.8-SNAPSHOT/index.html                     | 156 ++++++
 jspf/1.0.2-SNAPSHOT/index.html                     | 156 ++++++
 mime4j/0.8.4-SNAPSHOT/index.html                   | 156 ++++++
 postage/0.1-SNAPSHOT/index.html                    | 156 ++++++
 sitemap-james-project.xml                          | 582 +++++++++++++++++----
 sitemap-james-site.xml                             |   4 +-
 sitemap-jdkim.xml                                  |   7 +
 sitemap-jsieve.xml                                 |   7 +
 sitemap-jspf.xml                                   |   7 +
 sitemap-mime4j.xml                                 |   7 +
 sitemap-postage.xml                                |   7 +
 307 files changed, 4718 insertions(+), 1248 deletions(-)

diff --git a/404.html b/404.html
index 89cb8ac..6a50359 100644
--- a/404.html
+++ b/404.html
@@ -73,6 +73,9 @@
         <li class="version is-latest">
           <a href="/james-project/3.7.0/index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="/james-project/3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
diff --git a/_/img/close.svg b/_/img/close.svg
new file mode 100644
index 0000000..b4a8088
--- /dev/null
+++ b/_/img/close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M12.736 87.264l74.528-74.528m-74.528 0l74.528 74.528" fill="none" stroke="#222" stroke-width="8"/></svg>
\ No newline at end of file
diff --git a/james-project/3.6.0/community/contributing.html b/james-project/3.6.0/community/contributing.html
index 5e0b901..e38272c 100644
--- a/james-project/3.6.0/community/contributing.html
+++ b/james-project/3.6.0/community/contributing.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="contributing.html">Contributing</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/contributing.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/community/contributing.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="contributing.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/community/pages/contributing.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/community/download.html b/james-project/3.6.0/community/download.html
index 60fc021..8add99f 100644
--- a/james-project/3.6.0/community/download.html
+++ b/james-project/3.6.0/community/download.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="download.html">Download releases</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/download.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/community/download.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="download.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/community/pages/download.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/community/guidelines.html b/james-project/3.6.0/community/guidelines.html
index e472f12..f1d8666 100644
--- a/james-project/3.6.0/community/guidelines.html
+++ b/james-project/3.6.0/community/guidelines.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="guidelines.html">Guidelines</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/guidelines.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/community/guidelines.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="guidelines.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/community/pages/guidelines.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/community/index.html b/james-project/3.6.0/community/index.html
index 932b71a..041c137 100644
--- a/james-project/3.6.0/community/index.html
+++ b/james-project/3.6.0/community/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="index.html">Community</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/community/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/community/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/community/mailing-lists.html b/james-project/3.6.0/community/mailing-lists.html
index 73b6494..953977b 100644
--- a/james-project/3.6.0/community/mailing-lists.html
+++ b/james-project/3.6.0/community/mailing-lists.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="mailing-lists.html">Mailing lists</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/mailing-lists.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/community/mailing-lists.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="mailing-lists.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/community/pages/mailing-lists.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/community/release.html b/james-project/3.6.0/community/release.html
index 690a68c..aaf19ac 100644
--- a/james-project/3.6.0/community/release.html
+++ b/james-project/3.6.0/community/release.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="release.html">Creating an official Apache James release</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/release.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/community/release.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="release.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/community/pages/release.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -513,8 +523,6 @@
 </aside>
 <article class="doc">
 <h1 class="page">Creating an official Apache James release</h1>
-<div id="preamble">
-<div class="sectionbody">
 <div class="paragraph">
 <p>Read details about <a href="http://www.apache.org/dev/publishing-maven-artifacts.html">Publishing Maven releases to Maven Central Repository</a></p>
 </div>
@@ -552,302 +560,6 @@
 $ cd /www/www.apache.org/dist/james</pre>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_release_cheat_sheet"><a class="anchor" href="#_release_cheat_sheet"></a>Release cheat sheet</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>First, discuss your intention to perform a release on server-dev mailing list, to ensure a consensus would be reached
-before starting this time-consuming process.</p>
-</div>
-<div class="paragraph">
-<p>Then you can prepare the release materials:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Ensure the <code>CHANGELOG.md</code> and <code>upgrade-instructions.md</code> files are up to date.</p>
-</li>
-<li>
-<p>Freeze your version in it and initiate a new iteration.</p>
-</li>
-<li>
-<p>Write a blog post within <code>/src/homepage/_post</code> about your release.</p>
-</li>
-<li>
-<p>Update the documentation website <code>/docs</code>, <code>src/site</code>, and <code>README.md</code> to point to your new release.</p>
-</li>
-<li>
-<p>Update the <code>/dockerfiles</code></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Open a pull request to validate the changes.</p>
-</div>
-<div class="sect2">
-<h3 id="_running_a_maven_release"><a class="anchor" href="#_running_a_maven_release"></a>Running a maven release</h3>
-<div class="paragraph">
-<p>Once merged, it is time for the maven release.</p>
-</div>
-<div class="paragraph">
-<p>Set up your maven configuration in <code>~/.m2/settings.xml</code> :</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">&lt;settings&gt;
-  &lt;servers&gt;
-    &lt;server&gt;
-      &lt;id&gt;apache.snapshots.https&lt;/id&gt;
-      &lt;username&gt;apacheId&lt;/username&gt;
-      &lt;password&gt;xxxxxx&lt;/password&gt;
-    &lt;/server&gt;
-    &lt;!-- To stage a release of some part of Maven --&gt;
-    &lt;server&gt;
-      &lt;id&gt;apache.releases.https&lt;/id&gt;
-      &lt;username&gt;apacheId&lt;/username&gt;
-      &lt;password&gt;xxxxxxxx&lt;/password&gt;
-    &lt;/server&gt;
-    &lt;server&gt;
-      &lt;id&gt;svn.apache.org&lt;/id&gt;
-      &lt;username&gt;apacheId&lt;/username&gt;
-      &lt;password&gt;xxxxxx&lt;/password&gt;
-    &lt;/server&gt;
-
-  &lt;/servers&gt;
-&lt;/settings&gt;</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Ensure that released branch HEAD have a clean green build on the CI.</p>
-</div>
-<div class="paragraph">
-<p>Run these commands to perform a release, from the master branch:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn clean install -DskipTests -Djib.skip -Dmaven.javadoc.skip=true -T 4
-
-mvn deploy -DskipTests -Dskip.jib -Dmaven.javadoc.skip=true -T 8
-
-mvn release:clean
-
-mvn release:prepare -Darguments="-Dmaven.javadoc.skip=true -DskipTests -Dskip.jib" -DautoVersionSubmodules=true
-
-mvn release:perform -Darguments="-Dmaven.javadoc.skip=true -DskipTests -Dskip.jib" -DautoVersionSubmodules=true</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Failure to react when being prompted for git or GPG credentials might abort the release. GPG agent with a reasonable session time can be used to unlock the key before hand and reduce this risk.</p>
-</div>
-<div class="paragraph">
-<p>Then visit <a href="https://repository.apache.org/#stagingRepositories">Apache maven repository</a>, go in staging repository, close
-the corresponding artifact before performing the vote.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_voting_procedure"><a class="anchor" href="#_voting_procedure"></a>Voting procedure</h3>
-<div class="paragraph">
-<p>Send the following voting template on the server-dev mailing list to call the vote:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>Subject: Call for vote: Apache James x.x.x
-
-Hi,
-
-I would like to propose a new vote for x.x.x release of the Apache James server.
-
-You can find:
-
- - The maven release staged in repository.apache.org as the
-artifact #xxx:
-https://repository.apache.org/content/repositories/orgapachejames-xxx/
- - The changelog for
-x.x.x:
-https://github.com/apache/james-project/blob/master/CHANGELOG.md
- - The compatibility instructions/upgrade
-recommendation:
-https://github.com/apache/james-project/blob/master/upgrade-instructions.md#360-version
-
-[You can comment on major changes ]
-
-Voting rules:
- - This is a majority approval: this release may not be vetoed.
- - A quorum of 3 binding votes is required
- - The vote starts at XXXXXX xxxth of xxxxx xxxx, xxxx UTC+x
- - The vote ends at XXXXXX xxxth of xxxxx xxxx, xxxx UTC+x
-
-You can answer to it just with +1 and -1. Down-votes may be motivated.
-
-3 binding votes are expected move forward on this release.
-
-Cheers,
-
-PMC member name</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>After the voting period, do the voting aftermaths. Reply in the voting thread:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>Hi all,
-
-I am happy to announce you the vote for the x.x.x release did succeed.
-
-The release received X positive votes, X of them being binding.
-
-Thanks to all contributors, developers and committers who made this
-possible!
-
-In the coming hours, I will finalize the release process, namely:
-
-- Publish the maven artifacts
-- Upgrade the download page and the (old) website
-- Announce the release
-
-Cheers,
-
-PMC member name</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_convenience_downloads_for_your_release"><a class="anchor" href="#_convenience_downloads_for_your_release"></a>Convenience downloads for your release</h3>
-<div class="paragraph">
-<p>Clone this SVN repository: <code><a href="https://dist.apache.org/repos/dist/release/james" class="bare">https://dist.apache.org/repos/dist/release/james</a></code></p>
-</div>
-<div class="paragraph">
-<p>Create a folder for your release:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>mkdir server/3.x.x
-cd server/3.x.x
-svn add .</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Move the release zipped data in this folder:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>The convenience ZIPs needs to be downloaded from there staged repository. This includes server/app.</p>
-</li>
-<li>
-<p>sources can be obtained from GitHub tag</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>I use the following script to set up the uploads:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>% cat /usr/local/bin/auto_sig
-#/bin/bash
-
-# This quick bash scipt intend to help commiters
-# preparing artifacts for SVN upload.
-#
-# Performs:
-#  - Hashing (sha1 + sha512)
-#  - Signing (main)
-#  - Position SVN properties
-#
-# $1: file to prepare
-# $2: Key footprint to use for signing
-
-sha512sum $1 &gt; $1.sha512
-gpg -u $2 --output $1.asc --detach-sig $1
-svn add $1
-svn propset svn:mime-type application/octet-stream $1
-svn add $1.sha512
-svn add $1.asc
-svn propset svn:mime-type application/octet-stream $1.asc</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Once done it is time to commit! <code>svn commit -m "Upload convenience artifacts for James release 3.x.x"</code></p>
-</div>
-<div class="paragraph">
-<p>The convenience binaries will then be available. Check that the links of the download page works.</p>
-</div>
-<div class="paragraph">
-<p>Cleanup: Only supported release lines should be maintained. Archive the previous release by deleting them from <code>repos/dist/release</code> - the INFRA will automatically move them to archive:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>svn rm 3.5.0
-svn commit -m "Archive James release 3.5.0"</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_push_docker_containers"><a class="anchor" href="#_push_docker_containers"></a>Push docker containers</h3>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-Docker images are not considered as an official Apache release materials yet the Apache JAMES PMC members decided
-to offer their community with a set of maintained docker images, for convenience.
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Docker images includes:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>apache/james:memory-3.x.x built from <a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/memory" class="bare">https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/memory</a></p>
-</li>
-<li>
-<p>apache/james:jpa-3.x.x built from <a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpa" class="bare">https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpa</a></p>
-</li>
-<li>
-<p>apache/james:demo-3.x.x built from <a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/provisioned" class="bare">https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/provisioned</a></p>
-</li>
-<li>
-<p>apache/james:cassandra-3.x.x build from <a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra" class="bare">https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra</a></p>
-</li>
-<li>
-<p>apache/james:distributed-3.x.x built from <a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-rabbitmq" class="bare">https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-rabbitmq</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>As a committer contact the INFRA and hand them your docker-hub account to get the permission.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_other_steps"><a class="anchor" href="#_other_steps"></a>Other steps</h3>
-<div class="paragraph">
-<p>Once done:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Deploy website changes</p>
-</li>
-<li>
-<p>Send an announce on server-user</p>
-</li>
-<li>
-<p>Send an Apache foundation wide announce</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
 </article>
   </div>
 </main>
diff --git a/james-project/3.6.0/community/support.html b/james-project/3.6.0/community/support.html
index 18eb7eb..5858be3 100644
--- a/james-project/3.6.0/community/support.html
+++ b/james-project/3.6.0/community/support.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="support.html">Professional support</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/support.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/community/support.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="support.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/community/pages/support.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/community/website.html b/james-project/3.6.0/community/website.html
index 33adf21..c8b06a2 100644
--- a/james-project/3.6.0/community/website.html
+++ b/james-project/3.6.0/community/website.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="website.html">Building and publishing the website</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/website.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/community/website.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="website.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/community/pages/website.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/configuration.html b/james-project/3.6.0/concepts/configuration.html
index c2b62bb..11792ed 100644
--- a/james-project/3.6.0/concepts/configuration.html
+++ b/james-project/3.6.0/concepts/configuration.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="configuration.html">Configuration</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/configuration.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/concepts/configuration.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="configuration.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/configuration.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/glossary.html b/james-project/3.6.0/concepts/glossary.html
index b5cdd8b..acb8545 100644
--- a/james-project/3.6.0/concepts/glossary.html
+++ b/james-project/3.6.0/concepts/glossary.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="glossary.html">Glossary</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/glossary.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/concepts/glossary.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="glossary.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/glossary.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/index.html b/james-project/3.6.0/concepts/index.html
index 37be5f6..7e8b256 100644
--- a/james-project/3.6.0/concepts/index.html
+++ b/james-project/3.6.0/concepts/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="index.html">Concepts</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/concepts/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/mail/index.html b/james-project/3.6.0/concepts/mail/index.html
index aebdc07..0f99898 100644
--- a/james-project/3.6.0/concepts/mail/index.html
+++ b/james-project/3.6.0/concepts/mail/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="index.html">Emails</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/mail/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/mail/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/mail/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/messages/imf.html b/james-project/3.6.0/concepts/messages/imf.html
index 2647b59..5edcc3c 100644
--- a/james-project/3.6.0/concepts/messages/imf.html
+++ b/james-project/3.6.0/concepts/messages/imf.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="imf.html">Internet Message Format</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/messages/imf.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/messages/imf.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="imf.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/messages/imf.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/messages/index.html b/james-project/3.6.0/concepts/messages/index.html
index 7aea868..9c93564 100644
--- a/james-project/3.6.0/concepts/messages/index.html
+++ b/james-project/3.6.0/concepts/messages/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="index.html">Email Messages</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/messages/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/messages/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/messages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/messages/mime.html b/james-project/3.6.0/concepts/messages/mime.html
index 5e1e277..b719638 100644
--- a/james-project/3.6.0/concepts/messages/mime.html
+++ b/james-project/3.6.0/concepts/messages/mime.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="mime.html">Multipurpose Internet Mail Extensions</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/messages/mime.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/messages/mime.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="mime.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/messages/mime.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/processing/index.html b/james-project/3.6.0/concepts/processing/index.html
index 6c9c9d3..8633880 100644
--- a/james-project/3.6.0/concepts/processing/index.html
+++ b/james-project/3.6.0/concepts/processing/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="index.html">Processing</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/processing/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/processing/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/processing/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/protocols/esmtp.html b/james-project/3.6.0/concepts/protocols/esmtp.html
index 3369b34..1f23723 100644
--- a/james-project/3.6.0/concepts/protocols/esmtp.html
+++ b/james-project/3.6.0/concepts/protocols/esmtp.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="esmtp.html">ESMTP</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/esmtp.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/protocols/esmtp.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="esmtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/protocols/esmtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/protocols/imap.html b/james-project/3.6.0/concepts/protocols/imap.html
index 86712eb..7547981 100644
--- a/james-project/3.6.0/concepts/protocols/imap.html
+++ b/james-project/3.6.0/concepts/protocols/imap.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="imap.html">IMAP</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/imap.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/protocols/imap.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="imap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/protocols/imap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/protocols/index.html b/james-project/3.6.0/concepts/protocols/index.html
index 0e70915..e3fb089 100644
--- a/james-project/3.6.0/concepts/protocols/index.html
+++ b/james-project/3.6.0/concepts/protocols/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="index.html">Protocols</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/protocols/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/protocols/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/protocols/jmap.html b/james-project/3.6.0/concepts/protocols/jmap.html
index 0272595..3de86e8 100644
--- a/james-project/3.6.0/concepts/protocols/jmap.html
+++ b/james-project/3.6.0/concepts/protocols/jmap.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="jmap.html">JMAP</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/jmap.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/protocols/jmap.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="jmap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/protocols/jmap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/protocols/lmtp.html b/james-project/3.6.0/concepts/protocols/lmtp.html
index 4dce0e7..793237c 100644
--- a/james-project/3.6.0/concepts/protocols/lmtp.html
+++ b/james-project/3.6.0/concepts/protocols/lmtp.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="lmtp.html">LMTP</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/lmtp.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/protocols/lmtp.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="lmtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/protocols/lmtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/protocols/pop.html b/james-project/3.6.0/concepts/protocols/pop.html
index b8720c4..9711caf 100644
--- a/james-project/3.6.0/concepts/protocols/pop.html
+++ b/james-project/3.6.0/concepts/protocols/pop.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="pop.html">POP</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/pop.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/protocols/pop.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="pop.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/protocols/pop.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/protocols/smtp.html b/james-project/3.6.0/concepts/protocols/smtp.html
index ea03f0c..b96f3bf 100644
--- a/james-project/3.6.0/concepts/protocols/smtp.html
+++ b/james-project/3.6.0/concepts/protocols/smtp.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="smtp.html">SMTP</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/smtp.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/protocols/smtp.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="smtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/protocols/smtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/storage/index.html b/james-project/3.6.0/concepts/storage/index.html
index ea5425e..c2582f1 100644
--- a/james-project/3.6.0/concepts/storage/index.html
+++ b/james-project/3.6.0/concepts/storage/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="index.html">Storage</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/storage/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/storage/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/storage/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/storage/mailbox.html b/james-project/3.6.0/concepts/storage/mailbox.html
index 33793a7..bbe30e4 100644
--- a/james-project/3.6.0/concepts/storage/mailbox.html
+++ b/james-project/3.6.0/concepts/storage/mailbox.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="mailbox.html">Mailboxes</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/storage/mailbox.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/storage/mailbox.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="mailbox.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/storage/mailbox.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/storage/users.html b/james-project/3.6.0/concepts/storage/users.html
index 1285800..d779064 100644
--- a/james-project/3.6.0/concepts/storage/users.html
+++ b/james-project/3.6.0/concepts/storage/users.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="users.html">Users</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/storage/users.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/storage/users.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="users.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/storage/users.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/concepts/user/index.html b/james-project/3.6.0/concepts/user/index.html
index 7edff94..8662f04 100644
--- a/james-project/3.6.0/concepts/user/index.html
+++ b/james-project/3.6.0/concepts/user/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="index.html">User Model</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/user/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/concepts/user/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/concepts/pages/user/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/customization/index.html b/james-project/3.6.0/customization/index.html
index 06a3a71..e89572e 100644
--- a/james-project/3.6.0/customization/index.html
+++ b/james-project/3.6.0/customization/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="index.html">Customization</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/customization/pages/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/customization/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/customization/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/development/index.html b/james-project/3.6.0/development/index.html
index 4291cd0..05d5e58 100644
--- a/james-project/3.6.0/development/index.html
+++ b/james-project/3.6.0/development/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="index.html">Developer Guide</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/development/pages/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/development/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/development/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/development/logging.html b/james-project/3.6.0/development/logging.html
index 2bb6e98..ef77c90 100644
--- a/james-project/3.6.0/development/logging.html
+++ b/james-project/3.6.0/development/logging.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="logging.html">Logging in Apache James</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/development/pages/logging.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/development/logging.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="logging.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/development/pages/logging.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/index.html b/james-project/3.6.0/index.html
index 63f8d83..dd15388 100644
--- a/james-project/3.6.0/index.html
+++ b/james-project/3.6.0/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="index.html">Apache James Server</a>
+      <a class="title" href="../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="index.html">Welcome</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/ROOT/pages/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/ROOT/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -526,7 +536,7 @@ James runs on the JVM and is highly customizable.</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="concepts/index.html" class="page">James Core Concepts</a></p>
+<p><a href="../3.7.0/concepts/index.html" class="page">James Core Concepts</a></p>
 <div class="ulist">
 <ul>
 <li>
@@ -538,7 +548,7 @@ and how it is designed.</p>
 </div>
 </li>
 <li>
-<p><a href="servers/index.html" class="page">James Servers</a></p>
+<p><a href="../3.7.0/servers/index.html" class="page">James Servers</a></p>
 <div class="ulist">
 <ul>
 <li>
@@ -550,7 +560,7 @@ want to get up and running quickly with a working production-grade mail server.<
 </div>
 </li>
 <li>
-<p><a href="customization/index.html" class="page">Customization</a></p>
+<p><a href="../3.7.0/customization/index.html" class="page">Customization</a></p>
 <div class="ulist">
 <ul>
 <li>
@@ -563,7 +573,7 @@ needs and are interested in a custom solution.</p>
 </div>
 </li>
 <li>
-<p><a href="development/index.html" class="page">James Developer Guide</a></p>
+<p><a href="../3.7.0/development/index.html" class="page">James Developer Guide</a></p>
 <div class="ulist">
 <ul>
 <li>
@@ -574,7 +584,7 @@ how you can assemble your own specialized server.</p>
 </div>
 </li>
 <li>
-<p><a href="community/index.html" class="page">James Community</a></p>
+<p><a href="../3.7.0/community/index.html" class="page">James Community</a></p>
 <div class="ulist">
 <ul>
 <li>
@@ -587,7 +597,7 @@ part of this active and dynamic group, too!</p>
 </ul>
 </div>
 <div class="paragraph">
-<p>Please note that this Reference Documentation is a <strong>living document</strong>. It is subject to change. You are currently reading version 3.6.0. If you find anything that is unclear, unfinished, or confusing, please do not hestiate to <a href="community/index.html" class="page">lend us a hand</a>.</p>
+<p>Please note that this Reference Documentation is a <strong>living document</strong>. It is subject to change. You are currently reading version 3.6.0. If you find anything that is unclear, unfinished, or confusing, please do not hestiate to <a href="../3.7.0/community/index.html" class="page">lend us a hand</a>.</p>
 </div>
 </article>
   </div>
diff --git a/james-project/3.6.0/servers/15-minute-demo.html b/james-project/3.6.0/servers/15-minute-demo.html
index 82912e1..76eee7c 100644
--- a/james-project/3.6.0/servers/15-minute-demo.html
+++ b/james-project/3.6.0/servers/15-minute-demo.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="15-minute-demo.html">Long Demo</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/15-minute-demo.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/servers/15-minute-demo.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="15-minute-demo.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/15-minute-demo.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -575,7 +585,7 @@ We will create a <code>webadmin.properties</code> file that James will use in or
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker run -d -p "25:25" -p "143:143" -p "127.0.0.1:8000:8000" -v $(pwd)/webadmin.properties:/root/conf/webadmin.properties --name james apache/james:demo-3.6.0</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker run -d -p "25:25" -p "143:143" -p "127.0.0.1:8000:8000" -v $(pwd)/webadmin.properties:/root/conf/webadmin.properties --name james linagora/james-jpa-sample:3.4.0</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -616,7 +626,28 @@ We will create a <code>webadmin.properties</code> file that James will use in or
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>docker exec james james-cli &lt;&lt;COMMAND&gt;&gt;</pre>
+<pre>docker exec james java -jar /root/james-cli.jar \
+    -h \&lt;&lt;HOST&gt;&gt; -p \&lt;&lt;PORT&gt;&gt; \&lt;&lt;COMMAND&gt;&gt;</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In this demo, we are using host 127.0.0.1 and port 9999, so every command looks like:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>docker exec james java -jar /root/james-cli.jar \
+    -h 127.0.0.1 -p 9999 \&lt;&lt;COMMAND&gt;&gt;</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Host 127.0.0.1 is of course localhost, and the use of port 9999 is completely arbitrary.</p>
+</div>
+<div class="paragraph">
+<p>To make this demo a little easier to use, set this up as a bash script by copying and pasting this script:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">printf '#!/bin/bash\n\ndocker exec james java -jar /root/james-cli.jar -h 127.0.0.1 -p 9999 $@' &gt;&gt; james ; chmod +x james</code></pre>
 </div>
 </div>
 </div>
@@ -626,7 +657,7 @@ We will create a <code>webadmin.properties</code> file that James will use in or
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli listDomains</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james listDomains</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -637,7 +668,7 @@ We will create a <code>webadmin.properties</code> file that James will use in or
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli listUsers</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james listUsers</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -648,7 +679,7 @@ We will create a <code>webadmin.properties</code> file that James will use in or
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli addDomain test.local</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james addDomain test.local</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -656,7 +687,7 @@ We will create a <code>webadmin.properties</code> file that James will use in or
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli listDomains</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james listDomains</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -664,7 +695,7 @@ We will create a <code>webadmin.properties</code> file that James will use in or
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli addUser testuser@test.local password</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james addUser testuser@test.local password</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -672,7 +703,7 @@ We will create a <code>webadmin.properties</code> file that James will use in or
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli listUsers</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james listUsers</code></pre>
 </div>
 </div>
 </div>
diff --git a/james-project/3.6.0/servers/5-minute-demo.html b/james-project/3.6.0/servers/5-minute-demo.html
index 510761c..9db3982 100644
--- a/james-project/3.6.0/servers/5-minute-demo.html
+++ b/james-project/3.6.0/servers/5-minute-demo.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="5-minute-demo.html">Short Demo</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/5-minute-demo.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/servers/5-minute-demo.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="5-minute-demo.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/5-minute-demo.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -541,7 +551,7 @@ Then you will add a domain, and a user account within that domain.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker run -d -p "25:25" -p "143:143" --name james apache/james:demo-3.6.0</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker run -d -p "25:25" -p "143:143" --name james linagora/james-jpa-sample:3.4.0</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -581,9 +591,30 @@ Then you will add a domain, and a user account within that domain.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>docker exec james james-cli &lt;&lt;COMMAND&gt;&gt;</pre>
+<pre>docker exec james java -jar /root/james-cli.jar \
+    -h \&lt;&lt;HOST&gt;&gt; -p \&lt;&lt;PORT&gt;&gt; \&lt;&lt;COMMAND&gt;&gt;</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In this demo, we are using host 127.0.0.1 and port 9999, so every command looks like:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>docker exec james java -jar /root/james-cli.jar \
+    -h 127.0.0.1 -p 9999 \&lt;&lt;COMMAND&gt;&gt;</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Host 127.0.0.1 is of course localhost, and the use of port 9999 is completely arbitrary.</p>
+</div>
 </div>
 </div>
+<div class="paragraph">
+<p>To make this demo a little easier to use, set this up as a bash script by copying and pasting this script:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">printf '#!/bin/bash\n\ndocker exec james java -jar /root/james-cli.jar -h 127.0.0.1 -p 9999 $@' &gt;&gt; james ; chmod +x james</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -591,7 +622,7 @@ Then you will add a domain, and a user account within that domain.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli listDomains</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james listDomains</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -602,7 +633,7 @@ Then you will add a domain, and a user account within that domain.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli listUsers</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james listUsers</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -613,7 +644,7 @@ Then you will add a domain, and a user account within that domain.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli addDomain test.local</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james addDomain test.local</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -621,7 +652,7 @@ Then you will add a domain, and a user account within that domain.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli listDomains</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james listDomains</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -629,7 +660,7 @@ Then you will add a domain, and a user account within that domain.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli addUser testuser@test.local password</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james addUser testuser@test.local password</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -637,7 +668,7 @@ Then you will add a domain, and a user account within that domain.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">docker exec james james-cli listUsers</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">./james listUsers</code></pre>
 </div>
 </div>
 <div class="paragraph">
diff --git a/james-project/3.6.0/servers/basic/architecture.html b/james-project/3.6.0/servers/basic/architecture.html
index 2f74f30..79a1b6c 100644
--- a/james-project/3.6.0/servers/basic/architecture.html
+++ b/james-project/3.6.0/servers/basic/architecture.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="architecture.html">Architecture</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/architecture.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/servers/basic/architecture.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="architecture.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/basic/architecture.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/basic/concepts.html b/james-project/3.6.0/servers/basic/concepts.html
index 5e411a7..3afa864 100644
--- a/james-project/3.6.0/servers/basic/concepts.html
+++ b/james-project/3.6.0/servers/basic/concepts.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="concepts.html">Concepts</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/concepts.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/servers/basic/concepts.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="concepts.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/basic/concepts.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/basic/conf/index.html b/james-project/3.6.0/servers/basic/conf/index.html
index 6ff29d6..acb5229 100644
--- a/james-project/3.6.0/servers/basic/conf/index.html
+++ b/james-project/3.6.0/servers/basic/conf/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="index.html">Configuration</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/conf/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/basic/conf/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/basic/conf/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/basic/context.html b/james-project/3.6.0/servers/basic/context.html
index 66a8233..4af5eb5 100644
--- a/james-project/3.6.0/servers/basic/context.html
+++ b/james-project/3.6.0/servers/basic/context.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="context.html">Context</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/context.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/servers/basic/context.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="context.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/basic/context.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/basic/help.html b/james-project/3.6.0/servers/basic/help.html
index 046c424..b9aeb18 100644
--- a/james-project/3.6.0/servers/basic/help.html
+++ b/james-project/3.6.0/servers/basic/help.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="help.html">Help</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/help.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/servers/basic/help.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="help.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/basic/help.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/basic/index.html b/james-project/3.6.0/servers/basic/index.html
index c457e85..da16244 100644
--- a/james-project/3.6.0/servers/basic/index.html
+++ b/james-project/3.6.0/servers/basic/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="index.html">Basic</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/servers/basic/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/basic/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/basic/objectives.html b/james-project/3.6.0/servers/basic/objectives.html
index 87c7e03..400b0a5 100644
--- a/james-project/3.6.0/servers/basic/objectives.html
+++ b/james-project/3.6.0/servers/basic/objectives.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="objectives.html">Objectives</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/objectives.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/servers/basic/objectives.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="objectives.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/basic/objectives.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/demo.html b/james-project/3.6.0/servers/demo.html
index 60facee..21494f3 100644
--- a/james-project/3.6.0/servers/demo.html
+++ b/james-project/3.6.0/servers/demo.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="demo.html">Demo</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/demo.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/servers/demo.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="demo.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/demo.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed.html b/james-project/3.6.0/servers/distributed.html
index ea56abe..22232a9 100644
--- a/james-project/3.6.0/servers/distributed.html
+++ b/james-project/3.6.0/servers/distributed.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="distributed.html">Distributed</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/servers/distributed.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="distributed.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -550,7 +560,7 @@ technical knowledge and is the most complex and feature-rich option.</p>
 <p><a href="distributed/objectives.html" class="page">Objectives and motivation of the Distributed Server</a></p>
 </li>
 <li>
-<p><a href="distributed/architecture/index.html" class="page">Overview of architecture</a></p>
+<p><a href="#distributed/architecture.adoc" class="page unresolved">Overview of architecture</a></p>
 </li>
 <li>
 <p><a href="distributed/run.html" class="page">Running the Distributed Server</a></p>
diff --git a/james-project/3.6.0/servers/distributed/architecture/consistency-model.html b/james-project/3.6.0/servers/distributed/architecture/consistency-model.html
index f3cc300..2a5e722 100644
--- a/james-project/3.6.0/servers/distributed/architecture/consistency-model.html
+++ b/james-project/3.6.0/servers/distributed/architecture/consistency-model.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="consistency-model.html">Consistency Model</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/architecture/consistency-model.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/architecture/consistency-model.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="consistency-model.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/architecture/consistency-model.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/architecture/index.html b/james-project/3.6.0/servers/distributed/architecture/index.html
index 69cc4d0..0f4cfbb 100644
--- a/james-project/3.6.0/servers/distributed/architecture/index.html
+++ b/james-project/3.6.0/servers/distributed/architecture/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="index.html">Architecture</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/architecture/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/architecture/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/architecture/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -584,28 +594,18 @@
 </ul>
 </div>
 <div class="paragraph">
-<p>The following protocols should be considered experimental:</p>
+<p>The following protocols should be considered experimental</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p><strong>JMAP</strong> (RFC-8620 &amp;RFC-8621 specifications and known limitations of the James implementation are defined <a href="https://github.com/apache/james-project/tree/master/server/protocols/jmap-rfc-8621/doc">here</a>)</p>
+<p><strong>JMAP</strong> (draft specification as defined <a href="https://github.com/apache/james-project/tree/master/server/protocols/jmap-draft/doc">here</a>)</p>
 </li>
 <li>
 <p><strong>POP3</strong></p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>The following protocols should be considered deprecated:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>JMAP-draft</strong> (draft specification as defined <a href="https://github.com/apache/james-project/tree/master/server/protocols/jmap-draft/doc">here</a>)</p>
-</li>
-</ul>
-</div>
 </div>
 </div>
 <div class="sect1">
diff --git a/james-project/3.6.0/servers/distributed/architecture/specialized-instances.html b/james-project/3.6.0/servers/distributed/architecture/specialized-instances.html
index 5828be6..6fdc150 100644
--- a/james-project/3.6.0/servers/distributed/architecture/specialized-instances.html
+++ b/james-project/3.6.0/servers/distributed/architecture/specialized-instances.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="specialized-instances.html">Specialized instances</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/architecture/specialized-instances.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/architecture/specialized-instances.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="specialized-instances.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/architecture/specialized-instances.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -564,23 +574,11 @@ protocols configuration files to learn more.</p>
 </ul>
 </div>
 <div class="paragraph">
-<p>Front-line servers will likely not handle back office responsibilities (but be sure to have back-office servers that do!).</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="../configure/mailetcontainer.html" class="page">Mail processing can be switched off</a>.</p>
-</li>
-<li>
-<p><a href="../configure/listeners.html" class="page">Mailbox event processing can be switched off</a>.</p>
-</li>
-<li>
-<p><a href="../configure/rabbitmq.html" class="page">Task execution can be switched off</a>.</p>
-</li>
-<li>
-<p>Remote Delivery service is not started if the RemoteDelivery mailet is not positioned in mailetcontainer.xml.</p>
-</li>
-</ul>
+<p>Front-line servers will likely not handle back office responsibilities (but be sure to have back-office servers that do!).
+  - <a href="../configure/mailetcontainer.html" class="page">Mail processing can be switched off</a>.
+  - <a href="../configure/listeners.html" class="page">Mailbox event processing can be switched off</a>.
+  - <a href="../configure/rabbitmq.html" class="page">Task execution can be switched off</a>.
+  - Remote Delivery service is not started if the RemoteDelivery mailet is not positioned in mailetcontainer.xml.</p>
 </div>
 <div class="paragraph">
 <p>Of course, the above instances can be collocated at will, to reach some intermediate deployments with fewer
diff --git a/james-project/3.6.0/servers/distributed/configure/batchsizes.html b/james-project/3.6.0/servers/distributed/configure/batchsizes.html
index d5326d4..2d3f9a4 100644
--- a/james-project/3.6.0/servers/distributed/configure/batchsizes.html
+++ b/james-project/3.6.0/servers/distributed/configure/batchsizes.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="batchsizes.html">batchsizes.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/batchsizes.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/batchsizes.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="batchsizes.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/batchsizes.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -524,7 +534,7 @@ needed as IMAP can generate some potentially large requests.</p>
 <p>Increasing these values tend to fasten individual requests, at the cost of enabling potential higher load.</p>
 </div>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/batchsizes.properties">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/batchsizes.properties">example</a>
 to get some examples and hints.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
diff --git a/james-project/3.6.0/servers/distributed/configure/blobstore.html b/james-project/3.6.0/servers/distributed/configure/blobstore.html
index b1fcbbf..59f3b4f 100644
--- a/james-project/3.6.0/servers/distributed/configure/blobstore.html
+++ b/james-project/3.6.0/servers/distributed/configure/blobstore.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="blobstore.html">blobstore.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/blobstore.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/blobstore.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="blobstore.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/blobstore.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -533,7 +543,7 @@ James uses the BlobStore for storing blobs which are usually mail contents, atta
 <p>It could be the implementation on top of Cassandra or file storage service S3 compatible like Openstack Swift and AWS S3.</p>
 </div>
 <div class="paragraph">
-<p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties">blob.properties</a>
+<p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties">blob.properties</a>
 in GIT to get some examples and hints.</p>
 </div>
 <div class="sect2">
@@ -590,56 +600,6 @@ If you are upgrading from James 3.5 or older, the deduplication was enabled.
 </div>
 </div>
 <div class="sect2">
-<h3 id="_encryption_choice"><a class="anchor" href="#_encryption_choice"></a>Encryption choice</h3>
-<div class="paragraph">
-<p>Data can be optionally encrypted with a symmetric key using AES before being stored in the blobStore. As many user relies
-on third party for object storage, a compromised third party will not escalate to a data disclosure. Of course, a
-performance price have to be paid, as encryption takes resources.</p>
-</div>
-<div class="paragraph">
-<p><strong>encryption.aes.enable</strong> : Optional boolean, defaults to false.</p>
-</div>
-<div class="paragraph">
-<p>If AES encryption is enabled, then the following properties MUST be present:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>encryption.aes.password</strong> : String</p>
-</li>
-<li>
-<p><strong>encryption.aes.salt</strong> : Hexadecimal string</p>
-</li>
-</ul>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-Once chosen this choice can not be reverted, all the data is either clear or encrypted. Mixed encryption
-is not supported.
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Here is an example of how you can generate the above values (be mindful to customize the byte lengths in order to add
-enough entropy.</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre># Password generation
-openssl rand -base64 64
-
-# Salt generation
-generate salt with : openssl rand -hex 16</pre>
-</div>
-</div>
-</div>
-<div class="sect2">
 <h3 id="_cassandra_blobstore_cache"><a class="anchor" href="#_cassandra_blobstore_cache"></a>Cassandra BlobStore Cache</h3>
 <div class="paragraph">
 <p>A Cassandra cache can be enabled to reduce latency when reading small blobs frequently.
@@ -716,10 +676,6 @@ Maximum size of stored objects expressed in bytes.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">objectstorage.s3.secretKey</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys">S3 access key secret</a></p></td>
 </tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">objectstorage.s3.http.concurrency</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Allow setting the number of concurrent HTTP requests allowed by the Netty driver.</p></td>
-</tr>
 </tbody>
 </table>
 </div>
@@ -766,7 +722,7 @@ The deleted messages are transformed into a blob and James will export that blob
 <p>This configuration helps you choose the blob exporting mechanism fit with your James setup and it is only applicable with Guice products.</p>
 </div>
 <div class="paragraph">
-<p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties">blob.properties</a>
+<p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties">blob.properties</a>
 in GIT to get some examples and hints.</p>
 </div>
 <div class="paragraph">
@@ -816,7 +772,7 @@ LinShare server and download them.</p>
 <p>This way helps you to share via whole network as long as they can access to LinShare server.</p>
 </div>
 <div class="paragraph">
-<p>To get an example or details explained, visit <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties">blob.properties</a></p>
+<p>To get an example or details explained, visit <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties">blob.properties</a></p>
 </div>
 <div class="paragraph">
 <p><strong>blob.export.linshare.url</strong>: The URL to connect to LinShare</p>
diff --git a/james-project/3.6.0/servers/distributed/configure/cassandra.html b/james-project/3.6.0/servers/distributed/configure/cassandra.html
index 7da3d81..3896e03 100644
--- a/james-project/3.6.0/servers/distributed/configure/cassandra.html
+++ b/james-project/3.6.0/servers/distributed/configure/cassandra.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="cassandra.html">cassandra.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/cassandra.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/cassandra.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="cassandra.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/cassandra.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -519,7 +529,7 @@
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties">example</a>
 to get some examples and hints.</p>
 </div>
 </div>
@@ -618,18 +628,6 @@ Allowed values: <a href="https://docs.datastax.com/en/cassandra-oss/3.x/cassandr
 <td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Allows specifying the driver serial consistency level. Defaults to SERIAL.
 Allowed values: <a href="https://docs.datastax.com/en/cassandra-oss/3.x/cassandra/dml/dmlConfigConsistency.html">SERIAL or LOCAL_SERIAL</a></p></td>
 </tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.local.dc</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Allows specifying the local DC as part of the load balancing policy. Specifying it
-would result in the use of <code>new TokenAwarePolicy(DCAwareRoundRobinPolicy.builder().withLocalDc(value).build())</code> as a LoadBalancingPolicy.
-This value is useful in a multi-DC Cassandra setup. Be aware of <a href="#../architecture/consistency-model.html#_about_multi_data_center_setups" class="page unresolved">limitation of multi-DC setups for James</a>
-Not specifying this value results in the driver&#8217;s default load balancing policy to be used.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">optimistic.consistency.level.enabled</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Allows specifying consistency level ONE for reads in Cassandra BlobStore.
-Falls back to default read consistency level if the blob is missing. Defaults to false.</p></td>
-</tr>
 </tbody>
 </table>
 </div>
@@ -788,29 +786,13 @@ Controls the number of messages to be retrieved in parallel.</p></td>
 Controls the size of blob parts used to store messages in the Cassandra blobStore.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">mailbox.read.strong.consistency</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Boolean, defaults to true. Disabling should be considered experimental.
-If enabled, regular consistency level is used for read transactions for mailbox. Not doing so might result
-in stale reads as the system.paxos table will not be checked for latest updates. Better performance are expected
-by turning it off. Note that reads performed as part of write transactions are always performed with a strong
-consistency.</p></td>
-</tr>
-<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">message.read.strong.consistency</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Boolean, defaults to true. Disabling should be considered experimental.
-If enabled, regular consistency level is used for read transactions for message. Not doing so might result
+If enabled, regular consistency level is used for read transactions for message. This might result
 in stale reads as the system.paxos table will not be checked for latest updates. Better performance are expected
 by turning it off. Note that reads performed as part of write transactions are always performed with a strong
 consistency.</p></td>
 </tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">message.write.strong.consistency.unsafe</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Boolean, defaults to true. Disabling should be considered experimental and unsafe.
-If disabled, Lightweight transactions will no longer be used upon messages operation (table <code>imapUidTable</code>).
-As message flags updates relies so far on a read-before-write model, it exposes yourself to data races leading to
-potentially update loss. Better performance are expected
-by turning it off. Reads performed as part of write transaction are also performed with a relaxed consistency.</p></td>
-</tr>
 </tbody>
 </table>
 </div>
diff --git a/james-project/3.6.0/servers/distributed/configure/collecting-contacts.html b/james-project/3.6.0/servers/distributed/configure/collecting-contacts.html
index d0d9833..437a75e 100644
--- a/james-project/3.6.0/servers/distributed/configure/collecting-contacts.html
+++ b/james-project/3.6.0/servers/distributed/configure/collecting-contacts.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="collecting-contacts.html">Contact collection</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/collecting-contacts.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/collecting-contacts.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="collecting-contacts.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/collecting-contacts.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/collecting-events.html b/james-project/3.6.0/servers/distributed/configure/collecting-events.html
index d147f4b..9711aa8 100644
--- a/james-project/3.6.0/servers/distributed/configure/collecting-events.html
+++ b/james-project/3.6.0/servers/distributed/configure/collecting-events.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="collecting-events.html">Event collection</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/collecting-events.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/collecting-events.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="collecting-events.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/collecting-events.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/dns.html b/james-project/3.6.0/servers/distributed/configure/dns.html
index 378fc80..06b443e 100644
--- a/james-project/3.6.0/servers/distributed/configure/dns.html
+++ b/james-project/3.6.0/servers/distributed/configure/dns.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="dns.html">dnsservice.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/dns.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/dns.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="dns.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/dns.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -517,7 +527,7 @@
 <article class="doc">
 <h1 class="page">Distributed James Server &mdash; dnsservice.xml</h1>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/dnsservice.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/dnsservice.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="paragraph">
diff --git a/james-project/3.6.0/servers/distributed/configure/domainlist.html b/james-project/3.6.0/servers/distributed/configure/domainlist.html
index 42cb09b..3bb8d27 100644
--- a/james-project/3.6.0/servers/distributed/configure/domainlist.html
+++ b/james-project/3.6.0/servers/distributed/configure/domainlist.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="domainlist.html">domainlist.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/domainlist.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/domainlist.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="domainlist.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/domainlist.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -517,7 +527,7 @@
 <article class="doc">
 <h1 class="page">Distributed James Server &mdash; domainlist.xml</h1>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/domainlist.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/domainlist.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="paragraph">
diff --git a/james-project/3.6.0/servers/distributed/configure/dsn.html b/james-project/3.6.0/servers/distributed/configure/dsn.html
index d41b13b..8a9f2a4 100644
--- a/james-project/3.6.0/servers/distributed/configure/dsn.html
+++ b/james-project/3.6.0/servers/distributed/configure/dsn.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="dsn.html">ESMTP DSN support</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/dsn.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/dsn.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="dsn.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/dsn.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/elasticsearch.html b/james-project/3.6.0/servers/distributed/configure/elasticsearch.html
index 4205f07..d9bb7b7 100644
--- a/james-project/3.6.0/servers/distributed/configure/elasticsearch.html
+++ b/james-project/3.6.0/servers/distributed/configure/elasticsearch.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="elasticsearch.html">elasticsearch.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/elasticsearch.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/elasticsearch.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="elasticsearch.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/elasticsearch.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -519,7 +529,7 @@
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="paragraph">
@@ -694,19 +704,6 @@ searches. Disabling ElasticSearch requires no extra action, however
 <div class="sect1">
 <h2 id="_exporting_metrics_directly_to_elasticsearch"><a class="anchor" href="#_exporting_metrics_directly_to_elasticsearch"></a>Exporting metrics directly to ElasticSearch</h2>
 <div class="sectionbody">
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-A separate ElasticSearch server is required, as an ElasticSearch 6.3 is needed, which is
-not compatible with ElasticSearch 7.10, required by James.
-</td>
-</tr>
-</table>
-</div>
 <div class="paragraph">
 <p>For configuring the metric reporting on ElasticSearch :</p>
 </div>
@@ -751,7 +748,7 @@ not compatible with ElasticSearch 7.10, required by James.
 <h2 id="_ssl_trusting_configuration"><a class="anchor" href="#_ssl_trusting_configuration"></a>SSL Trusting Configuration</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>By default, James will use the system TrustStore to validate https server certificates, if the certificate on
+<p>By default James will use the system TrustStore to validate https server certificates, if the certificate on
 ES side is already in the system TrustStore, you can leave the sslValidationStrategy property empty or set it to default.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
diff --git a/james-project/3.6.0/servers/distributed/configure/extensions.html b/james-project/3.6.0/servers/distributed/configure/extensions.html
index 30015e2..a086b9a 100644
--- a/james-project/3.6.0/servers/distributed/configure/extensions.html
+++ b/james-project/3.6.0/servers/distributed/configure/extensions.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="extensions.html">extensions.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/extensions.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/extensions.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="extensions.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/extensions.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/healthcheck.html b/james-project/3.6.0/servers/distributed/configure/healthcheck.html
index a55cb1d..1ed725d 100644
--- a/james-project/3.6.0/servers/distributed/configure/healthcheck.html
+++ b/james-project/3.6.0/servers/distributed/configure/healthcheck.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="healthcheck.html">healthcheck.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/healthcheck.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/healthcheck.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="healthcheck.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/healthcheck.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -517,7 +527,7 @@
 <article class="doc">
 <h1 class="page">Distributed James Server &mdash; healthcheck.properties</h1>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/healthcheck.properties">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/healthcheck.properties">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="paragraph">
diff --git a/james-project/3.6.0/servers/distributed/configure/imap.html b/james-project/3.6.0/servers/distributed/configure/imap.html
index 6ba40de..de0f82f 100644
--- a/james-project/3.6.0/servers/distributed/configure/imap.html
+++ b/james-project/3.6.0/servers/distributed/configure/imap.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="imap.html">imapserver.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/imap.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/imap.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="imap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/imap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -517,7 +527,7 @@
 <article class="doc">
 <h1 class="page">Distributed James Server &mdash; imapserver.xml</h1>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/imapserver.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/imapserver.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="paragraph">
diff --git a/james-project/3.6.0/servers/distributed/configure/index.html b/james-project/3.6.0/servers/distributed/configure/index.html
index d03dc9d..f64903a 100644
--- a/james-project/3.6.0/servers/distributed/configure/index.html
+++ b/james-project/3.6.0/servers/distributed/configure/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="index.html">Configuration</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -538,25 +548,25 @@ or rely on reasonable defaults.</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="imap.html" class="page"><strong>imapserver.xml</strong></a> allows configuration for the IMAP protocol <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/imapserver.xml">example</a></p>
+<p><a href="imap.html" class="page"><strong>imapserver.xml</strong></a> allows configuration for the IMAP protocol <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/imapserver.xml">example</a></p>
 </li>
 <li>
-<p><a href="jmap.html" class="page"><strong>jmap.properties</strong></a> allows to configure the JMAP protocol <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmap.properties">example</a></p>
+<p><a href="jmap.html" class="page"><strong>jmap.properties</strong></a> allows to configure the JMAP protocol <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/jmap.properties">example</a></p>
 </li>
 <li>
-<p><a href="jmx.html" class="page"><strong>jmx.properties</strong></a> allows configuration of JMX being used by the Command Line Interface <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmx.properties">example</a></p>
+<p><a href="jmx.html" class="page"><strong>jmx.properties</strong></a> allows configuration of JMX being used by the Command Line Interface <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/jmx.properties">example</a></p>
 </li>
 <li>
-<p><a href="smtp.html#_lmtp_configuration" class="page"><strong>lmtpserver.xml</strong></a> allows configuring the LMTP protocol <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/lmtpserver.xml">example</a></p>
+<p><a href="smtp.html#_lmtp_configuration" class="page"><strong>lmtpserver.xml</strong></a> allows configuring the LMTP protocol <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/lmtpserver.xml">example</a></p>
 </li>
 <li>
-<p><strong>managesieveserver.xml</strong> allows configuration for ManagedSieve (unsupported) <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/managesieveserver.xml">example</a></p>
+<p><strong>managesieveserver.xml</strong> allows configuration for ManagedSieve (unsupported) <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/managesieveserver.xml">example</a></p>
 </li>
 <li>
-<p><a href="pop3.html" class="page"><strong>pop3server.xml</strong></a> allows configuration for the POP3 protocol (experimental) <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/pop3server.xml">example</a></p>
+<p><a href="pop3.html" class="page"><strong>pop3server.xml</strong></a> allows configuration for the POP3 protocol (experimental) <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/pop3server.xml">example</a></p>
 </li>
 <li>
-<p><a href="smtp.html" class="page"><strong>smtpserver.xml</strong></a> allows configuration for the SMTP protocol <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml">example</a></p>
+<p><a href="smtp.html" class="page"><strong>smtpserver.xml</strong></a> allows configuration for the SMTP protocol <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/smtpserver.xml">example</a></p>
 <div class="ulist">
 <ul>
 <li>
@@ -566,7 +576,7 @@ or rely on reasonable defaults.</p>
 </div>
 </li>
 <li>
-<p><a href="webadmin.html" class="page"><strong>webadmin.properties</strong></a> enables configuration for the WebAdmin protocol <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/webadmin.properties">example</a></p>
+<p><a href="webadmin.html" class="page"><strong>webadmin.properties</strong></a> enables configuration for the WebAdmin protocol <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/webadmin.properties">example</a></p>
 </li>
 <li>
 <p><a href="ssl.html" class="page">This page</a> details SSL &amp; TLS configuration.</p>
@@ -584,19 +594,19 @@ or rely on reasonable defaults.</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="blobstore.html" class="page"><strong>blobstore.properties</strong></a> allows to configure the BlobStore <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties">example</a></p>
+<p><a href="blobstore.html" class="page"><strong>blobstore.properties</strong></a> allows to configure the BlobStore <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties">example</a></p>
 </li>
 <li>
-<p><a href="cassandra.html" class="page"><strong>cassandra.properties</strong></a> allows to configure the Cassandra driver <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties">example</a></p>
+<p><a href="cassandra.html" class="page"><strong>cassandra.properties</strong></a> allows to configure the Cassandra driver <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties">example</a></p>
 </li>
 <li>
-<p><a href="elasticsearch.html" class="page"><strong>elasticsearch.properties</strong></a> allows to configure ElasticSearch driver <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties">example</a></p>
+<p><a href="elasticsearch.html" class="page"><strong>elasticsearch.properties</strong></a> allows to configure ElasticSearch driver <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties">example</a></p>
 </li>
 <li>
-<p><a href="rabbitmq.html" class="page"><strong>rabbitmq.properties</strong></a> allows configuration for the RabbitMQ driver <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">example</a></p>
+<p><a href="rabbitmq.html" class="page"><strong>rabbitmq.properties</strong></a> allows configuration for the RabbitMQ driver <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">example</a></p>
 </li>
 <li>
-<p><a href="tika.html" class="page"><strong>tika.properties</strong></a> allows configuring Tika as a backend for text extraction <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/tika.properties">example</a></p>
+<p><a href="tika.html" class="page"><strong>tika.properties</strong></a> allows configuring Tika as a backend for text extraction <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/tika.properties">example</a></p>
 </li>
 </ul>
 </div>
@@ -611,19 +621,19 @@ or rely on reasonable defaults.</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="batchsizes.html" class="page"><strong>batchsizes.properties</strong></a> allows to configure mailbox read batch sizes <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/batchsizes.properties">example</a></p>
+<p><a href="batchsizes.html" class="page"><strong>batchsizes.properties</strong></a> allows to configure mailbox read batch sizes <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/batchsizes.properties">example</a></p>
 </li>
 <li>
-<p><a href="dns.html" class="page"><strong>dnsservice.xml</strong></a> allows to configure DNS resolution <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/dnsservice.xml">example</a></p>
+<p><a href="dns.html" class="page"><strong>dnsservice.xml</strong></a> allows to configure DNS resolution <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/dnsservice.xml">example</a></p>
 </li>
 <li>
-<p><a href="domainlist.html" class="page"><strong>domainlist.xml</strong></a> allows to configure Domain storage <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/domainlist.xml">example</a></p>
+<p><a href="domainlist.html" class="page"><strong>domainlist.xml</strong></a> allows to configure Domain storage <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/domainlist.xml">example</a></p>
 </li>
 <li>
-<p><a href="healthcheck.html" class="page"><strong>healthcheck.properties</strong></a> allows to configure periodical healthchecks <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/healthcheck.properties">example</a></p>
+<p><a href="healthcheck.html" class="page"><strong>healthcheck.properties</strong></a> allows to configure periodical healthchecks <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/healthcheck.properties">example</a></p>
 </li>
 <li>
-<p><a href="mailetcontainer.html" class="page"><strong>mailetcontainer.xml</strong></a> allows configuring mail processing <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailetcontainer.xml">example</a></p>
+<p><a href="mailetcontainer.html" class="page"><strong>mailetcontainer.xml</strong></a> allows configuring mail processing <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml">example</a></p>
 <div class="ulist">
 <ul>
 <li>
@@ -636,13 +646,13 @@ or rely on reasonable defaults.</p>
 </div>
 </li>
 <li>
-<p><a href="mailrepositorystore.html" class="page"><strong>mailrepositorystore.xml</strong></a> enables registration of allowed MailRepository protcols and link them to MailRepository implementations <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailrepositorystore.xml">example</a></p>
+<p><a href="mailrepositorystore.html" class="page"><strong>mailrepositorystore.xml</strong></a> enables registration of allowed MailRepository protcols and link them to MailRepository implementations <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailrepositorystore.xml">example</a></p>
 </li>
 <li>
-<p><a href="recipientrewritetable.html" class="page"><strong>recipientrewritetable.xml</strong></a> enables advanced configuration for the Recipient Rewrite Table component <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/recipientrewritetable.xml">example</a></p>
+<p><a href="recipientrewritetable.html" class="page"><strong>recipientrewritetable.xml</strong></a> enables advanced configuration for the Recipient Rewrite Table component <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/recipientrewritetable.xml">example</a></p>
 </li>
 <li>
-<p><a href="usersrepository.html" class="page"><strong>usersrepository.xml</strong></a> allows configuration of user storage <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml">example</a></p>
+<p><a href="usersrepository.html" class="page"><strong>usersrepository.xml</strong></a> allows configuration of user storage <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/usersrepository.xml">example</a></p>
 </li>
 </ul>
 </div>
@@ -657,13 +667,13 @@ or rely on reasonable defaults.</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="vault.html" class="page"><strong>deletedMessageVault.properties</strong></a> allows to configure the DeletedMessageVault <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties">example</a></p>
+<p><a href="vault.html" class="page"><strong>deletedMessageVault.properties</strong></a> allows to configure the DeletedMessageVault <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/deletedMessageVault.properties">example</a></p>
 </li>
 <li>
-<p><a href="listeners.html" class="page"><strong>listeners.xml</strong></a> enables configuration of Mailbox Listeners <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listeners.xml">example</a></p>
+<p><a href="listeners.html" class="page"><strong>listeners.xml</strong></a> enables configuration of Mailbox Listeners <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listeners.xml">example</a></p>
 </li>
 <li>
-<p><a href="extensions.html" class="page"><strong>extensions.properties</strong></a> allows to extend James behaviour by loading your extensions in it <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/extensions.properties">example</a></p>
+<p><a href="extensions.html" class="page"><strong>extensions.properties</strong></a> allows to extend James behaviour by loading your extensions in it <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/extensions.properties">example</a></p>
 </li>
 <li>
 <p><a href="spam.html" class="page">This page</a> documents Anti-Spam setup with SpamAssassin.</p>
diff --git a/james-project/3.6.0/servers/distributed/configure/jmap.html b/james-project/3.6.0/servers/distributed/configure/jmap.html
index 240d652..7529095 100644
--- a/james-project/3.6.0/servers/distributed/configure/jmap.html
+++ b/james-project/3.6.0/servers/distributed/configure/jmap.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="jmap.html">jmap.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/jmap.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/jmap.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="jmap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/jmap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -524,7 +534,7 @@ stores. It therefore intends to primarily replace IMAP + SMTP submission. It is
 generic. It does not replace MTA-to-MTA SMTP transmission.</p>
 </div>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmap.properties">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/jmap.properties">example</a>
 to get some examples and hints.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
@@ -568,28 +578,26 @@ This should not be the same keystore than the ones used by TLS based protocols.<
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Default value: <a href="http://localhost" class="bare">http://localhost</a>.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">websocket.url.prefix</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. URL for JMAP WebSocket route.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Default value: ws://localhost</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">upload.max.size</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">upload.max.size</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Configuration max size Upload in new JMAP-RFC-8621.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default value: 30M. Supported units are B (bytes) K (KB) M (MB) G (GB).</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Default value: 30M. Supported units are B (bytes) K (KB) M (MB) G (GB).</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">view.email.query.enabled</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional boolean. Defaults to false.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional boolean. Defaults to false.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Should simple Email/query be resolved against a Cassandra projection, or should we resolve them against ElasticSearch?
 This enables a higher resilience, but the projection needs to be correctly populated.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">jmap.version.default</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">jmap.version.default</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Optional string. Defaults to draft. Allowed values: draft, rfc-8621.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Which version of the JMAP protocol should be served when none supplied in the Accept header.
+Defaults to draft for legacy reasons (avoid breaking changes) but setting the value to
+rfc-8621 allow compatibility with other third party apps.</p></td>
 </tr>
 </tbody>
 </table>
diff --git a/james-project/3.6.0/servers/distributed/configure/jmx.html b/james-project/3.6.0/servers/distributed/configure/jmx.html
index 593b33e..8dd4b02 100644
--- a/james-project/3.6.0/servers/distributed/configure/jmx.html
+++ b/james-project/3.6.0/servers/distributed/configure/jmx.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="jmx.html">jmx.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/jmx.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/jmx.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="jmx.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/jmx.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -520,7 +530,7 @@
 <p>This is used to configure the JMX MBean server via which all management is achieved.</p>
 </div>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmx.properties">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/jmx.properties">example</a>
 in GIT to get some examples and hints.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
diff --git a/james-project/3.6.0/servers/distributed/configure/listeners.html b/james-project/3.6.0/servers/distributed/configure/listeners.html
index 029e915..4550d1f 100644
--- a/james-project/3.6.0/servers/distributed/configure/listeners.html
+++ b/james-project/3.6.0/servers/distributed/configure/listeners.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="listeners.html">listeners.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/listeners.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/listeners.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="listeners.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/listeners.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -533,7 +543,7 @@ operations on the system.</p>
 <p>Distributed James allows the user to register potentially user defined additional mailbox listeners.</p>
 </div>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listener.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listener.xml">example</a>
 to get some examples and hints.</p>
 </div>
 </div>
diff --git a/james-project/3.6.0/servers/distributed/configure/mailetcontainer.html b/james-project/3.6.0/servers/distributed/configure/mailetcontainer.html
index c9f5208..f684b36 100644
--- a/james-project/3.6.0/servers/distributed/configure/mailetcontainer.html
+++ b/james-project/3.6.0/servers/distributed/configure/mailetcontainer.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="mailetcontainer.html">mailetcontainer.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/mailetcontainer.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/mailetcontainer.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="mailetcontainer.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/mailetcontainer.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -523,7 +533,7 @@
 MailetContainer is a Matchers (condition for executing a mailet) and Mailets (execution units that perform
 actions based on incoming mail) pipeline arranged into processors (List of mailet/matcher pairs allowing
 better logical organisation). You can read more about these concepts on
-<a href="../architecture/index.html#_mail_processing" class="page">the mailet container feature description</a>.</p>
+<a href="#distributed/architecture.adoc#_mail_processing" class="page unresolved">the mailet container feature description</a>.</p>
 </div>
 <div class="paragraph">
 <p>Apache James Server includes a number of <a href="mailets.html" class="page">Packaged Mailets</a> and
@@ -533,7 +543,7 @@ better logical organisation). You can read more about these concepts on
 <p>Futhermore, you can write and use with James <a href="../extending/mail-processing.html" class="page">your own mailet and matchers</a>.</p>
 </div>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailetcontainer.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
@@ -621,16 +631,8 @@ process the mail using the <strong>error</strong> processor.</p>
 </div>
 <div class="paragraph">
 <p>The <strong>onMailetException</strong> property allows you to override this behaviour. You can specify another
-processor than the <strong>error</strong> one for handling the errors of this mailet.</p>
-</div>
-<div class="paragraph">
-<p>The <strong>ignore</strong> special value also allows to continue processing and ignore the error.</p>
-</div>
-<div class="paragraph">
-<p>The <strong>propagate</strong> special value causes the mailet container to rethrow the
-exception, propagating it to the execution context. In an SMTP execution context, the spooler will then requeue
-the item and automatic retries will be setted up - note that attempts will be done for each recipients. In LMTP
-(if LMTP is configured to execute the mailetContainer), the entire mail transaction is reported as failed to the caller.</p>
+processor than the <strong>error</strong> one for handling the errors of this mailet. The <strong>ignore</strong> special value also
+allows to continue processing and ignore the error.</p>
 </div>
 <div class="paragraph">
 <p>Moreover, the <strong>onMatcherException</strong> allows you to override matcher error handling. You can
diff --git a/james-project/3.6.0/servers/distributed/configure/mailets.html b/james-project/3.6.0/servers/distributed/configure/mailets.html
index ff2f87b..0be7754 100644
--- a/james-project/3.6.0/servers/distributed/configure/mailets.html
+++ b/james-project/3.6.0/servers/distributed/configure/mailets.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="mailets.html">Packaged Mailets</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/mailets.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/mailets.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="mailets.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/mailets.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/mailrepositorystore.html b/james-project/3.6.0/servers/distributed/configure/mailrepositorystore.html
index f5706d9..c11ccb0 100644
--- a/james-project/3.6.0/servers/distributed/configure/mailrepositorystore.html
+++ b/james-project/3.6.0/servers/distributed/configure/mailrepositorystore.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="mailrepositorystore.html">mailrepositorystore.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/mailrepositorystore.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/mailrepositorystore.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="mailrepositorystore.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/mailrepositorystore.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -541,7 +551,7 @@ associated to a protocol in <strong>mailrepositorystore.xml</strong> for a usage
 <h2 id="_configuration"><a class="anchor" href="#_configuration"></a>Configuration</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailrepositorystore.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailrepositorystore.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="literalblock">
diff --git a/james-project/3.6.0/servers/distributed/configure/matchers.html b/james-project/3.6.0/servers/distributed/configure/matchers.html
index 5a28465..a9ba069 100644
--- a/james-project/3.6.0/servers/distributed/configure/matchers.html
+++ b/james-project/3.6.0/servers/distributed/configure/matchers.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="matchers.html">Packaged Matchers</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/matchers.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/matchers.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="matchers.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/matchers.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -746,9 +756,6 @@ toString() is called on the attribute value, and that is the value matched again
 <p>This matcher checks if the content type matches.</p>
 </div>
 <div class="paragraph">
-<p>This matcher does not walk down the mime tree and stops at the top level mime part.</p>
-</div>
-<div class="paragraph">
 <p>use:</p>
 </div>
 <div class="literalblock">
diff --git a/james-project/3.6.0/servers/distributed/configure/pop3.html b/james-project/3.6.0/servers/distributed/configure/pop3.html
index 67b4684..eeb635c 100644
--- a/james-project/3.6.0/servers/distributed/configure/pop3.html
+++ b/james-project/3.6.0/servers/distributed/configure/pop3.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="pop3.html">pop3server.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/pop3.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/pop3.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="pop3.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/pop3.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -517,7 +527,7 @@
 <article class="doc">
 <h1 class="page">Distributed James Server &mdash; pop3server.xml</h1>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/pop3server.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/pop3server.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="paragraph">
diff --git a/james-project/3.6.0/servers/distributed/configure/rabbitmq.html b/james-project/3.6.0/servers/distributed/configure/rabbitmq.html
index 83dd060..ee58926 100644
--- a/james-project/3.6.0/servers/distributed/configure/rabbitmq.html
+++ b/james-project/3.6.0/servers/distributed/configure/rabbitmq.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="rabbitmq.html">rabbitmq.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/rabbitmq.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/rabbitmq.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="rabbitmq.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/rabbitmq.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -522,7 +532,7 @@
 <p>This configuration helps you configure components using RabbitMQ.</p>
 </div>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">example</a>
 to get some examples and hints.</p>
 </div>
 </div>
@@ -657,21 +667,21 @@ this implementation relies on Cassandra.</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock">mailqueue.view.sliceWindow</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">James divides the view into slices, each slice contains data for a given period, sliceWindow parameter controls this period.
 This dividing of periods allows faster browsing of the mail queue. Tips for choosing sliceWindow are explained in
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a></p></td>
+<a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">mailqueue.view.bucketCount</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Mails in a mail queue are distributed across the underlying storage service.
 BucketCount describes how to be distributing mails to fit with your James setup
 Tips for choosing bucketCount are explained in
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a></p></td>
+<a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">mailqueue.view.updateBrowseStartPace</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">To browse, James needs a starting point and to continuously update that point in runtime.
 UpdateBrowseStartPace describes the probability to update the starting point.
 Tips for choosing updateBrowseStartPace are explained in
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a></p></td>
+<a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">mailqueue.size.metricsEnabled</p></td>
@@ -680,7 +690,7 @@ As computing the size of the mail queue is currently implemented on top of brows
 sometimes it can get too big, making it impossible for the ES reporter to handle it correctly without crashing.
 It can be useful then to disable it.
 Tips for choosing metricsEnabled are explained in
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a></p></td>
+<a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a></p></td>
 </tr>
 </tbody>
 </table>
diff --git a/james-project/3.6.0/servers/distributed/configure/recipientrewritetable.html b/james-project/3.6.0/servers/distributed/configure/recipientrewritetable.html
index 96e7a14..bbe64a4 100644
--- a/james-project/3.6.0/servers/distributed/configure/recipientrewritetable.html
+++ b/james-project/3.6.0/servers/distributed/configure/recipientrewritetable.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="recipientrewritetable.html">recipientrewritetable.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/recipientrewritetable.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/recipientrewritetable.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="recipientrewritetable.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/recipientrewritetable.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -517,10 +527,10 @@
 <article class="doc">
 <h1 class="page">Distributed James Server &mdash; recipientrewritetable.xml</h1>
 <div class="paragraph">
-<p>Here are explanations on the different kinds about <a href="../architecture/index.html#_recipient_rewrite_tables" class="page">recipient rewritting</a>.</p>
+<p>Here are explanations on the different kinds about <a href="#distributed/architecture.adoc#_recipient_rewrite_tables" class="page unresolved">recipient rewritting</a>.</p>
 </div>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/recipientrewritetable.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/recipientrewritetable.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
diff --git a/james-project/3.6.0/servers/distributed/configure/remote-delivery-error-handling.html b/james-project/3.6.0/servers/distributed/configure/remote-delivery-error-handling.html
index f3bf3ea..f2bd57c 100644
--- a/james-project/3.6.0/servers/distributed/configure/remote-delivery-error-handling.html
+++ b/james-project/3.6.0/servers/distributed/configure/remote-delivery-error-handling.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/remote-delivery-error-handling.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/remote-delivery-error-handling.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="remote-delivery-error-handling.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/remote-delivery-error-handling.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/smtp-hooks.html b/james-project/3.6.0/servers/distributed/configure/smtp-hooks.html
index ecbc63b..5d8d4d9 100644
--- a/james-project/3.6.0/servers/distributed/configure/smtp-hooks.html
+++ b/james-project/3.6.0/servers/distributed/configure/smtp-hooks.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="smtp-hooks.html">Packaged SMTP hooks</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/smtp-hooks.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/smtp-hooks.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="smtp-hooks.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/smtp-hooks.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/smtp.html b/james-project/3.6.0/servers/distributed/configure/smtp.html
index c9e5244..204a6e9 100644
--- a/james-project/3.6.0/servers/distributed/configure/smtp.html
+++ b/james-project/3.6.0/servers/distributed/configure/smtp.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/smtp.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/smtp.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="smtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/smtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -520,7 +530,7 @@
 <h2 id="_incoming_smtp"><a class="anchor" href="#_incoming_smtp"></a>Incoming SMTP</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/smtpserver.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="paragraph">
@@ -739,7 +749,7 @@ Eudora, Evolution).</p>
 <h2 id="_lmtp_configuration"><a class="anchor" href="#_lmtp_configuration"></a>LMTP Configuration</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/lmtpserver.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/lmtpserver.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="paragraph">
@@ -748,57 +758,6 @@ to get some examples and hints.</p>
 <div class="paragraph">
 <p>By default, it is deactivated. You can activate it alongside SMTP and bind for example on port 24.</p>
 </div>
-<div class="paragraph">
-<p>The default LMTP server stores directly emails in user mailboxes, without further treatment.</p>
-</div>
-<div class="paragraph">
-<p>However we do ship an alternative handler chain allowing to execute the mailet container, thus achieving a behaviour similar
-to the default SMTP protocol. Here is how to achieve this:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>&lt;lmtpservers&gt;
-    &lt;lmtpserver enabled="true"&gt;
-        &lt;jmxName&gt;lmtpserver&lt;/jmxName&gt;
-        &lt;bind&gt;0.0.0.0:24&lt;/bind&gt;
-        &lt;connectionBacklog&gt;200&lt;/connectionBacklog&gt;
-        &lt;connectiontimeout&gt;1200&lt;/connectiontimeout&gt;
-        &lt;connectionLimit&gt;0&lt;/connectionLimit&gt;
-        &lt;connectionLimitPerIP&gt;0&lt;/connectionLimitPerIP&gt;
-        &lt;maxmessagesize&gt;0&lt;/maxmessagesize&gt;
-        &lt;handlerchain coreHandlersPackage="org.apache.james.lmtpserver.MailetContainerCmdHandlerLoader"&gt;
-            &lt;handler class="org.apache.james.lmtpserver.MailetContainerCmdHandlerLoader"/&gt;
-        &lt;/handlerchain&gt;
-    &lt;/lmtpserver&gt;
-&lt;/lmtpservers&gt;</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Note that by default the mailet container is executed with all recipients at once and do not allow per recipient
-error reporting. An option &lt;code&gt;splitExecution&lt;/code&gt; allow to execute the mailet container for each recipient separately and mitigate this
-limitation at the cost of performance.</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>&lt;lmtpservers&gt;
-    &lt;lmtpserver enabled="true"&gt;
-        &lt;jmxName&gt;lmtpserver&lt;/jmxName&gt;
-        &lt;bind&gt;0.0.0.0:24&lt;/bind&gt;
-        &lt;connectionBacklog&gt;200&lt;/connectionBacklog&gt;
-        &lt;connectiontimeout&gt;1200&lt;/connectiontimeout&gt;
-        &lt;connectionLimit&gt;0&lt;/connectionLimit&gt;
-        &lt;connectionLimitPerIP&gt;0&lt;/connectionLimitPerIP&gt;
-        &lt;maxmessagesize&gt;0&lt;/maxmessagesize&gt;
-        &lt;handlerchain coreHandlersPackage="org.apache.james.lmtpserver.MailetContainerCmdHandlerLoader"&gt;
-            &lt;handler class="org.apache.james.lmtpserver.MailetContainerCmdHandlerLoader"/&gt;
-            &lt;handler class="org.apache.james.lmtpserver.MailetContainerHandler"&gt;
-                &lt;splitExecution&gt;true&lt;/splitExecution&gt;
-            &lt;/handler&gt;
-        &lt;/handlerchain&gt;
-    &lt;/lmtpserver&gt;
-&lt;/lmtpservers&gt;</pre>
-</div>
-</div>
 </div>
 </div>
 </article>
diff --git a/james-project/3.6.0/servers/distributed/configure/spam.html b/james-project/3.6.0/servers/distributed/configure/spam.html
index da51d9c..fe72f2a 100644
--- a/james-project/3.6.0/servers/distributed/configure/spam.html
+++ b/james-project/3.6.0/servers/distributed/configure/spam.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="spam.html">Anti-Spam setup</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/spam.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/spam.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="spam.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/spam.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/ssl.html b/james-project/3.6.0/servers/distributed/configure/ssl.html
index 71ef5ae..09d418e 100644
--- a/james-project/3.6.0/servers/distributed/configure/ssl.html
+++ b/james-project/3.6.0/servers/distributed/configure/ssl.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="ssl.html">SSL &amp; TLS</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/ssl.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/ssl.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="ssl.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/ssl.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/tika.html b/james-project/3.6.0/servers/distributed/configure/tika.html
index df68fca..85f1fa0 100644
--- a/james-project/3.6.0/servers/distributed/configure/tika.html
+++ b/james-project/3.6.0/servers/distributed/configure/tika.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="tika.html">tika.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/tika.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/tika.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="tika.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/tika.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/configure/usersrepository.html b/james-project/3.6.0/servers/distributed/configure/usersrepository.html
index 6592438..d42d25c 100644
--- a/james-project/3.6.0/servers/distributed/configure/usersrepository.html
+++ b/james-project/3.6.0/servers/distributed/configure/usersrepository.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="usersrepository.html">usersrepository.xml</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/usersrepository.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/usersrepository.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="usersrepository.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/usersrepository.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -522,7 +532,7 @@
 <p>User repositories are required to store James user information and authentication data.</p>
 </div>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/usersrepository.xml">example</a>
 to get some examples and hints.</p>
 </div>
 </div>
@@ -598,11 +608,11 @@ acting on the behalf of any user.</p></td>
 <h2 id="_configuring_a_ldap"><a class="anchor" href="#_configuring_a_ldap"></a>Configuring a LDAP</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Alternatively you can authenticate your users against a LDAP server. You need to configure
-the properties for accessing your LDAP server in this file.</p>
+<p>If you run the LDAP fashion of the distributed server, you need to configure the properties for accessing
+your LDAP server in this file.</p>
 </div>
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml">example</a>
 to get some examples and hints.</p>
 </div>
 <div class="paragraph">
diff --git a/james-project/3.6.0/servers/distributed/configure/vault.html b/james-project/3.6.0/servers/distributed/configure/vault.html
index 42853ff..439ec7e 100644
--- a/james-project/3.6.0/servers/distributed/configure/vault.html
+++ b/james-project/3.6.0/servers/distributed/configure/vault.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="vault.html">deletedMessageVault.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/vault.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/vault.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="vault.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/vault.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -548,7 +558,7 @@ based on an object storage or on Cassandra. For configuring the BlobStore the va
 <h2 id="_deletedmessagevault_properties"><a class="anchor" href="#_deletedmessagevault_properties"></a>deletedMessageVault.properties</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/deletedMessageVault.properties">example</a>
 to get some examples and hints.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
diff --git a/james-project/3.6.0/servers/distributed/configure/webadmin.html b/james-project/3.6.0/servers/distributed/configure/webadmin.html
index 91f6dbb..5496b7d 100644
--- a/james-project/3.6.0/servers/distributed/configure/webadmin.html
+++ b/james-project/3.6.0/servers/distributed/configure/webadmin.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -508,7 +511,14 @@
     <li><a href="webadmin.html">webadmin.properties</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/webadmin.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/configure/webadmin.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="webadmin.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/configure/webadmin.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -537,7 +547,7 @@ for example: Swagger documentation &amp; James health checks.</p>
 <h2 id="_configuration"><a class="anchor" href="#_configuration"></a>Configuration</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/webadmin.properties">example</a>
+<p>Consult this <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/webadmin.properties">example</a>
 to get some examples and hints.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
diff --git a/james-project/3.6.0/servers/distributed/extending/index.html b/james-project/3.6.0/servers/distributed/extending/index.html
index 9d8e1b1..8010d35 100644
--- a/james-project/3.6.0/servers/distributed/extending/index.html
+++ b/james-project/3.6.0/servers/distributed/extending/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="index.html">Extending server behavior</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/extending/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/extending/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -517,11 +527,6 @@
 <div class="sect1">
 <h2 id="_available_extension_mechanisms"><a class="anchor" href="#_available_extension_mechanisms"></a>Available extension mechanisms</h2>
 <div class="sectionbody">
-<div class="imageblock">
-<div class="content">
-<img src="../../_images/mail-processing-hexagons.png" alt="Extension mechanisms for the Distributed Server">
-</div>
-</div>
 <div class="paragraph">
 <p>The Distributed Server exposes several interfaces allowing the user to write custom extensions in
 order to extend the Distributed Server behavior.</p>
diff --git a/james-project/3.6.0/servers/distributed/extending/mail-processing.html b/james-project/3.6.0/servers/distributed/extending/mail-processing.html
index 57e5c4f..baa9c2a 100644
--- a/james-project/3.6.0/servers/distributed/extending/mail-processing.html
+++ b/james-project/3.6.0/servers/distributed/extending/mail-processing.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="mail-processing.html">Custom mail processing components</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/mail-processing.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/extending/mail-processing.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="mail-processing.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/extending/mail-processing.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/extending/mailbox-listeners.html b/james-project/3.6.0/servers/distributed/extending/mailbox-listeners.html
index cfc3405..a4efeac 100644
--- a/james-project/3.6.0/servers/distributed/extending/mailbox-listeners.html
+++ b/james-project/3.6.0/servers/distributed/extending/mailbox-listeners.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="mailbox-listeners.html">Custom Mailbox Listeners</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/mailbox-listeners.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/extending/mailbox-listeners.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="mailbox-listeners.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/extending/mailbox-listeners.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/extending/smtp-hooks.html b/james-project/3.6.0/servers/distributed/extending/smtp-hooks.html
index b9655d6..61f785d 100644
--- a/james-project/3.6.0/servers/distributed/extending/smtp-hooks.html
+++ b/james-project/3.6.0/servers/distributed/extending/smtp-hooks.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="smtp-hooks.html">Custom SMTP hooks</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/smtp-hooks.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/extending/smtp-hooks.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="smtp-hooks.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/extending/smtp-hooks.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/extending/webadmin-routes.html b/james-project/3.6.0/servers/distributed/extending/webadmin-routes.html
index 67783ea..eb9c3fd 100644
--- a/james-project/3.6.0/servers/distributed/extending/webadmin-routes.html
+++ b/james-project/3.6.0/servers/distributed/extending/webadmin-routes.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="webadmin-routes.html">Custom WebAdmin routes</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/webadmin-routes.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/extending/webadmin-routes.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="webadmin-routes.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/extending/webadmin-routes.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/objectives.html b/james-project/3.6.0/servers/distributed/objectives.html
index 329fba4..275b94a 100644
--- a/james-project/3.6.0/servers/distributed/objectives.html
+++ b/james-project/3.6.0/servers/distributed/objectives.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="objectives.html">Objectives and motivation</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/objectives.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/servers/distributed/objectives.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="objectives.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/objectives.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/operate/cassandra-migration.html b/james-project/3.6.0/servers/distributed/operate/cassandra-migration.html
index 6f4b21f..4225fba 100644
--- a/james-project/3.6.0/servers/distributed/operate/cassandra-migration.html
+++ b/james-project/3.6.0/servers/distributed/operate/cassandra-migration.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="cassandra-migration.html">Cassandra migration</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/cassandra-migration.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/operate/cassandra-migration.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="cassandra-migration.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/operate/cassandra-migration.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -540,11 +550,20 @@ version upon partial failures, that race condition in version upgrades will be i
 <div class="ulist">
 <ul>
 <li>
-<p><strong>From V8 to V9</strong> : Adopt a more compact representation for message properties.</p>
+<p><strong>From V5 to V6</strong> : Goal is to no longer rely on an UDT partition key for mailboxPath tables. Entries will be migrated
+to mailboxPathV2 table relying on a composite primary key.</p>
 </li>
 <li>
-<p><strong>From V9 to V10</strong> : Handles Mailbox ACL transactionality with event-sourcing. We got read of SERIAL consistency upon
-reads thus unlocking a major performance enhancement.</p>
+<p><strong>From V6 to V7</strong> : Goal is to populate mapping_sources projection table. This table allows finding the source of a given redirection, which is
+handy for things like mail aliases (I want to list aliases rewritting things to bob). Without this projection table being available,
+(ie we rely on schema version 6 or less) such information is obtained through a full table scan, unoptimized. From schema version 7,
+the optimized projection can safely be used.</p>
+</li>
+<li>
+<p><strong>From V7 to V8</strong> : Add UID_VALIDITY to mailboxPath table in order not to mandate mailbox table reads.</p>
+</li>
+<li>
+<p><strong>From V8 to V9</strong> : Adopt a more compact representation for message properties.</p>
 </li>
 </ul>
 </div>
diff --git a/james-project/3.6.0/servers/distributed/operate/cli.html b/james-project/3.6.0/servers/distributed/operate/cli.html
index 45c6383..7e94747 100644
--- a/james-project/3.6.0/servers/distributed/operate/cli.html
+++ b/james-project/3.6.0/servers/distributed/operate/cli.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="cli.html">Command Line Interface</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/cli.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/operate/cli.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="cli.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/operate/cli.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/operate/guide.html b/james-project/3.6.0/servers/distributed/operate/guide.html
index bec2dfb..921b80f 100644
--- a/james-project/3.6.0/servers/distributed/operate/guide.html
+++ b/james-project/3.6.0/servers/distributed/operate/guide.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="guide.html">Operator guide</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/guide.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/operate/guide.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="guide.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/operate/guide.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -636,7 +646,7 @@ the root cause has been addressed, the mail can be reprocessed.</p>
 <div class="paragraph">
 <p>It is possible for the administrator of James to define the mailbox
 listeners he wants to use, by adding them in the
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listeners.xml">listeners.xml</a>
+<a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listeners.xml">listeners.xml</a>
 configuration file. It’s possible also to add your own custom mailbox
 listeners. This enables to enhance capabilities of James as a Mail
 Delivery Agent. You can get more information about those
@@ -782,7 +792,7 @@ the old index</a></p>
 </li>
 <li>
 <p>You might want as well modify the James configuration file
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties">elasticsearch.properties</a>
+<a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties">elasticsearch.properties</a>
 by setting the parameter <code>elasticsearch.index.mailbox.name</code> to the name
 of your new index. This is to avoid that James re-creates index upon
 restart</p>
@@ -1334,7 +1344,7 @@ steps:</p>
 <h4 id="_enable_deleted_messages_vault_by_configuring_pre_deletion_hooks"><a class="anchor" href="#_enable_deleted_messages_vault_by_configuring_pre_deletion_hooks"></a>Enable Deleted Messages Vault by configuring Pre Deletion Hooks</h4>
 <div class="paragraph">
 <p>You need to configure this hook in
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listeners.xml">listeners.xml</a>
+<a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listeners.xml">listeners.xml</a>
 configuration file. More details about configuration &amp; example can be
 found at <a href="http://james.apache.org/server/config-listeners.html">Pre
 Deletion Hook Configuration</a></p>
@@ -1346,7 +1356,7 @@ Deletion Hook Configuration</a></p>
 <p>In order to configure the retention time for the Deleted Messages Vault,
 an administrator needs to perform fine configuration tunning as
 explained in
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties">deletedMessageVault.properties</a>.
+<a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/deletedMessageVault.properties">deletedMessageVault.properties</a>.
 Mails are not retained forever as you have to configure a retention
 period (by <code>retentionPeriod</code>) before using it (with one-year retention
 by default if not defined).</p>
diff --git a/james-project/3.6.0/servers/distributed/operate/index.html b/james-project/3.6.0/servers/distributed/operate/index.html
index a303811..e945584 100644
--- a/james-project/3.6.0/servers/distributed/operate/index.html
+++ b/james-project/3.6.0/servers/distributed/operate/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="index.html">Operate</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/operate/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/operate/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -514,8 +524,6 @@
 </aside>
 <article class="doc">
 <h1 class="page">Distributed James Server &mdash; Operate the Distributed server</h1>
-<div id="preamble">
-<div class="sectionbody">
 <div class="paragraph">
 <p>The following pages detail how to operate the Distributed server.</p>
 </div>
@@ -550,57 +558,6 @@ distributed James operators.</p>
 <div class="paragraph">
 <p>Read more about <a href="cassandra-migration.html" class="page">Cassandra data migration</a>.</p>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_upgrading"><a class="anchor" href="#_upgrading"></a>Upgrading</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This section sums up and links upgrade instructions for people willing to upgrade their Distributed server to newer versions.</p>
-</div>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 1. Upgrade path</caption>
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Upgrade from</th>
-<th class="tableblock halign-left valign-top">Recommended upgrade path to 3.7.0 (unreleased)</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">3.6.0</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Rolling upgrade to 3.7.0 (unreleased). No specific upgrade instructions to perform.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">3.5.0</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1. Upgrade, and apply <a href="https://github.com/apache/james-project/blob/master/upgrade-instructions.md#360-version">3.6.0 upgrade instructions</a></p>
-<p class="tableblock">Note: Because of ElasticSearch upgrade (6.3 &#8594; 7.10) this migration cannot be done in a rolling fashion manner.</p>
-<p class="tableblock">2. Rolling upgrade to 3.7.0 (unreleased). No specific upgrade instructions to perform.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">3.4.0</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1. Rolling upgrade to 3.5.0, and apply <a href="https://github.com/apache/james-project/blob/master/upgrade-instructions.md#350-version">3.5.0 upgrade instructions</a></p>
-<p class="tableblock">2. Upgrade to 3.6.0, and apply <a href="https://github.com/apache/james-project/blob/master/upgrade-instructions.md#360-version">3.6.0 upgrade instructions</a></p>
-<p class="tableblock">Note: Because of ElasticSearch upgrade (6.3 &#8594; 7.10) this migration cannot be done in a rolling fashion manner.</p>
-<p class="tableblock">3. Rolling upgrade to 3.7.0 (unreleased). No specific upgrade instructions to perform.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">3.3.0</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1. upgrade to 3.4.0, and apply <a href="https://github.com/apache/james-project/blob/master/upgrade-instructions.md#340-version">3.4.0 upgrade instructions</a></p>
-<p class="tableblock">Note: Because of ElasticSearch upgrade (2.2 &#8594;  6.3) this migration cannot be done in a rolling fashion manner.</p>
-<p class="tableblock">2. Rolling upgrade to 3.5.0, and apply <a href="https://github.com/apache/james-project/blob/master/upgrade-instructions.md#350-version">3.5.0 upgrade instructions</a></p>
-<p class="tableblock">3. Upgrade to 3.6.0, and apply <a href="https://github.com/apache/james-project/blob/master/upgrade-instructions.md#360-version">3.6.0 upgrade instructions</a></p>
-<p class="tableblock">Note: Because of ElasticSearch upgrade (6.3 &#8594; 7.10) this migration cannot be done in a rolling fashion manner.</p>
-<p class="tableblock">4. Rolling upgrade to 3.7.0 (unreleased). No specific upgrade instructions to perform.</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
 </article>
   </div>
 </main>
diff --git a/james-project/3.6.0/servers/distributed/operate/logging.html b/james-project/3.6.0/servers/distributed/operate/logging.html
index 9a1d220..43ee942 100644
--- a/james-project/3.6.0/servers/distributed/operate/logging.html
+++ b/james-project/3.6.0/servers/distributed/operate/logging.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="logging.html">Logging</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/logging.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/operate/logging.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="logging.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/operate/logging.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/operate/metrics.html b/james-project/3.6.0/servers/distributed/operate/metrics.html
index 5ec2b2f..adaca85 100644
--- a/james-project/3.6.0/servers/distributed/operate/metrics.html
+++ b/james-project/3.6.0/servers/distributed/operate/metrics.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="metrics.html">Metrics</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/metrics.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/operate/metrics.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="metrics.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/operate/metrics.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -526,168 +536,17 @@ for keeping track of some core metrics of James.</p>
 mbean plugins.</p>
 </div>
 <div class="paragraph">
-<p>We also support displaying them via <a href="https://grafana.com/">Grafana</a>. Two methods can be used to back grafana display:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Prometheus metric collection - Data are exposed on a HTTP endpoint for Prometheus scrape.</p>
-</li>
-<li>
-<p>ElasticSearch metric collection - This method is depreciated and will be removed in next version.</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_expose_metrics_for_prometheus_collection"><a class="anchor" href="#_expose_metrics_for_prometheus_collection"></a>Expose metrics for Prometheus collection</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Metrics can be exposed over HTTP and made available by using <code>extensions.routes</code> in James <a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/webadmin.adoc">webadmin.properties</a> file:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>extensions.routes=org.apache.james.webadmin.dropwizard.MetricsRoutes</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You can test the result by accessing to:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>http://james_server:8000/metrics</pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_running_james_with_prometheus"><a class="anchor" href="#_running_james_with_prometheus"></a>Running James with Prometheus</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Make the below changes to scrape job config in <code>prometheus.yml</code> to collect the data for Grafana dashboard.</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>global:
-  scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
-  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
-  # scrape_timeout is set to the global default (10s).
-
-alerting:
-  alertmanagers:
-  - static_configs:
-    - targets:
-      # - alertmanager:9093
-
-rule_files:
-  # - "first_rules.yml"
-  # - "second_rules.yml"
-
-scrape_configs:
-  # The job name is added as a label `job=&lt;job_name&gt;` to any timeseries scraped from this config.
-  - job_name: 'prometheus'
-    scrape_interval: 5s
-    static_configs:
-      - targets: ['localhost:9090']
-  - job_name: 'Apache James'
-    scrape_interval: 5s
-    metrics_path: /metrics
-    static_configs:
-      - targets: ['james:8000']</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You can download the dashboard json files and use <a href="https://grafana.com/tutorials/provision-dashboards-and-data-sources/">Grafana provision</a> to make the metrics datasource and dashboards available after container creation. [Insert link to Prometheus json files.]</p>
-</div>
-<div class="paragraph">
-<p>Update the <a href="https://github.com/grafana/grafana/blob/master/conf/sample.ini">grafana.ini</a> configuration file in the <code>/etc/grafana/grafana.ini</code> to override default configuration options. You only need to change the provisioning folder path:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>;provisioning = /etc/grafana/provisioning</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Create the provisioning folder tree and copy all the dashboard json files to <code>/provisioning/dashboards/james/</code></p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>|-- provisioning
-    |-- dashboards
-        |-- defaults.yml
-        |-- james
-    |-- datasources
-        |-- prometheus_ds.yml
-    |-- notifiers
-    |-- plugins</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Define the folder path for pre-load dashboard json files in <code>defaults.yml</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>apiVersion: 1
-
-providers:
-  - name: Default    # A uniquely identifiable name for the provider
-    folder: Services # The folder where to place the dashboards
-    type: file
-    options:
-      path:  /etc/grafana/provisioning/dashboards/james</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Define the configuration for pre-load Prometheus datasource in <code>prometheus_ds.yml</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>apiVersion: 1
-
-datasources:
-  - name: prometheus
-    type: prometheus
-    url: http://prometheus_server_ip:9090
-    editable: true</code></pre>
-</div>
+<p>You can also export the metrics to ElasticSearch and visualize them with <a href="https://grafana.com/">Grafana</a>.
+See <a href="../configure/elasticsearch.html#_exporting_metrics_directly_to_elasticsearch" class="page">elaticseach.properties</a>
+documentation for more details on how to set this up.</p>
 </div>
 <div class="paragraph">
-<p>Finally define volume mount for <code>grafana.ini</code> and provisioning folder path in <code>docker-compose.yml</code> and start prometheus/grafana montoring stack:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>version: '3'
-
-services:
-  grafana:
-    image: grafana/grafana:latest
-    container_name: grafana
-    ports:
-      - "3000:3000"
-    volumes: #Map your provision config to grafana container
-      - /path/to/grafana.ini:/etc/grafana/grafana.ini
-      - /path/to/grafana/provisioning:/etc/grafana/provisioning
-
-  prometheus:
-    image: prom/prometheus:latest
-    restart: unless-stopped
-    ports:
-      - "9090:9090"
-    volumes: #Map your scrape config to prometheus container.
-      - ./conf/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Once running, Prometheus datasource and dashboards will be ready on your Grafana. Datasource name should match with the name provided in dashboard json files. Or else you will have to edit Grafana dashboards afterward.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../_images/preload-dashboards.png" alt="Pre-loaded dashboards">
-</div>
-</div>
-<div class="paragraph">
-<p>*Note: For communication between multiple docker-compose projects, see <a href="https://stackoverflow.com/questions/38088279/communication-between-multiple-docker-compose-projects">here</a> for example. An easier approach is to merge James and Metric docker-compose files together.</p>
+<p>If some metrics seem abnormally slow despite in depth database
+performance tuning, feedback is appreciated as well on the bug tracker,
+the user mailing list or our Gitter channel (see our
+<a href="http://james.apache.org/#second">community page</a>) . Any additional
+details categorizing the slowness are appreciated as well (details of
+the slow requests for instance).</p>
 </div>
 </div>
 </div>
@@ -871,7 +730,7 @@ Latencies for Tika text extraction. Note that this is relevant if this component
 </div>
 </div>
 <div class="sect1">
-<h2 id="_expose_metrics_for_elasticsearch_collection"><a class="anchor" href="#_expose_metrics_for_elasticsearch_collection"></a>Expose metrics for Elasticsearch collection</h2>
+<h2 id="_running_and_configuring_grafana"><a class="anchor" href="#_running_and_configuring_grafana"></a>Running and configuring Grafana</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>The following command allow you to run a fresh grafana server :</p>
@@ -898,15 +757,7 @@ your ES node - Specify the index name. By default, it should be :</p>
 <p>You then need to enable reporting through ElasticSearch. Modify your
 James ElasticSearch configuration file accordingly. To help you doing
 this, you can take a look to
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties">elasticsearch.properties</a>.</p>
-</div>
-<div class="paragraph">
-<p>If some metrics seem abnormally slow despite in depth database
-performance tuning, feedback is appreciated as well on the bug tracker,
-the user mailing list or our Gitter channel (see our
-<a href="http://james.apache.org/#second">community page</a>) . Any additional
-details categorizing the slowness are appreciated as well (details of
-the slow requests for instance).</p>
+<a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties">elasticsearch.properties</a>.</p>
 </div>
 </div>
 </div>
diff --git a/james-project/3.6.0/servers/distributed/operate/migrating.html b/james-project/3.6.0/servers/distributed/operate/migrating.html
index 3281d6e..4294b72 100644
--- a/james-project/3.6.0/servers/distributed/operate/migrating.html
+++ b/james-project/3.6.0/servers/distributed/operate/migrating.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="migrating.html">Migrating existing data</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/migrating.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/operate/migrating.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="migrating.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/operate/migrating.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/distributed/operate/webadmin.html b/james-project/3.6.0/servers/distributed/operate/webadmin.html
index 44a3cdb..d584532 100644
--- a/james-project/3.6.0/servers/distributed/operate/webadmin.html
+++ b/james-project/3.6.0/servers/distributed/operate/webadmin.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../../index.html">Apache James Server</a>
+      <a class="title" href="../../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -507,7 +510,14 @@
     <li><a href="webadmin.html">WebAdmin REST administration API</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/webadmin.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../../3.7.0/servers/distributed/operate/webadmin.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="webadmin.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/operate/webadmin.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -1886,49 +1896,6 @@ still be indexed).</p>
 </div>
 </div>
 </div>
-<div class="sect4">
-<h5 id="_create_missing_parent_mailboxes"><a class="anchor" href="#_create_missing_parent_mailboxes"></a>Create missing parent mailboxes</h5>
-<div class="paragraph">
-<p>Will schedule a task for creating all the missing parent mailboxes in a hierarchical mailbox tree, which is the result
-of a partially failed rename operation of a child mailbox.</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>curl -XPOST http://ip:port/mailboxes?task=createMissingParents</pre>
-</div>
-</div>
-<div class="paragraph">
-<p><a href="#_endpoints_returning_a_task">More details about endpoints returning
-a task</a>.</p>
-</div>
-<div class="paragraph">
-<p>Response codes:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>201: Success. Corresponding task id is returned.</p>
-</li>
-<li>
-<p>400: Error in the request. Details can be found in the reported error.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The scheduled task will have the following type <code>createMissingParents</code> and the following <code>additionalInformation</code>:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>{
-  "type":"createMissingParents"
-  "created": ["1", "2" ],
-  "totalCreated": 2,
-  "failures": [],
-  "totalFailure": 0
-}</pre>
-</div>
-</div>
-</div>
 </div>
 </div>
 <div class="sect2">
diff --git a/james-project/3.6.0/servers/distributed/run-docker.html b/james-project/3.6.0/servers/distributed/run-docker.html
index debaf8f..77f2eb0 100644
--- a/james-project/3.6.0/servers/distributed/run-docker.html
+++ b/james-project/3.6.0/servers/distributed/run-docker.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="run-docker.html">Run with docker</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/run-docker.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/servers/distributed/run-docker.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="run-docker.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/run-docker.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -526,7 +536,7 @@ It will be configured to run with Cassandra &amp; ElasticSearch.
 All those three components will be started with a single command.</p>
 </div>
 <div class="paragraph">
-<p>You can retrieve the docker-compose file : ( docker-compose file and james image name should be changed)</p>
+<p>You can retrieve the docker-compose file :</p>
 </div>
 <div class="literalblock">
 <div class="content">
@@ -538,7 +548,7 @@ All those three components will be started with a single command.</p>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ docker-compose up -d</pre>
+<pre>$ docker-compose up</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -550,7 +560,7 @@ james           | Started : true</p>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ docker exec james james-cli -h 127.0.0.1 -p 9999 listdomains</pre>
+<pre>$ docker exec james java -jar /root/james-cli.jar -h 127.0.0.1 -p 9999 listdomains</pre>
 </div>
 </div>
 <div class="paragraph">
diff --git a/james-project/3.6.0/servers/distributed/run.html b/james-project/3.6.0/servers/distributed/run.html
index 7757abe..fd33af2 100644
--- a/james-project/3.6.0/servers/distributed/run.html
+++ b/james-project/3.6.0/servers/distributed/run.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../../index.html">Apache James Server</a>
+      <a class="title" href="../../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -506,7 +509,14 @@
     <li><a href="run.html">Run</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/run.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../../3.7.0/servers/distributed/run.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="run.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/distributed/run.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -594,7 +604,7 @@ configuration files.</p>
 <p>James requires the configuration to be in a subfolder of working
 directory that is called <strong>conf</strong>. You can get a sample directory for
 configuration from
-<a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/">server/container/guice/cassandra-rabbitmq-guice/sample-configuration/</a>.
+<a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf">dockerfiles/run/guice/cassandra-rabbitmq/destination/conf</a>.
 You might need to adapt it to your needs.</p>
 </div>
 <div class="paragraph">
@@ -645,6 +655,41 @@ objectstorage.s3.secretKey=secretKey1</code></pre>
 </div>
 </div>
 </div>
+<div class="sect1">
+<h2 id="_guice_cassandra_rabbitmq_ldap"><a class="anchor" href="#_guice_cassandra_rabbitmq_ldap"></a>Guice-cassandra-rabbitmq-ldap</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>You can follow the same guide to build and run
+guice-cassandra-rabbitmq-s3-ldap artifact, except that:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The <strong>jar</strong> and <strong>libs</strong> needs to be retrieve from
+server/container/guice/cassandra-rabbitmq-ldap-guice/target after
+compilation</p>
+</li>
+<li>
+<p>The sample configuration can be found in
+<a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf">dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf</a></p>
+</li>
+<li>
+<p>You need to configure James to be connecting to a running LDAP server.
+The configuration file is located in
+<a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml">dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml</a></p>
+</li>
+<li>
+<p>You can then launch James via this command:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">$ java -Dworking.directory=. -jar target/james-server-cassandra-rabbitmq-ldap-guice.jar</code></pre>
+</div>
+</div>
+</div>
+</div>
 </article>
   </div>
 </main>
diff --git a/james-project/3.6.0/servers/extendable.html b/james-project/3.6.0/servers/extendable.html
index 2fdab3a..87f32a1 100644
--- a/james-project/3.6.0/servers/extendable.html
+++ b/james-project/3.6.0/servers/extendable.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="extendable.html">Extendable</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/extendable.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/servers/extendable.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="extendable.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/extendable.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/index.html b/james-project/3.6.0/servers/index.html
index 5951b39..cdd119f 100644
--- a/james-project/3.6.0/servers/index.html
+++ b/james-project/3.6.0/servers/index.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="index.html">Servers</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/index.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/servers/index.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/run.html b/james-project/3.6.0/servers/run.html
index 0523e80..bf77f7d 100644
--- a/james-project/3.6.0/servers/run.html
+++ b/james-project/3.6.0/servers/run.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -504,7 +507,14 @@
     <li><a href="run.html">Run James in Production</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/run.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/servers/run.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="run.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/run.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.6.0/servers/test.html b/james-project/3.6.0/servers/test.html
index 1d53a63..dc430ac 100644
--- a/james-project/3.6.0/servers/test.html
+++ b/james-project/3.6.0/servers/test.html
@@ -474,9 +474,12 @@
   </div>
   <ul class="components">
     <li class="component is-current">
-      <a class="title" href="../index.html">Apache James Server</a>
+      <a class="title" href="../../3.7.0/index.html">Apache James Server</a>
       <ul class="versions">
-        <li class="version is-current is-latest">
+        <li class="version is-latest">
+          <a href="../../3.7.0/index.html">3.7.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-current">
           <a href="../index.html">3.6.0 Snapshot</a>
         </li>
       </ul>
@@ -505,7 +508,14 @@
     <li><a href="test.html">Test</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/test.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.6.0 Snapshot</button>
+  <div class="version-menu">
+    <a class="version" href="../../3.7.0/servers/test.html">3.7.0 SNAPSHOT</a>
+    <a class="version is-current" href="test.html">3.6.0 Snapshot</a>
+  </div>
+</div>
+  <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/james-project-3.6.0/docs/modules/servers/pages/test.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
diff --git a/james-project/3.7.0-SNAPSHOT/community/contributing.html b/james-project/3.7.0-SNAPSHOT/community/contributing.html
index b13c257..d1b13e7 100644
--- a/james-project/3.7.0-SNAPSHOT/community/contributing.html
+++ b/james-project/3.7.0-SNAPSHOT/community/contributing.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="contributing.html">Contributing</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="contributing.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/community/contributing.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/contributing.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/community/download.html b/james-project/3.7.0-SNAPSHOT/community/download.html
index d9fce4a..11f6543 100644
--- a/james-project/3.7.0-SNAPSHOT/community/download.html
+++ b/james-project/3.7.0-SNAPSHOT/community/download.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="download.html">Download releases</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="download.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/community/download.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/download.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/community/guidelines.html b/james-project/3.7.0-SNAPSHOT/community/guidelines.html
index 4486af6..b9e1b78 100644
--- a/james-project/3.7.0-SNAPSHOT/community/guidelines.html
+++ b/james-project/3.7.0-SNAPSHOT/community/guidelines.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="guidelines.html">Guidelines</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="guidelines.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/community/guidelines.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/guidelines.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/community/index.html b/james-project/3.7.0-SNAPSHOT/community/index.html
index 1312782..4e9fade 100644
--- a/james-project/3.7.0-SNAPSHOT/community/index.html
+++ b/james-project/3.7.0-SNAPSHOT/community/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Community</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/community/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/community/mailing-lists.html b/james-project/3.7.0-SNAPSHOT/community/mailing-lists.html
index d09e82d..124e7b0 100644
--- a/james-project/3.7.0-SNAPSHOT/community/mailing-lists.html
+++ b/james-project/3.7.0-SNAPSHOT/community/mailing-lists.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="mailing-lists.html">Mailing lists</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailing-lists.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/community/mailing-lists.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/mailing-lists.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/community/release.html b/james-project/3.7.0-SNAPSHOT/community/release.html
index 4994bcf..7102263 100644
--- a/james-project/3.7.0-SNAPSHOT/community/release.html
+++ b/james-project/3.7.0-SNAPSHOT/community/release.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="release.html">Creating an official Apache James release</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="release.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/community/release.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/release.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/community/support.html b/james-project/3.7.0-SNAPSHOT/community/support.html
index d7cb32e..98b5248 100644
--- a/james-project/3.7.0-SNAPSHOT/community/support.html
+++ b/james-project/3.7.0-SNAPSHOT/community/support.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="support.html">Professional support</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="support.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/community/support.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/support.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/community/website.html b/james-project/3.7.0-SNAPSHOT/community/website.html
index 75820c6..7113e9f 100644
--- a/james-project/3.7.0-SNAPSHOT/community/website.html
+++ b/james-project/3.7.0-SNAPSHOT/community/website.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="website.html">Building and publishing the website</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="website.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/community/website.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/website.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/configuration.html b/james-project/3.7.0-SNAPSHOT/concepts/configuration.html
index d3fda48..04aa2df 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/configuration.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/configuration.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="configuration.html">Configuration</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="configuration.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/concepts/configuration.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/configuration.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/glossary.html b/james-project/3.7.0-SNAPSHOT/concepts/glossary.html
index acf868e..6708eb4 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/glossary.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/glossary.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="glossary.html">Glossary</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="glossary.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/concepts/glossary.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/glossary.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/index.html b/james-project/3.7.0-SNAPSHOT/concepts/index.html
index 230355b..b407d2a 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Concepts</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/concepts/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/mail/index.html b/james-project/3.7.0-SNAPSHOT/concepts/mail/index.html
index be65eea..8c37c35 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/mail/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/mail/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Emails</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/mail/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/mail/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/messages/imf.html b/james-project/3.7.0-SNAPSHOT/concepts/messages/imf.html
index be8ecda..b88a6db 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/messages/imf.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/messages/imf.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="imf.html">Internet Message Format</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="imf.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/messages/imf.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/messages/imf.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/messages/index.html b/james-project/3.7.0-SNAPSHOT/concepts/messages/index.html
index 8cbb565..8fb0e26 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/messages/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/messages/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Email Messages</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/messages/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/messages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/messages/mime.html b/james-project/3.7.0-SNAPSHOT/concepts/messages/mime.html
index 10bc6fc..84de63a 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/messages/mime.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/messages/mime.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="mime.html">Multipurpose Internet Mail Extensions</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mime.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/messages/mime.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/messages/mime.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/processing/index.html b/james-project/3.7.0-SNAPSHOT/concepts/processing/index.html
index f0edd60..3ea5e32 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/processing/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/processing/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Processing</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/processing/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/processing/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/protocols/esmtp.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/esmtp.html
index 85319d1..d998c23 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/protocols/esmtp.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/esmtp.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="esmtp.html">ESMTP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="esmtp.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/esmtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/esmtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/protocols/imap.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/imap.html
index afa190d..38a3453 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/protocols/imap.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/imap.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="imap.html">IMAP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="imap.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/imap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/imap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/protocols/index.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/index.html
index a4663eb..428ebc6 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/protocols/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Protocols</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/protocols/jmap.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/jmap.html
index fd166d2..b32414d 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/protocols/jmap.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/jmap.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="jmap.html">JMAP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="jmap.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/jmap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/jmap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/protocols/lmtp.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/lmtp.html
index c0f4f13..e442a1e 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/protocols/lmtp.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/lmtp.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="lmtp.html">LMTP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="lmtp.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/lmtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/lmtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/protocols/pop.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/pop.html
index 1c870d0..67adc60 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/protocols/pop.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/pop.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="pop.html">POP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="pop.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/pop.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/pop.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/protocols/smtp.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/smtp.html
index c6938bf..962c686 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/protocols/smtp.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/smtp.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="smtp.html">SMTP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="smtp.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/smtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/smtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/storage/index.html b/james-project/3.7.0-SNAPSHOT/concepts/storage/index.html
index 5814978..1bcb52c 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/storage/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/storage/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Storage</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/storage/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/storage/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/storage/mailbox.html b/james-project/3.7.0-SNAPSHOT/concepts/storage/mailbox.html
index 43f6fb8..c7d19ec 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/storage/mailbox.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/storage/mailbox.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="mailbox.html">Mailboxes</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailbox.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/storage/mailbox.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/storage/mailbox.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/storage/users.html b/james-project/3.7.0-SNAPSHOT/concepts/storage/users.html
index 1b3135b..0c1cf43 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/storage/users.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/storage/users.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="users.html">Users</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="users.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/storage/users.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/storage/users.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/concepts/user/index.html b/james-project/3.7.0-SNAPSHOT/concepts/user/index.html
index af8d3a0..44e9ca1 100644
--- a/james-project/3.7.0-SNAPSHOT/concepts/user/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/user/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">User Model</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/concepts/user/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/user/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/customization/index.html b/james-project/3.7.0-SNAPSHOT/customization/index.html
index 7e267bc..e11a4de 100644
--- a/james-project/3.7.0-SNAPSHOT/customization/index.html
+++ b/james-project/3.7.0-SNAPSHOT/customization/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Customization</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/customization/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/customization/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/development/index.html b/james-project/3.7.0-SNAPSHOT/development/index.html
index a753fa6..7031861 100644
--- a/james-project/3.7.0-SNAPSHOT/development/index.html
+++ b/james-project/3.7.0-SNAPSHOT/development/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Developer Guide</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/development/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/development/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/development/logging.html b/james-project/3.7.0-SNAPSHOT/development/logging.html
index 1a781a6..e8c5583 100644
--- a/james-project/3.7.0-SNAPSHOT/development/logging.html
+++ b/james-project/3.7.0-SNAPSHOT/development/logging.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="logging.html">Logging in Apache James</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="logging.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/development/logging.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/development/pages/logging.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/index.html b/james-project/3.7.0-SNAPSHOT/index.html
index ea7e4b5..c6c2dd2 100644
--- a/james-project/3.7.0-SNAPSHOT/index.html
+++ b/james-project/3.7.0-SNAPSHOT/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Welcome</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../3.6.0/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/ROOT/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/15-minute-demo.html b/james-project/3.7.0-SNAPSHOT/servers/15-minute-demo.html
index 8c0f7be..c6f17da 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/15-minute-demo.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/15-minute-demo.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="15-minute-demo.html">Long Demo</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="15-minute-demo.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/servers/15-minute-demo.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/15-minute-demo.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/5-minute-demo.html b/james-project/3.7.0-SNAPSHOT/servers/5-minute-demo.html
index 55d8d0d..ec48c50 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/5-minute-demo.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/5-minute-demo.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="5-minute-demo.html">Short Demo</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="5-minute-demo.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/servers/5-minute-demo.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/5-minute-demo.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/basic/architecture.html b/james-project/3.7.0-SNAPSHOT/servers/basic/architecture.html
index ce8c906..0147603 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/basic/architecture.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/architecture.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="architecture.html">Architecture</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="architecture.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/servers/basic/architecture.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/architecture.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/basic/concepts.html b/james-project/3.7.0-SNAPSHOT/servers/basic/concepts.html
index 8cb4f4f..c50697f 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/basic/concepts.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/concepts.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="concepts.html">Concepts</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="concepts.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/servers/basic/concepts.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/concepts.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/basic/conf/index.html b/james-project/3.7.0-SNAPSHOT/servers/basic/conf/index.html
index d675cb2..e23a037 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/basic/conf/index.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/conf/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="index.html">Configuration</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/basic/conf/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/conf/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/basic/context.html b/james-project/3.7.0-SNAPSHOT/servers/basic/context.html
index 09a8416..2cfd341 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/basic/context.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/context.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="context.html">Context</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="context.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/servers/basic/context.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/context.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/basic/help.html b/james-project/3.7.0-SNAPSHOT/servers/basic/help.html
index 71462a9..662afee 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/basic/help.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/help.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="help.html">Help</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="help.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/servers/basic/help.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/help.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/basic/index.html b/james-project/3.7.0-SNAPSHOT/servers/basic/index.html
index 130f55c..6efb0ec 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/basic/index.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Basic</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/servers/basic/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/basic/objectives.html b/james-project/3.7.0-SNAPSHOT/servers/basic/objectives.html
index 3f96a16..45d8582 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/basic/objectives.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/objectives.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="objectives.html">Objectives</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="objectives.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/servers/basic/objectives.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/objectives.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/demo.html b/james-project/3.7.0-SNAPSHOT/servers/demo.html
index c83163f..0678b60 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/demo.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/demo.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="demo.html">Demo</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="demo.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/servers/demo.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/demo.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed.html b/james-project/3.7.0-SNAPSHOT/servers/distributed.html
index 5fd1e5d..c20c94a 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="distributed.html">Distributed</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="distributed.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/servers/distributed.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/consistency-model.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/consistency-model.html
index fd2f99d..309322c 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/consistency-model.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/consistency-model.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="consistency-model.html">Consistency Model</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="consistency-model.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/architecture/consistency-model.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/architecture/consistency-model.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/index.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/index.html
index e2b9fb9..e880f44 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/index.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="index.html">Architecture</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/architecture/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/architecture/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/specialized-instances.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/specialized-instances.html
index 90a7186..ba94f39 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/specialized-instances.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/specialized-instances.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="specialized-instances.html">Specialized instances</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="specialized-instances.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/architecture/specialized-instances.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/architecture/specialized-instances.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/batchsizes.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/batchsizes.html
index 8613282..1c2b709 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/batchsizes.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/batchsizes.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="batchsizes.html">batchsizes.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="batchsizes.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/batchsizes.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/batchsizes.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/blobstore.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/blobstore.html
index dcef897..6867586 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/blobstore.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/blobstore.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="blobstore.html">blobstore.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="blobstore.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/blobstore.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/blobstore.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/cassandra.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/cassandra.html
index b25965f..7848404 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/cassandra.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/cassandra.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="cassandra.html">cassandra.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="cassandra.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/cassandra.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/cassandra.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/collecting-contacts.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/collecting-contacts.html
index b35d8e0..e503b77 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/collecting-contacts.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/collecting-contacts.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="collecting-contacts.html">Contact collection</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="collecting-contacts.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/collecting-contacts.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/collecting-contacts.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/collecting-events.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/collecting-events.html
index a284bc4..02a5ca3 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/collecting-events.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/collecting-events.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="collecting-events.html">Event collection</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="collecting-events.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/collecting-events.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/collecting-events.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/dns.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/dns.html
index 2f56284..babc63f 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/dns.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/dns.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="dns.html">dnsservice.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="dns.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/dns.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/dns.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/domainlist.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/domainlist.html
index b720df8..ec432de 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/domainlist.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/domainlist.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="domainlist.html">domainlist.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="domainlist.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/domainlist.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/domainlist.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/dsn.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/dsn.html
index 630ec36..7f10f0e 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/dsn.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/dsn.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="dsn.html">ESMTP DSN support</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="dsn.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/dsn.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/dsn.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/elasticsearch.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/elasticsearch.html
index 1d9b36d..40f6e84 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/elasticsearch.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/elasticsearch.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="elasticsearch.html">elasticsearch.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="elasticsearch.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/elasticsearch.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/elasticsearch.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/extensions.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/extensions.html
index 0fd9879..04551a8 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/extensions.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/extensions.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="extensions.html">extensions.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="extensions.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/extensions.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/extensions.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/healthcheck.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/healthcheck.html
index 4545c24..7fb7739 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/healthcheck.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/healthcheck.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="healthcheck.html">healthcheck.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="healthcheck.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/healthcheck.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/healthcheck.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/imap.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/imap.html
index 99d778d..0b2eaf9 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/imap.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/imap.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="imap.html">imapserver.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="imap.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/imap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/imap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/index.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/index.html
index 09b9cbc..02b15d2 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/index.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="index.html">Configuration</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/jmap.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/jmap.html
index cb2b02c..67549f3 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/jmap.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/jmap.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="jmap.html">jmap.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="jmap.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/jmap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/jmap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/jmx.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/jmx.html
index 7bd9e1a..ba31127 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/jmx.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/jmx.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="jmx.html">jmx.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="jmx.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/jmx.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/jmx.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/listeners.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/listeners.html
index 9170bed..16bbbeb 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/listeners.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/listeners.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="listeners.html">listeners.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="listeners.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/listeners.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/listeners.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailetcontainer.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailetcontainer.html
index 47b2488..52dbe62 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailetcontainer.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailetcontainer.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="mailetcontainer.html">mailetcontainer.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailetcontainer.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/mailetcontainer.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/mailetcontainer.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailets.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailets.html
index 819f467..5436d71 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailets.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailets.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="mailets.html">Packaged Mailets</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailets.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/mailets.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/mailets.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailrepositorystore.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailrepositorystore.html
index 9e21979..545b60f 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailrepositorystore.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/mailrepositorystore.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="mailrepositorystore.html">mailrepositorystore.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailrepositorystore.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/mailrepositorystore.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/mailrepositorystore.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/matchers.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/matchers.html
index fbf396e..de70b8f 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/matchers.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/matchers.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="matchers.html">Packaged Matchers</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="matchers.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/matchers.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/matchers.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/pop3.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/pop3.html
index 0661d2a..8a3fb80 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/pop3.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/pop3.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="pop3.html">pop3server.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="pop3.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/pop3.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/pop3.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/rabbitmq.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/rabbitmq.html
index 89edcba..c0c382b 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/rabbitmq.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/rabbitmq.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="rabbitmq.html">rabbitmq.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="rabbitmq.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/rabbitmq.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/rabbitmq.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/recipientrewritetable.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/recipientrewritetable.html
index 3a8a9f4..d8aba98 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/recipientrewritetable.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/recipientrewritetable.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="recipientrewritetable.html">recipientrewritetable.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="recipientrewritetable.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/recipientrewritetable.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/recipientrewritetable.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/remote-delivery-error-handling.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/remote-delivery-error-handling.html
index 0743fa7..a3e320a 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/remote-delivery-error-handling.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/remote-delivery-error-handling.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="remote-delivery-error-handling.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/remote-delivery-error-handling.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/remote-delivery-error-handling.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/smtp-hooks.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/smtp-hooks.html
index 1623ef7..c35ab28 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/smtp-hooks.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/smtp-hooks.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="smtp-hooks.html">Packaged SMTP hooks</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="smtp-hooks.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/smtp-hooks.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/smtp-hooks.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/smtp.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/smtp.html
index 05b46a2..9bda96c 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/smtp.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/smtp.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="smtp.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/smtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/smtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/spam.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/spam.html
index 8ed3501..9be041a 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/spam.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/spam.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="spam.html">Anti-Spam setup</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="spam.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/spam.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/spam.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/ssl.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/ssl.html
index 89a5d42..9f64817 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/ssl.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/ssl.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="ssl.html">SSL &amp; TLS</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="ssl.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/ssl.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/ssl.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/tika.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/tika.html
index 4eda208..7e3205d 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/tika.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/tika.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="tika.html">tika.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="tika.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/tika.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/tika.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/usersrepository.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/usersrepository.html
index 98f71c8..d7d2d36 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/usersrepository.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/usersrepository.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="usersrepository.html">usersrepository.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="usersrepository.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/usersrepository.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/usersrepository.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/vault.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/vault.html
index 4909110..093fc02 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/vault.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/vault.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="vault.html">deletedMessageVault.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="vault.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/vault.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/vault.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/webadmin.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/webadmin.html
index 2b28d0f..e314b5b 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/webadmin.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/configure/webadmin.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="webadmin.html">webadmin.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="webadmin.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/webadmin.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/webadmin.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/index.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/index.html
index 0410844..a3157d5 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/index.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="index.html">Extending server behavior</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/extending/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/mail-processing.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/mail-processing.html
index ab4db75..fcd2f9a 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/mail-processing.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/mail-processing.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="mail-processing.html">Custom mail processing components</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mail-processing.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/extending/mail-processing.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/mail-processing.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/mailbox-listeners.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/mailbox-listeners.html
index 415fdf1..580033e 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/mailbox-listeners.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/mailbox-listeners.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="mailbox-listeners.html">Custom Mailbox Listeners</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailbox-listeners.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/extending/mailbox-listeners.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/mailbox-listeners.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/smtp-hooks.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/smtp-hooks.html
index c1067f8..de4a10e 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/smtp-hooks.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/smtp-hooks.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="smtp-hooks.html">Custom SMTP hooks</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="smtp-hooks.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/extending/smtp-hooks.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/smtp-hooks.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/webadmin-routes.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/webadmin-routes.html
index 23e7116..33ed158 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/webadmin-routes.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/extending/webadmin-routes.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="webadmin-routes.html">Custom WebAdmin routes</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="webadmin-routes.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/extending/webadmin-routes.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/extending/webadmin-routes.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/objectives.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/objectives.html
index 76fdc71..79addc3 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/objectives.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/objectives.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="objectives.html">Objectives and motivation</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="objectives.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/servers/distributed/objectives.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/objectives.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/cassandra-migration.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/cassandra-migration.html
index 6d432d4..eaf9de1 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/cassandra-migration.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/cassandra-migration.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="cassandra-migration.html">Cassandra migration</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="cassandra-migration.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/operate/cassandra-migration.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/cassandra-migration.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/cli.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/cli.html
index 7ca1705..f99b5f5 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/cli.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/cli.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="cli.html">Command Line Interface</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="cli.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/operate/cli.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/cli.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/guide.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/guide.html
index c897ed1..57e931a 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/guide.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/guide.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="guide.html">Operator guide</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="guide.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/operate/guide.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/guide.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/index.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/index.html
index d58fbf2..2194f80 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/index.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="index.html">Operate</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/operate/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/logging.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/logging.html
index b6d010f..7d7e48c 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/logging.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/logging.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="logging.html">Logging</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="logging.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/operate/logging.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/logging.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/metrics.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/metrics.html
index 1d4fd05..9f2b09f 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/metrics.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/metrics.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="metrics.html">Metrics</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="metrics.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/operate/metrics.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/metrics.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/migrating.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/migrating.html
index befd7b3..164f7e3 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/migrating.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/migrating.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="migrating.html">Migrating existing data</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="migrating.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/operate/migrating.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/migrating.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/webadmin.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/webadmin.html
index ac293e2..df6fc25 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/webadmin.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/operate/webadmin.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="webadmin.html">WebAdmin REST administration API</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="webadmin.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/operate/webadmin.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/operate/webadmin.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/run-docker.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/run-docker.html
index e359a0a..1bc528c 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/run-docker.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/run-docker.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="run-docker.html">Run with docker</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="run-docker.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/servers/distributed/run-docker.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/run-docker.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/distributed/run.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/run.html
index f8db087..cb2ee04 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/distributed/run.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/run.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="run.html">Run</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="run.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../../3.6.0/servers/distributed/run.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/run.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/extendable.html b/james-project/3.7.0-SNAPSHOT/servers/extendable.html
index 8c3722c..451cbeb 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/extendable.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/extendable.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="extendable.html">Extendable</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="extendable.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/servers/extendable.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/extendable.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/index.html b/james-project/3.7.0-SNAPSHOT/servers/index.html
index 855e670..0e55ee6 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/index.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Servers</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/servers/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/run.html b/james-project/3.7.0-SNAPSHOT/servers/run.html
index fdfa677..45fba7f 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/run.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/run.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="run.html">Run James in Production</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="run.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/servers/run.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/run.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0-SNAPSHOT/servers/test.html b/james-project/3.7.0-SNAPSHOT/servers/test.html
index c017c2e..efd4573 100644
--- a/james-project/3.7.0-SNAPSHOT/servers/test.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/test.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0-SNAPSHOT Snapshot</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="test.html">Test</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0-SNAPSHOT Snapshot</button>
+  <div class="version-menu">
+    <a class="version is-current" href="test.html">3.7.0-SNAPSHOT Snapshot</a>
+    <a class="version" href="../../3.6.0/servers/test.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/test.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/community/contributing.html b/james-project/3.7.0/community/contributing.html
index 0d778dd..5b8d0f8 100644
--- a/james-project/3.7.0/community/contributing.html
+++ b/james-project/3.7.0/community/contributing.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="contributing.html">Contributing</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="contributing.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/community/contributing.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/contributing.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/community/download.html b/james-project/3.7.0/community/download.html
index 4b5a014..07c0b65 100644
--- a/james-project/3.7.0/community/download.html
+++ b/james-project/3.7.0/community/download.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="download.html">Download releases</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="download.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/community/download.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/download.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/community/guidelines.html b/james-project/3.7.0/community/guidelines.html
index 56b30af..8886f91 100644
--- a/james-project/3.7.0/community/guidelines.html
+++ b/james-project/3.7.0/community/guidelines.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="guidelines.html">Guidelines</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="guidelines.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/community/guidelines.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/guidelines.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/community/index.html b/james-project/3.7.0/community/index.html
index 24a6659..7e850ed 100644
--- a/james-project/3.7.0/community/index.html
+++ b/james-project/3.7.0/community/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Community</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/community/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/community/mailing-lists.html b/james-project/3.7.0/community/mailing-lists.html
index d048d5a..6351afc 100644
--- a/james-project/3.7.0/community/mailing-lists.html
+++ b/james-project/3.7.0/community/mailing-lists.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="mailing-lists.html">Mailing lists</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailing-lists.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/community/mailing-lists.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/mailing-lists.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/community/release.html b/james-project/3.7.0/community/release.html
index f8d7b3a..62c7596 100644
--- a/james-project/3.7.0/community/release.html
+++ b/james-project/3.7.0/community/release.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="release.html">Creating an official Apache James release</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="release.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/community/release.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/release.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/community/support.html b/james-project/3.7.0/community/support.html
index 796f8ab..4a8699d 100644
--- a/james-project/3.7.0/community/support.html
+++ b/james-project/3.7.0/community/support.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="support.html">Professional support</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="support.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/community/support.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/support.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/community/website.html b/james-project/3.7.0/community/website.html
index e96e3d3..9680a70 100644
--- a/james-project/3.7.0/community/website.html
+++ b/james-project/3.7.0/community/website.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="website.html">Building and publishing the website</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="website.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/community/website.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/community/pages/website.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/configuration.html b/james-project/3.7.0/concepts/configuration.html
index 8eb446c..f034509 100644
--- a/james-project/3.7.0/concepts/configuration.html
+++ b/james-project/3.7.0/concepts/configuration.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="configuration.html">Configuration</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="configuration.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/concepts/configuration.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/configuration.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/glossary.html b/james-project/3.7.0/concepts/glossary.html
index 2993a9a..42ed723 100644
--- a/james-project/3.7.0/concepts/glossary.html
+++ b/james-project/3.7.0/concepts/glossary.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="glossary.html">Glossary</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="glossary.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/concepts/glossary.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/glossary.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/index.html b/james-project/3.7.0/concepts/index.html
index 8f3c5ed..c84e7f7 100644
--- a/james-project/3.7.0/concepts/index.html
+++ b/james-project/3.7.0/concepts/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Concepts</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/concepts/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/mail/index.html b/james-project/3.7.0/concepts/mail/index.html
index a239dca..e2c000a 100644
--- a/james-project/3.7.0/concepts/mail/index.html
+++ b/james-project/3.7.0/concepts/mail/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Emails</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/mail/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/mail/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/messages/imf.html b/james-project/3.7.0/concepts/messages/imf.html
index 0f207e1..c80c207 100644
--- a/james-project/3.7.0/concepts/messages/imf.html
+++ b/james-project/3.7.0/concepts/messages/imf.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="imf.html">Internet Message Format</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="imf.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/messages/imf.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/messages/imf.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/messages/index.html b/james-project/3.7.0/concepts/messages/index.html
index e4c7599..3bf627b 100644
--- a/james-project/3.7.0/concepts/messages/index.html
+++ b/james-project/3.7.0/concepts/messages/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Email Messages</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/messages/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/messages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/messages/mime.html b/james-project/3.7.0/concepts/messages/mime.html
index bc5c1f1..2b9b9a9 100644
--- a/james-project/3.7.0/concepts/messages/mime.html
+++ b/james-project/3.7.0/concepts/messages/mime.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="mime.html">Multipurpose Internet Mail Extensions</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mime.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/messages/mime.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/messages/mime.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/processing/index.html b/james-project/3.7.0/concepts/processing/index.html
index aca1906..3e4766b 100644
--- a/james-project/3.7.0/concepts/processing/index.html
+++ b/james-project/3.7.0/concepts/processing/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Processing</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/processing/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/processing/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/protocols/esmtp.html b/james-project/3.7.0/concepts/protocols/esmtp.html
index 1e188b7..2e9fb58 100644
--- a/james-project/3.7.0/concepts/protocols/esmtp.html
+++ b/james-project/3.7.0/concepts/protocols/esmtp.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="esmtp.html">ESMTP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="esmtp.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/esmtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/esmtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/protocols/imap.html b/james-project/3.7.0/concepts/protocols/imap.html
index 04054ac..cfc23f3 100644
--- a/james-project/3.7.0/concepts/protocols/imap.html
+++ b/james-project/3.7.0/concepts/protocols/imap.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="imap.html">IMAP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="imap.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/imap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/imap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/protocols/index.html b/james-project/3.7.0/concepts/protocols/index.html
index c906172..e21b668 100644
--- a/james-project/3.7.0/concepts/protocols/index.html
+++ b/james-project/3.7.0/concepts/protocols/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Protocols</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/protocols/jmap.html b/james-project/3.7.0/concepts/protocols/jmap.html
index 389b60c..576ed16 100644
--- a/james-project/3.7.0/concepts/protocols/jmap.html
+++ b/james-project/3.7.0/concepts/protocols/jmap.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="jmap.html">JMAP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="jmap.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/jmap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/jmap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/protocols/lmtp.html b/james-project/3.7.0/concepts/protocols/lmtp.html
index a54697d..c7bbd19 100644
--- a/james-project/3.7.0/concepts/protocols/lmtp.html
+++ b/james-project/3.7.0/concepts/protocols/lmtp.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="lmtp.html">LMTP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="lmtp.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/lmtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/lmtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/protocols/pop.html b/james-project/3.7.0/concepts/protocols/pop.html
index 554a285..8ec8d62 100644
--- a/james-project/3.7.0/concepts/protocols/pop.html
+++ b/james-project/3.7.0/concepts/protocols/pop.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="pop.html">POP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="pop.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/pop.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/pop.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/protocols/smtp.html b/james-project/3.7.0/concepts/protocols/smtp.html
index febef42..12a6d55 100644
--- a/james-project/3.7.0/concepts/protocols/smtp.html
+++ b/james-project/3.7.0/concepts/protocols/smtp.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="smtp.html">SMTP</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="smtp.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/protocols/smtp.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/protocols/smtp.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/storage/index.html b/james-project/3.7.0/concepts/storage/index.html
index fc13f7a..ea68840 100644
--- a/james-project/3.7.0/concepts/storage/index.html
+++ b/james-project/3.7.0/concepts/storage/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Storage</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/storage/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/storage/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/storage/mailbox.html b/james-project/3.7.0/concepts/storage/mailbox.html
index ce83e38..439d020 100644
--- a/james-project/3.7.0/concepts/storage/mailbox.html
+++ b/james-project/3.7.0/concepts/storage/mailbox.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="mailbox.html">Mailboxes</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailbox.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/storage/mailbox.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/storage/mailbox.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/storage/users.html b/james-project/3.7.0/concepts/storage/users.html
index fa06098..ecf7267 100644
--- a/james-project/3.7.0/concepts/storage/users.html
+++ b/james-project/3.7.0/concepts/storage/users.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="users.html">Users</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="users.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/storage/users.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/storage/users.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/concepts/user/index.html b/james-project/3.7.0/concepts/user/index.html
index 9fcc661..823a10d 100644
--- a/james-project/3.7.0/concepts/user/index.html
+++ b/james-project/3.7.0/concepts/user/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">User Model</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/concepts/user/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/concepts/pages/user/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/customization/index.html b/james-project/3.7.0/customization/index.html
index 4da2f9b..8f7afec 100644
--- a/james-project/3.7.0/customization/index.html
+++ b/james-project/3.7.0/customization/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Customization</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/customization/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/customization/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/development/index.html b/james-project/3.7.0/development/index.html
index 35b3d9a..8d13872 100644
--- a/james-project/3.7.0/development/index.html
+++ b/james-project/3.7.0/development/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Developer Guide</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/development/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/development/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/development/logging.html b/james-project/3.7.0/development/logging.html
index afb1ed0..d9c1de3 100644
--- a/james-project/3.7.0/development/logging.html
+++ b/james-project/3.7.0/development/logging.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="logging.html">Logging in Apache James</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="logging.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/development/logging.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/development/pages/logging.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/index.html b/james-project/3.7.0/index.html
index a59a3f6..d40d6b5 100644
--- a/james-project/3.7.0/index.html
+++ b/james-project/3.7.0/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -504,6 +507,13 @@
     <li><a href="index.html">Welcome</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../3.6.0/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/ROOT/pages/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/15-minute-demo.html b/james-project/3.7.0/servers/15-minute-demo.html
index ba7a8c8..65318b0 100644
--- a/james-project/3.7.0/servers/15-minute-demo.html
+++ b/james-project/3.7.0/servers/15-minute-demo.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="15-minute-demo.html">Long Demo</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="15-minute-demo.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/servers/15-minute-demo.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/15-minute-demo.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/5-minute-demo.html b/james-project/3.7.0/servers/5-minute-demo.html
index bbbe920..af31585 100644
--- a/james-project/3.7.0/servers/5-minute-demo.html
+++ b/james-project/3.7.0/servers/5-minute-demo.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="5-minute-demo.html">Short Demo</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="5-minute-demo.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/servers/5-minute-demo.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/5-minute-demo.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/basic/architecture.html b/james-project/3.7.0/servers/basic/architecture.html
index b8cb706..b89ef0e 100644
--- a/james-project/3.7.0/servers/basic/architecture.html
+++ b/james-project/3.7.0/servers/basic/architecture.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="architecture.html">Architecture</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="architecture.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/servers/basic/architecture.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/architecture.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/basic/concepts.html b/james-project/3.7.0/servers/basic/concepts.html
index 65021f9..1b26343 100644
--- a/james-project/3.7.0/servers/basic/concepts.html
+++ b/james-project/3.7.0/servers/basic/concepts.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="concepts.html">Concepts</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="concepts.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/servers/basic/concepts.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/concepts.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/basic/conf/index.html b/james-project/3.7.0/servers/basic/conf/index.html
index be821b6..2618a92 100644
--- a/james-project/3.7.0/servers/basic/conf/index.html
+++ b/james-project/3.7.0/servers/basic/conf/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="index.html">Configuration</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/basic/conf/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/conf/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/basic/context.html b/james-project/3.7.0/servers/basic/context.html
index cbed41b..c449b4b 100644
--- a/james-project/3.7.0/servers/basic/context.html
+++ b/james-project/3.7.0/servers/basic/context.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="context.html">Context</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="context.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/servers/basic/context.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/context.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/basic/help.html b/james-project/3.7.0/servers/basic/help.html
index 9b388ad..fd53989 100644
--- a/james-project/3.7.0/servers/basic/help.html
+++ b/james-project/3.7.0/servers/basic/help.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="help.html">Help</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="help.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/servers/basic/help.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/help.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/basic/index.html b/james-project/3.7.0/servers/basic/index.html
index 5592805..fd4771c 100644
--- a/james-project/3.7.0/servers/basic/index.html
+++ b/james-project/3.7.0/servers/basic/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="index.html">Basic</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/servers/basic/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/basic/objectives.html b/james-project/3.7.0/servers/basic/objectives.html
index 8652eeb..6a59500 100644
--- a/james-project/3.7.0/servers/basic/objectives.html
+++ b/james-project/3.7.0/servers/basic/objectives.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="objectives.html">Objectives</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="objectives.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../3.6.0/servers/basic/objectives.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/basic/objectives.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/demo.html b/james-project/3.7.0/servers/demo.html
index 695b33b..bd036dd 100644
--- a/james-project/3.7.0/servers/demo.html
+++ b/james-project/3.7.0/servers/demo.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="demo.html">Demo</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="demo.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/servers/demo.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/demo.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed.html b/james-project/3.7.0/servers/distributed.html
index d3f14c2..315ee04 100644
--- a/james-project/3.7.0/servers/distributed.html
+++ b/james-project/3.7.0/servers/distributed.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -505,6 +508,13 @@
     <li><a href="distributed.html">Distributed</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="distributed.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../3.6.0/servers/distributed.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/architecture/consistency-model.html b/james-project/3.7.0/servers/distributed/architecture/consistency-model.html
index 2139ebc..71554c3 100644
--- a/james-project/3.7.0/servers/distributed/architecture/consistency-model.html
+++ b/james-project/3.7.0/servers/distributed/architecture/consistency-model.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="consistency-model.html">Consistency Model</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="consistency-model.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/architecture/consistency-model.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/architecture/consistency-model.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/architecture/index.html b/james-project/3.7.0/servers/distributed/architecture/index.html
index 08301cc..75e6215 100644
--- a/james-project/3.7.0/servers/distributed/architecture/index.html
+++ b/james-project/3.7.0/servers/distributed/architecture/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="index.html">Architecture</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/architecture/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/architecture/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/architecture/specialized-instances.html b/james-project/3.7.0/servers/distributed/architecture/specialized-instances.html
index d293fd1..b0eb427 100644
--- a/james-project/3.7.0/servers/distributed/architecture/specialized-instances.html
+++ b/james-project/3.7.0/servers/distributed/architecture/specialized-instances.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -507,6 +510,13 @@
     <li><a href="specialized-instances.html">Specialized instances</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="specialized-instances.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/architecture/specialized-instances.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/architecture/specialized-instances.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/batchsizes.html b/james-project/3.7.0/servers/distributed/configure/batchsizes.html
index 58ea7aa..47e6b0d 100644
--- a/james-project/3.7.0/servers/distributed/configure/batchsizes.html
+++ b/james-project/3.7.0/servers/distributed/configure/batchsizes.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="batchsizes.html">batchsizes.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="batchsizes.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/batchsizes.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/batchsizes.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/blobstore.html b/james-project/3.7.0/servers/distributed/configure/blobstore.html
index aef1c3d..cc3e6e3 100644
--- a/james-project/3.7.0/servers/distributed/configure/blobstore.html
+++ b/james-project/3.7.0/servers/distributed/configure/blobstore.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="blobstore.html">blobstore.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="blobstore.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/blobstore.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/blobstore.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/cassandra.html b/james-project/3.7.0/servers/distributed/configure/cassandra.html
index 2a6b9ee..4f4f7fd 100644
--- a/james-project/3.7.0/servers/distributed/configure/cassandra.html
+++ b/james-project/3.7.0/servers/distributed/configure/cassandra.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="cassandra.html">cassandra.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="cassandra.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/cassandra.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/cassandra.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/collecting-contacts.html b/james-project/3.7.0/servers/distributed/configure/collecting-contacts.html
index ce33521..63ae533 100644
--- a/james-project/3.7.0/servers/distributed/configure/collecting-contacts.html
+++ b/james-project/3.7.0/servers/distributed/configure/collecting-contacts.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="collecting-contacts.html">Contact collection</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="collecting-contacts.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/collecting-contacts.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/collecting-contacts.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/collecting-events.html b/james-project/3.7.0/servers/distributed/configure/collecting-events.html
index 9729ece..5a953f3 100644
--- a/james-project/3.7.0/servers/distributed/configure/collecting-events.html
+++ b/james-project/3.7.0/servers/distributed/configure/collecting-events.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="collecting-events.html">Event collection</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="collecting-events.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/collecting-events.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/collecting-events.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/dns.html b/james-project/3.7.0/servers/distributed/configure/dns.html
index c17d5f5..f3bd6ec 100644
--- a/james-project/3.7.0/servers/distributed/configure/dns.html
+++ b/james-project/3.7.0/servers/distributed/configure/dns.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="dns.html">dnsservice.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="dns.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/dns.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/dns.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/domainlist.html b/james-project/3.7.0/servers/distributed/configure/domainlist.html
index 283a19e..6c73ced 100644
--- a/james-project/3.7.0/servers/distributed/configure/domainlist.html
+++ b/james-project/3.7.0/servers/distributed/configure/domainlist.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="domainlist.html">domainlist.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="domainlist.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/domainlist.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/domainlist.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/dsn.html b/james-project/3.7.0/servers/distributed/configure/dsn.html
index fe31bc9..15fde7e 100644
--- a/james-project/3.7.0/servers/distributed/configure/dsn.html
+++ b/james-project/3.7.0/servers/distributed/configure/dsn.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="dsn.html">ESMTP DSN support</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="dsn.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/dsn.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/dsn.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/elasticsearch.html b/james-project/3.7.0/servers/distributed/configure/elasticsearch.html
index 9ddd0a8..adebd07 100644
--- a/james-project/3.7.0/servers/distributed/configure/elasticsearch.html
+++ b/james-project/3.7.0/servers/distributed/configure/elasticsearch.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="elasticsearch.html">elasticsearch.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="elasticsearch.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/elasticsearch.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/elasticsearch.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/extensions.html b/james-project/3.7.0/servers/distributed/configure/extensions.html
index 07b7888..73c3d78 100644
--- a/james-project/3.7.0/servers/distributed/configure/extensions.html
+++ b/james-project/3.7.0/servers/distributed/configure/extensions.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="extensions.html">extensions.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="extensions.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/extensions.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/extensions.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/healthcheck.html b/james-project/3.7.0/servers/distributed/configure/healthcheck.html
index 4313c19..56da7d2 100644
--- a/james-project/3.7.0/servers/distributed/configure/healthcheck.html
+++ b/james-project/3.7.0/servers/distributed/configure/healthcheck.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="healthcheck.html">healthcheck.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="healthcheck.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/healthcheck.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/healthcheck.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/imap.html b/james-project/3.7.0/servers/distributed/configure/imap.html
index 02fd8e7..957c46d 100644
--- a/james-project/3.7.0/servers/distributed/configure/imap.html
+++ b/james-project/3.7.0/servers/distributed/configure/imap.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="imap.html">imapserver.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="imap.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/imap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/imap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/index.html b/james-project/3.7.0/servers/distributed/configure/index.html
index 51a2b63..e2feabc 100644
--- a/james-project/3.7.0/servers/distributed/configure/index.html
+++ b/james-project/3.7.0/servers/distributed/configure/index.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -506,6 +509,13 @@
     <li><a href="index.html">Configuration</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="index.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/index.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/index.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/jmap.html b/james-project/3.7.0/servers/distributed/configure/jmap.html
index 166355e..1e28fa3 100644
--- a/james-project/3.7.0/servers/distributed/configure/jmap.html
+++ b/james-project/3.7.0/servers/distributed/configure/jmap.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="jmap.html">jmap.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="jmap.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/jmap.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/jmap.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/jmx.html b/james-project/3.7.0/servers/distributed/configure/jmx.html
index a0c9ac2..65ada62 100644
--- a/james-project/3.7.0/servers/distributed/configure/jmx.html
+++ b/james-project/3.7.0/servers/distributed/configure/jmx.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="jmx.html">jmx.properties</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="jmx.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/jmx.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/jmx.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/listeners.html b/james-project/3.7.0/servers/distributed/configure/listeners.html
index 47a7e9c..81053b6 100644
--- a/james-project/3.7.0/servers/distributed/configure/listeners.html
+++ b/james-project/3.7.0/servers/distributed/configure/listeners.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="listeners.html">listeners.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="listeners.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/listeners.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/listeners.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/mailetcontainer.html b/james-project/3.7.0/servers/distributed/configure/mailetcontainer.html
index 3e389f5..6c36e7a 100644
--- a/james-project/3.7.0/servers/distributed/configure/mailetcontainer.html
+++ b/james-project/3.7.0/servers/distributed/configure/mailetcontainer.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="mailetcontainer.html">mailetcontainer.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailetcontainer.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/mailetcontainer.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/mailetcontainer.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/mailets.html b/james-project/3.7.0/servers/distributed/configure/mailets.html
index 09f7ca2..791c2a6 100644
--- a/james-project/3.7.0/servers/distributed/configure/mailets.html
+++ b/james-project/3.7.0/servers/distributed/configure/mailets.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="mailets.html">Packaged Mailets</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailets.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/mailets.html">3.6.0 Snapshot</a>
+  </div>
+</div>
   <div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/master/docs/modules/servers/pages/distributed/configure/mailets.adoc">Edit this Page</a></div>
   </div>
   <div class="content">
diff --git a/james-project/3.7.0/servers/distributed/configure/mailrepositorystore.html b/james-project/3.7.0/servers/distributed/configure/mailrepositorystore.html
index e9d6d0b..b987a3a 100644
--- a/james-project/3.7.0/servers/distributed/configure/mailrepositorystore.html
+++ b/james-project/3.7.0/servers/distributed/configure/mailrepositorystore.html
@@ -479,6 +479,9 @@
         <li class="version is-current is-latest">
           <a href="../../../index.html">3.7.0 SNAPSHOT</a>
         </li>
+        <li class="version">
+          <a href="../../../../3.6.0/index.html">3.6.0 Snapshot</a>
+        </li>
       </ul>
     </li>
     <li class="component">
@@ -508,6 +511,13 @@
     <li><a href="mailrepositorystore.html">mailrepositorystore.xml</a></li>
   </ul>
 </nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.0 SNAPSHOT</button>
+  <div class="version-menu">
+    <a class="version is-current" href="mailrepositorystore.html">3.7.0 SNAPSHOT</a>
+    <a class="version" href="../../../../3.6.0/servers/distributed/configure/mailrepositorystore.html">3.6.0 Snapshot</a>
+  </div>
+</div>
... 2732 lines suppressed ...

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org