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/09/06 06:29:14 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 5b559a6  Site checkin for project Apache James: Jenkins Tools
5b559a6 is described below

commit 5b559a6310fc0f2211bdefa91acfeb3dae63399d
Author: jenkins <bu...@apache.org>
AuthorDate: Mon Sep 6 06:29:11 2021 +0000

    Site checkin for project Apache James: Jenkins Tools
---
 404.html                                           |   3 +
 _/img/close.svg                                    |   1 +
 james-project/3.6.0/community/_images/linagora.png | Bin 0 -> 14370 bytes
 .../{3.7.0 => 3.6.0}/community/contributing.html   |  22 +-
 .../{3.7.0 => 3.6.0}/community/download.html       |  22 +-
 .../{3.7.0 => 3.6.0}/community/guidelines.html     |  22 +-
 .../{3.7.0 => 3.6.0}/community/index.html          |  22 +-
 .../{3.7.0 => 3.6.0}/community/mailing-lists.html  |  22 +-
 .../support.html => 3.6.0/community/release.html}  |  81 +--
 .../{3.7.0 => 3.6.0}/community/support.html        |  22 +-
 .../{3.7.0 => 3.6.0}/community/website.html        |  26 +-
 .../{3.7.0 => 3.6.0}/concepts/configuration.html   |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/glossary.html        |  22 +-
 james-project/{3.7.0 => 3.6.0}/concepts/index.html |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/mail/index.html      |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/messages/imf.html    |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/messages/index.html  |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/messages/mime.html   |  22 +-
 .../concepts/processing/index.html                 |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/protocols/esmtp.html |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/protocols/imap.html  |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/protocols/index.html |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/protocols/jmap.html  |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/protocols/lmtp.html  |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/protocols/pop.html   |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/protocols/smtp.html  |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/storage/index.html   |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/storage/mailbox.html |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/storage/users.html   |  22 +-
 .../{3.7.0 => 3.6.0}/concepts/user/index.html      |  22 +-
 .../{3.7.0 => 3.6.0}/customization/index.html      |  22 +-
 .../{3.7.0 => 3.6.0}/development/index.html        |  22 +-
 .../{3.7.0 => 3.6.0}/development/logging.html      |  22 +-
 james-project/{3.7.0 => 3.6.0}/index.html          |  36 +-
 .../{3.7.0 => 3.6.0}/servers/15-minute-demo.html   |  59 ++-
 .../{3.7.0 => 3.6.0}/servers/5-minute-demo.html    |  59 ++-
 .../servers/_images/james-hexagons-extensions.png  | Bin 0 -> 39191 bytes
 james-project/3.6.0/servers/_images/metrics.png    | Bin 0 -> 127304 bytes
 .../3.6.0/servers/_images/preload-dashboards.png   | Bin 0 -> 59900 bytes
 .../_images/remote-delivery-error-handling.png     | Bin 0 -> 64745 bytes
 .../3.6.0/servers/_images/server-components.png    | Bin 0 -> 97620 bytes
 .../servers/_images/specialized-instances.png      | Bin 0 -> 45878 bytes
 james-project/3.6.0/servers/_images/storage.png    | Bin 0 -> 129939 bytes
 .../servers/basic/architecture.html                |  22 +-
 .../{3.7.0 => 3.6.0}/servers/basic/concepts.html   |  22 +-
 .../{3.7.0 => 3.6.0}/servers/basic/conf/index.html |  22 +-
 .../{3.7.0 => 3.6.0}/servers/basic/context.html    |  22 +-
 .../{3.7.0 => 3.6.0}/servers/basic/help.html       |  22 +-
 .../{3.7.0 => 3.6.0}/servers/basic/index.html      |  22 +-
 .../{3.7.0 => 3.6.0}/servers/basic/objectives.html |  22 +-
 james-project/{3.7.0 => 3.6.0}/servers/demo.html   |  22 +-
 .../{3.7.0 => 3.6.0}/servers/distributed.html      |  24 +-
 .../architecture/consistency-model.html            |  22 +-
 .../servers/distributed/architecture/index.html    |  36 +-
 .../architecture/specialized-instances.html        |  44 +-
 .../servers/distributed/configure/batchsizes.html  |  24 +-
 .../servers/distributed/configure/blobstore.html   |  99 +---
 .../servers/distributed/configure/cassandra.html   |  54 +-
 .../distributed/configure/collecting-contacts.html |  22 +-
 .../distributed/configure/collecting-events.html   |  22 +-
 .../servers/distributed/configure/dns.html         |  24 +-
 .../servers/distributed/configure/domainlist.html  |  24 +-
 .../servers/distributed/configure/dsn.html         |  22 +-
 .../distributed/configure/elasticsearch.html       |  39 +-
 .../servers/distributed/configure/extensions.html  |  22 +-
 .../servers/distributed/configure/healthcheck.html |  33 +-
 .../servers/distributed/configure/imap.html        |  32 +-
 .../servers/distributed/configure/index.html       |  70 +--
 .../servers/distributed/configure/jmap.html        |  36 +-
 .../servers/distributed/configure/jmx.html         |  24 +-
 .../servers/distributed/configure/listeners.html   |  24 +-
 .../distributed/configure/mailetcontainer.html     |  38 +-
 .../servers/distributed/configure/mailets.html     |  22 +-
 .../distributed/configure/mailrepositorystore.html |  24 +-
 .../servers/distributed/configure/matchers.html    |  25 +-
 .../servers/distributed/configure/pop3.html        |  24 +-
 .../servers/distributed/configure/rabbitmq.html    |  50 +-
 .../configure/recipientrewritetable.html           |  26 +-
 .../configure/remote-delivery-error-handling.html  |  22 +-
 .../servers/distributed/configure/smtp-hooks.html  |  22 +-
 .../servers/distributed/configure/smtp.html        |  79 +--
 .../servers/distributed/configure/spam.html        |  22 +-
 .../servers/distributed/configure/ssl.html         |  22 +-
 .../servers/distributed/configure/tika.html        |  22 +-
 .../distributed/configure/usersrepository.html     |  30 +-
 .../servers/distributed/configure/vault.html       |  24 +-
 .../servers/distributed/configure/webadmin.html    |  24 +-
 .../servers/distributed/extending/index.html       |  27 +-
 .../distributed/extending/mail-processing.html     |  22 +-
 .../distributed/extending/mailbox-listeners.html   |  22 +-
 .../servers/distributed/extending/smtp-hooks.html  |  22 +-
 .../distributed/extending/webadmin-routes.html     |  22 +-
 .../servers/distributed/objectives.html            |  22 +-
 .../distributed/operate/cassandra-migration.html   |  37 +-
 .../servers/distributed/operate/cli.html           |  22 +-
 .../servers/distributed/operate/guide.html         |  30 +-
 .../servers/distributed/operate/index.html}        |  71 +--
 .../servers/distributed/operate/logging.html       |  22 +-
 .../servers/distributed/operate/metrics.html       | 247 +++------
 .../servers/distributed/operate/migrating.html     |  22 +-
 .../servers/distributed/operate/webadmin.html      | 256 +--------
 .../servers/distributed/run-docker.html            |  89 ++--
 .../{3.7.0 => 3.6.0}/servers/distributed/run.html  |  73 ++-
 .../{3.7.0 => 3.6.0}/servers/extendable.html       |  22 +-
 james-project/{3.7.0 => 3.6.0}/servers/index.html  |  22 +-
 james-project/{3.7.0 => 3.6.0}/servers/run.html    |  22 +-
 james-project/{3.7.0 => 3.6.0}/servers/test.html   |  22 +-
 .../3.7.0-SNAPSHOT/community/_images/linagora.png  | Bin 0 -> 14370 bytes
 .../community/contributing.html                    |  16 +-
 .../community/download.html                        |  16 +-
 .../community/guidelines.html                      |  16 +-
 .../{3.7.0 => 3.7.0-SNAPSHOT}/community/index.html |  16 +-
 .../community/mailing-lists.html                   |  16 +-
 .../community/release.html                         |  28 +-
 .../community/support.html                         |  16 +-
 .../community/website.html                         |  20 +-
 .../concepts/configuration.html                    |  16 +-
 .../concepts/glossary.html                         |  16 +-
 .../{3.7.0 => 3.7.0-SNAPSHOT}/concepts/index.html  |  16 +-
 .../concepts/mail/index.html                       |  16 +-
 .../concepts/messages/imf.html                     |  16 +-
 .../concepts/messages/index.html                   |  16 +-
 .../concepts/messages/mime.html                    |  16 +-
 .../concepts/processing/index.html                 |  16 +-
 .../concepts/protocols/esmtp.html                  |  16 +-
 .../concepts/protocols/imap.html                   |  16 +-
 .../concepts/protocols/index.html                  |  16 +-
 .../concepts/protocols/jmap.html                   |  16 +-
 .../concepts/protocols/lmtp.html                   |  16 +-
 .../concepts/protocols/pop.html                    |  16 +-
 .../concepts/protocols/smtp.html                   |  16 +-
 .../concepts/storage/index.html                    |  16 +-
 .../concepts/storage/mailbox.html                  |  16 +-
 .../concepts/storage/users.html                    |  16 +-
 .../concepts/user/index.html                       |  16 +-
 .../customization/index.html                       |  16 +-
 .../development/index.html                         |  16 +-
 .../development/logging.html                       |  16 +-
 james-project/{3.7.0 => 3.7.0-SNAPSHOT}/index.html |  20 +-
 .../servers/15-minute-demo.html                    |  16 +-
 .../servers/5-minute-demo.html                     |  16 +-
 .../servers/_images/james-hexagons-extensions.png  | Bin 0 -> 39191 bytes
 .../3.7.0-SNAPSHOT/servers/_images/metrics.png     | Bin 0 -> 127304 bytes
 .../servers/_images/preload-dashboards.png         | Bin 0 -> 59900 bytes
 .../_images/remote-delivery-error-handling.png     | Bin 0 -> 64745 bytes
 .../servers/_images/server-components.png          | Bin 0 -> 97620 bytes
 .../servers/_images/specialized-instances.png      | Bin 0 -> 45878 bytes
 .../3.7.0-SNAPSHOT/servers/_images/storage.png     | Bin 0 -> 129939 bytes
 .../servers/basic/architecture.html                |  16 +-
 .../servers/basic/concepts.html                    |  16 +-
 .../servers/basic/conf/index.html                  |  16 +-
 .../servers/basic/context.html                     |  16 +-
 .../servers/basic/help.html                        |  16 +-
 .../servers/basic/index.html                       |  16 +-
 .../servers/basic/objectives.html                  |  16 +-
 .../{3.7.0 => 3.7.0-SNAPSHOT}/servers/demo.html    |  16 +-
 .../servers/distributed.html                       |  16 +-
 .../architecture/consistency-model.html            |  16 +-
 .../servers/distributed/architecture/index.html    |  16 +-
 .../architecture/specialized-instances.html        |  16 +-
 .../servers/distributed/configure/batchsizes.html  |  18 +-
 .../servers/distributed/configure/blobstore.html   |  39 +-
 .../servers/distributed/configure/cassandra.html   |  18 +-
 .../distributed/configure/collecting-contacts.html |  16 +-
 .../distributed/configure/collecting-events.html   |  16 +-
 .../servers/distributed/configure/dns.html         |  18 +-
 .../servers/distributed/configure/domainlist.html  |  18 +-
 .../servers/distributed/configure/dsn.html         |  16 +-
 .../distributed/configure/elasticsearch.html       |  18 +-
 .../servers/distributed/configure/extensions.html  |  16 +-
 .../servers/distributed/configure/healthcheck.html |  27 +-
 .../servers/distributed/configure/imap.html        |  26 +-
 .../servers/distributed/configure/index.html       |  64 ++-
 .../servers/distributed/configure/jmap.html        |  34 +-
 .../servers/distributed/configure/jmx.html         |  18 +-
 .../servers/distributed/configure/listeners.html   |  18 +-
 .../distributed/configure/mailetcontainer.html     |  18 +-
 .../servers/distributed/configure/mailets.html     |  16 +-
 .../distributed/configure/mailrepositorystore.html |  18 +-
 .../servers/distributed/configure/matchers.html    |  16 +-
 .../servers/distributed/configure/pop3.html        |  18 +-
 .../servers/distributed/configure/rabbitmq.html    |  44 +-
 .../configure/recipientrewritetable.html           |  18 +-
 .../configure/remote-delivery-error-handling.html  |  16 +-
 .../servers/distributed/configure/smtp-hooks.html  |  16 +-
 .../servers/distributed/configure/smtp.html        |  22 +-
 .../servers/distributed/configure/spam.html        |  16 +-
 .../servers/distributed/configure/ssl.html         |  16 +-
 .../servers/distributed/configure/tika.html        |  16 +-
 .../distributed/configure/usersrepository.html     |  20 +-
 .../servers/distributed/configure/vault.html       |  18 +-
 .../servers/distributed/configure/webadmin.html    |  18 +-
 .../servers/distributed/extending/index.html       |  16 +-
 .../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 +-
 .../servers/distributed/objectives.html            |  16 +-
 .../distributed/operate/cassandra-migration.html   |  16 +-
 .../servers/distributed/operate/cli.html           |  16 +-
 .../servers/distributed/operate/guide.html         |  24 +-
 .../servers/distributed/operate/index.html         |  16 +-
 .../servers/distributed/operate/logging.html       |  16 +-
 .../servers/distributed/operate/metrics.html       | 240 ++++++---
 .../servers/distributed/operate/migrating.html     |  16 +-
 .../servers/distributed/operate/webadmin.html      | 207 +-------
 .../servers/distributed/run-docker.html            |  77 +--
 .../servers/distributed/run.html                   |  32 +-
 .../servers/extendable.html                        |  16 +-
 .../{3.7.0 => 3.7.0-SNAPSHOT}/servers/index.html   |  16 +-
 .../{3.7.0 => 3.7.0-SNAPSHOT}/servers/run.html     |  16 +-
 .../{3.7.0 => 3.7.0-SNAPSHOT}/servers/test.html    |  16 +-
 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 +
 james-project/3.7.0/servers/_images/metrics.png    | Bin 0 -> 127304 bytes
 .../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    |  16 +-
 .../architecture/specialized-instances.html        |  10 +
 .../servers/distributed/configure/batchsizes.html  |  10 +
 .../servers/distributed/configure/blobstore.html   |  33 +-
 .../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      |  81 +++
 .../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 +
 324 files changed, 5777 insertions(+), 2270 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/_images/linagora.png b/james-project/3.6.0/community/_images/linagora.png
new file mode 100644
index 0000000..de0a185
Binary files /dev/null and b/james-project/3.6.0/community/_images/linagora.png differ
diff --git a/james-project/3.7.0/community/contributing.html b/james-project/3.6.0/community/contributing.html
similarity index 97%
copy from james-project/3.7.0/community/contributing.html
copy to james-project/3.6.0/community/contributing.html
index 0d778dd..e38272c 100644
--- a/james-project/3.7.0/community/contributing.html
+++ b/james-project/3.6.0/community/contributing.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/community/download.html b/james-project/3.6.0/community/download.html
similarity index 96%
copy from james-project/3.7.0/community/download.html
copy to james-project/3.6.0/community/download.html
index 4b5a014..8add99f 100644
--- a/james-project/3.7.0/community/download.html
+++ b/james-project/3.6.0/community/download.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/community/guidelines.html b/james-project/3.6.0/community/guidelines.html
similarity index 97%
copy from james-project/3.7.0/community/guidelines.html
copy to james-project/3.6.0/community/guidelines.html
index 56b30af..f1d8666 100644
--- a/james-project/3.7.0/community/guidelines.html
+++ b/james-project/3.6.0/community/guidelines.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/community/index.html b/james-project/3.6.0/community/index.html
similarity index 97%
copy from james-project/3.7.0/community/index.html
copy to james-project/3.6.0/community/index.html
index 24a6659..041c137 100644
--- a/james-project/3.7.0/community/index.html
+++ b/james-project/3.6.0/community/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/community/mailing-lists.html b/james-project/3.6.0/community/mailing-lists.html
similarity index 97%
copy from james-project/3.7.0/community/mailing-lists.html
copy to james-project/3.6.0/community/mailing-lists.html
index d048d5a..953977b 100644
--- a/james-project/3.7.0/community/mailing-lists.html
+++ b/james-project/3.6.0/community/mailing-lists.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/community/support.html b/james-project/3.6.0/community/release.html
similarity index 92%
copy from james-project/3.7.0/community/support.html
copy to james-project/3.6.0/community/release.html
index 796f8ab..aaf19ac 100644
--- a/james-project/3.7.0/community/support.html
+++ b/james-project/3.6.0/community/release.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Professional support :: Apache James</title>
+    <title>Creating an official Apache James release :: Apache James</title>
     <meta name="generator" content="Antora 2.3.4">
     <link rel="stylesheet" href="../../../_/css/site.css">
     <script>var uiRootPath = '../../../_'</script>
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -427,10 +427,10 @@
   <li class="nav-item" data-depth="2">
     <a class="nav-link" href="website.html">Building and publishing the website</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item is-current-page" data-depth="2">
     <a class="nav-link" href="release.html">Creating an official Apache James release</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="2">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="support.html">Professional support</a>
   </li>
   <li class="nav-item" data-depth="2">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -502,45 +505,59 @@
   <ul>
     <li><a href="../index.html">Apache James Server</a></li>
     <li><a href="index.html">Community</a></li>
-    <li><a href="support.html">Professional support</a></li>
+    <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/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/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">
   <div class="toc-menu"></div>
 </aside>
 <article class="doc">
-<h1 class="page">Professional support</h1>
-<div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p>Here is a list of companies which can provide you some support on James.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_linagora"><a class="anchor" href="#_linagora"></a>Linagora</h2>
-<div class="sectionbody">
-<div class="imageblock">
-<div class="content">
-<a class="image" href="https://linagora.com"><img src="_images/linagora.png" alt="linagora"></a>
-</div>
-</div>
+<h1 class="page">Creating an official Apache James release</h1>
 <div class="paragraph">
-<p><strong>Linagora</strong> is an Open Source Software Company.</p>
+<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>
 <div class="paragraph">
-<p>Their mission is to bring digital independency to their customers.</p>
+<p>In short, just follow the 'standard' process:</p>
 </div>
-<div class="paragraph">
-<p>They are focused on large organizations both from private and public sector. They have set themselves the goal of
-helping Governments to achieve their digital sovereignty.</p>
+<div class="ulist">
+<ul>
+<li>
+<p>prepare pom for release</p>
+</li>
+<li>
+<p>publish snapshot</p>
+</li>
+<li>
+<p>prepare release</p>
+</li>
+<li>
+<p>stage the release for a vote (don&#8217;t forget to close the staging repository)</p>
+</li>
+<li>
+<p>vote</p>
+</li>
+<li>
+<p>release</p>
+</li>
+</ul>
 </div>
 <div class="paragraph">
-<p><strong>Linagora</strong> can offer professional services related to James: support, feature development or project integration.</p>
+<p>Don&#8217;t forget to add your key to <a href="https://downloads.apache.org/james/KEYS" class="bare">https://downloads.apache.org/james/KEYS</a></p>
 </div>
+<div class="literalblock">
+<div class="content">
+<pre>$ ssh people.apache.org
+$ cd /www/www.apache.org/dist/james</pre>
 </div>
 </div>
 </article>
diff --git a/james-project/3.7.0/community/support.html b/james-project/3.6.0/community/support.html
similarity index 96%
copy from james-project/3.7.0/community/support.html
copy to james-project/3.6.0/community/support.html
index 796f8ab..5858be3 100644
--- a/james-project/3.7.0/community/support.html
+++ b/james-project/3.6.0/community/support.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/community/website.html b/james-project/3.6.0/community/website.html
similarity index 96%
copy from james-project/3.7.0/community/website.html
copy to james-project/3.6.0/community/website.html
index e96e3d3..c8b06a2 100644
--- a/james-project/3.7.0/community/website.html
+++ b/james-project/3.6.0/community/website.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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">
@@ -553,7 +563,7 @@ a proxy to review the changes (described here: <a href="http://www.apache.org/de
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ docker build -t james/homepage src/homepage
+<pre>$ docker build -t james/homepage dockerfiles/site/homepage
 $ docker run -v $PWD:/origin -v $PWD/site:/destination james/homepage master</pre>
 </div>
 </div>
@@ -573,7 +583,7 @@ $ docker run -v $PWD:/origin -v $PWD/site:/destination james/homepage master</pr
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ docker build -t james/site src/site
+<pre>$ docker build -t james/site dockerfiles/site/website
 $ docker run -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/site:/destination james/site master</pre>
 </div>
 </div>
diff --git a/james-project/3.7.0/concepts/configuration.html b/james-project/3.6.0/concepts/configuration.html
similarity index 96%
copy from james-project/3.7.0/concepts/configuration.html
copy to james-project/3.6.0/concepts/configuration.html
index 8eb446c..11792ed 100644
--- a/james-project/3.7.0/concepts/configuration.html
+++ b/james-project/3.6.0/concepts/configuration.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/glossary.html b/james-project/3.6.0/concepts/glossary.html
similarity index 97%
copy from james-project/3.7.0/concepts/glossary.html
copy to james-project/3.6.0/concepts/glossary.html
index 2993a9a..acb8545 100644
--- a/james-project/3.7.0/concepts/glossary.html
+++ b/james-project/3.6.0/concepts/glossary.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/index.html b/james-project/3.6.0/concepts/index.html
similarity index 97%
copy from james-project/3.7.0/concepts/index.html
copy to james-project/3.6.0/concepts/index.html
index 8f3c5ed..7e8b256 100644
--- a/james-project/3.7.0/concepts/index.html
+++ b/james-project/3.6.0/concepts/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/mail/index.html b/james-project/3.6.0/concepts/mail/index.html
similarity index 96%
copy from james-project/3.7.0/concepts/mail/index.html
copy to james-project/3.6.0/concepts/mail/index.html
index a239dca..0f99898 100644
--- a/james-project/3.7.0/concepts/mail/index.html
+++ b/james-project/3.6.0/concepts/mail/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/messages/imf.html b/james-project/3.6.0/concepts/messages/imf.html
similarity index 97%
copy from james-project/3.7.0/concepts/messages/imf.html
copy to james-project/3.6.0/concepts/messages/imf.html
index 0f207e1..5edcc3c 100644
--- a/james-project/3.7.0/concepts/messages/imf.html
+++ b/james-project/3.6.0/concepts/messages/imf.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/messages/index.html b/james-project/3.6.0/concepts/messages/index.html
similarity index 96%
copy from james-project/3.7.0/concepts/messages/index.html
copy to james-project/3.6.0/concepts/messages/index.html
index e4c7599..9c93564 100644
--- a/james-project/3.7.0/concepts/messages/index.html
+++ b/james-project/3.6.0/concepts/messages/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/messages/mime.html b/james-project/3.6.0/concepts/messages/mime.html
similarity index 97%
copy from james-project/3.7.0/concepts/messages/mime.html
copy to james-project/3.6.0/concepts/messages/mime.html
index bc5c1f1..b719638 100644
--- a/james-project/3.7.0/concepts/messages/mime.html
+++ b/james-project/3.6.0/concepts/messages/mime.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/processing/index.html b/james-project/3.6.0/concepts/processing/index.html
similarity index 96%
copy from james-project/3.7.0/concepts/processing/index.html
copy to james-project/3.6.0/concepts/processing/index.html
index aca1906..8633880 100644
--- a/james-project/3.7.0/concepts/processing/index.html
+++ b/james-project/3.6.0/concepts/processing/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/protocols/esmtp.html b/james-project/3.6.0/concepts/protocols/esmtp.html
similarity index 96%
copy from james-project/3.7.0/concepts/protocols/esmtp.html
copy to james-project/3.6.0/concepts/protocols/esmtp.html
index 1e188b7..1f23723 100644
--- a/james-project/3.7.0/concepts/protocols/esmtp.html
+++ b/james-project/3.6.0/concepts/protocols/esmtp.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/protocols/imap.html b/james-project/3.6.0/concepts/protocols/imap.html
similarity index 97%
copy from james-project/3.7.0/concepts/protocols/imap.html
copy to james-project/3.6.0/concepts/protocols/imap.html
index 04054ac..7547981 100644
--- a/james-project/3.7.0/concepts/protocols/imap.html
+++ b/james-project/3.6.0/concepts/protocols/imap.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/protocols/index.html b/james-project/3.6.0/concepts/protocols/index.html
similarity index 96%
copy from james-project/3.7.0/concepts/protocols/index.html
copy to james-project/3.6.0/concepts/protocols/index.html
index c906172..e3fb089 100644
--- a/james-project/3.7.0/concepts/protocols/index.html
+++ b/james-project/3.6.0/concepts/protocols/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/protocols/jmap.html b/james-project/3.6.0/concepts/protocols/jmap.html
similarity index 96%
copy from james-project/3.7.0/concepts/protocols/jmap.html
copy to james-project/3.6.0/concepts/protocols/jmap.html
index 389b60c..3de86e8 100644
--- a/james-project/3.7.0/concepts/protocols/jmap.html
+++ b/james-project/3.6.0/concepts/protocols/jmap.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/protocols/lmtp.html b/james-project/3.6.0/concepts/protocols/lmtp.html
similarity index 96%
copy from james-project/3.7.0/concepts/protocols/lmtp.html
copy to james-project/3.6.0/concepts/protocols/lmtp.html
index a54697d..793237c 100644
--- a/james-project/3.7.0/concepts/protocols/lmtp.html
+++ b/james-project/3.6.0/concepts/protocols/lmtp.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/protocols/pop.html b/james-project/3.6.0/concepts/protocols/pop.html
similarity index 97%
copy from james-project/3.7.0/concepts/protocols/pop.html
copy to james-project/3.6.0/concepts/protocols/pop.html
index 554a285..9711caf 100644
--- a/james-project/3.7.0/concepts/protocols/pop.html
+++ b/james-project/3.6.0/concepts/protocols/pop.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/protocols/smtp.html b/james-project/3.6.0/concepts/protocols/smtp.html
similarity index 97%
copy from james-project/3.7.0/concepts/protocols/smtp.html
copy to james-project/3.6.0/concepts/protocols/smtp.html
index febef42..b96f3bf 100644
--- a/james-project/3.7.0/concepts/protocols/smtp.html
+++ b/james-project/3.6.0/concepts/protocols/smtp.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/storage/index.html b/james-project/3.6.0/concepts/storage/index.html
similarity index 96%
copy from james-project/3.7.0/concepts/storage/index.html
copy to james-project/3.6.0/concepts/storage/index.html
index fc13f7a..c2582f1 100644
--- a/james-project/3.7.0/concepts/storage/index.html
+++ b/james-project/3.6.0/concepts/storage/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/storage/mailbox.html b/james-project/3.6.0/concepts/storage/mailbox.html
similarity index 97%
copy from james-project/3.7.0/concepts/storage/mailbox.html
copy to james-project/3.6.0/concepts/storage/mailbox.html
index ce83e38..bbe30e4 100644
--- a/james-project/3.7.0/concepts/storage/mailbox.html
+++ b/james-project/3.6.0/concepts/storage/mailbox.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/storage/users.html b/james-project/3.6.0/concepts/storage/users.html
similarity index 97%
copy from james-project/3.7.0/concepts/storage/users.html
copy to james-project/3.6.0/concepts/storage/users.html
index fa06098..d779064 100644
--- a/james-project/3.7.0/concepts/storage/users.html
+++ b/james-project/3.6.0/concepts/storage/users.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/concepts/user/index.html b/james-project/3.6.0/concepts/user/index.html
similarity index 97%
copy from james-project/3.7.0/concepts/user/index.html
copy to james-project/3.6.0/concepts/user/index.html
index 9fcc661..8662f04 100644
--- a/james-project/3.7.0/concepts/user/index.html
+++ b/james-project/3.6.0/concepts/user/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/customization/index.html b/james-project/3.6.0/customization/index.html
similarity index 96%
copy from james-project/3.7.0/customization/index.html
copy to james-project/3.6.0/customization/index.html
index 4da2f9b..e89572e 100644
--- a/james-project/3.7.0/customization/index.html
+++ b/james-project/3.6.0/customization/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/development/index.html b/james-project/3.6.0/development/index.html
similarity index 96%
copy from james-project/3.7.0/development/index.html
copy to james-project/3.6.0/development/index.html
index 35b3d9a..05d5e58 100644
--- a/james-project/3.7.0/development/index.html
+++ b/james-project/3.6.0/development/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/development/logging.html b/james-project/3.6.0/development/logging.html
similarity index 96%
copy from james-project/3.7.0/development/logging.html
copy to james-project/3.6.0/development/logging.html
index afb1ed0..ef77c90 100644
--- a/james-project/3.7.0/development/logging.html
+++ b/james-project/3.6.0/development/logging.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/index.html b/james-project/3.6.0/index.html
similarity index 94%
copy from james-project/3.7.0/index.html
copy to james-project/3.6.0/index.html
index a59a3f6..dd15388 100644
--- a/james-project/3.7.0/index.html
+++ b/james-project/3.6.0/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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">
@@ -513,7 +523,7 @@
 <article class="doc">
 <h1 class="page">Welcome</h1>
 <div class="paragraph">
-<p>Welcome to the Apache James Reference Documentation! These documents are for version 3.7.0 of James.</p>
+<p>Welcome to the Apache James Reference Documentation! These documents are for version 3.6.0 of James.</p>
 </div>
 <div class="paragraph">
 <p>Apache James is a flexible email platform that provides out-of-the-box mail servers that you can start
@@ -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.7.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.7.0/servers/15-minute-demo.html b/james-project/3.6.0/servers/15-minute-demo.html
similarity index 93%
copy from james-project/3.7.0/servers/15-minute-demo.html
copy to james-project/3.6.0/servers/15-minute-demo.html
index ba7a8c8..76eee7c 100644
--- a/james-project/3.7.0/servers/15-minute-demo.html
+++ b/james-project/3.6.0/servers/15-minute-demo.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/5-minute-demo.html b/james-project/3.6.0/servers/5-minute-demo.html
similarity index 92%
copy from james-project/3.7.0/servers/5-minute-demo.html
copy to james-project/3.6.0/servers/5-minute-demo.html
index bbbe920..9db3982 100644
--- a/james-project/3.7.0/servers/5-minute-demo.html
+++ b/james-project/3.6.0/servers/5-minute-demo.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/_images/james-hexagons-extensions.png b/james-project/3.6.0/servers/_images/james-hexagons-extensions.png
new file mode 100644
index 0000000..6e228e2
Binary files /dev/null and b/james-project/3.6.0/servers/_images/james-hexagons-extensions.png differ
diff --git a/james-project/3.6.0/servers/_images/metrics.png b/james-project/3.6.0/servers/_images/metrics.png
new file mode 100644
index 0000000..e97b021
Binary files /dev/null and b/james-project/3.6.0/servers/_images/metrics.png differ
diff --git a/james-project/3.6.0/servers/_images/preload-dashboards.png b/james-project/3.6.0/servers/_images/preload-dashboards.png
new file mode 100644
index 0000000..8ecc77f
Binary files /dev/null and b/james-project/3.6.0/servers/_images/preload-dashboards.png differ
diff --git a/james-project/3.6.0/servers/_images/remote-delivery-error-handling.png b/james-project/3.6.0/servers/_images/remote-delivery-error-handling.png
new file mode 100644
index 0000000..7e0665a
Binary files /dev/null and b/james-project/3.6.0/servers/_images/remote-delivery-error-handling.png differ
diff --git a/james-project/3.6.0/servers/_images/server-components.png b/james-project/3.6.0/servers/_images/server-components.png
new file mode 100644
index 0000000..30112d9
Binary files /dev/null and b/james-project/3.6.0/servers/_images/server-components.png differ
diff --git a/james-project/3.6.0/servers/_images/specialized-instances.png b/james-project/3.6.0/servers/_images/specialized-instances.png
new file mode 100644
index 0000000..687cefe
Binary files /dev/null and b/james-project/3.6.0/servers/_images/specialized-instances.png differ
diff --git a/james-project/3.6.0/servers/_images/storage.png b/james-project/3.6.0/servers/_images/storage.png
new file mode 100644
index 0000000..d52322a
Binary files /dev/null and b/james-project/3.6.0/servers/_images/storage.png differ
diff --git a/james-project/3.7.0/servers/basic/architecture.html b/james-project/3.6.0/servers/basic/architecture.html
similarity index 96%
copy from james-project/3.7.0/servers/basic/architecture.html
copy to james-project/3.6.0/servers/basic/architecture.html
index b8cb706..79a1b6c 100644
--- a/james-project/3.7.0/servers/basic/architecture.html
+++ b/james-project/3.6.0/servers/basic/architecture.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/basic/concepts.html b/james-project/3.6.0/servers/basic/concepts.html
similarity index 96%
copy from james-project/3.7.0/servers/basic/concepts.html
copy to james-project/3.6.0/servers/basic/concepts.html
index 65021f9..3afa864 100644
--- a/james-project/3.7.0/servers/basic/concepts.html
+++ b/james-project/3.6.0/servers/basic/concepts.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/basic/conf/index.html b/james-project/3.6.0/servers/basic/conf/index.html
similarity index 96%
copy from james-project/3.7.0/servers/basic/conf/index.html
copy to james-project/3.6.0/servers/basic/conf/index.html
index be821b6..acb5229 100644
--- a/james-project/3.7.0/servers/basic/conf/index.html
+++ b/james-project/3.6.0/servers/basic/conf/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/basic/context.html b/james-project/3.6.0/servers/basic/context.html
similarity index 96%
copy from james-project/3.7.0/servers/basic/context.html
copy to james-project/3.6.0/servers/basic/context.html
index cbed41b..4af5eb5 100644
--- a/james-project/3.7.0/servers/basic/context.html
+++ b/james-project/3.6.0/servers/basic/context.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/basic/help.html b/james-project/3.6.0/servers/basic/help.html
similarity index 96%
copy from james-project/3.7.0/servers/basic/help.html
copy to james-project/3.6.0/servers/basic/help.html
index 9b388ad..b9aeb18 100644
--- a/james-project/3.7.0/servers/basic/help.html
+++ b/james-project/3.6.0/servers/basic/help.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/basic/index.html b/james-project/3.6.0/servers/basic/index.html
similarity index 96%
copy from james-project/3.7.0/servers/basic/index.html
copy to james-project/3.6.0/servers/basic/index.html
index 5592805..da16244 100644
--- a/james-project/3.7.0/servers/basic/index.html
+++ b/james-project/3.6.0/servers/basic/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/basic/objectives.html b/james-project/3.6.0/servers/basic/objectives.html
similarity index 96%
copy from james-project/3.7.0/servers/basic/objectives.html
copy to james-project/3.6.0/servers/basic/objectives.html
index 8652eeb..400b0a5 100644
--- a/james-project/3.7.0/servers/basic/objectives.html
+++ b/james-project/3.6.0/servers/basic/objectives.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/demo.html b/james-project/3.6.0/servers/demo.html
similarity index 96%
copy from james-project/3.7.0/servers/demo.html
copy to james-project/3.6.0/servers/demo.html
index 695b33b..21494f3 100644
--- a/james-project/3.7.0/servers/demo.html
+++ b/james-project/3.6.0/servers/demo.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed.html b/james-project/3.6.0/servers/distributed.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed.html
copy to james-project/3.6.0/servers/distributed.html
index d3f14c2..22232a9 100644
--- a/james-project/3.7.0/servers/distributed.html
+++ b/james-project/3.6.0/servers/distributed.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/architecture/consistency-model.html b/james-project/3.6.0/servers/distributed/architecture/consistency-model.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/architecture/consistency-model.html
copy to james-project/3.6.0/servers/distributed/architecture/consistency-model.html
index 2139ebc..2a5e722 100644
--- a/james-project/3.7.0/servers/distributed/architecture/consistency-model.html
+++ b/james-project/3.6.0/servers/distributed/architecture/consistency-model.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/architecture/index.html b/james-project/3.6.0/servers/distributed/architecture/index.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/architecture/index.html
copy to james-project/3.6.0/servers/distributed/architecture/index.html
index 08301cc..0f4cfbb 100644
--- a/james-project/3.7.0/servers/distributed/architecture/index.html
+++ b/james-project/3.6.0/servers/distributed/architecture/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/architecture/specialized-instances.html b/james-project/3.6.0/servers/distributed/architecture/specialized-instances.html
similarity index 94%
copy from james-project/3.7.0/servers/distributed/architecture/specialized-instances.html
copy to james-project/3.6.0/servers/distributed/architecture/specialized-instances.html
index d293fd1..6fdc150 100644
--- a/james-project/3.7.0/servers/distributed/architecture/specialized-instances.html
+++ b/james-project/3.6.0/servers/distributed/architecture/specialized-instances.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/batchsizes.html b/james-project/3.6.0/servers/distributed/configure/batchsizes.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/batchsizes.html
copy to james-project/3.6.0/servers/distributed/configure/batchsizes.html
index 58ea7aa..2d3f9a4 100644
--- a/james-project/3.7.0/servers/distributed/configure/batchsizes.html
+++ b/james-project/3.6.0/servers/distributed/configure/batchsizes.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/blobstore.html b/james-project/3.6.0/servers/distributed/configure/blobstore.html
similarity index 91%
copy from james-project/3.7.0/servers/distributed/configure/blobstore.html
copy to james-project/3.6.0/servers/distributed/configure/blobstore.html
index aef1c3d..59f3b4f 100644
--- a/james-project/3.7.0/servers/distributed/configure/blobstore.html
+++ b/james-project/3.6.0/servers/distributed/configure/blobstore.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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">
@@ -551,23 +561,6 @@ in GIT to get some examples and hints.</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">
-JAMES-3591 Cassandra is not made to store large binary content, its use will be suboptimal compared to
-Alternatives (namely S3 compatible BlobStores backed by for instance S3, MinIO or Ozone)
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The generated startup warning log can be deactivated via the <code>cassandra.blob.store.disable.startup.warning</code> environment
-variable being positioned to <code>false</code>.</p>
-</div>
 <div class="paragraph">
 <p><strong>deduplication.enable</strong>: Mandatory. Supported value: true and false.</p>
 </div>
@@ -607,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.
@@ -733,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>
@@ -783,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/apps/distributed-app/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">
@@ -833,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/apps/distributed-app/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.7.0/servers/distributed/configure/cassandra.html b/james-project/3.6.0/servers/distributed/configure/cassandra.html
similarity index 92%
copy from james-project/3.7.0/servers/distributed/configure/cassandra.html
copy to james-project/3.6.0/servers/distributed/configure/cassandra.html
index 2a6b9ee..3896e03 100644
--- a/james-project/3.7.0/servers/distributed/configure/cassandra.html
+++ b/james-project/3.6.0/servers/distributed/configure/cassandra.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/collecting-contacts.html b/james-project/3.6.0/servers/distributed/configure/collecting-contacts.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/collecting-contacts.html
copy to james-project/3.6.0/servers/distributed/configure/collecting-contacts.html
index ce33521..437a75e 100644
--- a/james-project/3.7.0/servers/distributed/configure/collecting-contacts.html
+++ b/james-project/3.6.0/servers/distributed/configure/collecting-contacts.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/collecting-events.html b/james-project/3.6.0/servers/distributed/configure/collecting-events.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/collecting-events.html
copy to james-project/3.6.0/servers/distributed/configure/collecting-events.html
index 9729ece..9711aa8 100644
--- a/james-project/3.7.0/servers/distributed/configure/collecting-events.html
+++ b/james-project/3.6.0/servers/distributed/configure/collecting-events.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/dns.html b/james-project/3.6.0/servers/distributed/configure/dns.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/dns.html
copy to james-project/3.6.0/servers/distributed/configure/dns.html
index c17d5f5..06b443e 100644
--- a/james-project/3.7.0/servers/distributed/configure/dns.html
+++ b/james-project/3.6.0/servers/distributed/configure/dns.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/domainlist.html b/james-project/3.6.0/servers/distributed/configure/domainlist.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/domainlist.html
copy to james-project/3.6.0/servers/distributed/configure/domainlist.html
index 283a19e..3bb8d27 100644
--- a/james-project/3.7.0/servers/distributed/configure/domainlist.html
+++ b/james-project/3.6.0/servers/distributed/configure/domainlist.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/dsn.html b/james-project/3.6.0/servers/distributed/configure/dsn.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/configure/dsn.html
copy to james-project/3.6.0/servers/distributed/configure/dsn.html
index fe31bc9..8a9f2a4 100644
--- a/james-project/3.7.0/servers/distributed/configure/dsn.html
+++ b/james-project/3.6.0/servers/distributed/configure/dsn.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/elasticsearch.html b/james-project/3.6.0/servers/distributed/configure/elasticsearch.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/configure/elasticsearch.html
copy to james-project/3.6.0/servers/distributed/configure/elasticsearch.html
index 9ddd0a8..d9bb7b7 100644
--- a/james-project/3.7.0/servers/distributed/configure/elasticsearch.html
+++ b/james-project/3.6.0/servers/distributed/configure/elasticsearch.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/extensions.html b/james-project/3.6.0/servers/distributed/configure/extensions.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/extensions.html
copy to james-project/3.6.0/servers/distributed/configure/extensions.html
index 07b7888..a086b9a 100644
--- a/james-project/3.7.0/servers/distributed/configure/extensions.html
+++ b/james-project/3.6.0/servers/distributed/configure/extensions.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/healthcheck.html b/james-project/3.6.0/servers/distributed/configure/healthcheck.html
similarity index 95%
copy from james-project/3.7.0/servers/distributed/configure/healthcheck.html
copy to james-project/3.6.0/servers/distributed/configure/healthcheck.html
index 95a161a..1ed725d 100644
--- a/james-project/3.7.0/servers/distributed/configure/healthcheck.html
+++ b/james-project/3.6.0/servers/distributed/configure/healthcheck.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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">
@@ -540,15 +550,6 @@ to get some examples and hints.</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock">healthcheck.period</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Define the period between two periodical health checks (default: 60s). Units supported are (ms - millisecond, s - second, m - minute, h - hour, d - day). Default unit is millisecond.</p></td>
 </tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">reception.check.user</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">User to be using for running the "mail reception" health check. The user must exist.
-If not specified, the mail reception check is a noop.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">reception.check.timeout</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Period after which mail reception is considered faulty. Defaults to one minute.</p></td>
-</tr>
 </tbody>
 </table>
 </article>
diff --git a/james-project/3.7.0/servers/distributed/configure/imap.html b/james-project/3.6.0/servers/distributed/configure/imap.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/imap.html
copy to james-project/3.6.0/servers/distributed/configure/imap.html
index e537088..de0f82f 100644
--- a/james-project/3.7.0/servers/distributed/configure/imap.html
+++ b/james-project/3.6.0/servers/distributed/configure/imap.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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">
@@ -569,13 +579,7 @@ This should be set with caution as a to high value can make the server a target
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">inMemorySizeLimit</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Size limit before we will start to stream to a temporary file.
-Defaults to 10MB. Must be a positive integer, optionally with a unit: B, K, M, G.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">literalSizeLimit</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Maximum size of a literal (IMAP APPEND).
-Defaults to 0 (unlimited). Must be a positive integer, optionally with a unit: B, K, M, G.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">10MB size limit before we will start to stream to a temporary file</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">plainAuthDisallowed</p></td>
diff --git a/james-project/3.7.0/servers/distributed/configure/index.html b/james-project/3.6.0/servers/distributed/configure/index.html
similarity index 87%
copy from james-project/3.7.0/servers/distributed/configure/index.html
copy to james-project/3.6.0/servers/distributed/configure/index.html
index 51a2b63..f64903a 100644
--- a/james-project/3.7.0/servers/distributed/configure/index.html
+++ b/james-project/3.6.0/servers/distributed/configure/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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.7.0/servers/distributed/configure/jmap.html b/james-project/3.6.0/servers/distributed/configure/jmap.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/jmap.html
copy to james-project/3.6.0/servers/distributed/configure/jmap.html
index 08ddc69..7529095 100644
--- a/james-project/3.7.0/servers/distributed/configure/jmap.html
+++ b/james-project/3.6.0/servers/distributed/configure/jmap.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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,18 +578,6 @@ 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>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">email.send.max.size</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Configuration max size for message created in both JMAP Draft amd RFC-8621.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Default value: None. Supported units are B (bytes) K (KB) M (MB) G (GB).</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">upload.max.size</p></td>
 </tr>
 <tr>
diff --git a/james-project/3.7.0/servers/distributed/configure/jmx.html b/james-project/3.6.0/servers/distributed/configure/jmx.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/jmx.html
copy to james-project/3.6.0/servers/distributed/configure/jmx.html
index a0c9ac2..8dd4b02 100644
--- a/james-project/3.7.0/servers/distributed/configure/jmx.html
+++ b/james-project/3.6.0/servers/distributed/configure/jmx.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/listeners.html b/james-project/3.6.0/servers/distributed/configure/listeners.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/configure/listeners.html
copy to james-project/3.6.0/servers/distributed/configure/listeners.html
index 47a7e9c..4550d1f 100644
--- a/james-project/3.7.0/servers/distributed/configure/listeners.html
+++ b/james-project/3.6.0/servers/distributed/configure/listeners.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/mailetcontainer.html b/james-project/3.6.0/servers/distributed/configure/mailetcontainer.html
similarity index 95%
copy from james-project/3.7.0/servers/distributed/configure/mailetcontainer.html
copy to james-project/3.6.0/servers/distributed/configure/mailetcontainer.html
index 3e389f5..f684b36 100644
--- a/james-project/3.7.0/servers/distributed/configure/mailetcontainer.html
+++ b/james-project/3.6.0/servers/distributed/configure/mailetcontainer.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/mailets.html b/james-project/3.6.0/servers/distributed/configure/mailets.html
similarity index 99%
copy from james-project/3.7.0/servers/distributed/configure/mailets.html
copy to james-project/3.6.0/servers/distributed/configure/mailets.html
index 09f7ca2..0be7754 100644
--- a/james-project/3.7.0/servers/distributed/configure/mailets.html
+++ b/james-project/3.6.0/servers/distributed/configure/mailets.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/mailrepositorystore.html b/james-project/3.6.0/servers/distributed/configure/mailrepositorystore.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/mailrepositorystore.html
copy to james-project/3.6.0/servers/distributed/configure/mailrepositorystore.html
index e9d6d0b..c11ccb0 100644
--- a/james-project/3.7.0/servers/distributed/configure/mailrepositorystore.html
+++ b/james-project/3.6.0/servers/distributed/configure/mailrepositorystore.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/matchers.html b/james-project/3.6.0/servers/distributed/configure/matchers.html
similarity index 98%
copy from james-project/3.7.0/servers/distributed/configure/matchers.html
copy to james-project/3.6.0/servers/distributed/configure/matchers.html
index 1c2e6ee..a9ba069 100644
--- a/james-project/3.7.0/servers/distributed/configure/matchers.html
+++ b/james-project/3.6.0/servers/distributed/configure/matchers.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/pop3.html b/james-project/3.6.0/servers/distributed/configure/pop3.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/pop3.html
copy to james-project/3.6.0/servers/distributed/configure/pop3.html
index 197766d..eeb635c 100644
--- a/james-project/3.7.0/servers/distributed/configure/pop3.html
+++ b/james-project/3.6.0/servers/distributed/configure/pop3.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/rabbitmq.html b/james-project/3.6.0/servers/distributed/configure/rabbitmq.html
similarity index 93%
copy from james-project/3.7.0/servers/distributed/configure/rabbitmq.html
copy to james-project/3.6.0/servers/distributed/configure/rabbitmq.html
index f4d0ff7..ee58926 100644
--- a/james-project/3.7.0/servers/distributed/configure/rabbitmq.html
+++ b/james-project/3.6.0/servers/distributed/configure/rabbitmq.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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>
@@ -626,24 +636,6 @@ Optional string, defaults to empty string</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Configure the keystore password. If configured then "ssl.keystore" must also be configured,
 Optional string, defaults to empty string</p></td>
 </tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">quorum.queues.enable</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Boolean. Whether to activate Quorum queue usage for use cases that benefits from it (work queue).
-Quorum queues enables high availability.
-False (default value) results in the usage of classic queues.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">quorum.queues.replication.factor</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Strictly positive integer. The replication factor to use when creating quorum queues.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">hosts</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional, default to the host specified as part of the URI.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Allow creating cluster aware connections.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">A coma separated list of hosts, example: hosts=ip1:5672,ip2:5672</p></td>
-</tr>
 </tbody>
 </table>
 </div>
@@ -675,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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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>
@@ -698,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/apps/distributed-app/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.7.0/servers/distributed/configure/recipientrewritetable.html b/james-project/3.6.0/servers/distributed/configure/recipientrewritetable.html
similarity index 95%
copy from james-project/3.7.0/servers/distributed/configure/recipientrewritetable.html
copy to james-project/3.6.0/servers/distributed/configure/recipientrewritetable.html
index cdc6ddc..bbe64a4 100644
--- a/james-project/3.7.0/servers/distributed/configure/recipientrewritetable.html
+++ b/james-project/3.6.0/servers/distributed/configure/recipientrewritetable.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/remote-delivery-error-handling.html b/james-project/3.6.0/servers/distributed/configure/remote-delivery-error-handling.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/remote-delivery-error-handling.html
copy to james-project/3.6.0/servers/distributed/configure/remote-delivery-error-handling.html
index fb68d27..f2bd57c 100644
--- a/james-project/3.7.0/servers/distributed/configure/remote-delivery-error-handling.html
+++ b/james-project/3.6.0/servers/distributed/configure/remote-delivery-error-handling.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/smtp-hooks.html b/james-project/3.6.0/servers/distributed/configure/smtp-hooks.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/configure/smtp-hooks.html
copy to james-project/3.6.0/servers/distributed/configure/smtp-hooks.html
index ad2b6cb..5d8d4d9 100644
--- a/james-project/3.7.0/servers/distributed/configure/smtp-hooks.html
+++ b/james-project/3.6.0/servers/distributed/configure/smtp-hooks.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/smtp.html b/james-project/3.6.0/servers/distributed/configure/smtp.html
similarity index 91%
copy from james-project/3.7.0/servers/distributed/configure/smtp.html
copy to james-project/3.6.0/servers/distributed/configure/smtp.html
index 01b0aa4..204a6e9 100644
--- a/james-project/3.7.0/servers/distributed/configure/smtp.html
+++ b/james-project/3.6.0/servers/distributed/configure/smtp.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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">
@@ -632,7 +642,7 @@ If unspecified, default value is true.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">This is an optional tag with a non-negative integer body.  It specifies the maximum
 size, in kbytes, of any message that will be transmitted by this SMTP server.  It is a service-wide, as opposed to
 a per user, limit.  If the value is zero then there is no limit.  If the tag isn&#8217;t specified, the service will
-default to an unlimited message size. Must be a positive integer, optionally with a unit: B, K, M, G.</p></td>
+default to an unlimited message size.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">heloEhloEnforcement</p></td>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/spam.html b/james-project/3.6.0/servers/distributed/configure/spam.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/configure/spam.html
copy to james-project/3.6.0/servers/distributed/configure/spam.html
index 1e8eb88..fe72f2a 100644
--- a/james-project/3.7.0/servers/distributed/configure/spam.html
+++ b/james-project/3.6.0/servers/distributed/configure/spam.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/ssl.html b/james-project/3.6.0/servers/distributed/configure/ssl.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/configure/ssl.html
copy to james-project/3.6.0/servers/distributed/configure/ssl.html
index 632b447..09d418e 100644
--- a/james-project/3.7.0/servers/distributed/configure/ssl.html
+++ b/james-project/3.6.0/servers/distributed/configure/ssl.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/tika.html b/james-project/3.6.0/servers/distributed/configure/tika.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/tika.html
copy to james-project/3.6.0/servers/distributed/configure/tika.html
index 8f000f3..85f1fa0 100644
--- a/james-project/3.7.0/servers/distributed/configure/tika.html
+++ b/james-project/3.6.0/servers/distributed/configure/tika.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/configure/usersrepository.html b/james-project/3.6.0/servers/distributed/configure/usersrepository.html
similarity index 95%
copy from james-project/3.7.0/servers/distributed/configure/usersrepository.html
copy to james-project/3.6.0/servers/distributed/configure/usersrepository.html
index 04d1640..d42d25c 100644
--- a/james-project/3.7.0/servers/distributed/configure/usersrepository.html
+++ b/james-project/3.6.0/servers/distributed/configure/usersrepository.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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/apps/distributed-app/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.7.0/servers/distributed/configure/vault.html b/james-project/3.6.0/servers/distributed/configure/vault.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/vault.html
copy to james-project/3.6.0/servers/distributed/configure/vault.html
index 816fafb..439ec7e 100644
--- a/james-project/3.7.0/servers/distributed/configure/vault.html
+++ b/james-project/3.6.0/servers/distributed/configure/vault.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/configure/webadmin.html b/james-project/3.6.0/servers/distributed/configure/webadmin.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/configure/webadmin.html
copy to james-project/3.6.0/servers/distributed/configure/webadmin.html
index 82e118f..5496b7d 100644
--- a/james-project/3.7.0/servers/distributed/configure/webadmin.html
+++ b/james-project/3.6.0/servers/distributed/configure/webadmin.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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.7.0/servers/distributed/extending/index.html b/james-project/3.6.0/servers/distributed/extending/index.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/extending/index.html
copy to james-project/3.6.0/servers/distributed/extending/index.html
index 48a5088..8010d35 100644
--- a/james-project/3.7.0/servers/distributed/extending/index.html
+++ b/james-project/3.6.0/servers/distributed/extending/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/extending/mail-processing.html b/james-project/3.6.0/servers/distributed/extending/mail-processing.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/extending/mail-processing.html
copy to james-project/3.6.0/servers/distributed/extending/mail-processing.html
index 6cf9c1b..baa9c2a 100644
--- a/james-project/3.7.0/servers/distributed/extending/mail-processing.html
+++ b/james-project/3.6.0/servers/distributed/extending/mail-processing.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/extending/mailbox-listeners.html b/james-project/3.6.0/servers/distributed/extending/mailbox-listeners.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/extending/mailbox-listeners.html
copy to james-project/3.6.0/servers/distributed/extending/mailbox-listeners.html
index 83a2d32..a4efeac 100644
--- a/james-project/3.7.0/servers/distributed/extending/mailbox-listeners.html
+++ b/james-project/3.6.0/servers/distributed/extending/mailbox-listeners.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/extending/smtp-hooks.html b/james-project/3.6.0/servers/distributed/extending/smtp-hooks.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/extending/smtp-hooks.html
copy to james-project/3.6.0/servers/distributed/extending/smtp-hooks.html
index e90a610..61f785d 100644
--- a/james-project/3.7.0/servers/distributed/extending/smtp-hooks.html
+++ b/james-project/3.6.0/servers/distributed/extending/smtp-hooks.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/extending/webadmin-routes.html b/james-project/3.6.0/servers/distributed/extending/webadmin-routes.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/extending/webadmin-routes.html
copy to james-project/3.6.0/servers/distributed/extending/webadmin-routes.html
index 67073c4..eb9c3fd 100644
--- a/james-project/3.7.0/servers/distributed/extending/webadmin-routes.html
+++ b/james-project/3.6.0/servers/distributed/extending/webadmin-routes.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/objectives.html b/james-project/3.6.0/servers/distributed/objectives.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/objectives.html
copy to james-project/3.6.0/servers/distributed/objectives.html
index dfb26dc..275b94a 100644
--- a/james-project/3.7.0/servers/distributed/objectives.html
+++ b/james-project/3.6.0/servers/distributed/objectives.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/operate/cassandra-migration.html b/james-project/3.6.0/servers/distributed/operate/cassandra-migration.html
similarity index 93%
copy from james-project/3.7.0/servers/distributed/operate/cassandra-migration.html
copy to james-project/3.6.0/servers/distributed/operate/cassandra-migration.html
index f335e44..4225fba 100644
--- a/james-project/3.7.0/servers/distributed/operate/cassandra-migration.html
+++ b/james-project/3.6.0/servers/distributed/operate/cassandra-migration.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/operate/cli.html b/james-project/3.6.0/servers/distributed/operate/cli.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/operate/cli.html
copy to james-project/3.6.0/servers/distributed/operate/cli.html
index ad60d3a..7e94747 100644
--- a/james-project/3.7.0/servers/distributed/operate/cli.html
+++ b/james-project/3.6.0/servers/distributed/operate/cli.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/operate/guide.html b/james-project/3.6.0/servers/distributed/operate/guide.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/operate/guide.html
copy to james-project/3.6.0/servers/distributed/operate/guide.html
index 3e19ce7..921b80f 100644
--- a/james-project/3.7.0/servers/distributed/operate/guide.html
+++ b/james-project/3.6.0/servers/distributed/operate/guide.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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/apps/distributed-app/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.7.0/servers/distributed/operate/cassandra-migration.html b/james-project/3.6.0/servers/distributed/operate/index.html
similarity index 89%
copy from james-project/3.7.0/servers/distributed/operate/cassandra-migration.html
copy to james-project/3.6.0/servers/distributed/operate/index.html
index f335e44..e945584 100644
--- a/james-project/3.7.0/servers/distributed/operate/cassandra-migration.html
+++ b/james-project/3.6.0/servers/distributed/operate/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Distributed James Server &mdash; Cassandra migration :: Apache James</title>
+    <title>Distributed James Server &mdash; Operate the Distributed server :: Apache James</title>
     <meta name="generator" content="Antora 2.3.4">
     <link rel="stylesheet" href="../../../../../_/css/site.css">
     <script>var uiRootPath = '../../../../../_'</script>
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -338,7 +338,7 @@
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item is-current-page" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Operate</a>
 <ul class="nav-list">
@@ -360,7 +360,7 @@
   <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="4">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cassandra-migration.html">Cassandra migration</a>
   </li>
 </ul>
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -504,52 +507,56 @@
     <li><a href="../../index.html">Servers</a></li>
     <li><a href="../../distributed.html">Distributed</a></li>
     <li><a href="index.html">Operate</a></li>
-    <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/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">
   <div class="toc-menu"></div>
 </aside>
 <article class="doc">
-<h1 class="page">Distributed James Server &mdash; Cassandra migration</h1>
+<h1 class="page">Distributed James Server &mdash; Operate the Distributed server</h1>
 <div class="paragraph">
-<p>Cassandra upgrades implies the creation of a new table. Thus restarting James is needed, as new tables are created on restart.</p>
+<p>The following pages detail how to operate the Distributed server.</p>
 </div>
 <div class="paragraph">
-<p>Once done, we ship code that tries to read from new tables, and if not possible backs up to old tables. You can thus safely run
-without running additional migrations.</p>
+<p>Once you have a Distributed James server up and running you then need to ensure it operates correctly.
+You may also need to perform some operation maintenance or recover from incidents. This section covers
+these topics.</p>
 </div>
 <div class="paragraph">
-<p>On the fly migration can be enabled. However, one might want to force the migration in a controlled fashion, and update
-automatically current schema version used (assess in the database old versions is no more used, as the corresponding tables are empty).
-Note that this process is safe: we ensure the service is not running concurrently on this James instance, that it does not bump
-version upon partial failures, that race condition in version upgrades will be idempotent, etc&#8230;&#8203;</p>
+<p>Read more about <a href="logging.html" class="page">Logging</a>.</p>
 </div>
 <div class="paragraph">
-<p>These schema updates can be triggered by <a href="webadmin.html#_cassandra_schema_upgrades" class="page">webadmin</a>.</p>
+<p>The <a href="webadmin.html" class="page">WebAdmin Restfull administration API</a> is the
+recommended way to operate the Distributed James server. It allows managing and interacting with most
+server components.</p>
 </div>
 <div class="paragraph">
-<p>Note that currently the progress can be tracked by logs.</p>
+<p>The <a href="cli.html" class="page">Command line interface</a> allows to interact with some
+server components. However it relies on JMX technologies and its use is discouraged.</p>
 </div>
 <div class="paragraph">
-<p>Here are the implemented migrations:</p>
+<p>The <a href="metrics.html" class="page">metrics</a> allows to build latency and throughput
+graphs, that can be visualized, for instance in <strong>Grafana</strong>.</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>From V8 to V9</strong> : Adopt a more compact representation for message properties.</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>
-</li>
-</ul>
+<div class="paragraph">
+<p>We did put together a <a href="guide.html" class="page">detailed guide</a> for
+distributed James operators.</p>
+</div>
+<div class="paragraph">
+<p>We also included a guide for <a href="migrating.html" class="page">migrating existing data</a> into the distributed server.</p>
 </div>
 <div class="paragraph">
-<p>The <a href="guide.html#_updating_cassandra_schema_version" class="page">Operator guide</a> further details the migration process.</p>
+<p>Read more about <a href="cassandra-migration.html" class="page">Cassandra data migration</a>.</p>
 </div>
 </article>
   </div>
diff --git a/james-project/3.7.0/servers/distributed/operate/logging.html b/james-project/3.6.0/servers/distributed/operate/logging.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/operate/logging.html
copy to james-project/3.6.0/servers/distributed/operate/logging.html
index 5097f7a..43ee942 100644
--- a/james-project/3.7.0/servers/distributed/operate/logging.html
+++ b/james-project/3.6.0/servers/distributed/operate/logging.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/operate/metrics.html b/james-project/3.6.0/servers/distributed/operate/metrics.html
similarity index 77%
copy from james-project/3.7.0/servers/distributed/operate/metrics.html
copy to james-project/3.6.0/servers/distributed/operate/metrics.html
index 4f92a40..adaca85 100644
--- a/james-project/3.7.0/servers/distributed/operate/metrics.html
+++ b/james-project/3.6.0/servers/distributed/operate/metrics.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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,107 +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>To enable James metrics, add <code>extensions.routes</code> to <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="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>extensions.routes=org.apache.james.webadmin.dropwizard.MetricsRoutes</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Connect to james-admin url to test the result:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>http://james-admin-url/metrics</pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_configure_prometheus_data_source"><a class="anchor" href="#_configure_prometheus_data_source"></a>Configure Prometheus Data source</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>You need to set up <a href="https://prometheus.io/docs/prometheus/latest/getting_started/">Prometheus</a> first to scrape James metrics.<br>
-Add Apache James WebAdmin Url or IP address to <code>prometheus.yaml</code> configuration file:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>scrape_configs:
-  # The job name is added as a label `job=&lt;job_name&gt;` to any timeseries scraped from this config.
-  - job_name: 'WebAdmin url Example'
-    scrape_interval: 5s
-    metrics_path: /metrics
-    static_configs:
-      - targets: ['james-webamin-url']
-  - job_name: 'WebAdmin IP Example'
-    scrape_interval: 5s
-    metrics_path: /metrics
-    static_configs:
-      - targets: ['192.168.100.10:8000']</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>
-</div>
-<div class="sect1">
-<h2 id="_connect_prometheus_to_grafana"><a class="anchor" href="#_connect_prometheus_to_grafana"></a>Connect Prometheus to Grafana</h2>
-<div class="sectionbody">
 <div class="paragraph">
-<p>You can do this either from <a href="https://prometheus.io/docs/visualization/grafana/">Grafana UI</a> or from a <a href="https://grafana.com/docs/grafana/latest/datasources/prometheus/">configuration file</a>.<br>
-The following <code>docker-compose.yaml</code> will help you install a simple Prometheus/ Grafana stack :</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code>version: '3'
-#Metric monitoring
-  grafana:
-    image: grafana/grafana:latest
-    container_name: grafana
-    ports:
-      - "3000:3000"
-
-  prometheus:
-    image: prom/prometheus:latest
-    restart: unless-stopped
-    ports:
-      - "9090:9090"
-    volumes:
-      - ./conf/prometheus.yml:/etc/prometheus/prometheus.yml</code></pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_getting_dashboards"><a class="anchor" href="#_getting_dashboards"></a>Getting dashboards</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Now that the Promtheus/Grafana servers are up, go to this <a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/">link</a> to get all dashboards JSON file. Import the different JSON files in this directory to Grafana via UI.</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>
@@ -720,102 +640,97 @@ The following <code>docker-compose.yaml</code> will help you install a simple Pr
 <div class="ulist">
 <ul>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_BlobStore.json">BlobStore</a> :
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/BlobStore-1543222647953-dashboard.json">BlobStore</a> :
 Rates and percentiles for the BlobStore component</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_DNS_Dashboard.json">DNS</a> :
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/CacheBlobStore-15911761170000-dashboard.json">BlobStore Cache</a> :
+Hit ratios and percentiles for the BlobStore Cache component. Note that this is relevant if this component is configured.</p>
+</li>
+<li>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/Cassandra_driver-1504068385404-dashboard.json">Cassandra driver</a> :
+Exposes some dashboard for the merics collected by the Cassandra driver, like request counts, and percentiles.</p>
+</li>
+<li>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/DeletedMessagesVault-1563771591074-dashboard.json">Deleted Message Vault</a> :
+Exposes metrics for the deleted message vault. Note that this is relevant if this component is configured.</p>
+</li>
+<li>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/JAMES_DNS_dashboard-1491268903944-dashboard.json">DNS</a> :
 Latencies and query counts for DNS resolution.</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_IMAP_Board.json">IMAP</a> :
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/IMAP_board-1488774825351-dashboard.json">IMAP</a> :
 Latencies for the IMAP protocol</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_IMAP_CountBoard.json">IMAP counts</a> :
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/IMAP_count_board-1488774815587-dashboard.json">IMAP counts</a> :
 Request counts for the IMAP protocol</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_JMAP_Board.json">JMAP</a> :
-Latencies for the JMAP protocol</p>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/James_JVM-1504068360629-dashboard.json">JVM</a> :
+JVM statistics (heap, gcs, etc&#8230;&#8203;)</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_JMAP_CountBoard.json">JMAP counts</a> :
-Request counts for the JMAP protocol</p>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/MAILET-1490071694187-dashboard.json">Mailets</a> :
+Per-mailet execution timings.</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_JVM.json">JVM</a> :
-JVM statistics (heap, gcs, etc&#8230;&#8203;)</p>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/MATCHER-1490071813409-dashboard.json">Matchers</a> :
+Per-matcher execution timings
+-https://github.com/apache/james-project/blob/master/grafana-reporting/MailQueue-1490071879988-dashboard.json[MailQueue] :
+MailQueue statistics</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_MAILET.json">Mailets</a> :
-Per-mailet execution timings.</p>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/MailboxListeners%20rate-1552903378376.json">MailboxListener rates</a> :
+Mailbox events processing rate</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_MATCHER.json">Matchers</a> :
-Per-matcher execution timings</p>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/MailboxListeners-1528958667486-dashboard.json">MailboxListener</a> :
+Mailbox events processing latencies</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_MailQueue.json">MailQueue</a> :
-MailQueue statistics</p>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/MessageFastViewProjection-1575520507952.json">MessageFastViewProjection</a> :
+Hit ratio &amp; latencies for the JMAP Message FastView projection</p>
+</li>
+<li>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/Miscalleneous-1490072265151-dashboard.json">Miscalleneous</a> :
+Collection of various metrics not included in other boards.</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_SMTP_Board.json">SMTP</a> :
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/PreDeletionHooks-1553684324244-dashboard.json">PreDeletionHooks</a> :
+Latencies for PreDeletionHooks. Note that this is relevant if this component is configured.</p>
+</li>
+<li>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/SMTP_board-1488774774172-dashboard.json">SMTP</a> :
 SMTP latencies reports</p>
 </li>
 <li>
-<p><a href="https://github.com/apache/james-project/tree/master/server/grafana-reporting/prometheus-datasource/James_SMTP_CountBoard.json">SMTP count</a> :
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/SMTP_count_board-1488774761350-dashboard.json">SMTP count</a> :
 Request count for the SMTP protocol</p>
 </li>
+<li>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/SpamAssassin-1522226824255-dashboard.json">SpamAssassin</a> :
+Latencies for SpamAssassin Spam detection and feedback. Note that this is relevant if this component is configured.</p>
+</li>
+<li>
+<p><a href="https://github.com/apache/james-project/blob/master/grafana-reporting/Tika-1522226794419-dashboard.json">Tika</a> :
+Latencies for Tika text extraction. Note that this is relevant if this component is configured.</p>
+</li>
 </ul>
 </div>
-<div class="sect2">
-<h3 id="_dashboard_samples"><a class="anchor" href="#_dashboard_samples"></a>Dashboard samples</h3>
 <div class="paragraph">
-<p>Latencies for the JMAP protocol<br></p>
+<p>This is for instance how the JMAP dashboard looks like:</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="../../_images/JMAP_board.png" alt="JMAP">
-</div>
-</div>
-<div class="paragraph">
-<p>Latencies for the IMAP protocol<br></p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../_images/IMAP_board.png" alt="IMAP">
-</div>
-</div>
-<div class="paragraph">
-<p>JVM Statistics<br></p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../_images/JVM_board.png" alt="JVM">
-</div>
-</div>
-<div class="paragraph">
-<p>BlobStore Statistics<br></p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../_images/BlobStore.png" alt="BlobStore">
-</div>
-</div>
-<div class="paragraph">
-<p>webAdmin Statistics<br></p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../_images/webAdmin.png" alt="webAdmin">
-</div>
+<img src="../../_images/metrics.png" alt="metrics for the JMAP protocol request latencies">
 </div>
 </div>
 </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>
@@ -842,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/apps/distributed-app/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.7.0/servers/distributed/operate/migrating.html b/james-project/3.6.0/servers/distributed/operate/migrating.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/operate/migrating.html
copy to james-project/3.6.0/servers/distributed/operate/migrating.html
index c2e6899..4294b72 100644
--- a/james-project/3.7.0/servers/distributed/operate/migrating.html
+++ b/james-project/3.6.0/servers/distributed/operate/migrating.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/distributed/operate/webadmin.html b/james-project/3.6.0/servers/distributed/operate/webadmin.html
similarity index 96%
copy from james-project/3.7.0/servers/distributed/operate/webadmin.html
copy to james-project/3.6.0/servers/distributed/operate/webadmin.html
index 82963c1..d584532 100644
--- a/james-project/3.7.0/servers/distributed/operate/webadmin.html
+++ b/james-project/3.6.0/servers/distributed/operate/webadmin.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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">
@@ -631,11 +641,6 @@ explanations.</p>
 <p><strong>JPA Backend</strong>: JPA storage.</p>
 </li>
 <li>
-<p><strong>MailReceptionCheck</strong> We rely on a configured user, send an email to him and
-assert that the email is well received, and can be read within the given configured
-period. Unhealthy means that the email could not be received before reacing the timeout.</p>
-</li>
-<li>
 <p><strong>MessageFastViewProjection</strong> Health check of the component storing JMAP properties
 which are fast to retrieve. Those properties are computed in advance
 from messages and persisted in order to archive a better performance.
@@ -1891,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">
@@ -2596,125 +2558,6 @@ during the reIndexing might be ignored.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_counting_emails"><a class="anchor" href="#_counting_emails"></a>Counting emails</h3>
-<div class="literalblock">
-<div class="content">
-<pre>curl -XGET http://ip:port/users/{usernameToBeUsed}/mailboxes/{mailboxName}/messageCount</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Will return the total count of messages within the mailbox of that user.</p>
-</div>
-<div class="paragraph">
-<p>Resource name <code>usernameToBeUsed</code> should be an existing user.</p>
-</div>
-<div class="paragraph">
-<p>Resource name <code>mailboxName</code> should not be empty, nor contain <code>% *</code> characters, nor starting with <code>#</code>.</p>
-</div>
-<div class="paragraph">
-<p>Response codes:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>200: The number of emails in a given mailbox</p>
-</li>
-<li>
-<p>400: Invalid mailbox name</p>
-</li>
-<li>
-<p>404: Invalid get on user mailboxes. The <code>usernameToBeUsed</code> or <code>mailboxName</code> does not exit'</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_counting_unseen_emails"><a class="anchor" href="#_counting_unseen_emails"></a>Counting unseen emails</h3>
-<div class="literalblock">
-<div class="content">
-<pre>curl -XGET http://ip:port/users/{usernameToBeUsed}/mailboxes/{mailboxName}/unseenMessageCount</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Will return the total count of unseen messages within the mailbox of that user.</p>
-</div>
-<div class="paragraph">
-<p>Resource name <code>usernameToBeUsed</code> should be an existing user.</p>
-</div>
-<div class="paragraph">
-<p>Resource name <code>mailboxName</code> should not be empty, nor contain <code>% *</code> characters, nor starting with <code>#</code>.</p>
-</div>
-<div class="paragraph">
-<p>Response codes:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>200: The number of unseen emails in a given mailbox</p>
-</li>
-<li>
-<p>400: Invalid mailbox name</p>
-</li>
-<li>
-<p>404: Invalid get on user mailboxes. The <code>usernameToBeUsed</code> or <code>mailboxName</code> does not exit'</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_clearing_mailbox_content"><a class="anchor" href="#_clearing_mailbox_content"></a>Clearing mailbox content</h3>
-<div class="literalblock">
-<div class="content">
-<pre>curl -XDELETE http://ip:port/users/{usernameToBeUsed}/mailboxes/{mailboxName}/messages</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Will schedule a task for clearing all the mails in <code>mailboxName</code> mailbox of <code>usernameToBeUsed</code>.</p>
-</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>Resource name <code>usernameToBeUsed</code> should be an existing user.</p>
-</div>
-<div class="paragraph">
-<p>Resource name <code>mailboxName</code> should not be empty, nor contain <code>% *</code> characters, nor starting with <code>#</code>.</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: Invalid mailbox name</p>
-</li>
-<li>
-<p>404: Invalid get on user mailboxes. The <code>username</code> or <code>mailboxName</code> does not exit</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The scheduled task will have the following type <code>ClearMailboxContentTask</code> and
-the following <code>additionalInformation</code>:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>{
-    "mailboxName": "mbx1",
-    "messagesFailCount": 9,
-    "messagesSuccessCount": 10,
-    "timestamp": "2007-12-03T10:15:30Z",
-    "type": "ClearMailboxContentTask",
-    "username": "bob@domain.tld"
-}</pre>
-</div>
-</div>
-</div>
-<div class="sect2">
 <h3 id="_subscribing_a_user_to_all_of_its_mailboxes"><a class="anchor" href="#_subscribing_a_user_to_all_of_its_mailboxes"></a>Subscribing a user to all of its mailboxes</h3>
 <div class="literalblock">
 <div class="content">
@@ -4114,55 +3957,6 @@ more quota for this user:</p>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_administrating_jmap_uploads"><a class="anchor" href="#_administrating_jmap_uploads"></a>Administrating Jmap Uploads</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_cleaning_upload_repository"><a class="anchor" href="#_cleaning_upload_repository"></a>Cleaning upload repository</h3>
-<div class="literalblock">
-<div class="content">
-<pre>curl -XDELETE http://ip:port/jmap/uploads?scope=expired</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Will schedule a task for clearing expired upload entries.</p>
-</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>Query parameter <code>scope</code> is required and have the value <code>expired</code>.</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: Scope invalid</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The scheduled task will have the following type <code>UploadRepositoryCleanupTask</code> and
-the following <code>additionalInformation</code>:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>{
-  "scope": "expired",
-  "timestamp": "2007-12-03T10:15:30Z",
-  "type": "UploadRepositoryCleanupTask"
-}</pre>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
 <h2 id="_administrating_recipient_rewriting"><a class="anchor" href="#_administrating_recipient_rewriting"></a>Administrating Recipient rewriting</h2>
 <div class="sectionbody">
 <div class="sect2">
@@ -5980,24 +5774,6 @@ short form (<code>h</code>, <code>d</code>, <code>w</code>, etc.), or in the lon
 </div>
 </div>
 <div class="sect1">
-<h2 id="_sending_email_over_webadmin"><a class="anchor" href="#_sending_email_over_webadmin"></a>Sending email over webAdmin</h2>
-<div class="sectionbody">
-<div class="literalblock">
-<div class="content">
-<pre>curl -XPOST /mail-transfer-service
-
-{MIME message}</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Will send the following email to the recipients specified in the MIME message.</p>
-</div>
-<div class="paragraph">
-<p>The <code>{MIME message}</code> payload must match <code>message/rfc822</code> format.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
 <h2 id="_event_dead_letter"><a class="anchor" href="#_event_dead_letter"></a>Event Dead Letter</h2>
 <div class="sectionbody">
 <div class="paragraph">
diff --git a/james-project/3.7.0/servers/distributed/run-docker.html b/james-project/3.6.0/servers/distributed/run-docker.html
similarity index 90%
copy from james-project/3.7.0/servers/distributed/run-docker.html
copy to james-project/3.6.0/servers/distributed/run-docker.html
index 71f43bf..77f2eb0 100644
--- a/james-project/3.7.0/servers/distributed/run-docker.html
+++ b/james-project/3.6.0/servers/distributed/run-docker.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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,11 +536,11 @@ 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">
-<pre>$ wget https://raw.githubusercontent.com/apache/james-project/master/server/apps/distributed-app/docker-compose.yml</pre>
+<pre>$ wget https://raw.githubusercontent.com/apache/james-project/master/dockerfiles/run/docker-compose.yml</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -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">
@@ -566,27 +576,15 @@ Follow the 'Useful commands' section for more information about James CLI.</p>
 <div class="sect2">
 <h3 id="_requirements"><a class="anchor" href="#_requirements"></a>Requirements</h3>
 <div class="paragraph">
-<p>Compile the whole project:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>mvn clean install -DskipTests -T 4</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Then load the distributed server docker image:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>docker load -i server/apps/distributed-app/target/jib-image.tar</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Alternatively we provide convenience distribution for the latest release:</p>
+<p>Built artifacts should be in ./dockerfiles/run/guice/cassandra-rabbitmq/destination folder for cassandra.
+If you haven&#8217;t already:</p>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>docker pull apache/james:distributed-3.6.0</pre>
+<pre>  $ docker build -t james/project dockerfiles/compilation/java-11
+  $ docker run -v $HOME/.m2:/root/.m2 -v $PWD:/origin \
+-v $PWD/dockerfiles/run/guice/cassandra-rabbitmq/destination:/cassandra-rabbitmq/destination \
+-t james/project -s HEAD</pre>
 </div>
 </div>
 </div>
@@ -605,7 +603,7 @@ Follow the 'Useful commands' section for more information about James CLI.</p>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ docker run -d --name=rabbitmq rabbitmq:3.8.18-management</pre>
+<pre>$ docker run -d --name=rabbitmq rabbitmq:3.8.1-management</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -639,11 +637,19 @@ Follow the 'Useful commands' section for more information about James CLI.</p>
 <p>We need to provide the key we will use for TLS. For obvious reasons, this is not provided in this git.</p>
 </div>
 <div class="paragraph">
-<p>Copy your TLS keys to the current folder or generate it using the following command. The password must be <code>james72laBalle</code> to match default configuration.</p>
+<p>Copy your TLS keys to <code>run/guice/cassandra-rabbitmq/destination/conf/keystore</code> or generate it using the following command. The password must be <code>james72laBalle</code> to match default configuration.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>$ keytool -genkey -alias james -keyalg RSA -keystore dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/keystore</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Then we need to build james container :</p>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ keytool -genkey -alias james -keyalg RSA -keystore keystore</pre>
+<pre>$ docker build -t james_run dockerfiles/run/guice/cassandra-rabbitmq</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -651,9 +657,8 @@ Follow the 'Useful commands' section for more information about James CLI.</p>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ docker run --hostname HOSTNAME -p "25:25" -p 80:80 -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" -p "127.0.0.1:8000:8000" --link cassandra:cassandra --link rabbitmq:rabbitmq
-     --link elasticsearch:elasticsearch --link tika:tika --link s3:s3.docker.test --name james_run
-     -v $PWD/keystore:/root/conf/keystore -t apache/james:distributed-latest</pre>
+<pre> $ docker run --hostname HOSTNAME -p "25:25" -p 80:80 -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" -p "127.0.0.1:8000:8000" --link cassandra:cassandra --link rabbitmq:rabbitmq
+--link elasticsearch:elasticsearch --link tika:tika --link s3:s3.docker.test --name james_run -t james_run</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -671,11 +676,11 @@ Follow the 'Useful commands' section for more information about James CLI.</p>
 Note that the above example assumes <code>127.0.0.1</code> is your loopback interface for convenience but you should change it if this is not the case on your machine.</p>
 </div>
 <div class="paragraph">
-<p>If you want to pass additional options to the underlying java command, you can configure a <em>JAVA_TOOL_OPTIONS</em> env variable, for example add:</p>
+<p>If you want to pass additional options to the underlying java command, you can configure a <em>JVM_OPTIONS</em> env variable, for example add:</p>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>--env "JAVA_TOOL_OPTIONS=-Xms256m -Xmx2048m"</pre>
+<pre>--env JVM_OPTIONS="-Xms256m -Xmx2048m"</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -685,12 +690,13 @@ Note that the above example assumes <code>127.0.0.1</code> is your loopback inte
 <div class="sect2">
 <h3 id="_instrumentation"><a class="anchor" href="#_instrumentation"></a>Instrumentation</h3>
 <div class="paragraph">
-<p>You can use <a href="https://glowroot.org/">Glowroot</a> to instrumentalize James. It is packaged as part of the docker distribution to easily enable valuable performances insights.
-Disabled by default, its java agent can easily be enabled:</p>
+<p>You can use Glowroot to instrumentalize James. The provided guice docker files allow a simple way to do it.
+In order to activate Glowroot you need to run the container with the environment variable <em>GLOWROOT_ACTIVATED</em> set to <em>true</em>
+and to expose the glowroot instrumentation ui port.</p>
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>--env "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar" -p "4000:4000"</pre>
+<pre>--env GLOWROOT_ACTIVATED=true -p "4000:4000"</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -720,9 +726,8 @@ See the <a href="https://github.com/glowroot/glowroot/wiki/Agent-Installation-(w
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ docker run --hostname HOSTNAME -p "25:25" -p 80:80 -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" -p "127.0.0.1:8000:8000" --link cassandra:cassandra --link rabbitmq:rabbitmq
-     --link elasticsearch:elasticsearch --link tika:tika --link s3:s3.docker.test --name james_run
-     --link tika:tika -v $PWD/keystore:/root/conf/keystore -t apache/james:distributed-latest</pre>
+<pre>$ docker run --hostname HOSTNAME -p "25:25" -p 80:80 -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" --link cassandra:cassandra --link rabbitmq:rabbitmq
+--link elasticsearch:elasticsearch --link tika:tika --name james_run -t james_run</pre>
 </div>
 </div>
 </div>
diff --git a/james-project/3.7.0/servers/distributed/run.html b/james-project/3.6.0/servers/distributed/run.html
similarity index 90%
copy from james-project/3.7.0/servers/distributed/run.html
copy to james-project/3.6.0/servers/distributed/run.html
index 1cf5fe6..fd33af2 100644
--- a/james-project/3.7.0/servers/distributed/run.html
+++ b/james-project/3.6.0/servers/distributed/run.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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">
@@ -525,7 +535,7 @@
 <p>Java 11 SDK</p>
 </li>
 <li>
-<p>Docker ∕ ElasticSearch 7.10.2, RabbitMQ Management 3.8.18, S3 compatible
+<p>Docker ∕ ElasticSearch 7.10.2, RabbitMQ Management 3.3.7, S3 compatible
 ObjectStorage and Cassandra 3.11.10</p>
 </li>
 <li>
@@ -538,15 +548,15 @@ ObjectStorage and Cassandra 3.11.10</p>
 <h3 id="_building_the_artifacts"><a class="anchor" href="#_building_the_artifacts"></a>Building the artifacts</h3>
 <div class="paragraph">
 <p>An usual compilation using maven will produce two artifacts into
-server/apps/distributed-app/target directory:</p>
+server/container/guice/cassandra-rabbitmq-guice/target directory:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>james-server-distributed-app.jar</p>
+<p>james-server-cassandra-rabbitmq-guice.jar</p>
 </li>
 <li>
-<p>james-server-distributed-app.lib</p>
+<p>james-server-cassandra-rabbitmq-guice.lib</p>
 </li>
 </ul>
 </div>
@@ -576,7 +586,7 @@ server/apps/distributed-app/target directory:</p>
 <p>ElasticSearch 7.10.2</p>
 </li>
 <li>
-<p>RabbitMQ-Management 3.8.17</p>
+<p>RabbitMQ-Management 3.8.1</p>
 </li>
 <li>
 <p>Swift ObjectStorage 2.15.1 or Zenko Cloudserver or AWS S3</p>
@@ -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/apps/distributed-app/sample-configuration/">server/apps/distributed-app/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">
@@ -614,7 +624,7 @@ running. You can either install the servers or launch them via docker:</p>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">$ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.10
 $ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:7.10.2
-$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.8.17-management
+$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.8.1-management
 $ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 zenko/cloudserver:8.2.6</code></pre>
 </div>
 </div>
@@ -623,7 +633,7 @@ $ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID
 </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-distributed-app.jar</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">$ java -Dworking.directory=. -jar target/james-server-cassandra-rabbitmq-guice.jar</code></pre>
 </div>
 </div>
 <div class="sect3">
@@ -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.7.0/servers/extendable.html b/james-project/3.6.0/servers/extendable.html
similarity index 96%
copy from james-project/3.7.0/servers/extendable.html
copy to james-project/3.6.0/servers/extendable.html
index 29ac98a..87f32a1 100644
--- a/james-project/3.7.0/servers/extendable.html
+++ b/james-project/3.6.0/servers/extendable.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/index.html b/james-project/3.6.0/servers/index.html
similarity index 97%
copy from james-project/3.7.0/servers/index.html
copy to james-project/3.6.0/servers/index.html
index 57d850c..cdd119f 100644
--- a/james-project/3.7.0/servers/index.html
+++ b/james-project/3.6.0/servers/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/run.html b/james-project/3.6.0/servers/run.html
similarity index 97%
copy from james-project/3.7.0/servers/run.html
copy to james-project/3.6.0/servers/run.html
index 3a70584..bf77f7d 100644
--- a/james-project/3.7.0/servers/run.html
+++ b/james-project/3.6.0/servers/run.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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.7.0/servers/test.html b/james-project/3.6.0/servers/test.html
similarity index 96%
copy from james-project/3.7.0/servers/test.html
copy to james-project/3.6.0/servers/test.html
index c418621..dc430ac 100644
--- a/james-project/3.7.0/servers/test.html
+++ b/james-project/3.6.0/servers/test.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.6.0">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.6.0 Snapshot</span>
   </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">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+        <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>
     </li>
@@ -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/_images/linagora.png b/james-project/3.7.0-SNAPSHOT/community/_images/linagora.png
new file mode 100644
index 0000000..de0a185
Binary files /dev/null and b/james-project/3.7.0-SNAPSHOT/community/_images/linagora.png differ
diff --git a/james-project/3.7.0/community/contributing.html b/james-project/3.7.0-SNAPSHOT/community/contributing.html
similarity index 98%
copy from james-project/3.7.0/community/contributing.html
copy to james-project/3.7.0-SNAPSHOT/community/contributing.html
index 0d778dd..d1b13e7 100644
--- a/james-project/3.7.0/community/contributing.html
+++ b/james-project/3.7.0-SNAPSHOT/community/contributing.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/community/download.html b/james-project/3.7.0-SNAPSHOT/community/download.html
similarity index 97%
copy from james-project/3.7.0/community/download.html
copy to james-project/3.7.0-SNAPSHOT/community/download.html
index 4b5a014..11f6543 100644
--- a/james-project/3.7.0/community/download.html
+++ b/james-project/3.7.0-SNAPSHOT/community/download.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/community/guidelines.html b/james-project/3.7.0-SNAPSHOT/community/guidelines.html
similarity index 98%
copy from james-project/3.7.0/community/guidelines.html
copy to james-project/3.7.0-SNAPSHOT/community/guidelines.html
index 56b30af..b9e1b78 100644
--- a/james-project/3.7.0/community/guidelines.html
+++ b/james-project/3.7.0-SNAPSHOT/community/guidelines.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/community/index.html b/james-project/3.7.0-SNAPSHOT/community/index.html
similarity index 97%
copy from james-project/3.7.0/community/index.html
copy to james-project/3.7.0-SNAPSHOT/community/index.html
index 24a6659..4e9fade 100644
--- a/james-project/3.7.0/community/index.html
+++ b/james-project/3.7.0-SNAPSHOT/community/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/community/mailing-lists.html b/james-project/3.7.0-SNAPSHOT/community/mailing-lists.html
similarity index 98%
copy from james-project/3.7.0/community/mailing-lists.html
copy to james-project/3.7.0-SNAPSHOT/community/mailing-lists.html
index d048d5a..124e7b0 100644
--- a/james-project/3.7.0/community/mailing-lists.html
+++ b/james-project/3.7.0-SNAPSHOT/community/mailing-lists.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/community/release.html b/james-project/3.7.0-SNAPSHOT/community/release.html
similarity index 95%
copy from james-project/3.7.0/community/release.html
copy to james-project/3.7.0-SNAPSHOT/community/release.html
index dc9411c..7102263 100644
--- a/james-project/3.7.0/community/release.html
+++ b/james-project/3.7.0-SNAPSHOT/community/release.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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">
@@ -762,7 +772,7 @@ svn add .</code></pre>
 # $2: Key footprint to use for signing
 
 sha512sum $1 &gt; $1.sha512
-gpg -u $2 --output $1.asc --detach-sig --armor $1
+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
@@ -807,19 +817,19 @@ to offer their community with a set of maintained docker images, for convenience
 <div class="ulist">
 <ul>
 <li>
-<p>apache/james:memory-3.x.x built from <a href="https://github.com/apache/james-project/tree/master/server/apps/memory-app" class="bare">https://github.com/apache/james-project/tree/master/server/apps/memory-app</a></p>
+<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/server/apps/jpa-app" class="bare">https://github.com/apache/james-project/tree/master/server/apps/jpa-app</a></p>
+<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/server/apps/provisioned-app" class="bare">https://github.com/apache/james-project/tree/master/server/apps/provisioned-app</a></p>
+<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/server/apps/cassandra-app" class="bare">https://github.com/apache/james-project/tree/master/server/apps/cassandra-app</a></p>
+<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/server/apps/distributed-app" class="bare">https://github.com/apache/james-project/tree/master/dockerfiles/server/apps/distributed-app</a></p>
+<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>
diff --git a/james-project/3.7.0/community/support.html b/james-project/3.7.0-SNAPSHOT/community/support.html
similarity index 97%
copy from james-project/3.7.0/community/support.html
copy to james-project/3.7.0-SNAPSHOT/community/support.html
index 796f8ab..98b5248 100644
--- a/james-project/3.7.0/community/support.html
+++ b/james-project/3.7.0-SNAPSHOT/community/support.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/community/website.html b/james-project/3.7.0-SNAPSHOT/community/website.html
similarity index 97%
copy from james-project/3.7.0/community/website.html
copy to james-project/3.7.0-SNAPSHOT/community/website.html
index e96e3d3..7113e9f 100644
--- a/james-project/3.7.0/community/website.html
+++ b/james-project/3.7.0-SNAPSHOT/community/website.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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">
@@ -553,7 +563,7 @@ a proxy to review the changes (described here: <a href="http://www.apache.org/de
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ docker build -t james/homepage src/homepage
+<pre>$ docker build -t james/homepage dockerfiles/site/homepage
 $ docker run -v $PWD:/origin -v $PWD/site:/destination james/homepage master</pre>
 </div>
 </div>
@@ -573,7 +583,7 @@ $ docker run -v $PWD:/origin -v $PWD/site:/destination james/homepage master</pr
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>$ docker build -t james/site src/site
+<pre>$ docker build -t james/site dockerfiles/site/website
 $ docker run -v $PWD/.m2:/root/.m2 -v $PWD:/origin -v $PWD/site:/destination james/site master</pre>
 </div>
 </div>
diff --git a/james-project/3.7.0/concepts/configuration.html b/james-project/3.7.0-SNAPSHOT/concepts/configuration.html
similarity index 97%
copy from james-project/3.7.0/concepts/configuration.html
copy to james-project/3.7.0-SNAPSHOT/concepts/configuration.html
index 8eb446c..04aa2df 100644
--- a/james-project/3.7.0/concepts/configuration.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/configuration.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/glossary.html b/james-project/3.7.0-SNAPSHOT/concepts/glossary.html
similarity index 97%
copy from james-project/3.7.0/concepts/glossary.html
copy to james-project/3.7.0-SNAPSHOT/concepts/glossary.html
index 2993a9a..6708eb4 100644
--- a/james-project/3.7.0/concepts/glossary.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/glossary.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/index.html b/james-project/3.7.0-SNAPSHOT/concepts/index.html
similarity index 97%
copy from james-project/3.7.0/concepts/index.html
copy to james-project/3.7.0-SNAPSHOT/concepts/index.html
index 8f3c5ed..b407d2a 100644
--- a/james-project/3.7.0/concepts/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/mail/index.html b/james-project/3.7.0-SNAPSHOT/concepts/mail/index.html
similarity index 97%
copy from james-project/3.7.0/concepts/mail/index.html
copy to james-project/3.7.0-SNAPSHOT/concepts/mail/index.html
index a239dca..8c37c35 100644
--- a/james-project/3.7.0/concepts/mail/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/mail/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/messages/imf.html b/james-project/3.7.0-SNAPSHOT/concepts/messages/imf.html
similarity index 97%
copy from james-project/3.7.0/concepts/messages/imf.html
copy to james-project/3.7.0-SNAPSHOT/concepts/messages/imf.html
index 0f207e1..b88a6db 100644
--- a/james-project/3.7.0/concepts/messages/imf.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/messages/imf.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/messages/index.html b/james-project/3.7.0-SNAPSHOT/concepts/messages/index.html
similarity index 97%
copy from james-project/3.7.0/concepts/messages/index.html
copy to james-project/3.7.0-SNAPSHOT/concepts/messages/index.html
index e4c7599..8fb0e26 100644
--- a/james-project/3.7.0/concepts/messages/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/messages/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/messages/mime.html b/james-project/3.7.0-SNAPSHOT/concepts/messages/mime.html
similarity index 97%
copy from james-project/3.7.0/concepts/messages/mime.html
copy to james-project/3.7.0-SNAPSHOT/concepts/messages/mime.html
index bc5c1f1..84de63a 100644
--- a/james-project/3.7.0/concepts/messages/mime.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/messages/mime.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/processing/index.html b/james-project/3.7.0-SNAPSHOT/concepts/processing/index.html
similarity index 97%
copy from james-project/3.7.0/concepts/processing/index.html
copy to james-project/3.7.0-SNAPSHOT/concepts/processing/index.html
index aca1906..3ea5e32 100644
--- a/james-project/3.7.0/concepts/processing/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/processing/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/protocols/esmtp.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/esmtp.html
similarity index 97%
copy from james-project/3.7.0/concepts/protocols/esmtp.html
copy to james-project/3.7.0-SNAPSHOT/concepts/protocols/esmtp.html
index 1e188b7..d998c23 100644
--- a/james-project/3.7.0/concepts/protocols/esmtp.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/esmtp.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/protocols/imap.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/imap.html
similarity index 98%
copy from james-project/3.7.0/concepts/protocols/imap.html
copy to james-project/3.7.0-SNAPSHOT/concepts/protocols/imap.html
index 04054ac..38a3453 100644
--- a/james-project/3.7.0/concepts/protocols/imap.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/imap.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/protocols/index.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/index.html
similarity index 97%
copy from james-project/3.7.0/concepts/protocols/index.html
copy to james-project/3.7.0-SNAPSHOT/concepts/protocols/index.html
index c906172..428ebc6 100644
--- a/james-project/3.7.0/concepts/protocols/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/protocols/jmap.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/jmap.html
similarity index 97%
copy from james-project/3.7.0/concepts/protocols/jmap.html
copy to james-project/3.7.0-SNAPSHOT/concepts/protocols/jmap.html
index 389b60c..b32414d 100644
--- a/james-project/3.7.0/concepts/protocols/jmap.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/jmap.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/protocols/lmtp.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/lmtp.html
similarity index 97%
copy from james-project/3.7.0/concepts/protocols/lmtp.html
copy to james-project/3.7.0-SNAPSHOT/concepts/protocols/lmtp.html
index a54697d..e442a1e 100644
--- a/james-project/3.7.0/concepts/protocols/lmtp.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/lmtp.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/protocols/pop.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/pop.html
similarity index 98%
copy from james-project/3.7.0/concepts/protocols/pop.html
copy to james-project/3.7.0-SNAPSHOT/concepts/protocols/pop.html
index 554a285..67adc60 100644
--- a/james-project/3.7.0/concepts/protocols/pop.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/pop.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/protocols/smtp.html b/james-project/3.7.0-SNAPSHOT/concepts/protocols/smtp.html
similarity index 98%
copy from james-project/3.7.0/concepts/protocols/smtp.html
copy to james-project/3.7.0-SNAPSHOT/concepts/protocols/smtp.html
index febef42..962c686 100644
--- a/james-project/3.7.0/concepts/protocols/smtp.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/protocols/smtp.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/storage/index.html b/james-project/3.7.0-SNAPSHOT/concepts/storage/index.html
similarity index 97%
copy from james-project/3.7.0/concepts/storage/index.html
copy to james-project/3.7.0-SNAPSHOT/concepts/storage/index.html
index fc13f7a..1bcb52c 100644
--- a/james-project/3.7.0/concepts/storage/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/storage/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/storage/mailbox.html b/james-project/3.7.0-SNAPSHOT/concepts/storage/mailbox.html
similarity index 98%
copy from james-project/3.7.0/concepts/storage/mailbox.html
copy to james-project/3.7.0-SNAPSHOT/concepts/storage/mailbox.html
index ce83e38..c7d19ec 100644
--- a/james-project/3.7.0/concepts/storage/mailbox.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/storage/mailbox.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/storage/users.html b/james-project/3.7.0-SNAPSHOT/concepts/storage/users.html
similarity index 97%
copy from james-project/3.7.0/concepts/storage/users.html
copy to james-project/3.7.0-SNAPSHOT/concepts/storage/users.html
index fa06098..0c1cf43 100644
--- a/james-project/3.7.0/concepts/storage/users.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/storage/users.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/concepts/user/index.html b/james-project/3.7.0-SNAPSHOT/concepts/user/index.html
similarity index 97%
copy from james-project/3.7.0/concepts/user/index.html
copy to james-project/3.7.0-SNAPSHOT/concepts/user/index.html
index 9fcc661..44e9ca1 100644
--- a/james-project/3.7.0/concepts/user/index.html
+++ b/james-project/3.7.0-SNAPSHOT/concepts/user/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/customization/index.html b/james-project/3.7.0-SNAPSHOT/customization/index.html
similarity index 97%
copy from james-project/3.7.0/customization/index.html
copy to james-project/3.7.0-SNAPSHOT/customization/index.html
index 4da2f9b..e11a4de 100644
--- a/james-project/3.7.0/customization/index.html
+++ b/james-project/3.7.0-SNAPSHOT/customization/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/development/index.html b/james-project/3.7.0-SNAPSHOT/development/index.html
similarity index 97%
copy from james-project/3.7.0/development/index.html
copy to james-project/3.7.0-SNAPSHOT/development/index.html
index 35b3d9a..7031861 100644
--- a/james-project/3.7.0/development/index.html
+++ b/james-project/3.7.0-SNAPSHOT/development/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/development/logging.html b/james-project/3.7.0-SNAPSHOT/development/logging.html
similarity index 97%
copy from james-project/3.7.0/development/logging.html
copy to james-project/3.7.0-SNAPSHOT/development/logging.html
index afb1ed0..e8c5583 100644
--- a/james-project/3.7.0/development/logging.html
+++ b/james-project/3.7.0-SNAPSHOT/development/logging.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/index.html b/james-project/3.7.0-SNAPSHOT/index.html
similarity index 96%
copy from james-project/3.7.0/index.html
copy to james-project/3.7.0-SNAPSHOT/index.html
index a59a3f6..c6c2dd2 100644
--- a/james-project/3.7.0/index.html
+++ b/james-project/3.7.0-SNAPSHOT/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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">
@@ -513,7 +523,7 @@
 <article class="doc">
 <h1 class="page">Welcome</h1>
 <div class="paragraph">
-<p>Welcome to the Apache James Reference Documentation! These documents are for version 3.7.0 of James.</p>
+<p>Welcome to the Apache James Reference Documentation! These documents are for version 3.7.0-SNAPSHOT of James.</p>
 </div>
 <div class="paragraph">
 <p>Apache James is a flexible email platform that provides out-of-the-box mail servers that you can start
@@ -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.7.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.7.0-SNAPSHOT. 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>
 </div>
 </article>
   </div>
diff --git a/james-project/3.7.0/servers/15-minute-demo.html b/james-project/3.7.0-SNAPSHOT/servers/15-minute-demo.html
similarity index 98%
copy from james-project/3.7.0/servers/15-minute-demo.html
copy to james-project/3.7.0-SNAPSHOT/servers/15-minute-demo.html
index ba7a8c8..c6f17da 100644
--- a/james-project/3.7.0/servers/15-minute-demo.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/15-minute-demo.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/5-minute-demo.html b/james-project/3.7.0-SNAPSHOT/servers/5-minute-demo.html
similarity index 97%
copy from james-project/3.7.0/servers/5-minute-demo.html
copy to james-project/3.7.0-SNAPSHOT/servers/5-minute-demo.html
index bbbe920..ec48c50 100644
--- a/james-project/3.7.0/servers/5-minute-demo.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/5-minute-demo.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/_images/james-hexagons-extensions.png b/james-project/3.7.0-SNAPSHOT/servers/_images/james-hexagons-extensions.png
new file mode 100644
index 0000000..6e228e2
Binary files /dev/null and b/james-project/3.7.0-SNAPSHOT/servers/_images/james-hexagons-extensions.png differ
diff --git a/james-project/3.7.0-SNAPSHOT/servers/_images/metrics.png b/james-project/3.7.0-SNAPSHOT/servers/_images/metrics.png
new file mode 100644
index 0000000..e97b021
Binary files /dev/null and b/james-project/3.7.0-SNAPSHOT/servers/_images/metrics.png differ
diff --git a/james-project/3.7.0-SNAPSHOT/servers/_images/preload-dashboards.png b/james-project/3.7.0-SNAPSHOT/servers/_images/preload-dashboards.png
new file mode 100644
index 0000000..8ecc77f
Binary files /dev/null and b/james-project/3.7.0-SNAPSHOT/servers/_images/preload-dashboards.png differ
diff --git a/james-project/3.7.0-SNAPSHOT/servers/_images/remote-delivery-error-handling.png b/james-project/3.7.0-SNAPSHOT/servers/_images/remote-delivery-error-handling.png
new file mode 100644
index 0000000..7e0665a
Binary files /dev/null and b/james-project/3.7.0-SNAPSHOT/servers/_images/remote-delivery-error-handling.png differ
diff --git a/james-project/3.7.0-SNAPSHOT/servers/_images/server-components.png b/james-project/3.7.0-SNAPSHOT/servers/_images/server-components.png
new file mode 100644
index 0000000..30112d9
Binary files /dev/null and b/james-project/3.7.0-SNAPSHOT/servers/_images/server-components.png differ
diff --git a/james-project/3.7.0-SNAPSHOT/servers/_images/specialized-instances.png b/james-project/3.7.0-SNAPSHOT/servers/_images/specialized-instances.png
new file mode 100644
index 0000000..687cefe
Binary files /dev/null and b/james-project/3.7.0-SNAPSHOT/servers/_images/specialized-instances.png differ
diff --git a/james-project/3.7.0-SNAPSHOT/servers/_images/storage.png b/james-project/3.7.0-SNAPSHOT/servers/_images/storage.png
new file mode 100644
index 0000000..d52322a
Binary files /dev/null and b/james-project/3.7.0-SNAPSHOT/servers/_images/storage.png differ
diff --git a/james-project/3.7.0/servers/basic/architecture.html b/james-project/3.7.0-SNAPSHOT/servers/basic/architecture.html
similarity index 97%
copy from james-project/3.7.0/servers/basic/architecture.html
copy to james-project/3.7.0-SNAPSHOT/servers/basic/architecture.html
index b8cb706..0147603 100644
--- a/james-project/3.7.0/servers/basic/architecture.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/architecture.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/basic/concepts.html b/james-project/3.7.0-SNAPSHOT/servers/basic/concepts.html
similarity index 97%
copy from james-project/3.7.0/servers/basic/concepts.html
copy to james-project/3.7.0-SNAPSHOT/servers/basic/concepts.html
index 65021f9..c50697f 100644
--- a/james-project/3.7.0/servers/basic/concepts.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/concepts.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/basic/conf/index.html b/james-project/3.7.0-SNAPSHOT/servers/basic/conf/index.html
similarity index 97%
copy from james-project/3.7.0/servers/basic/conf/index.html
copy to james-project/3.7.0-SNAPSHOT/servers/basic/conf/index.html
index be821b6..e23a037 100644
--- a/james-project/3.7.0/servers/basic/conf/index.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/conf/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/basic/context.html b/james-project/3.7.0-SNAPSHOT/servers/basic/context.html
similarity index 97%
copy from james-project/3.7.0/servers/basic/context.html
copy to james-project/3.7.0-SNAPSHOT/servers/basic/context.html
index cbed41b..2cfd341 100644
--- a/james-project/3.7.0/servers/basic/context.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/context.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/basic/help.html b/james-project/3.7.0-SNAPSHOT/servers/basic/help.html
similarity index 97%
copy from james-project/3.7.0/servers/basic/help.html
copy to james-project/3.7.0-SNAPSHOT/servers/basic/help.html
index 9b388ad..662afee 100644
--- a/james-project/3.7.0/servers/basic/help.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/help.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/basic/index.html b/james-project/3.7.0-SNAPSHOT/servers/basic/index.html
similarity index 97%
copy from james-project/3.7.0/servers/basic/index.html
copy to james-project/3.7.0-SNAPSHOT/servers/basic/index.html
index 5592805..6efb0ec 100644
--- a/james-project/3.7.0/servers/basic/index.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/index.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/basic/objectives.html b/james-project/3.7.0-SNAPSHOT/servers/basic/objectives.html
similarity index 97%
copy from james-project/3.7.0/servers/basic/objectives.html
copy to james-project/3.7.0-SNAPSHOT/servers/basic/objectives.html
index 8652eeb..45d8582 100644
--- a/james-project/3.7.0/servers/basic/objectives.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/basic/objectives.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/demo.html b/james-project/3.7.0-SNAPSHOT/servers/demo.html
similarity index 97%
copy from james-project/3.7.0/servers/demo.html
copy to james-project/3.7.0-SNAPSHOT/servers/demo.html
index 695b33b..0678b60 100644
--- a/james-project/3.7.0/servers/demo.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/demo.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/distributed.html b/james-project/3.7.0-SNAPSHOT/servers/distributed.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed.html
copy to james-project/3.7.0-SNAPSHOT/servers/distributed.html
index d3f14c2..c20c94a 100644
--- a/james-project/3.7.0/servers/distributed.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../index.html">Apache James Server</a>
       <ul class="versions">
         <li class="version is-current is-latest">
-          <a href="../index.html">3.7.0 SNAPSHOT</a>
+          <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>
@@ -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/servers/distributed/architecture/consistency-model.html b/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/consistency-model.html
similarity index 97%
copy from james-project/3.7.0/servers/distributed/architecture/consistency-model.html
copy to james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/consistency-model.html
index 2139ebc..309322c 100644
--- a/james-project/3.7.0/servers/distributed/architecture/consistency-model.html
+++ b/james-project/3.7.0-SNAPSHOT/servers/distributed/architecture/consistency-model.html
@@ -62,7 +62,7 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.7.0">
+<div class="nav-container" data-component="james-project" data-version="3.7.0-SNAPSHOT">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -470,14 +470,17 @@
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
     <span class="title">Apache James Server</span>
-    <span class="version">3.7.0 SNAPSHOT</span>
+    <span class="version">3.7.0-SNAPSHOT Snapshot</span>
   </div>
   <ul class="components">
     <li class="component is-current">
       <a class="title" href="../../../index.html">Apache James Server</a>
... 8655 lines suppressed ...

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