You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by jh...@apache.org on 2026/01/30 21:08:26 UTC

(james-site) 10/24: Site checkin for project Apache James: Jenkins Tools

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

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

commit 5ec6f75cddda56beba7634d6f581059c1f3a0a82
Author: jenkins <bu...@apache.org>
AuthorDate: Mon Jan 6 08:26:22 2025 +0000

    Site checkin for project Apache James: Jenkins Tools
---
 404.html                                           |   27 +-
 james-distributed-app/3.7.5/_images/BlobStore.png  |  Bin 0 -> 132760 bytes
 james-distributed-app/3.7.5/_images/IMAP_board.png |  Bin 0 -> 215231 bytes
 james-distributed-app/3.7.5/_images/JMAP_board.png |  Bin 0 -> 127304 bytes
 james-distributed-app/3.7.5/_images/JVM_board.png  |  Bin 0 -> 152770 bytes
 james-distributed-app/3.7.5/_images/MATCHER.png    |  Bin 0 -> 135315 bytes
 .../3.7.5/_images/apache-james-lens.png            |  Bin 0 -> 31245 bytes
 .../3.7.5/_images/james-hexagons-extensions.png    |  Bin 0 -> 39191 bytes
 .../3.7.5/_images/preload-dashboards.png           |  Bin 0 -> 59900 bytes
 .../_images/remote-delivery-error-handling.png     |  Bin 0 -> 64745 bytes
 .../3.7.5/_images/server-components.png            |  Bin 0 -> 97620 bytes
 .../3.7.5}/_images/specialized-instances.png       |  Bin
 .../3.7.5}/_images/storage.png                     |  Bin
 james-distributed-app/3.7.5/_images/webAdmin.png   |  Bin 0 -> 49488 bytes
 .../3.7.5/architecture/consistency-model.html      |  578 +-
 .../3.7.5}/architecture/index.html                 |  552 +-
 .../3.7.5}/architecture/specialized-instances.html |  440 +-
 .../3.7.5}/configure/batchsizes.html               |  422 +-
 .../3.7.5}/configure/blobstore.html                |  616 +-
 .../3.7.5}/configure/cassandra.html                |  601 +-
 .../3.7.5}/configure/collecting-contacts.html      |  428 +-
 .../3.7.5}/configure/collecting-events.html        |  439 +-
 .../3.7.5}/configure/dns.html                      |  422 +-
 .../3.7.5}/configure/domainlist.html               |  422 +-
 .../3.7.5}/configure/dsn.html                      |  442 +-
 .../3.7.5/configure/elasticsearch.html             |  729 ++
 .../3.7.5}/configure/extensions.html               |  474 +-
 .../3.7.5}/configure/healthcheck.html              |  426 +-
 .../3.7.5}/configure/imap.html                     |  553 +-
 .../3.7.5/configure/index.html                     |  666 +-
 .../3.7.5}/configure/jmap.html                     |  507 +-
 .../3.7.5}/configure/jmx.html                      |  444 +-
 .../3.7.5/configure/jvm.html                       |  471 +-
 .../3.7.5}/configure/listeners.html                |  496 +-
 .../3.7.5}/configure/mailetcontainer.html          |  480 +-
 .../3.7.5}/configure/mailets.html                  |  723 +-
 .../3.7.5}/configure/mailrepositorystore.html      |  430 +-
 .../3.7.5}/configure/matchers.html                 |  535 +-
 .../3.7.5}/configure/pop3.html                     |  448 +-
 .../3.7.5}/configure/rabbitmq.html                 |  586 +-
 .../3.7.5}/configure/recipientrewritetable.html    |  424 +-
 .../configure/remote-delivery-error-handling.html  |  436 +-
 .../3.7.5}/configure/sieve.html                    |  445 +-
 .../3.7.5}/configure/smtp-hooks.html               |  615 +-
 .../3.7.5}/configure/smtp.html                     |  531 +-
 .../3.7.5/configure/spam.html                      |  558 +-
 .../3.7.5}/configure/ssl.html                      |  493 +-
 .../3.7.5}/configure/tika.html                     |  428 +-
 .../3.7.5/configure/usersrepository.html           |  526 +-
 .../3.7.5}/configure/vault.html                    |  442 +-
 .../3.7.5}/configure/webadmin.html                 |  473 +-
 .../3.7.5/extending}/index.html                    |  673 +-
 .../3.7.5/extending/mail-processing.html           |  620 +-
 .../3.7.5/extending/mailbox-listeners.html         |  532 +-
 .../3.7.5/extending/smtp-hooks.html                |  555 +-
 .../3.7.5/extending/webadmin-routes.html           |  486 +-
 .../3.7.5}/index.html                              |  436 +-
 .../3.7.5}/objectives.html                         |  428 +-
 .../3.7.5}/operate/cassandra-migration.html        |  426 +-
 .../3.7.5}/operate/cli.html                        |  514 +-
 .../3.7.5}/operate/guide.html                      |  766 +-
 .../3.7.5}/operate/index.html                      |  474 +-
 james-distributed-app/3.7.5/operate/logging.html   |  788 +++
 .../3.7.5}/operate/metrics.html                    |  450 +-
 .../3.7.5}/operate/migrating.html                  |  440 +-
 .../3.7.5}/operate/security.html                   |  562 +-
 .../3.7.5}/operate/webadmin.html                   | 6829 +++++++-----------
 .../3.7.5}/run/index.html                          |  430 +-
 .../3.7.5}/run/k8s-checklist.html                  |  424 +-
 .../3.7.5}/run/k8s-logsMetrics.html                |  426 +-
 .../3.7.5}/run/k8s-secrets.html                    |  426 +-
 .../3.7.5}/run/k8s-values.html                     |  467 +-
 .../3.7.5}/run/run-docker.html                     |  475 +-
 .../3.7.5}/run/run-java.html                       |  452 +-
 .../3.7.5}/run/run-kubernetes.html                 |  448 +-
 james-distributed-app/3.8.1/_images/BlobStore.png  |  Bin 0 -> 132760 bytes
 james-distributed-app/3.8.1/_images/IMAP_board.png |  Bin 0 -> 215231 bytes
 james-distributed-app/3.8.1/_images/JMAP_board.png |  Bin 0 -> 127304 bytes
 james-distributed-app/3.8.1/_images/JVM_board.png  |  Bin 0 -> 152770 bytes
 james-distributed-app/3.8.1/_images/MATCHER.png    |  Bin 0 -> 135315 bytes
 .../3.8.1/_images/apache-james-lens.png            |  Bin 0 -> 31245 bytes
 .../_images/cassandra_stress_test_result_1.png     |  Bin 0 -> 68487 bytes
 .../_images/cassandra_stress_test_result_2.png     |  Bin 0 -> 62484 bytes
 .../3.8.1/_images/james-hexagons-extensions.png    |  Bin 0 -> 39191 bytes
 .../3.8.1}/_images/james-imap-base-performance.png |  Bin
 .../3.8.1/_images/preload-dashboards.png           |  Bin 0 -> 59900 bytes
 .../_images/remote-delivery-error-handling.png     |  Bin 0 -> 64745 bytes
 .../3.8.1/_images/server-components.png            |  Bin 0 -> 97620 bytes
 .../3.8.1}/_images/specialized-instances.png       |  Bin
 .../3.8.1}/_images/storage.png                     |  Bin
 james-distributed-app/3.8.1/_images/webAdmin.png   |  Bin 0 -> 49488 bytes
 .../3.8.1/architecture/consistency-model.html      |  574 +-
 .../3.8.1}/architecture/implemented-standards.html |  425 +-
 .../3.8.1}/architecture/index.html                 |  521 +-
 .../3.8.1}/architecture/specialized-instances.html |  436 +-
 .../3.8.1}/benchmark/db-benchmark.html             |  842 +--
 .../3.8.1/benchmark/index.html                     |  435 +-
 .../3.8.1}/benchmark/james-benchmark.html          |  452 +-
 .../3.8.1}/configure/batchsizes.html               |  418 +-
 .../3.8.1}/configure/blobstore.html                |  588 +-
 .../3.8.1}/configure/cassandra.html                |  433 +-
 .../3.8.1}/configure/collecting-contacts.html      |  424 +-
 .../3.8.1}/configure/collecting-events.html        |  435 +-
 .../3.8.1}/configure/dns.html                      |  418 +-
 .../3.8.1}/configure/domainlist.html               |  418 +-
 .../3.8.1}/configure/dsn.html                      |  438 +-
 .../3.8.1}/configure/extensions.html               |  432 +-
 .../3.8.1}/configure/healthcheck.html              |  418 +-
 .../3.8.1}/configure/imap.html                     |  479 +-
 .../3.8.1/configure/index.html                     |  666 +-
 .../3.8.1}/configure/jmap.html                     |  476 +-
 .../3.8.1}/configure/jmx.html                      |  440 +-
 .../3.8.1/configure/jvm.html                       |  535 +-
 .../3.8.1}/configure/listeners.html                |  488 +-
 .../3.8.1}/configure/mailetcontainer.html          |  476 +-
 .../3.8.1}/configure/mailets.html                  |  651 +-
 .../3.8.1}/configure/mailrepositorystore.html      |  426 +-
 .../3.8.1}/configure/matchers.html                 |  509 +-
 .../3.8.1}/configure/opensearch.html               |  527 +-
 .../3.8.1}/configure/pop3.html                     |  428 +-
 .../3.8.1}/configure/rabbitmq.html                 |  552 +-
 .../3.8.1}/configure/recipientrewritetable.html    |  420 +-
 .../3.8.1/configure/redis.html                     |  457 +-
 .../configure/remote-delivery-error-handling.html  |  432 +-
 .../3.8.1}/configure/sieve.html                    |  420 +-
 .../3.8.1}/configure/smtp-hooks.html               |  591 +-
 .../3.8.1}/configure/smtp.html                     |  471 +-
 .../3.8.1}/configure/spam.html                     |  442 +-
 .../3.8.1}/configure/ssl.html                      |  470 +-
 .../3.8.1}/configure/tika.html                     |  420 +-
 .../3.8.1/configure/usersrepository.html           |  554 +-
 .../3.8.1}/configure/vault.html                    |  432 +-
 .../3.8.1}/configure/webadmin.html                 |  450 +-
 .../3.8.1/extending/imap.html                      |  453 +-
 .../3.8.1/extending}/index.html                    |  492 +-
 .../3.8.1/extending/mail-processing.html           |  615 +-
 .../3.8.1/extending/mailbox-listeners.html         |  526 +-
 .../3.8.1/extending/smtp-hooks.html                |  549 +-
 .../3.8.1/extending/webadmin-routes.html           |  480 +-
 .../3.8.1}/index.html                              |  432 +-
 .../3.8.1}/objectives.html                         |  424 +-
 .../3.8.1}/operate/cassandra-migration.html        |  422 +-
 .../3.8.1}/operate/cli.html                        |  510 +-
 .../3.8.1}/operate/guide.html                      |  744 +-
 .../3.8.1}/operate/index.html                      |  472 +-
 .../3.8.1}/operate/logging.html                    |  770 +-
 .../3.8.1}/operate/metrics.html                    |  446 +-
 .../3.8.1}/operate/migrating.html                  |  436 +-
 .../3.8.1}/operate/performanceChecklist.html       |  603 +-
 .../3.8.1}/operate/security.html                   |  509 +-
 .../3.8.1}/operate/webadmin.html                   | 2938 +++-----
 .../3.8.1}/run/index.html                          |  424 +-
 .../3.8.1}/run/k8s-checklist.html                  |  418 +-
 .../3.8.1}/run/k8s-logsMetrics.html                |  420 +-
 .../3.8.1}/run/k8s-secrets.html                    |  418 +-
 .../3.8.1}/run/k8s-values.html                     |  441 +-
 .../3.8.1}/run/run-docker.html                     |  436 +-
 .../3.8.1}/run/run-java.html                       |  430 +-
 .../3.8.1}/run/run-kubernetes.html                 |  434 +-
 .../3.9.0/index.html                               |   63 +-
 .../community/_images/linagora.png                 |  Bin
 .../{3.9.0 => 3.6.0}/community/contributing.html   |  289 +-
 .../{3.9.0 => 3.6.0}/community/download.html       |  154 +-
 .../{3.9.0 => 3.6.0}/community/guidelines.html     |  305 +-
 .../{3.9.0 => 3.6.0}/community/index.html          |  168 +-
 .../{3.9.0 => 3.6.0}/community/mailing-lists.html  |  154 +-
 .../download.html => 3.6.0/community/release.html} |  198 +-
 .../download.html => 3.6.0/community/support.html} |  191 +-
 .../{3.9.0 => 3.6.0}/community/website.html        |  156 +-
 .../{3.9.0 => 3.6.0}/concepts/configuration.html   |  156 +-
 .../{3.9.0 => 3.6.0}/concepts/glossary.html        |  160 +-
 james-project/{3.9.0 => 3.6.0}/concepts/index.html |  162 +-
 .../{3.9.0 => 3.6.0}/concepts/mail/index.html      |  156 +-
 .../{3.9.0 => 3.6.0}/concepts/messages/imf.html    |  163 +-
 .../{3.9.0 => 3.6.0}/concepts/messages/index.html  |  164 +-
 .../{3.9.0 => 3.6.0}/concepts/messages/mime.html   |  161 +-
 .../concepts/processing/index.html                 |  152 +-
 .../{3.9.0 => 3.6.0}/concepts/protocols/esmtp.html |  158 +-
 .../{3.9.0 => 3.6.0}/concepts/protocols/imap.html  |  178 +-
 .../{3.9.0 => 3.6.0}/concepts/protocols/index.html |  164 +-
 .../concepts/protocols/jmap.html}                  |  179 +-
 .../{3.9.0 => 3.6.0}/concepts/protocols/lmtp.html  |  156 +-
 .../{3.9.0 => 3.6.0}/concepts/protocols/pop.html   |  168 +-
 .../{3.9.0 => 3.6.0}/concepts/protocols/smtp.html  |  168 +-
 .../{3.9.0 => 3.6.0}/concepts/storage/index.html   |  164 +-
 .../{3.9.0 => 3.6.0}/concepts/storage/mailbox.html |  164 +-
 .../{3.9.0 => 3.6.0}/concepts/storage/users.html   |  156 +-
 .../{3.9.0 => 3.6.0}/concepts/user/index.html      |  186 +-
 .../development => 3.6.0/customization}/index.html |  177 +-
 .../{3.9.0 => 3.6.0}/development/index.html        |  163 +-
 .../{3.9.0 => 3.6.0}/development/logging.html      |  153 +-
 james-project/{3.9.0 => 3.6.0}/index.html          |  166 +-
 .../{3.9.0 => 3.6.0}/servers/15-minute-demo.html   |  207 +-
 .../{3.9.0 => 3.6.0}/servers/5-minute-demo.html    |  193 +-
 james-project/3.6.0/servers/_images/metrics.png    |  Bin 0 -> 127304 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
 .../{3.9.0 => 3.6.0}/servers/_images/storage.png   |  Bin
 .../servers/basic/architecture.html                |  152 +-
 .../{3.9.0 => 3.6.0}/servers/basic/concepts.html   |  160 +-
 .../{3.9.0 => 3.6.0}/servers/basic/conf/index.html |  152 +-
 .../{3.9.0 => 3.6.0}/servers/basic/context.html    |  152 +-
 .../{3.9.0 => 3.6.0}/servers/basic/help.html       |  152 +-
 .../{3.9.0 => 3.6.0}/servers/basic/index.html      |  166 +-
 .../{3.9.0 => 3.6.0}/servers/basic/objectives.html |  154 +-
 james-project/{3.9.0 => 3.6.0}/servers/demo.html   |  156 +-
 .../demo.html => 3.6.0/servers/distributed.html}   |  208 +-
 .../architecture/consistency-model.html            |  315 +-
 .../servers/distributed/architecture/index.html    |  285 +-
 .../architecture/specialized-instances.html        |  187 +-
 .../servers/distributed/configure/batchsizes.html  |  155 +-
 .../servers/distributed/configure/blobstore.html   |  399 +-
 .../servers/distributed/configure/cassandra.html   |  354 +-
 .../distributed/configure/collecting-contacts.html |  159 +-
 .../distributed/configure/collecting-events.html   |  170 +-
 .../servers/distributed/configure/dns.html         |  155 +-
 .../servers/distributed/configure/domainlist.html  |  155 +-
 .../servers/distributed/configure/dsn.html         |  173 +-
 .../distributed/configure/elasticsearch.html}      |  520 +-
 .../servers/distributed/configure/extensions.html} |  221 +-
 .../servers/distributed/configure/healthcheck.html |  168 +-
 .../servers/distributed/configure/imap.html}       |  269 +-
 .../servers/distributed/configure/index.html}      |  379 +-
 .../servers/distributed/configure/jmap.html}       |  323 +-
 .../servers/distributed/configure/jmx.html}        |  189 +-
 .../servers/distributed/configure/listeners.html   |  229 +-
 .../distributed/configure/mailetcontainer.html     |  225 +-
 .../servers/distributed/configure/mailets.html     |  521 +-
 .../distributed/configure/mailrepositorystore.html |  163 +-
 .../servers/distributed/configure/matchers.html    |  328 +-
 .../servers/distributed/configure/pop3.html        |  183 +-
 .../servers/distributed/configure/rabbitmq.html    |  331 +-
 .../configure/recipientrewritetable.html           |  157 +-
 .../configure/remote-delivery-error-handling.html  |  165 +-
 .../servers/distributed/configure/smtp-hooks.html  |  346 +-
 .../servers/distributed/configure/smtp.html}       |  414 +-
 .../servers/distributed/configure/spam.html}       |  323 +-
 .../servers/distributed/configure/ssl.html         |  292 +-
 .../servers/distributed/configure/tika.html        |  159 +-
 .../distributed/configure/usersrepository.html}    |  254 +-
 .../servers/distributed/configure/vault.html       |  179 +-
 .../servers/distributed/configure/webadmin.html    |  208 +-
 .../servers/distributed/extending/index.html}      |  379 +-
 .../distributed/extending/mail-processing.html}    |  397 +-
 .../distributed/extending/mailbox-listeners.html}  |  250 +-
 .../servers/distributed/extending/smtp-hooks.html} |  271 +-
 .../distributed/extending/webadmin-routes.html}    |  216 +-
 .../servers/distributed/objectives.html            |  159 +-
 .../distributed/operate/cassandra-migration.html   |  172 +-
 .../servers/distributed/operate/cli.html           |  245 +-
 .../servers/distributed/operate/guide.html         |  508 +-
 .../servers/distributed/operate}/index.html        |  210 +-
 .../servers/distributed/operate/logging.html       |  505 +-
 .../servers/distributed/operate/metrics.html       |  386 +-
 .../servers/distributed/operate/migrating.html     |  171 +-
 .../servers/distributed/operate/webadmin.html      | 7459 ++++++++------------
 .../servers/distributed/run-docker.html}           |  396 +-
 .../servers/distributed/run.html}                  |  317 +-
 .../test.html => 3.6.0/servers/extendable.html}    |  163 +-
 james-project/{3.9.0 => 3.6.0}/servers/index.html  |  168 +-
 james-project/{3.9.0 => 3.6.0}/servers/run.html    |  152 +-
 james-project/{3.9.0 => 3.6.0}/servers/test.html   |  155 +-
 .../community/_images/linagora.png                 |  Bin
 .../{3.8.0 => 3.7.5}/community/contributing.html   |   73 +-
 .../{3.8.0 => 3.7.5}/community/download.html       |   55 +-
 .../{3.8.0 => 3.7.5}/community/guidelines.html     |   81 +-
 .../{3.8.0 => 3.7.5}/community/index.html          |   69 +-
 .../{3.8.0 => 3.7.5}/community/mailing-lists.html  |   55 +-
 .../{3.8.0 => 3.7.5}/community/release.html        |   65 +-
 .../{3.8.0 => 3.7.5}/community/support.html        |   73 +-
 .../{3.8.0 => 3.7.5}/community/website.html        |   57 +-
 .../{3.8.0 => 3.7.5}/concepts/configuration.html   |   57 +-
 .../{3.8.0 => 3.7.5}/concepts/glossary.html        |   61 +-
 james-project/{3.8.0 => 3.7.5}/concepts/index.html |   63 +-
 .../{3.8.0 => 3.7.5}/concepts/mail/index.html      |   57 +-
 .../{3.8.0 => 3.7.5}/concepts/messages/imf.html    |   64 +-
 .../{3.8.0 => 3.7.5}/concepts/messages/index.html  |   65 +-
 .../{3.8.0 => 3.7.5}/concepts/messages/mime.html   |   62 +-
 .../concepts/processing/index.html                 |   53 +-
 .../{3.8.0 => 3.7.5}/concepts/protocols/esmtp.html |   59 +-
 .../{3.8.0 => 3.7.5}/concepts/protocols/imap.html  |   73 +-
 .../{3.8.0 => 3.7.5}/concepts/protocols/index.html |   65 +-
 .../{3.8.0 => 3.7.5}/concepts/protocols/jmap.html  |   96 +-
 .../{3.8.0 => 3.7.5}/concepts/protocols/lmtp.html  |   57 +-
 .../{3.8.0 => 3.7.5}/concepts/protocols/pop.html   |   69 +-
 .../{3.8.0 => 3.7.5}/concepts/protocols/smtp.html  |   69 +-
 .../{3.8.0 => 3.7.5}/concepts/storage/index.html   |   65 +-
 .../{3.8.0 => 3.7.5}/concepts/storage/mailbox.html |   65 +-
 .../{3.8.0 => 3.7.5}/concepts/storage/users.html   |   57 +-
 .../{3.8.0 => 3.7.5}/concepts/user/index.html      |   87 +-
 .../{3.8.0 => 3.7.5}/customization/index.html      |   53 +-
 .../development/deployment-tests.html              |   53 +-
 .../{3.8.0 => 3.7.5}/development/index.html        |   53 +-
 .../{3.8.0 => 3.7.5}/development/logging.html      |   53 +-
 james-project/{3.8.0 => 3.7.5}/index.html          |   67 +-
 .../{3.8.0 => 3.7.5}/servers/15-minute-demo.html   |   73 +-
 .../{3.8.0 => 3.7.5}/servers/5-minute-demo.html    |   59 +-
 .../servers/basic/architecture.html                |   53 +-
 .../{3.8.0 => 3.7.5}/servers/basic/concepts.html   |   61 +-
 .../{3.8.0 => 3.7.5}/servers/basic/conf/index.html |   53 +-
 .../{3.8.0 => 3.7.5}/servers/basic/context.html    |   53 +-
 .../{3.8.0 => 3.7.5}/servers/basic/help.html       |   53 +-
 .../{3.8.0 => 3.7.5}/servers/basic/index.html      |   67 +-
 .../{3.8.0 => 3.7.5}/servers/basic/objectives.html |   55 +-
 james-project/{3.8.0 => 3.7.5}/servers/demo.html   |   57 +-
 .../{3.8.0 => 3.7.5}/servers/extendable.html       |   53 +-
 james-project/{3.8.0 => 3.7.5}/servers/index.html  |   69 +-
 james-project/{3.8.0 => 3.7.5}/servers/run.html    |   53 +-
 james-project/{3.8.0 => 3.7.5}/servers/test.html   |   56 +-
 james-project/3.8.1/community/contributing.html    |   55 +-
 james-project/3.8.1/community/download.html        |   43 +-
 james-project/3.8.1/community/guidelines.html      |   51 +-
 james-project/3.8.1/community/index.html           |   55 +-
 james-project/3.8.1/community/mailing-lists.html   |   41 +-
 james-project/3.8.1/community/release.html         |   51 +-
 james-project/3.8.1/community/support.html         |   41 +-
 james-project/3.8.1/community/website.html         |   45 +-
 james-project/3.8.1/concepts/configuration.html    |   45 +-
 james-project/3.8.1/concepts/glossary.html         |   47 +-
 james-project/3.8.1/concepts/index.html            |   49 +-
 james-project/3.8.1/concepts/mail/index.html       |   45 +-
 james-project/3.8.1/concepts/messages/imf.html     |   43 +-
 james-project/3.8.1/concepts/messages/index.html   |   45 +-
 james-project/3.8.1/concepts/messages/mime.html    |   43 +-
 james-project/3.8.1/concepts/processing/index.html |   41 +-
 james-project/3.8.1/concepts/protocols/esmtp.html  |   47 +-
 james-project/3.8.1/concepts/protocols/imap.html   |   51 +-
 james-project/3.8.1/concepts/protocols/index.html  |   53 +-
 james-project/3.8.1/concepts/protocols/jmap.html   |   84 +-
 james-project/3.8.1/concepts/protocols/lmtp.html   |   45 +-
 james-project/3.8.1/concepts/protocols/pop.html    |   57 +-
 james-project/3.8.1/concepts/protocols/smtp.html   |   57 +-
 james-project/3.8.1/concepts/storage/index.html    |   49 +-
 james-project/3.8.1/concepts/storage/mailbox.html  |   51 +-
 james-project/3.8.1/concepts/storage/users.html    |   45 +-
 james-project/3.8.1/concepts/user/index.html       |   57 +-
 james-project/3.8.1/customization/index.html       |   41 +-
 .../3.8.1/development/deployment-tests.html        |   41 +-
 james-project/3.8.1/development/index.html         |   41 +-
 james-project/3.8.1/development/logging.html       |   41 +-
 james-project/3.8.1/index.html                     |   53 +-
 james-project/3.8.1/servers/15-minute-demo.html    |   55 +-
 james-project/3.8.1/servers/5-minute-demo.html     |   41 +-
 .../3.8.1/servers/basic/architecture.html          |   41 +-
 james-project/3.8.1/servers/basic/concepts.html    |   49 +-
 james-project/3.8.1/servers/basic/conf/index.html  |   41 +-
 james-project/3.8.1/servers/basic/context.html     |   41 +-
 james-project/3.8.1/servers/basic/help.html        |   41 +-
 james-project/3.8.1/servers/basic/index.html       |   55 +-
 james-project/3.8.1/servers/basic/objectives.html  |   43 +-
 james-project/3.8.1/servers/demo.html              |   45 +-
 james-project/3.8.1/servers/extendable.html        |   41 +-
 james-project/3.8.1/servers/index.html             |   57 +-
 james-project/3.8.1/servers/run.html               |   41 +-
 james-project/3.8.1/servers/test.html              |   44 +-
 james-project/3.9.0/community/contributing.html    |   53 +-
 james-project/3.9.0/community/download.html        |   39 +-
 james-project/3.9.0/community/guidelines.html      |   49 +-
 james-project/3.9.0/community/index.html           |   53 +-
 james-project/3.9.0/community/mailing-lists.html   |   39 +-
 james-project/3.9.0/community/release.html         |   49 +-
 james-project/3.9.0/community/support.html         |   39 +-
 james-project/3.9.0/community/website.html         |   39 +-
 james-project/3.9.0/concepts/configuration.html    |   43 +-
 james-project/3.9.0/concepts/glossary.html         |   45 +-
 james-project/3.9.0/concepts/index.html            |   47 +-
 james-project/3.9.0/concepts/mail/index.html       |   43 +-
 james-project/3.9.0/concepts/messages/imf.html     |   41 +-
 james-project/3.9.0/concepts/messages/index.html   |   43 +-
 james-project/3.9.0/concepts/messages/mime.html    |   41 +-
 james-project/3.9.0/concepts/processing/index.html |   39 +-
 james-project/3.9.0/concepts/protocols/esmtp.html  |   45 +-
 james-project/3.9.0/concepts/protocols/imap.html   |   49 +-
 james-project/3.9.0/concepts/protocols/index.html  |   51 +-
 james-project/3.9.0/concepts/protocols/jmap.html   |   39 +-
 james-project/3.9.0/concepts/protocols/lmtp.html   |   43 +-
 james-project/3.9.0/concepts/protocols/pop.html    |   55 +-
 james-project/3.9.0/concepts/protocols/smtp.html   |   55 +-
 james-project/3.9.0/concepts/storage/index.html    |   47 +-
 james-project/3.9.0/concepts/storage/mailbox.html  |   49 +-
 james-project/3.9.0/concepts/storage/users.html    |   43 +-
 james-project/3.9.0/concepts/user/index.html       |   55 +-
 james-project/3.9.0/customization/imap.html        |   42 +-
 james-project/3.9.0/customization/index.html       |   55 +-
 .../3.9.0/customization/mail-processing.html       |   38 +-
 .../3.9.0/customization/mailbox-listeners.html     |   40 +-
 james-project/3.9.0/customization/smtp-hooks.html  |   40 +-
 .../3.9.0/customization/webadmin-routes.html       |   40 +-
 .../3.9.0/development/deployment-tests.html        |   39 +-
 james-project/3.9.0/development/index.html         |   43 +-
 james-project/3.9.0/development/logging.html       |   39 +-
 james-project/3.9.0/index.html                     |   51 +-
 james-project/3.9.0/servers/15-minute-demo.html    |   53 +-
 james-project/3.9.0/servers/5-minute-demo.html     |   39 +-
 .../3.9.0/servers/basic/architecture.html          |   39 +-
 james-project/3.9.0/servers/basic/concepts.html    |   47 +-
 james-project/3.9.0/servers/basic/conf/index.html  |   39 +-
 james-project/3.9.0/servers/basic/context.html     |   39 +-
 james-project/3.9.0/servers/basic/help.html        |   39 +-
 james-project/3.9.0/servers/basic/index.html       |   53 +-
 james-project/3.9.0/servers/basic/objectives.html  |   41 +-
 james-project/3.9.0/servers/demo.html              |   43 +-
 .../architecture/consistency-model.html            |   97 +-
 .../consistency_model_data_replication_extend.html |   40 +-
 .../architecture/implemented-standards.html        |   38 +-
 .../servers/distributed/architecture/index.html    |   71 +-
 .../architecture/mailqueue_combined_extend.html    |   38 +-
 .../architecture/specialized-instances.html        |   44 +-
 .../distributed/benchmark/benchmark_prepare.html   |   38 +-
 .../distributed/benchmark/db-benchmark.html        |   46 +-
 .../3.9.0/servers/distributed/benchmark/index.html |   40 +-
 .../distributed/benchmark/james-benchmark.html     |   41 +-
 .../servers/distributed/configure/batchsizes.html  |   38 +-
 .../servers/distributed/configure/blobstore.html   |   40 +-
 .../servers/distributed/configure/cassandra.html   |   40 +-
 .../distributed/configure/collecting-contacts.html |   38 +-
 .../distributed/configure/collecting-events.html   |   40 +-
 .../3.9.0/servers/distributed/configure/dns.html   |   38 +-
 .../servers/distributed/configure/domainlist.html  |   38 +-
 .../servers/distributed/configure/droplists.html   |   42 +-
 .../3.9.0/servers/distributed/configure/dsn.html   |   50 +-
 .../servers/distributed/configure/extensions.html  |   40 +-
 .../servers/distributed/configure/healthcheck.html |   38 +-
 .../3.9.0/servers/distributed/configure/imap.html  |   40 +-
 .../3.9.0/servers/distributed/configure/index.html |  112 +-
 .../3.9.0/servers/distributed/configure/jmap.html  |   38 +-
 .../3.9.0/servers/distributed/configure/jmx.html   |   44 +-
 .../3.9.0/servers/distributed/configure/jvm.html   |   38 +-
 .../servers/distributed/configure/listeners.html   |   42 +-
 .../distributed/configure/mailetcontainer.html     |   46 +-
 .../servers/distributed/configure/mailets.html     |   42 +-
 .../distributed/configure/mailrepositorystore.html |   46 +-
 .../servers/distributed/configure/matchers.html    |   40 +-
 .../servers/distributed/configure/opensearch.html  |   40 +-
 .../3.9.0/servers/distributed/configure/pop3.html  |   40 +-
 .../3.9.0/servers/distributed/configure/queue.html |   38 +-
 .../servers/distributed/configure/rabbitmq.html    |   38 +-
 .../configure/recipientrewritetable.html           |   40 +-
 .../3.9.0/servers/distributed/configure/redis.html |   38 +-
 .../configure/remote-delivery-error-handling.html  |   46 +-
 .../servers/distributed/configure/search.html      |   38 +-
 .../3.9.0/servers/distributed/configure/sieve.html |   40 +-
 .../servers/distributed/configure/smtp-hooks.html  |   42 +-
 .../3.9.0/servers/distributed/configure/smtp.html  |   42 +-
 .../3.9.0/servers/distributed/configure/spam.html  |   46 +-
 .../3.9.0/servers/distributed/configure/ssl.html   |   42 +-
 .../3.9.0/servers/distributed/configure/tika.html  |   38 +-
 .../distributed/configure/usersrepository.html     |   38 +-
 .../3.9.0/servers/distributed/configure/vault.html |   44 +-
 .../servers/distributed/configure/webadmin.html    |   40 +-
 .../3.9.0/servers/distributed/extending.html       |   40 +-
 james-project/3.9.0/servers/distributed/index.html |   50 +-
 .../3.9.0/servers/distributed/objectives.html      |   42 +-
 .../distributed/operate/cassandra-migration.html   |   42 +-
 .../3.9.0/servers/distributed/operate/cli.html     |   38 +-
 .../3.9.0/servers/distributed/operate/guide.html   |  128 +-
 .../3.9.0/servers/distributed/operate/index.html   |   54 +-
 .../3.9.0/servers/distributed/operate/logging.html |   40 +-
 .../operate/logging/docker-compose-block.html      |   38 +-
 .../3.9.0/servers/distributed/operate/metrics.html |   44 +-
 .../servers/distributed/operate/migrating.html     |   50 +-
 .../distributed/operate/performanceChecklist.html  |   38 +-
 .../servers/distributed/operate/security.html      |   68 +-
 .../servers/distributed/operate/webadmin.html      |  633 +-
 .../operate/webadmin/admin-mail-queues-extend.html |   38 +-
 .../operate/webadmin/admin-mailboxes-extend.html   |   38 +-
 .../operate/webadmin/admin-messages-extend.html    |   38 +-
 .../3.9.0/servers/distributed/run/index.html       |   44 +-
 .../servers/distributed/run/k8s-checklist.html     |   38 +-
 .../servers/distributed/run/k8s-logsMetrics.html   |   40 +-
 .../3.9.0/servers/distributed/run/k8s-secrets.html |   38 +-
 .../3.9.0/servers/distributed/run/k8s-values.html  |   38 +-
 .../3.9.0/servers/distributed/run/run-docker.html  |   42 +-
 .../3.9.0/servers/distributed/run/run-java.html    |   38 +-
 .../servers/distributed/run/run-kubernetes.html    |   50 +-
 james-project/3.9.0/servers/index.html             |   55 +-
 james-project/3.9.0/servers/run.html               |   39 +-
 james-project/3.9.0/servers/test.html              |   39 +-
 james-site/latest/homepage.html                    |   27 +-
 james-site/latest/index.html                       |   27 +-
 sitemap-james-distributed-app.xml                  |  523 ++
 sitemap-james-project.xml                          | 1002 ++-
 sitemap-james-site.xml                             |    4 +-
 sitemap.xml                                        |    3 +
 485 files changed, 47936 insertions(+), 66641 deletions(-)

diff --git a/404.html b/404.html
index 25cdba95f..7fdf4f72e 100644
--- a/404.html
+++ b/404.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Page Not Found :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
+    <meta name="generator" content="Antora 3.1.7">
     <link rel="stylesheet" href="/_/css/site.css">
   </head>
   <body class="status-404">
@@ -67,11 +67,34 @@
 <div class="nav-panel-explore is-active" data-panel="explore">
   <ul class="components">
     <li class="component">
-      <div class="title"><a href="/james-project/3.9.0/index.html">Apache James Server</a></div>
+      <div class="title"><a href="/james-distributed-app/3.8.1/index.html">Apache James Distributed Server</a></div>
       <ul class="versions">
+        <li class="version">
+          <a href="/james-distributed-app/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
         <li class="version is-latest">
+          <a href="/james-distributed-app/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="/james-distributed-app/3.7.5/index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="/james-project/3.8.1/index.html">Apache James Server</a></div>
+      <ul class="versions">
+        <li class="version">
           <a href="/james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
         </li>
+        <li class="version is-latest">
+          <a href="/james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="/james-project/3.7.5/index.html">3.7.5</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/james-distributed-app/3.7.5/_images/BlobStore.png b/james-distributed-app/3.7.5/_images/BlobStore.png
new file mode 100644
index 000000000..d964d2a8a
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/BlobStore.png differ
diff --git a/james-distributed-app/3.7.5/_images/IMAP_board.png b/james-distributed-app/3.7.5/_images/IMAP_board.png
new file mode 100644
index 000000000..2c3e935d9
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/IMAP_board.png differ
diff --git a/james-distributed-app/3.7.5/_images/JMAP_board.png b/james-distributed-app/3.7.5/_images/JMAP_board.png
new file mode 100644
index 000000000..e97b0211a
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/JMAP_board.png differ
diff --git a/james-distributed-app/3.7.5/_images/JVM_board.png b/james-distributed-app/3.7.5/_images/JVM_board.png
new file mode 100644
index 000000000..45f9463e3
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/JVM_board.png differ
diff --git a/james-distributed-app/3.7.5/_images/MATCHER.png b/james-distributed-app/3.7.5/_images/MATCHER.png
new file mode 100644
index 000000000..4730e94e7
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/MATCHER.png differ
diff --git a/james-distributed-app/3.7.5/_images/apache-james-lens.png b/james-distributed-app/3.7.5/_images/apache-james-lens.png
new file mode 100644
index 000000000..e97507cd8
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/apache-james-lens.png differ
diff --git a/james-distributed-app/3.7.5/_images/james-hexagons-extensions.png b/james-distributed-app/3.7.5/_images/james-hexagons-extensions.png
new file mode 100644
index 000000000..6e228e20f
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/james-hexagons-extensions.png differ
diff --git a/james-distributed-app/3.7.5/_images/preload-dashboards.png b/james-distributed-app/3.7.5/_images/preload-dashboards.png
new file mode 100644
index 000000000..8ecc77fd5
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/preload-dashboards.png differ
diff --git a/james-distributed-app/3.7.5/_images/remote-delivery-error-handling.png b/james-distributed-app/3.7.5/_images/remote-delivery-error-handling.png
new file mode 100644
index 000000000..7e0665a0a
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/remote-delivery-error-handling.png differ
diff --git a/james-distributed-app/3.7.5/_images/server-components.png b/james-distributed-app/3.7.5/_images/server-components.png
new file mode 100644
index 000000000..30112d9a3
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/server-components.png differ
diff --git a/james-project/3.9.0/servers/_images/specialized-instances.png b/james-distributed-app/3.7.5/_images/specialized-instances.png
similarity index 100%
copy from james-project/3.9.0/servers/_images/specialized-instances.png
copy to james-distributed-app/3.7.5/_images/specialized-instances.png
diff --git a/james-project/3.9.0/servers/_images/storage.png b/james-distributed-app/3.7.5/_images/storage.png
similarity index 100%
copy from james-project/3.9.0/servers/_images/storage.png
copy to james-distributed-app/3.7.5/_images/storage.png
diff --git a/james-distributed-app/3.7.5/_images/webAdmin.png b/james-distributed-app/3.7.5/_images/webAdmin.png
new file mode 100644
index 000000000..a0b88a9d8
Binary files /dev/null and b/james-distributed-app/3.7.5/_images/webAdmin.png differ
diff --git a/james-project/3.9.0/servers/distributed/architecture/consistency_model_data_replication_extend.html b/james-distributed-app/3.7.5/architecture/consistency-model.html
similarity index 59%
copy from james-project/3.9.0/servers/distributed/architecture/consistency_model_data_replication_extend.html
copy to james-distributed-app/3.7.5/architecture/consistency-model.html
index 5a11e9f6f..df7fbae57 100644
--- a/james-project/3.9.0/servers/distributed/architecture/consistency_model_data_replication_extend.html
+++ b/james-distributed-app/3.7.5/architecture/consistency-model.html
@@ -3,9 +3,10 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Untitled :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <title>Distributed James Server &mdash; Consistency Model :: Apache James</title>
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/architecture/consistency-model.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item is-current-page" data-depth="3">
     <a class="nav-link" href="consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../configure/index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="../configure/elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
       <ul class="versions">
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,16 +355,59 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
+  <ul>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
+    <li><a href="../index.html">Distributed James Application</a></li>
+    <li><a href="index.html">Architecture</a></li>
+    <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_data_replication_extend.adoc">Edit this Page</a></div>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/architecture/consistency-model.html">3.8.1</a>
+    <a class="version is-current" href="consistency-model.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/architecture/consistency-model.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; Consistency Model</h1>
+<div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>This page presents the consistency model used by the Distributed Server and
+points to the tools built around it.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_data_replication"><a class="anchor" href="#_data_replication"></a>Data Replication</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The Distributed Server relies on different storage technologies, all having their own
+consistency models.</p>
+</div>
+<div class="paragraph">
+<p>These data stores replicate data in order to enforce some level of availability. We call
+this process replication. By consistency, we mean the ability for all replica to hold the
+same data. By availability, we mean the ability for a replica to answer a request.</p>
+</div>
+<div class="paragraph">
+<p>In distributed systems, <a href="https://en.wikipedia.org/wiki/CAP_theorem">according to the CAP theorem</a>,
+as we will necessarily encounter network partitions, then trade-offs need to be made between
+consistency and availability.</p>
+</div>
+<div class="paragraph">
+<p>This section details this trade-off for data stores used by the Distributed Server.</p>
+</div>
 <div class="sect2">
 <h3 id="_cassandra_consistency_model"><a class="anchor" href="#_cassandra_consistency_model"></a>Cassandra consistency model</h3>
 <div class="paragraph">
@@ -585,11 +423,9 @@ leveraged by <strong>Distributed Server Administrator</strong>. Namely
 <a href="https://cassandra.apache.org/doc/latest/operating/read_repair.html">Read repair</a>.</p>
 </div>
 <div class="paragraph">
-<p>The {server-name} tries to mitigate inconsistencies by relying on
+<p>The Distributed Server tries to mitigate inconsistencies by relying on
 <a href="https://docs.datastax.com/en/archived/cassandra/3.0/cassandra/dml/dmlConfigConsistency.html">QUORUM</a> read and write levels.
-This means that a majority of replica are needed for read and write operations to be performed. This guaranty is needed
-as the Mailbox is a complex datamodel with several layers of metadata, and needs "read-your-writes" guaranties that QUORUM
-read+writes delivers.</p>
+This means that a majority of replica are needed for read and write operations to be performed.</p>
 </div>
 <div class="paragraph">
 <p>Critical business operations, like UID allocation, rely on strong consistency mechanisms brought by
@@ -604,13 +440,13 @@ and as lightweight transactions are slow across data centers, running James with
 Cassandra setup is discouraged.</p>
 </div>
 <div class="paragraph">
-<p>However, <a href="#{xref-base}/configure/cassandra.adoc" class="page unresolved">this page</a> enables setting alternative read level,
+<p>However, <a href="../configure/cassandra.html" class="xref page">this page</a> enables setting alternative read level,
 which could be acceptable regarding limited requirements. <code>LOCAL_QUORUM</code> coupled with <code>LOCAL_SERIAL</code>
 is likely the only scalable setup. Some options were added to turn off SERIAL consistency usage for message
 and mailbox management. However, the use of Lightweight Transaction cannot be disabled for UIDs and ModSeqs.</p>
 </div>
 <div class="paragraph">
-<p>Running the {server-name} IMAP server in a multi datacenter setup will likely result either in data loss,
+<p>Running the Distributed Server IMAP server in a multi datacenter setup will likely result either in data loss,
 or very slow operations - as we rely on monotic UID generation, without strong consistency, UIDs could be allocated
 several times.</p>
 </div>
@@ -624,6 +460,118 @@ JMAP support could be added, but requires followup developments as some componen
 </div>
 </div>
 </div>
+<div class="sect2">
+<h3 id="_elasticsearch_consistency_model"><a class="anchor" href="#_elasticsearch_consistency_model"></a>ElasticSearch consistency model</h3>
+<div class="paragraph">
+<p>ElasticSearch relies on <a href="https://www.elastic.co/blog/a-new-era-for-cluster-coordination-in-elasticsearch">strong consistency</a>
+with home grown algorithm.</p>
+</div>
+<div class="paragraph">
+<p>The 6.x release line, that the distributed server is using is known to be slow to recover from failures.</p>
+</div>
+<div class="paragraph">
+<p>Be aware that data is asynchronously indexed in ElasticSearch, changes will be eventually visible.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_rabbitmq_consistency_model"><a class="anchor" href="#_rabbitmq_consistency_model"></a>RabbitMQ consistency model</h3>
+<div class="paragraph">
+<p>The Distributed Server relies out of the box on a single RabbitMQ server, thus consistency concerns
+are not (yet) applicable. Availability concerns are applicable.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_denormalization"><a class="anchor" href="#_denormalization"></a>Denormalization</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>In Cassandra, data needs to be structured to match the read patterns. To support several conflicting
+read patterns, the data needs to be duplicated into different structures. This process is called
+denormalization.</p>
+</div>
+<div class="paragraph">
+<p>While data can be consistent at the table level, some inconsistencies can sneak in at the applicative
+level across denormalization tables.</p>
+</div>
+<div class="paragraph">
+<p>We write to a "table of truth" first, then duplicate the data to denormalization tables.</p>
+</div>
+<div class="paragraph">
+<p>The Distributed server offers several mechanisms to mitigate these inconsistencies:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Writes to denormalization tables are retried.</p>
+</li>
+<li>
+<p>Some <a href="../operate/guide.html#_solving_cassandra_inconsistencies" class="xref page">SolveInconsistencies tasks</a> are exposed and are able to heal a given denormalization table.
+They reset the "deduplication tables" content to the "table of truth" content.</p>
+</li>
+<li>
+<p><a href="https://github.com/apache/james-project/blob/master/src/adr/0042-applicative-read-repairs.md">Read repairs</a>,
+when implemented for a given denormalization, enables auto-healing. When an inconsistency is detected, They reset the
+"deduplication tables" entry to the "table of truth" entry.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_consistency_across_data_stores"><a class="anchor" href="#_consistency_across_data_stores"></a>Consistency across data stores</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The Distributed Server leverages several data stores:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Cassandra is used for metadata storage</p>
+</li>
+<li>
+<p>ElasticSearch for search</p>
+</li>
+<li>
+<p>Object Storage for large object storage</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Thus the Distributed Server also offers mechanisms to enforce consistency across data stores.</p>
+</div>
+<div class="sect2">
+<h3 id="_write_path_organisation"><a class="anchor" href="#_write_path_organisation"></a>Write path organisation</h3>
+<div class="paragraph">
+<p>The primary data stores are composed of Cassandra for metadata and Object storage for binary data.</p>
+</div>
+<div class="paragraph">
+<p>To ensure the data referenced in Cassandra is pointing to a valid object in the object store, we write
+the object store payload first, then write the corresponding metadata in Cassandra.</p>
+</div>
+<div class="paragraph">
+<p>Such a procedure avoids metadata pointing to unexisting blobs, however might lead to some unreferenced
+blobs.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_cassandra_elasticsearch"><a class="anchor" href="#_cassandra_elasticsearch"></a>Cassandra &lt;&#8658; ElasticSearch</h3>
+<div class="paragraph">
+<p>After being written to the primary stores (namely Cassandra &amp; Object Storage), email content is
+asynchronously indexed into ElasticSearch.</p>
+</div>
+<div class="paragraph">
+<p>This process, called the EventBus, which retries temporary errors, and stores transient errors for
+later admin-triggered retries is described further <a href="../operate/guide.html#_mailbox_event_bus" class="xref page">here</a>.
+His role is to spread load and limit inconsistencies.</p>
+</div>
+<div class="paragraph">
+<p>Furthermore, some <a href="../operate/guide.html#_usual_troubleshooting_procedures" class="xref page">re-indexing tasks</a>
+enables to re-synchronise ElasticSearch content with the primary data stores</p>
+</div>
+</div>
+</div>
+</div>
 </article>
   </div>
 </main>
@@ -632,7 +580,7 @@ JMAP support could be added, but requires followup developments as some componen
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/architecture/index.html b/james-distributed-app/3.7.5/architecture/index.html
similarity index 65%
copy from james-project/3.9.0/servers/distributed/architecture/index.html
copy to james-distributed-app/3.7.5/architecture/index.html
index 759a94547..190a96b11 100644
--- a/james-project/3.9.0/servers/distributed/architecture/index.html
+++ b/james-distributed-app/3.7.5/architecture/index.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Distributed James Server &mdash; Architecture :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/architecture/index.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="3">
+  <li class="nav-item is-current-page" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../configure/index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="../configure/elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
       <ul class="versions">
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,16 +355,23 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/architecture/index.html">3.8.1</a>
+    <a class="version is-current" href="index.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/architecture/index.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -580,7 +382,7 @@
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>This sections presents the Distributed James Server architecture.</p>
+<p>This sections presents the Distributed Server architecture.</p>
 </div>
 </div>
 </div>
@@ -588,41 +390,39 @@
 <h2 id="_storage"><a class="anchor" href="#_storage"></a>Storage</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>In order to deliver its promises, the Distributed James Server leverages the following storage strategies:</p>
+<p>In order to deliver its promises, the Distributed Server leverages the following storage strategies:</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="../../_images/storage_james_distributed.png" alt="Storage responsibilities for the Distributed James Server">
+<img src="../_images/storage.png" alt="Storage responsibilities for the Distributed Server">
 </div>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Cassandra is used for metadata storage. Cassandra is efficient for a very high workload of small queries following a known pattern.</p>
+<p><strong>Cassandra</strong> is used for metadata storage</p>
 </li>
 <li>
-<p>The <strong>blob store</strong> storage interface is responsible for storing potentially large binary data. For instance
- email bodies, headers or attachments. Different technologies can be used: <strong>cassandra</strong>, or S3 compatible <strong>Object Storage</strong>
-(S3 or Swift).</p>
+<p>The <strong>blob store</strong> storage interface is responsible of storing potentially large binary data. For instance
+ email bodies, headers or attachments. Different technologies can be used: <strong>Cassandra</strong>, or S3 compatible <strong>Object Storage</strong>
+(S3 or Swift)</p>
 </li>
 <li>
-<p><strong>OpenSearch</strong> component empowers full text search on emails. It also enables querying data with unplanned access
-patterns. OpenSearch throughput do not however match the one of cassandra thus its use is avoided upon regular workloads.</p>
+<p><strong>ElasticSearch</strong> component empowers full text search on emails.</p>
 </li>
 <li>
-<p><strong>RabbitMQ</strong> enables James nodes of a same cluster to collaborate together. It is used to implement connected protocols,
-notification patterns as well as distributed resilient work queues and mail queue.</p>
+<p><strong>RabbitMQ</strong> enables James nodes of a same cluster to collaborate together.</p>
 </li>
 <li>
 <p><strong>Tika</strong> (optional) enables text extraction from attachments, thus improving full text search results.</p>
 </li>
 <li>
-<p><strong><a href="https://spamassassin.apache.org/">SpamAssassin</a> or <a href="https://rspamd.com/">Rspamd</a></strong> (optional) can be used for Spam detection and user feedback is supported.</p>
+<p><strong>SpamAssassin</strong> (optional) can be used for Spam detection and user feedback is supported.</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p><a href="consistency-model.html" class="page">This page</a> further details Distributed James Server consistency model.</p>
+<p><a href="consistency-model.html" class="xref page">This page</a> further details Distributed James consistency model.</p>
 </div>
 </div>
 </div>
@@ -630,7 +430,7 @@ notification patterns as well as distributed resilient work queues and mail queu
 <h2 id="_protocols"><a class="anchor" href="#_protocols"></a>Protocols</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>The following protocols are supported and can be used to interact with the Distributed James Server:</p>
+<p>The following protocols are supported and can be used to interact with the Distributed Server:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -641,14 +441,11 @@ notification patterns as well as distributed resilient work queues and mail queu
 <p><strong>IMAP</strong></p>
 </li>
 <li>
-<p><a href="../operate/webadmin.html" class="page">WebAdmin</a> REST Administration API</p>
+<p><a href="../operate/webadmin.html" class="xref page">WebAdmin</a> REST Administration API</p>
 </li>
 <li>
 <p><strong>LMTP</strong></p>
 </li>
-<li>
-<p><strong>POP3</strong></p>
-</li>
 </ul>
 </div>
 <div class="paragraph">
@@ -660,12 +457,19 @@ notification patterns as well as distributed resilient work queues and mail queu
 <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>
 </li>
 <li>
-<p><strong>ManagedSieve</strong></p>
+<p><strong>POP3</strong></p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>Read more on <a href="implemented-standards.html" class="page">implemented standards</a>.</p>
+<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>
@@ -675,7 +479,7 @@ notification patterns as well as distributed resilient work queues and mail queu
 <div class="paragraph">
 <p>While it is perfectly possible to deploy homogeneous James instances, with the same configuration and thus the same
 protocols and the same responsibilities one might want to investigate in
-<a href="specialized-instances.html" class="page">'Specialized instances'</a>.</p>
+<a href="specialized-instances.html" class="xref page">'Specialized instances'</a>.</p>
 </div>
 </div>
 </div>
@@ -683,7 +487,7 @@ protocols and the same responsibilities one might want to investigate in
 <h2 id="_components"><a class="anchor" href="#_components"></a>Components</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>This section presents the various components of the Distributed James Server, providing context about
+<p>This section presents the various components of the Distributed server, providing context about
 their interactions, and about their implementations.</p>
 </div>
 <div class="sect2">
@@ -693,7 +497,7 @@ their interactions, and about their implementations.</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="../../_images/server-components.png" alt="Server components mobilized for SMTP &amp; IMAP">
+<img src="../_images/server-components.png" alt="Server components mobilized for SMTP &amp; IMAP">
 </div>
 </div>
 <div class="ulist">
@@ -703,7 +507,7 @@ their interactions, and about their implementations.</p>
 </li>
 <li>
 <p>The MailetContainer will start processing the mail Asynchronously and will take business decisions like storing the
-email locally in a user mailbox. The behaviour of the MailetContainer is highly customizable thanks to the Mailets and
+email localy in a user mailbox. The behaviour of the MailetContainer is highly customizable thanks to the Mailets and
 the Matcher composibility.</p>
 </li>
 <li>
@@ -777,7 +581,7 @@ of this mail repository can help refine a host spammer blacklist.</p>
 </li>
 <li>
 <p><code>cassandra://var/mail/rrt-error/</code> : runtime error upon Recipient
-Rewriting occurred. This is typically due to a loop.</p>
+Rewritting occurred. This is typically due to a loop.</p>
 </li>
 </ul>
 </div>
@@ -834,23 +638,26 @@ of your IP address.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_why_combining_rabbitmq_object_storage_cassandra_for_mailqueue"><a class="anchor" href="#_why_combining_rabbitmq_object_storage_cassandra_for_mailqueue"></a>Why combining RabbitMQ, Object storage , Cassandra for MailQueue</h4>
+<h4 id="_why_combining_cassandra_rabbitmq_and_object_storage_for_mailqueue"><a class="anchor" href="#_why_combining_cassandra_rabbitmq_and_object_storage_for_mailqueue"></a>Why combining Cassandra, RabbitMQ and Object storage for MailQueue</h4>
 <div class="ulist">
 <ul>
 <li>
 <p>RabbitMQ ensures the messaging function, and avoids polling.</p>
 </li>
 <li>
+<p>Cassandra enables administrative operations such as browsing, deleting
+using a time series which might require fine performance tuning (see
+<a href="http://cassandra.apache.org/doc/latest/operating/index.html">Operating
+Casandra documentation</a>).</p>
+</li>
+<li>
 <p>Object Storage stores potentially large binary payload.</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>Unresolved include directive in modules/servers/partials/architecture/index.adoc - include::servers:distributed/architecture/mailqueue_combined_extend.adoc[]</p>
-</div>
-<div class="paragraph">
-<p>However, the current design do not implement delays. Delays allow to
-define the time a mail have to be living in the mail queue before being
+<p>However the current design do not implement delays. Delays allow to
+define the time a mail have to be living in the mailqueue before being
 dequeued and is used for example for exponential wait delays upon remote
 delivery retries, or</p>
 </div>
@@ -862,33 +669,33 @@ delivery retries, or</p>
 <p>Storage for emails belonging for users.</p>
 </div>
 <div class="paragraph">
-<p>Metadata are stored in cassandra while headers, bodies and attachments are stored
+<p>Metadata are stored in Cassandra while headers, bodies and attachments are stored
 within the <a href="#_blobstore">BlobStore</a>.</p>
 </div>
 <div class="sect3">
 <h4 id="_search_index"><a class="anchor" href="#_search_index"></a>Search index</h4>
 <div class="paragraph">
-<p>Emails are indexed asynchronously in OpenSearch via the <a href="#_event_bus">EventBus</a>
-in order to empower advanced and fast email full text search.</p>
+<p>Emails are indexed asynchronously in ElasticSearch via the <a href="#_event_bus">EventBus</a>
+in order to enpower advanced and fast email full text search.</p>
 </div>
 <div class="paragraph">
 <p>Text extraction can be set up using <a href="https://tika.apache.org/">Tika</a>, allowing
 to extract the text from attachment, allowing to search your emails based on the attachment
-textual content. In such case, the OpenSearch indexer will call a Tika server prior
+textual content. In such case, the ElasticSearch indexer will call a Tika server prior
 indexing.</p>
 </div>
 </div>
 <div class="sect3">
 <h4 id="_quotas"><a class="anchor" href="#_quotas"></a>Quotas</h4>
 <div class="paragraph">
-<p>Current Quotas of users are hold in a cassandra projection. Limitations can be defined via
+<p>Current Quotas of users are hold in a Cassandra projection. Limitations can be defined via
 user, domain or globally.</p>
 </div>
 </div>
 <div class="sect3">
 <h4 id="_event_bus"><a class="anchor" href="#_event_bus"></a>Event Bus</h4>
 <div class="paragraph">
-<p>Distributed James Server relies on an event bus system to enrich mailbox capabilities. Each
+<p>Distributed James relies on an event bus system to enrich mailbox capabilities. Each
 operation performed on the mailbox will trigger related events, that can
 be processed asynchronously by potentially any James node on a
 distributed system.</p>
@@ -932,7 +739,8 @@ operation, such as:</p>
 <p><code>FlagsUpdated</code>: messages had their flags updated</p>
 </li>
 <li>
-<p><code>MessageMoveEvent</code>: messages have been moved from a mailbox to another</p>
+<p><code>MessageMoveEvent</code>: messages have been moved from a mailbox to an
+other</p>
 </li>
 </ul>
 </div>
@@ -953,13 +761,13 @@ operations on the system, like:</p>
 <p>Current quota calculation</p>
 </li>
 <li>
-<p>Message indexation with OpenSearch</p>
+<p>Message indexation with ElasticSearch</p>
 </li>
 <li>
 <p>Mailbox annotations cleanup</p>
 </li>
 <li>
-<p>Ham/spam reporting to Spam filtering system</p>
+<p>Ham/spam reporting to SpamAssassin</p>
 </li>
 <li>
 <p>…</p>
@@ -992,7 +800,7 @@ and by that we mean when they try to definitely delete them by emptying
 the trash, James will retain these mails into the Deleted Messages
 Vault, before an email or a mailbox is going to be deleted. And only
 administrators can interact with this component via
-<a href="../operate/webadmin.html#_deleted_messages_vault" class="page">WebAdmin</a> REST APIs.</p>
+wref:webadmin.adoc#_deleted-messages-vault[WebAdmin] REST APIs].</p>
 </div>
 <div class="paragraph">
 <p>However, mails are not retained forever as you have to configure a
@@ -1007,65 +815,65 @@ not defined). It’s also possible to permanently delete a mail if needed.</p>
 <p>Storage for domains and users.</p>
 </div>
 <div class="paragraph">
-<p>Domains are persisted in cassandra.</p>
+<p>Domains are persisted in Cassandra.</p>
 </div>
 <div class="paragraph">
-<p>Users can be managed in cassandra, or via a LDAP (read only).</p>
+<p>Users can be managed in Cassandra, or via a LDAP (read only).</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_recipient_rewrite_tables"><a class="anchor" href="#_recipient_rewrite_tables"></a>Recipient rewrite tables</h3>
 <div class="paragraph">
-<p>Storage of Recipients Rewriting rules, in cassandra.</p>
+<p>Storage of Recipients Rewritting rules, in Cassandra.</p>
 </div>
 <div class="sect3">
 <h4 id="_mapping_types"><a class="anchor" href="#_mapping_types"></a>Mapping types</h4>
 <div class="paragraph">
-<p>James allows using various mapping types for better expressing the intent of your address rewriting logic:</p>
+<p>James allows using various mapping types for better expressing the intent of your address rewritting logic:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
 <p><strong>Domain mapping</strong>: Rewrites the domain of mail addresses. Use it for technical purposes, user will not
 be allowed to use the source in their FROM address headers. Domain mappings can be managed via the CLI and
-added via <a href="../operate/webadmin.html#_domain_mappings" class="page">WebAdmin</a></p>
+added via <a href="../operate/webadmin.html#_domain_mappings" class="xref page">WebAdmin</a></p>
 </li>
 <li>
 <p><strong>Domain aliases</strong>: Rewrites the domain of mail addresses. Express the idea that both domains can be used
 inter-changeably. User will be allowed to use the source in their FROM address headers. Domain aliases can
-be managed via <a href="../operate/webadmin.html#_get_the_list_of_aliases_for_a_domain" class="page">WebAdmin</a></p>
+be managed via <a href="../operate/webadmin.html#_get_the_list_of_aliases_for_a_domain" class="xref page">WebAdmin</a></p>
 </li>
 <li>
 <p><strong>Forwards</strong>: Replaces the source address by another one. Vehicles the intent of forwarding incoming mails
 to other users. Listing the forward source in the forward destinations keeps a local copy. User will not be
 allowed to use the source in their FROM address headers. Forward can
-be managed via <a href="../operate/webadmin.html#_address_forwards" class="page">WebAdmin</a></p>
+be managed via <a href="../operate/webadmin.html#_address_forwards" class="xref page">WebAdmin</a></p>
 </li>
 <li>
 <p><strong>Groups</strong>: Replaces the source address by another one. Vehicles the intent of a group registration: group
 address will be swapped by group member addresses (Feature poor mailing list). User will not be
 allowed to use the source in their FROM address headers. Groups can
-be managed via <a href="../operate/webadmin.html#_address_group" class="page">WebAdmin</a></p>
+be managed via <a href="../operate/webadmin.html#_address_group" class="xref page">WebAdmin</a></p>
 </li>
 <li>
 <p><strong>Aliases</strong>: Replaces the source address by another one. Represents user owned mail address, with which
 he can interact as if it was his main mail address. User will be allowed to use the source in their FROM
-address headers. Aliases can be managed via <a href="../operate/webadmin.html#_address_aliases" class="page">WebAdmin</a></p>
+address headers. Aliases can be managed via <a href="../operate/webadmin.html#_address_aliases" class="xref page">WebAdmin</a></p>
 </li>
 <li>
-<p><strong>Address mappings</strong>: Replaces the source address by another one.Use for technical purposes, this mapping type do
-not hold specific intent.Prefer using one of the above mapping types&#8230;&#8203; User will not be allowed to use the source
-in their FROM address headers.Address mappings can be managed via the CLI or via
-<a href="../operate/webadmin.html#_address_mappings" class="page">WebAdmin</a></p>
+<p><strong>Address mappings</strong>: Replaces the source address by another one. Use for technical purposes, this mapping type do
+not hold specific intent. Prefer using one of the above mapping types&#8230;&#8203; User will not be allowed to use the source
+in their FROM address headers. Address mappings can be managed via the CLI or via
+<a href="../operate/webadmin.html#_address_mappings" class="xref page">WebAdmin</a></p>
 </li>
 <li>
-<p><strong>Regex mappings</strong>: Applies the regex on the supplied address.User will not be allowed to use the source
-in their FROM address headers.Regex mappings can be managed via the CLI or via
-<a href="../operate/webadmin.html#_regex_mapping" class="page">WebAdmin</a></p>
+<p><strong>Regex mappings</strong>: Applies the regex on the supplied address. User will not be allowed to use the source
+in their FROM address headers. Regex mappings can be managed via the CLI or via
+<a href="../operate/webadmin.html#_regex_mapping" class="xref page">WebAdmin</a></p>
 </li>
 <li>
-<p><strong>Error</strong>: Throws an error upon processing.User will not be allowed to use the source
-in their FROM address headers.Errors can be managed via the CLI</p>
+<p><strong>Error</strong>: Throws an error upon processing. User will not be allowed to use the source
+in their FROM address headers. Errors can be managed via the CLI</p>
 </li>
 </ul>
 </div>
@@ -1100,17 +908,17 @@ based on bloom filters can be used and triggered using the WebAdmin REST API.</p
 <div class="paragraph">
 <p>Allows to control and schedule long running tasks run by other
 components. Among other it enables scheduling, progress monitoring,
-cancellation of long running tasks.</p>
+cancelation of long running tasks.</p>
 </div>
 <div class="paragraph">
-<p>Distributed James Server leverage a task manager using Event Sourcing and RabbitMQ for messaging.</p>
+<p>Distributed James leverage a task manager using Event Sourcing and RabbitMQ for messaging.</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_event_sourcing"><a class="anchor" href="#_event_sourcing"></a>Event sourcing</h3>
 <div class="paragraph">
 <p><a href="https://martinfowler.com/eaaDev/EventSourcing.html">Event sourcing</a> implementation
-for the Distributed James Server stores events in cassandra. It enables components
+for the Distributed server stores events in Cassandra. It enables components
 to rely on event sourcing technics for taking decisions.</p>
 </div>
 <div class="paragraph">
@@ -1146,7 +954,7 @@ to rely on event sourcing technics for taking decisions.</p>
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/architecture/specialized-instances.html b/james-distributed-app/3.7.5/architecture/specialized-instances.html
similarity index 56%
copy from james-project/3.9.0/servers/distributed/architecture/specialized-instances.html
copy to james-distributed-app/3.7.5/architecture/specialized-instances.html
index 9868e7008..18ee7c8dc 100644
--- a/james-project/3.9.0/servers/distributed/architecture/specialized-instances.html
+++ b/james-distributed-app/3.7.5/architecture/specialized-instances.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Distributed James Server &mdash; Specialized instances :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/architecture/specialized-instances.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="4">
+  <li class="nav-item is-current-page" data-depth="3">
     <a class="nav-link" href="specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../configure/index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="../configure/elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="../configure/search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../configure/dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
       <ul class="versions">
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,17 +355,24 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <li><a href="index.html">Architecture</a></li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/architecture/specialized-instances.html">3.8.1</a>
+    <a class="version is-current" href="specialized-instances.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/architecture/specialized-instances.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -583,20 +385,20 @@
 protocols and the same responsibilities one might want to investigate in 'Specialized instances'.</p>
 </div>
 <div class="paragraph">
-<p>This deployment topology consists of Distributed James Server with heterogeneous configurations on top of shared
-databases. Groups of James servers will thus handle various protocols and have different responsibilities.</p>
+<p>This deployment topology consists of Distributed James servers with heterogeneous configurations on top of shared
+data-bases. Groups of James servers will thus handle various protocols and have different responsibilities.</p>
 </div>
 <div class="paragraph">
-<p>This approach limits cascading failures across protocols and services. Think of <strong>OutOfMemoryErrors</strong>, CPUs starvation,
-{backend-name} driver issue, etc.</p>
+<p>This approach limits cascading failures across protocols and services. Think of <strong>OutOfMemoryErrors</strong>, Cassandra driver
+queue overuse, CPUs starvation, etc.</p>
 </div>
 <div class="paragraph">
-<p>However, we can&#8217;t speak of microservices here: all James instances runs the same code, James is still a monolith, and
+<p>However, we can&#8217;t speak of micro-services here: all James instances runs the same code, James is still a monolith, and
 databases need to be shared across instances.</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="../../_images/specialized-instances-distributed.png" alt="Example of Specialized instances topology">
+<img src="../_images/specialized-instances.png" alt="Example of Specialized instances topology">
 </div>
 </div>
 <div class="paragraph">
@@ -632,13 +434,13 @@ protocols configuration files to learn more.</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="#{xref-base}/configure/mailetcontainer.adoc" class="page unresolved">Mail processing can be switched off</a>.</p>
+<p><a href="../configure/mailetcontainer.html" class="xref page">Mail processing can be switched off</a>.</p>
 </li>
 <li>
-<p><a href="#{xref-base}/configure/listeners.adoc" class="page unresolved">Mailbox event processing can be switched off</a>.</p>
+<p><a href="../configure/listeners.html" class="xref page">Mailbox event processing can be switched off</a>.</p>
 </li>
 <li>
-<p><a href="#{xref-base}/configure/rabbitmq.adoc" class="page unresolved">Task execution can be switched off</a>.</p>
+<p><a href="../configure/rabbitmq.html" class="xref 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>
@@ -657,7 +459,7 @@ instances to mitigate costs.</p>
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/configure/batchsizes.html b/james-distributed-app/3.7.5/configure/batchsizes.html
similarity index 60%
copy from james-project/3.9.0/servers/distributed/configure/batchsizes.html
copy to james-distributed-app/3.7.5/configure/batchsizes.html
index eb1d2286f..52461f675 100644
--- a/james-project/3.9.0/servers/distributed/configure/batchsizes.html
+++ b/james-distributed-app/3.7.5/configure/batchsizes.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Distributed James Server &mdash; batchsizes.properties :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/configure/batchsizes.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../architecture/index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../architecture/implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item is-current-page" data-depth="5">
+  <li class="nav-item is-current-page" data-depth="4">
     <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
       <ul class="versions">
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,18 +355,25 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <li><a href="index.html">Configuration</a></li>
     <li>Core components</li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/configure/batchsizes.html">3.8.1</a>
+    <a class="version is-current" href="batchsizes.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/configure/batchsizes.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -637,7 +439,7 @@ to get some examples and hints.</p>
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/configure/blobstore.html b/james-distributed-app/3.7.5/configure/blobstore.html
similarity index 64%
copy from james-project/3.9.0/servers/distributed/configure/blobstore.html
copy to james-distributed-app/3.7.5/configure/blobstore.html
index d755252f8..a925dcebe 100644
--- a/james-project/3.9.0/servers/distributed/configure/blobstore.html
+++ b/james-distributed-app/3.7.5/configure/blobstore.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Distributed James Server &mdash; blobstore.properties :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/configure/blobstore.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../architecture/index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../architecture/implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item is-current-page" data-depth="5">
+  <li class="nav-item is-current-page" data-depth="4">
     <a class="nav-link" href="blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
         </li>
       </ul>
     </li>
     <li class="component">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
       <ul class="versions">
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,18 +355,25 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <li><a href="index.html">Configuration</a></li>
     <li>Storage dependencies</li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/configure/blobstore.html">3.8.1</a>
+    <a class="version is-current" href="blobstore.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/configure/blobstore.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -612,10 +414,6 @@ in GIT to get some examples and hints.</p>
 <li>
 <p>objectstorage: use Swift/AWS S3 based BlobStore</p>
 </li>
-<li>
-<p>file: (experimental) use directly the file system. Useful for legacy architecture based on shared ISCI SANs and/or
-distributed file system with no object store available.</p>
-</li>
 </ul>
 </div>
 <div class="admonitionblock warning">
@@ -669,7 +467,7 @@ If you are upgrading from James 3.5 or older, the deduplication was enabled.
 <div class="paragraph">
 <p>Deduplication requires a garbage collector mechanism to effectively drop blobs. A first implementation
 based on bloom filters can be used and triggered using the WebAdmin REST API. See
-<a href="../operate/webadmin.html#_running_blob_garbage_collection" class="page">Running blob garbage collection</a>.</p>
+<a href="../operate/webadmin.html#_running_blob_garbage_collection" class="xref page">Running blob garbage collection</a>.</p>
 </div>
 <div class="paragraph">
 <p>In order to avoid concurrency issues upon garbage collection, we slice the blobs in generation, the two more recent
@@ -685,45 +483,6 @@ conflicts. Defaults to 1.</p>
 </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.
-A dedicated keyspace with a replication factor of one is then used.
-Cache eviction policy is TTL based.
-Only blobs below a given threshold will be stored.
-To be noted that blobs are stored within a single Cassandra row, hence a low threshold should be used.</p>
-</div>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 1. blobstore.properties cache related content</caption>
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property name</th>
-<th class="tableblock halign-left valign-top">explanation</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">cache.enable</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">DEFAULT: false, optional, must be a boolean. Whether the cache should be enabled.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">cache.cassandra.ttl</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">DEFAULT: 7 days, optional, must be a duration. Cache eviction policy is TTL based.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">cache.sizeThresholdInBytes</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">DEFAULT: 8192, optional, must be a positive integer. Unit: bytes.
-Supported units: bytes, Kib, MiB, GiB, TiB
-Maximum size of stored objects expressed in bytes.</p></td>
-</tr>
-</tbody>
-</table>
-</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
@@ -746,17 +505,6 @@ performance price have to be paid, as encryption takes resources.</p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>The following properties CAN be supplied:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>encryption.aes.private.key.algorithm</strong> : String, defaulting to PBKDF2WithHmacSHA512. Previously was
-PBKDF2WithHmacSHA1.</p>
-</li>
-</ul>
-</div>
 <div class="admonitionblock warning">
 <table>
 <tr>
@@ -783,24 +531,50 @@ openssl rand -base64 64
 generate salt with : openssl rand -hex 16</pre>
 </div>
 </div>
-<div class="paragraph">
-<p>AES blob store supports the following system properties that could be configured in <code>jvm.properties</code>:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre># Threshold from which we should buffer the blob to a file upon encrypting
-# Unit supported: K, M, G, default to no unit
-james.blob.aes.file.threshold.encrypt=100K
-
-# Threshold from which we should buffer the blob to a file upon decrypting
-# Unit supported: K, M, G, default to no unit
-james.blob.aes.file.threshold.decrypt=256K
-
-# Maximum size of a blob. Larger blobs will be rejected.
-# Unit supported: K, M, G, default to no unit
-james.blob.aes.blob.max.size=100M</pre>
 </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.
+A dedicated keyspace with a replication factor of one is then used.
+Cache eviction policy is TTL based.
+Only blobs below a given threshold will be stored.
+To be noted that blobs are stored within a single Cassandra row, hence a low threshold should be used.</p>
 </div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 1. blobstore.properties cache related content</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property name</th>
+<th class="tableblock halign-left valign-top">explanation</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cache.enable</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">DEFAULT: false, optional, must be a boolean. Whether the cache should be enabled.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cache.cassandra.ttl</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">DEFAULT: 7 days, optional, must be a duration. Cache eviction policy is TTL based.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cache.cassandra.timeout</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">DEFAULT: 100ms, optional, must be a duration, cannot exceed 1 hour.
+Timeout after which this cache should be bypassed.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cache.sizeThresholdInBytes</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">DEFAULT: 8192, optional, must be a positive integer. Unit: bytes.
+Supported units: bytes, Kib, MiB, GiB, TiB
+Maximum size of stored objects expressed in bytes.</p></td>
+</tr>
+</tbody>
+</table>
 </div>
 <div class="sect2">
 <h3 id="_object_storage_configuration"><a class="anchor" href="#_object_storage_configuration"></a>Object storage configuration</h3>
@@ -856,11 +630,6 @@ james.blob.aes.blob.max.size=100M</pre>
 <td class="tableblock halign-left valign-top"><p class="tableblock">optional: Use this specific trust store algorithm; default SunX509</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">objectstorage.s3.trustall</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">optional: boolean. Defaults to false. Cannot be set to true with other trustore options. Wether James should validate
-S3 endpoint SSL certificates.</p></td>
-</tr>
-<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">objectstorage.s3.read.timeout</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">optional: HTTP read timeout. duration, default value being second. Leaving it empty relies on S3 driver defaults.</p></td>
 </tr>
@@ -872,23 +641,6 @@ S3 endpoint SSL certificates.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">objectstorage.s3.connection.timeout</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">optional: HTTP connection timeout. duration, default value being second. Leaving it empty relies on S3 driver defaults.</p></td>
 </tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">objectstorage.s3.in.read.limit</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">optional: Object read in memory will be rejected if they exceed the size limit exposed here. Size, exemple <code>100M</code>.
-Supported units: K, M, G, defaults to B if no unit is specified. If unspecified, big object won&#8217;t be prevented
-from being loaded in memory. This settings complements protocol limits.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">objectstorage.s3.upload.retry.maxAttempts</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">optional: Integer. Default is zero. This property specifies the maximum number of retry attempts allowed for failed upload operations.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">objectstorage.s3.upload.retry.backoffDurationMillis</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">optional: Long (Milliseconds). Default is 10 (miliseconds).
-Only takes effect when the "objectstorage.s3.upload.retry.maxAttempts" property is declared.
-This property determines the duration (in milliseconds) to wait between retry attempts for failed upload operations.
-This delay is known as backoff. The jitter factor is 0.5</p></td>
-</tr>
 </tbody>
 </table>
 </div>
@@ -909,7 +661,7 @@ This delay is known as backoff. The jitter factor is 0.5</p></td>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">objectstorage.bucketPrefix</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Bucket is a concept in James and similar to Containers in Swift or Buckets in AWS S3.
+<td class="tableblock halign-left valign-top"><p class="tableblock">Bucket is an concept in James and similar to Containers in Swift or Buckets in AWS S3.
 BucketPrefix is the prefix of bucket names in James BlobStore</p></td>
 </tr>
 <tr>
@@ -920,58 +672,6 @@ Unless a special case like storing blobs of deleted messages.</p></td>
 </tbody>
 </table>
 </div>
-<div class="sect3">
-<h4 id="_sse_c_configuration"><a class="anchor" href="#_sse_c_configuration"></a>SSE-C Configuration</h4>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 4. SSE-C configuration</caption>
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property name</th>
-<th class="tableblock halign-left valign-top">explanation</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">encryption.s3.sse.c.enable</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">optional: Boolean. Default is false. Controls whether to use Server-Side Encryption with Customer-Provided Keys (SSE-C) for S3 blobs.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">encryption.s3.sse.c.master.key.algorithm</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">String. Required if <code>encryption.s3.sse.c.enable</code> is true. The algorithm used to derive the master key from the provided password. Eg: AES256</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">encryption.s3.sse.c.master.key.password</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">String. Required if <code>encryption.s3.sse.c.enable</code> is true. The password used to generate the customer key.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">encryption.s3.sse.c.master.key.salt</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">String. Required if <code>encryption.s3.sse.c.enable</code> is true. The salt used to generate the customer key.</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect3">
-<h4 id="_improve_listing_support_for_minio"><a class="anchor" href="#_improve_listing_support_for_minio"></a>Improve listing support for MinIO</h4>
-<div class="paragraph">
-<p>Due to blobs being stored in folder, adding <code>/</code> in blobs name emulates folder and avoids blobs to be all stored in a
-same folder, thus improving listing.</p>
-</div>
-<div class="paragraph">
-<p>Instead of <code>1_628_36825033-d835-4490-9f5a-eef120b1e85c</code> the following blob id will be used: <code>1/628/3/6/8/2/5033-d835-4490-9f5a-eef120b1e85c</code></p>
-</div>
-<div class="paragraph">
-<p>To enable blob hierarchy compatible with MinIO add in <code>jvm.properties</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>james.s3.minio.compatibility.mode=true</pre>
-</div>
-</div>
-</div>
 </div>
 </div>
 </div>
@@ -994,7 +694,7 @@ in GIT to get some examples and hints.</p>
 <p>Configuration for exporting blob content:</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 5. blobstore.properties content</caption>
+<caption class="title">Table 4. blobstore.properties content</caption>
 <colgroup>
 <col style="width: 100%;">
 </colgroup>
@@ -1029,7 +729,7 @@ Default: <a href="file://var/blobExporting" class="bare">file://var/blobExportin
 <div class="sect2">
 <h3 id="_linshare_blob_export_configuration"><a class="anchor" href="#_linshare_blob_export_configuration"></a>LinShare Blob Export Configuration</h3>
 <div class="paragraph">
-<p>Instead of exporting blobs in local file system, using <a href="https://www.linshare.org">LinShare</a>
+<p>Instead of exporting blobs in local file system, using <a href="https://www.linshare.org/en/index.html">LinShare</a>
 helps you upload your blobs and people you have been shared to can access those blobs by accessing to
 LinShare server and download them.</p>
 </div>
@@ -1056,7 +756,7 @@ LinShare server and download them.</p>
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/configure/cassandra.html b/james-distributed-app/3.7.5/configure/cassandra.html
similarity index 64%
copy from james-project/3.9.0/servers/distributed/configure/cassandra.html
copy to james-distributed-app/3.7.5/configure/cassandra.html
index 33b65cdc4..fa0412daf 100644
--- a/james-project/3.9.0/servers/distributed/configure/cassandra.html
+++ b/james-distributed-app/3.7.5/configure/cassandra.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Distributed James Server &mdash; cassandra.properties :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/configure/cassandra.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../architecture/index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../architecture/implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="5">
+  <li class="nav-item is-current-page" data-depth="4">
     <a class="nav-link" href="cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
         </li>
       </ul>
     </li>
     <li class="component">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
       <ul class="versions">
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,18 +355,25 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <li><a href="index.html">Configuration</a></li>
     <li>Storage dependencies</li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/configure/cassandra.html">3.8.1</a>
+    <a class="version is-current" href="cassandra.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/configure/cassandra.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -582,20 +384,9 @@
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>This configuration file allow setting some configuration properties in conjunction to
-Cassandra driver native configuration.</p>
-</div>
-<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>
 to get some examples and hints.</p>
 </div>
-<div class="paragraph">
-<p>Consult this <a href="https://github.com/apache/james-project/blob/master/server/apps/distributed-app/sample-configuration/cassandra-driver.conf">example</a>
-to get some examples and hints for Cassandra driver native configuration.</p>
-</div>
-<div class="paragraph">
-<p>Cassandra native configuration allows configuring SSL, timeouts, logs and metrics as well as execution profiles.</p>
-</div>
 </div>
 </div>
 <div class="sect1">
@@ -641,15 +432,62 @@ required if <strong>cassandra.password</strong> is supplied</p></td>
 required if &lt;strong&gt;cassandra.user&lt;/strong&gt; is supplied</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.ssl</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Whether SSL should be enabled on the communications with Cassandra cluster. Optional, defaults to false.</p>
+<p class="tableblock">The keystore used for trusting SSL server socket can be set via JSSE system properties as explained on
+<a href="https://docs.datastax.com/en/developer/java-driver/3.7/manual/ssl/">Cassandra driver manual</a>.</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.replication.factor</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Is the replication factor used upon keyspace creation. Modifying this property while the keyspace already exists
 will have no effect. Optional. Default value 1.</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.query.logger.constant.threshold</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">If specified all queries that take more than the given integer in millisecond will be considered slow and logged.
+If not specified by default a DynamicThresholdQueryLogger will be used (see above)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.query.slow.query.latency.threshold.percentile</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default is com.datastax.driver.core.QueryLogger.DEFAULT_SLOW_QUERY_THRESHOLD_PERCENTILE.
+The latency percentile beyond which queries are considered 'slow' and will be logged.
+If you specify cassandra.query.logger.constant.threshold, you should not specify this property</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.query.logger.max.query.string.length</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default is com.datastax.driver.core.QueryLogger.DEFAULT_MAX_QUERY_STRING.LENGTH.
+The maximum length of a CQL query string that can be logged verbatim by the cassandra driver</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.query.logger.max.logged.parameters</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default is com.datastax.driver.core.QueryLogger.DEFAULT_MAX_LOGGED_PARAMETERS.
+The maximum number of query parameters that can be logged by the cassandra driver</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.query.logger.max.parameter.value.length</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Default is com.datastax.driver.core.QueryLogger.DEFAULT_MAX_PARAMETER_VALUE_LENGTH.
+The maximum length of query parameter value that can be logged by the cassandra driver</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.readTimeoutMillis</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional.
+If specified defines the Cassandra <a href="https://docs.datastax.com/en/developer/java-driver/3.5/manual/socket_options/">driver read timeout</a>.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.consistency_level.regular</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Allows specifying the driver default consistency level. Defaults to QUORUM.
+Allowed values: <a href="https://docs.datastax.com/en/cassandra-oss/3.x/cassandra/dml/dmlConfigConsistency.html">QUORUM, LOCAL_QUORUM, or EACH_QUORUM</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.consistency_level.lightweight_transaction</p></td>
+<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">limitation of multi-DC setups for James</a>
+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="xref 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>
@@ -662,13 +500,85 @@ Falls back to default read consistency level if the blob is missing. Defaults to
 </div>
 </div>
 <div class="sect1">
+<h2 id="_pooling_options"><a class="anchor" href="#_pooling_options"></a>Pooling options</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Here are some properties for Pooling options:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre># Read com.datastax.driver.core.PoolingOptions for knowing defaults value
+# No value here will default to driver's default value
+
+# cassandra.pooling.local.max.connections=8
+# cassandra.pooling.local.max.requests=128
+## In ms. Should be higher than socket read timeout
+# cassandra.pooling.timeout=5000
+## In seconds.
+# cassandra.pooling.heartbeat.timeout=30
+# cassandra.pooling.max.queue.size=256</pre>
+</div>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 2. cassandra.properties content</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property name</th>
+<th class="tableblock halign-left valign-top">explanation</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.pooling.local.max.connections</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Defaults to 8.
+If specified defines the Cassandra
+<a href="https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/#pool-size">maximum number of connections to hosts</a>
+(remote and local).</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.pooling.local.max.requests</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Defaults to 128.
+If specified defines the Cassandra
+<a href="https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/">maximum number of concurrent requests per connection</a>.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.pooling.timeout</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Defaults to 5000 (ms).
+If specified defines the Cassandra
+<a href="https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/#acquisition-queue">timeout for waiting in the pool queue</a>.
+Should be higher than sockets timeout.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.pooling.heartbeat.timeout</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Defaults to 30 (s).
+If specified defines the Cassandra
+<a href="https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/#heartbeat">heartbeat timeout</a>.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">cassandra.pooling.max.queue.size</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Defaults to 256.
+If specified defines the Cassandra
+<a href="https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/#acquisition-queue">maximum size of the connection pool queue</a>.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>If you want more explanation about Cassandra configuration, you should visit the dedicated <a href="https://docs.datastax.com/en/developer/java-driver/3.9">documentation</a>.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_cassandra_mailbox_configuration"><a class="anchor" href="#_cassandra_mailbox_configuration"></a>Cassandra Mailbox Configuration</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p><strong>cassandra.properties</strong> file furthermore expose some options to tune the Cassandra Mailbox behaviour.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 2. cassandra.properties content</caption>
+<caption class="title">Table 3. cassandra.properties content</caption>
 <colgroup>
 <col style="width: 50%;">
 <col style="width: 50%;">
@@ -728,6 +638,11 @@ Controls the number of retries upon Cassandra flags update, in MessageMapper.</p
 Controls the number of retries upon Cassandra flags update, in MessageIdMapper.</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">fetch.advance.row.count</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Defaults to 1000.
+Controls the number of remaining rows we should wait before prefetch when paging.</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">chunk.size.message.read</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Defaults to 100.
 Controls the number of messages to be retrieved in parallel.</p></td>
@@ -746,22 +661,6 @@ by turning it off. Note that reads performed as part of write transactions are a
 consistency.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">uid.read.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.
-If enabled, regular consistency level is used for read transactions for uid upon read oepration (eg IMAP status, select).
-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">modseq.read.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.
-If enabled, regular consistency level is used for read transactions for modseq upon read operation (eg IMAP status, select).
-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
@@ -777,30 +676,6 @@ As message flags updates relies so far on a read-before-write model, it exposes
 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>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">mailrepository.strong.consistency</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Boolean, defaults to true. Allows not to use lightweight transactions in CassandraMailRepository.
- If disabled we implement an idempotent behaviour (duplicates are overridden, missing entries upon deletes are ignored).</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">acl.enabled</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Boolean, defaults to true. Allows disabling ACLs: if set to false, delegation will fail and users will only
-have access to the mailboxes they own. ACLs can represent a high volume of requests. If you do not propose mailbox sharing
-features to your users, you can consider disabling them in order to improve performance.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">email.change.ttl</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Duration, default to 60 days. Cassandra Time-to-live for Email change records. Setting time-to-live to zero means refusing to use time-to-live on email changes.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">mailbox.change.ttl</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Duration, default to 60 days. Cassandra Time-to-live for Mailbox change records. Setting time-to-live to zero means refusing to use time-to-live on mailbox changes.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">uid.modseq.increment</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Optional, default to 0. Defensive value to add to uids and modseqs generated. This can be used as an heuristic to maintain
-consistency even when consensus of Lightweight Transactions is broken, exemple during a disaster recovery process.</p></td>
-</tr>
 </tbody>
 </table>
 </div>
@@ -813,7 +688,7 @@ consistency even when consensus of Lightweight Transactions is broken, exemple d
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/configure/collecting-contacts.html b/james-distributed-app/3.7.5/configure/collecting-contacts.html
similarity index 58%
copy from james-project/3.9.0/servers/distributed/configure/collecting-contacts.html
copy to james-distributed-app/3.7.5/configure/collecting-contacts.html
index 5a9254780..c7f4c071b 100644
--- a/james-project/3.9.0/servers/distributed/configure/collecting-contacts.html
+++ b/james-distributed-app/3.7.5/configure/collecting-contacts.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Contact collection :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/configure/collecting-contacts.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../architecture/index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../architecture/implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="5">
+  <li class="nav-item is-current-page" data-depth="4">
     <a class="nav-link" href="collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
       <ul class="versions">
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,18 +355,25 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <li><a href="index.html">Configuration</a></li>
     <li>Extensions</li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/configure/collecting-contacts.html">3.8.1</a>
+    <a class="version is-current" href="collecting-contacts.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/configure/collecting-contacts.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -608,16 +410,16 @@ should even be performed when a user sends emails via SMTP for example using thu
 <div class="paragraph">
 <p>Here is a sample pipeline achieving aforementioned objectives :</p>
 </div>
-<div class="listingblock">
+<div class="literalblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;mailet match="SenderIsLocal" class="ContactExtractor"&gt;
+<pre>&lt;mailet match="SenderIsLocal" class="ContactExtractor"&gt;
     &lt;attribute&gt;extractedContacts&lt;/attribute&gt;
 &lt;/mailet&gt;
 &lt;mailet match="All" class="AmqpForwardAttribute"&gt;
     &lt;uri&gt;amqp://${env:JAMES_AMQP_USERNAME}:${env:JAMES_AMQP_PASSWORD}@${env:JAMES_AMQP_HOST}:${env:JAMES_AMQP_PORT}&lt;/uri&gt;
     &lt;exchange&gt;collector:email&lt;/exchange&gt;
     &lt;attribute&gt;extractedContacts&lt;/attribute&gt;
-&lt;/mailet&gt;</code></pre>
+&lt;/mailet&gt;</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -641,7 +443,7 @@ should even be performed when a user sends emails via SMTP for example using thu
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/configure/collecting-events.html b/james-distributed-app/3.7.5/configure/collecting-events.html
similarity index 58%
copy from james-project/3.9.0/servers/distributed/configure/collecting-events.html
copy to james-distributed-app/3.7.5/configure/collecting-events.html
index 5d27e0f73..7f0d70117 100644
--- a/james-project/3.9.0/servers/distributed/configure/collecting-events.html
+++ b/james-distributed-app/3.7.5/configure/collecting-events.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Event collection :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/configure/collecting-events.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../architecture/index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../architecture/implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="5">
+  <li class="nav-item is-current-page" data-depth="4">
     <a class="nav-link" href="collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
   <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
       <ul class="versions">
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,18 +355,25 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <li><a href="index.html">Configuration</a></li>
     <li>Extensions</li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/configure/collecting-events.html">3.8.1</a>
+    <a class="version is-current" href="collecting-events.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/configure/collecting-events.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -583,10 +385,10 @@
 <h2 id="_motivation"><a class="anchor" href="#_motivation"></a>Motivation</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Calendar applications typically add event invitations received via email directly to a user’s calendar.</p>
+<p>Many calendar application do add events invitation received by email directly in ones calendar.</p>
 </div>
 <div class="paragraph">
-<p>This behavior requires the calendar application to recognize and process ICalendar-related emails.</p>
+<p>Such behaviours requires the calendar application to be aware of the ICalendar related emails a user received.</p>
 </div>
 </div>
 </div>
@@ -608,9 +410,9 @@ can later be sent to other applications over AMQP to be treated in an asynchrono
 <div class="paragraph">
 <p>Here is a sample pipeline achieving aforementioned objectives :</p>
 </div>
-<div class="listingblock">
+<div class="literalblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;!-- ICAL pipeline --&gt;
+<pre>&lt;!-- ICAL pipeline --&gt;
 &lt;mailet match="All" class="StripAttachment"&gt;
     &lt;mimeType&gt;text/calendar&lt;/mimeType&gt;
     &lt;attribute&gt;rawIcalendar&lt;/attribute&gt;
@@ -635,14 +437,11 @@ can later be sent to other applications over AMQP to be treated in an asynchrono
     &lt;exchange&gt;james:events&lt;/exchange&gt;
     &lt;attribute&gt;icalendarAsJson&lt;/attribute&gt;
 &lt;/mailet&gt;
-&lt;!-- End of ICAL pipeline --&gt;</code></pre>
+&lt;!-- End of ICAL pipeline --&gt;</pre>
 </div>
 </div>
 <div class="paragraph">
-<p>The input of this pipeline is an ICS (ICalendar) file attached to an email. The pipeline processes the calendar attachment by decoding and parsing it, then transforming it into JSON format. This JSON data is added to the email object as an attribute named icalendarAsJson. Finally, it is published via AMQP for further processing by the Calendar app.</p>
-</div>
-<div class="paragraph">
-<p>The <code>icalendarAsJson</code> attribute will look like the following:</p>
+<p>A sample message looks like:</p>
 </div>
 <div class="literalblock">
 <div class="content">
@@ -665,7 +464,7 @@ The sample look like:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code>X-MEETING-UID: f1514f44bf39311568d640727cff54e819573448d09d2e5677987ff29caa01a9e047feb2aab16e43439a608f28671ab7c10e754ce92be513f8e04ae9ff15e65a9819cf285a6962bc</code></pre>
+<pre class="highlightjs highlight"><code class="language-none hljs">X-MEETING-UID: f1514f44bf39311568d640727cff54e819573448d09d2e5677987ff29caa01a9e047feb2aab16e43439a608f28671ab7c10e754ce92be513f8e04ae9ff15e65a9819cf285a6962bc</code></pre>
 </div>
 </div>
 </div>
@@ -678,7 +477,7 @@ The sample look like:</p>
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/configure/dns.html b/james-distributed-app/3.7.5/configure/dns.html
similarity index 62%
copy from james-project/3.9.0/servers/distributed/configure/dns.html
copy to james-distributed-app/3.7.5/configure/dns.html
index c67b6434b..fbe8d5c97 100644
--- a/james-project/3.9.0/servers/distributed/configure/dns.html
+++ b/james-distributed-app/3.7.5/configure/dns.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Distributed James Server &mdash; dnsservice.xml :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/configure/dns.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../architecture/index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../architecture/implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="5">
+  <li class="nav-item is-current-page" data-depth="4">
     <a class="nav-link" href="dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
       <ul class="versions">
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,18 +355,25 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <li><a href="index.html">Configuration</a></li>
     <li>Core components</li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/configure/dns.html">3.8.1</a>
+    <a class="version is-current" href="dns.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/configure/dns.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -661,7 +463,7 @@ cache or a negative value meaning infinite caching.</p></td>
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/configure/domainlist.html b/james-distributed-app/3.7.5/configure/domainlist.html
similarity index 61%
copy from james-project/3.9.0/servers/distributed/configure/domainlist.html
copy to james-distributed-app/3.7.5/configure/domainlist.html
index abd79b09e..a2317d563 100644
--- a/james-project/3.9.0/servers/distributed/configure/domainlist.html
+++ b/james-distributed-app/3.7.5/configure/domainlist.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Distributed James Server &mdash; domainlist.xml :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/configure/domainlist.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../architecture/index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../architecture/implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="5">
+  <li class="nav-item is-current-page" data-depth="4">
     <a class="nav-link" href="domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
       <ul class="versions">
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,18 +355,25 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <li><a href="index.html">Configuration</a></li>
     <li>Core components</li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/configure/domainlist.html">3.8.1</a>
+    <a class="version is-current" href="domainlist.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/configure/domainlist.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -647,7 +449,7 @@ In most cases this will be necessary. By default, the domainname 'localhost' is
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/configure/dsn.html b/james-distributed-app/3.7.5/configure/dsn.html
similarity index 69%
copy from james-project/3.9.0/servers/distributed/configure/dsn.html
copy to james-distributed-app/3.7.5/configure/dsn.html
index 0d63d8d3f..ec208483a 100644
--- a/james-project/3.9.0/servers/distributed/configure/dsn.html
+++ b/james-distributed-app/3.7.5/configure/dsn.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Distributed James Server &mdash; Delivery Submission Notifications :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/configure/dsn.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../architecture/index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../architecture/implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailetcontainer.html">mailetcontainer.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailets.html">Packaged Mailets</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="matchers.html">Packaged Matchers</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="mailrepositorystore.html">mailrepositorystore.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="recipientrewritetable.html">recipientrewritetable.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="search.html">search.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="usersrepository.html">usersrepository.xml</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Extensions</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="vault.html">deletedMessageVault.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="extensions.html">extensions.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="listeners.html">listeners.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="spam.html">Anti-Spam setup</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-contacts.html">Contact collection</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="collecting-events.html">Event collection</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="5">
+  <li class="nav-item is-current-page" data-depth="4">
     <a class="nav-link" href="dsn.html">ESMTP DSN support</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../operate/index.html">Operate</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/guide.html">Operator guide</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/performanceChecklist.html">Performance checklist</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/logging.html">Logging</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/metrics.html">Metrics</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
   </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../operate/security.html">Security checklist</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extending.html">Extending behaviour</a>
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../benchmark/index.html">Performance benchmark</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/db-benchmark.html">Database benchmarks</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../benchmark/james-benchmark.html">James benchmarks</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../test.html">Test</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../customization/index.html">Extending server behavior</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mail-processing.html">Custom mail processing components</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/mailbox-listeners.html">Custom Mailbox Listeners</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/smtp-hooks.html">Custom SMTP hooks</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/webadmin-routes.html">Custom WebAdmin routes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../customization/imap.html">Custom IMAP processing</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../development/index.html">Developer Guide</a>
-<ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../development/logging.html">Logging in Apache James</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../community/index.html">Community</a>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/mailing-lists.html">Mailing lists</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/contributing.html">Contributing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/guidelines.html">Guidelines</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/download.html">Download releases</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/website.html">Building and publishing the website</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/release.html">Creating an official Apache James release</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../community/support.html">Professional support</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Apache Software Foundation</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/">ASF</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/getinvolved.html">Get involved</a>
-  </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/faq.html">FAQ</a>
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/licenses/">Licenses</a>
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/security/">Security</a>
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
   </li>
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
   </li>
 </ul>
   </li>
@@ -532,23 +304,46 @@
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Apache James Server</span>
-    <span class="version">3.9.0 SNAPSHOT</span>
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
   </div>
   <ul class="components">
     <li class="component is-current">
-      <div class="title"><a href="../../../index.html">Apache James Server</a></div>
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../../../index.html">3.9.0 SNAPSHOT</a>
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
-      <div class="title"><a href="../../../../../james-site/latest/index.html">Apache James Site</a></div>
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
       <ul class="versions">
         <li class="version is-latest">
-          <a href="../../../../../james-site/latest/index.html">latest</a>
+          <a href="../../../james-site/latest/index.html">latest</a>
         </li>
       </ul>
     </li>
@@ -560,18 +355,25 @@
 <main class="article">
 <div class="toolbar" role="navigation">
 <button class="nav-toggle"></button>
-  <a href="../../../../../james-site/latest/homepage.html" class="home-link"></a>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../../../index.html">Apache James Server</a></li>
-    <li><a href="../../index.html">Servers</a></li>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
     <li><a href="../index.html">Distributed James Application</a></li>
     <li><a href="index.html">Configuration</a></li>
     <li>Extensions</li>
     <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.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version" href="../../3.8.1/configure/dsn.html">3.8.1</a>
+    <a class="version is-current" href="dsn.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/configure/dsn.adoc">Edit this Page</a></div>
 </div>
   <div class="content">
 <aside class="toc sidebar" data-title="Contents" data-levels="2">
@@ -588,7 +390,7 @@ progress.</p>
 </div>
 <div class="paragraph">
 <p>DSN support is not enabled by default, as it needs specific configuration of the
-<a href="mailetcontainer.html" class="page">mailetcontainer.xml</a> to be specification compliant.</p>
+<a href="mailetcontainer.html" class="xref page">mailetcontainer.xml</a> to be specification compliant.</p>
 </div>
 <div class="paragraph">
 <p>To enable it you need to:</p>
@@ -599,7 +401,7 @@ progress.</p>
 <p>Add DSN SMTP hooks as part of the SMTP server stack</p>
 </li>
 <li>
-<p>Configure <a href="mailetcontainer.html" class="page">mailetcontainer.xml</a> to generate DSN bounces when needed</p>
+<p>Configure <a href="mailetcontainer.html" class="xref page">mailetcontainer.xml</a> to generate DSN bounces when needed</p>
 </li>
 </ul>
 </div>
@@ -611,9 +413,9 @@ progress.</p>
 <div class="paragraph">
 <p>For this simply add the <code>DSN hooks</code> in the handler chain in <code>smtpserver.xml</code> :</p>
 </div>
-<div class="listingblock">
+<div class="literalblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;smtpserver enabled="true"&gt;
+<pre>&lt;smtpserver enabled="true"&gt;
     &lt;...&gt; &lt;!-- The rest of your SMTP configuration, unchanged --&gt;
     &lt;handlerchain&gt;
         &lt;handler class="org.apache.james.smtpserver.dsn.DSNEhloHook"/&gt;
@@ -623,7 +425,7 @@ progress.</p>
         &lt;...&gt; &lt;!-- other handlers, like: --&gt;
         &lt;handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/&gt; &lt;!-- for instance --&gt;
     &lt;/handlerchain&gt;
-&lt;/smtpserver&gt;</code></pre>
+&lt;/smtpserver&gt;</pre>
 </div>
 </div>
 </div>
@@ -633,11 +435,11 @@ progress.</p>
 <div class="sectionbody">
 <div class="paragraph">
 <p>For the below conditions to be matched we assume you follow
-<a href="remote-delivery-error-handling.html" class="page">RemoteDelivery error handling for MXs</a>, which is a
-requirement for detailed RemoteDelivery error and delay handling on top of the {server-name}.</p>
+<a href="remote-delivery-error-handling.html" class="xref page">RemoteDelivery error handling for MXs</a>, which is a
+requirement for detailed RemoteDelivery error and delay handling on top of the Distributed server.</p>
 </div>
 <div class="paragraph">
-<p>Here is a sample <a href="mailetcontainer.html" class="page">mailetcontainer.xml</a> achieving the following DSN generation:</p>
+<p>Here is a sample <a href="mailetcontainer.html" class="xref page">mailetcontainer.xml</a> achieving the following DSN generation:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -664,7 +466,7 @@ requirement for detailed RemoteDelivery error and delay handling on top of the {
 </li>
 </ul>
 </div>
-<div class="listingblock">
+<div class="literalblock">
 <div class="content">
 <pre>&lt;mailetcontainer enableJmx="true"&gt;
     &lt;!-- Common processing settings are unchanged --&gt;
@@ -823,7 +625,7 @@ Once resolved the admin should be able to resume the processing of your email.
 Below I include the list of recipients, and the reason why I was unable to deliver
 your message.&lt;/messageString&gt;
                 &lt;action&gt;failed&lt;/action&gt;
-                &lt;defaultStatus&gt;5.1.6&lt;/defaultStatus&gt;
+                &lt;defaultStatus&gt;5.1.6/defaultStatus&gt;
             &lt;/mailet&gt;
         &lt;/processor&gt;
     &lt;/processors&gt;
@@ -849,7 +651,7 @@ callback.</p>
   <p>This page was built using the Antora default UI.</p>
   <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
 </footer>
-<script id="site-script" src="../../../../../_/js/site.js" data-ui-root-path="../../../../../_"></script>
-<script async src="../../../../../_/js/vendor/highlight.js"></script>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/james-distributed-app/3.7.5/configure/elasticsearch.html b/james-distributed-app/3.7.5/configure/elasticsearch.html
new file mode 100644
index 000000000..ca19f6e6d
--- /dev/null
+++ b/james-distributed-app/3.7.5/configure/elasticsearch.html
@@ -0,0 +1,729 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>Distributed James Server &mdash; elasticsearch.properties :: Apache James</title>
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.7.5/configure/elasticsearch.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
+  </head>
+  <body class="article">
+<header class="header">
+  <nav class="navbar">
+    <div class="navbar-brand">
+      <a class="navbar-item" href="https://james.apache.org"><img src="/_/img/james.svg" alt="james logo"> Apache James</a>
+      <button class="navbar-burger" data-target="topbar-nav">
+        <span></span>
+        <span></span>
+        <span></span>
+      </button>
+    </div>
+    <div id="topbar-nav" class="navbar-menu">
+      <div class="navbar-end">
+        <a class="navbar-item" href="#">Home</a>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Products</a>
+          <div class="navbar-dropdown">
+            <div class="navbar-item"><strong>James server</strong></div>
+            <a class="navbar-item" href="https://github.com/apache/james-project">Repository</a>
+            <a class="navbar-item" href="https://issues.apache.org/jira/projects/JAMES/issues">Issue Tracker</a>
+            <hr class="navbar-divider">
+            <a class="navbar-item" href="https://james.apache.org/mime4j/index.html">Mime4J</a>
+            <a class="navbar-item" href="https://james.apache.org/jsieve/index.html">jSieve</a>
+            <a class="navbar-item" href="https://james.apache.org/jspf/index.html">jSPF</a>
+            <a class="navbar-item" href="https://james.apache.org/jdkim/index.html">jDKIM</a>
+            <a class="navbar-item" href="https://james.apache.org/hupa/index.html">HUPA</a>
+          </div>
+        </div>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Community</a>
+          <div class="navbar-dropdown">
+             <!-- Not ideal but dropping the version in the href requires tweaking james-projet docs module first -->
+            <a class="navbar-item" href="/james-project/3.6.0/community/mailing-lists.html">Mailing lists</a>
+            <a class="navbar-item" href="https://gitter.im/apache/james-project"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" class="logo-gitter-sign" data-v-44ebcb1a=""><rect x="15" y="5" width="2" height="10"></rect> <rect x="10" y="5" width="2" height="20"></rect> <rect x="5" y="5" width="2" height="20"></rect> <rect width="2" height="15"></rect></svg> Gitter</a>
+            <a class="navbar-item" href="https://twitter.com/ApacheJames">
+              <span class="icon">
+                <svg aria-hidden="true" data-icon="twitter" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+                  <path fill="#57aaee" d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.1 [...]
+                </svg>
+              </span> Twitter
+            </a>            
+            <a class="navbar-item" href="#">  <svg class="octicon octicon-mark-github v-align-middle" viewBox="0 0 16 16" version="1.1" aria-hidden="true"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 [...]
+          </div>
+        </div>
+<!--        <div class="navbar-item">
+          <span class="control">
+            <a class="button is-primary" href="#">Download</a>
+          </span>
+        </div> -->
+      </div>
+    </div>
+  </nav>
+</header>
+<div class="body">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
+  <aside class="nav">
+    <div class="panels">
+<div class="nav-panel-menu is-active" data-panel="menu">
+  <nav class="nav-menu">
+    <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="0">
+<ul class="nav-list">
+  <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <a class="nav-link" href="../index.html">Distributed James Application</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <a class="nav-link" href="../architecture/index.html">Architecture</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
+  </li>
+</ul>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <a class="nav-link" href="../run/index.html">Run</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../run/run-java.html">Run with Java</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <button class="nav-item-toggle"></button>
+    <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
+  </li>
+</ul>
+  </li>
+</ul>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <a class="nav-link" href="index.html">Configuration</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Protocols</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="imap.html">imapserver.xml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="jmap.html">jmap.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="jmx.html">jmx.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="pop3.html">pop3server.xml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="webadmin.html">webadmin.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
+  </li>
+</ul>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Storage dependencies</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="blobstore.html">blobstore.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="cassandra.html">cassandra.properties</a>
+  </li>
+  <li class="nav-item is-current-page" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="tika.html">tika.properties</a>
+  </li>
+</ul>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Core components</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="dns.html">dnsservice.xml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="domainlist.html">domainlist.xml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="mailetcontainer.html">mailetcontainer.xml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="mailets.html">Packaged Mailets</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="matchers.html">Packaged Matchers</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="mailrepositorystore.html">mailrepositorystore.xml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="recipientrewritetable.html">recipientrewritetable.xml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="usersrepository.html">usersrepository.xml</a>
+  </li>
+</ul>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Extensions</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="vault.html">deletedMessageVault.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="extensions.html">extensions.properties</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="listeners.html">listeners.xml</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="spam.html">Anti-Spam setup</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="remote-delivery-error-handling.html">About RemoteDelivery error handling</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="collecting-contacts.html">Contact collection</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="collecting-events.html">Event collection</a>
+  </li>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="dsn.html">ESMTP DSN support</a>
+  </li>
+</ul>
+  </li>
+</ul>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <a class="nav-link" href="../operate/index.html">Operate</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../operate/guide.html">Operator guide</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../operate/logging.html">Logging</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../operate/webadmin.html">WebAdmin REST administration API</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../operate/metrics.html">Metrics</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../operate/migrating.html">Migrating existing data</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../operate/cli.html">Command Line Interface</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../operate/cassandra-migration.html">Cassandra migration</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../operate/security.html">Security checklist</a>
+  </li>
+</ul>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <a class="nav-link" href="../extending/index.html">Extending server behavior</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../extending/mail-processing.html">Custom mail processing components</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../extending/mailbox-listeners.html">Custom Mailbox Listeners</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../extending/smtp-hooks.html">Custom SMTP hooks</a>
+  </li>
+  <li class="nav-item" data-depth="3">
+    <a class="nav-link" href="../extending/webadmin-routes.html">Custom WebAdmin routes</a>
+  </li>
+</ul>
+  </li>
+</ul>
+  </li>
+</ul>
+  </li>
+</ul>
+  </nav>
+</div>
+<div class="nav-panel-explore" data-panel="explore">
+  <div class="context">
+    <span class="title">Apache James Distributed Server</span>
+    <span class="version">3.7.5</span>
+  </div>
+  <ul class="components">
+    <li class="component is-current">
+      <div class="title"><a href="../../3.8.1/index.html">Apache James Distributed Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version is-current">
+          <a href="../index.html">3.7.5</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
+      <div class="title"><a href="../../../james-project/3.8.1/index.html">Apache James Server</a></div>
+      <ul class="versions">
+        <li class="version">
+          <a href="../../../james-project/3.9.0/index.html">3.9.0 SNAPSHOT</a>
+        </li>
+        <li class="version is-latest">
+          <a href="../../../james-project/3.8.1/index.html">3.8.1</a>
+        </li>
+        <li class="version">
+          <a href="../../../james-project/3.7.5/index.html">3.7.5</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">
+      <div class="title"><a href="../../../james-site/latest/index.html">Apache James Site</a></div>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../../james-site/latest/index.html">latest</a>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
+    </div>
+  </aside>
+</div>
+<main class="article">
+<div class="toolbar" role="navigation">
+<button class="nav-toggle"></button>
+  <a href="../../../james-site/latest/homepage.html" class="home-link"></a>
+<nav class="breadcrumbs" aria-label="breadcrumbs">
+  <ul>
+    <li><a href="../index.html">Apache James Distributed Server</a></li>
+    <li><a href="../index.html">Distributed James Application</a></li>
+    <li><a href="index.html">Configuration</a></li>
+    <li>Storage dependencies</li>
+    <li><a href="elasticsearch.html">elasticsearch.properties</a></li>
+  </ul>
+</nav>
+<div class="page-versions">
+  <button class="version-menu-toggle" title="Show other versions of page">3.7.5</button>
+  <div class="version-menu">
+    <a class="version is-missing" href="../../3.9.0/index.html">3.9.0 SNAPSHOT</a>
+    <a class="version is-missing" href="../../3.8.1/index.html">3.8.1</a>
+    <a class="version is-current" href="elasticsearch.html">3.7.5</a>
+  </div>
+</div>
+<div class="edit-this-page"><a href="https://github.com/apache/james-project/blob/3.7.x/server/apps/distributed-app/docs/modules/ROOT/pages/configure/elasticsearch.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; elasticsearch.properties</h1>
+<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>
+to get some examples and hints.</p>
+</div>
+<div class="paragraph">
+<p>If you want more explanation about ElasticSearch configuration, you should visit the dedicated <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html">documentation</a>.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_elasticsearch_configuration"><a class="anchor" href="#_elasticsearch_configuration"></a>ElasticSearch Configuration</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>This file section is used to configure the connection tp an ElasticSearch cluster.</p>
+</div>
+<div class="paragraph">
+<p>Here are the properties allowing to do so :</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 1. elasticsearch.properties content</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property name</th>
+<th class="tableblock halign-left valign-top">explanation</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.clusterName</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Is the name of the cluster used by James.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.nb.shards</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Number of shards for index provisionned by James</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.nb.replica</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Number of replica for index provisionned by James (default: 0)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.index.waitForActiveShards</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Wait for a certain number of active shard copies before proceeding with the operation. Defaults to 1.
+You may consult the <a href="https://www.elastic.co/guide/en/elasticsearch/reference/7.10/docs-index_.html#active-shards">documentation</a> for more information.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.retryConnection.maxRetries</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Number of retries when connecting the cluster</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.retryConnection.minDelay</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Minimum delay between connection attempts</p></td>
+</tr>
+</tbody>
+</table>
+<div class="sect2">
+<h3 id="_mailbox_search"><a class="anchor" href="#_mailbox_search"></a>Mailbox search</h3>
+<div class="paragraph">
+<p>The main use of ElasticSearch within the Distributed Server is indexing the mailbox content of users in order to enable
+powerful and efficient full-text search of the mailbox content.</p>
+</div>
+<div class="paragraph">
+<p>Data indexing is performed asynchronously in a reliable fashion via a MailboxListener.</p>
+</div>
+<div class="paragraph">
+<p>Here are the properties related to the use of ElasticSearch for Mailbox Search:</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 2. elasticsearch.properties content</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property name</th>
+<th class="tableblock halign-left valign-top">explanation</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.index.mailbox.name</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Name of the mailbox index backed by the alias. It will be created if missing.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.index.name</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Deprecated</strong> Use <strong>elasticsearch.index.mailbox.name</strong> instead.
+Name of the mailbox index backed by the alias. It will be created if missing.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.alias.read.mailbox.name</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Name of the alias to use by Apache James for mailbox reads. It will be created if missing.
+The target of the alias is the index name configured above.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.alias.read.name</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Deprecated</strong> Use <strong>elasticsearch.alias.read.mailbox.name</strong> instead.
+Name of the alias to use by Apache James for mailbox reads. It will be created if missing.
+The target of the alias is the index name configured above.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.alias.write.mailbox.name</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Name of the alias to use by Apache James for mailbox writes. It will be created if missing.
+The target of the alias is the index name configured above.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.alias.write.name</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Deprecated</strong> Use <strong>elasticsearch.alias.write.mailbox.name</strong> instead.
+Name of the alias to use by Apache James for mailbox writes. It will be created if missing.
+The target of the alias is the index name configured above.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.indexAttachments</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Indicates if you wish to index attachments or not (default: true).</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_quota_search"><a class="anchor" href="#_quota_search"></a>Quota search</h3>
+<div class="paragraph">
+<p>Users are indexed by quota usage, allowing operators a quick audit of users quota occupation.</p>
+</div>
+<div class="paragraph">
+<p>Users quota are asynchronously indexed upon quota changes via a dedicated MailboxListener.</p>
+</div>
+<div class="paragraph">
+<p>The following properties affect quota search :</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 3. elasticsearch.properties content</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property name</th>
+<th class="tableblock halign-left valign-top">explanation</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.index.quota.ratio.name</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Specify the ElasticSearch alias name used for quotas</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.alias.read.quota.ratio.name</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Specify the ElasticSearch alias name used for reading quotas</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.alias.write.quota.ratio.name</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Specify the ElasticSearch alias name used for writing quotas</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_disabling_elasticsearch"><a class="anchor" href="#_disabling_elasticsearch"></a>Disabling ElasticSearch</h3>
+<div class="paragraph">
+<p>ElasticSearch component can be disabled but consider it would make search feature to not work. In particular it will break JMAP protocol and SEARCH IMAP comment in an nondeterministic way.
+This is controlled in the <code>search.properties</code> file via the <code>implementation</code> property (defaults
+to <code>ElasticSearch</code>). Setting this configuration parameter to <code>scanning</code> will effectively disable ElasticSearch, no
+further indexation will be done however searches will rely on the scrolling search, leading to expensive and longer
+searches. Disabling ElasticSearch requires no extra action, however
+<a href="../operate/webadmin.html#reindexing_all_mails" class="xref page">a full re-indexing</a>needs to be carried out when enabling ElasticSearch.</p>
+</div>
+</div>
+</div>
+</div>
+<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>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 4. elasticsearch.properties content</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property name</th>
+<th class="tableblock halign-left valign-top">explanation</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.http.host</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Host to report metrics on. Defaults to master host. Must be specified if metric export to ElasticSearch is enabled.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.http.port</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Http port to use for publishing metrics. Must be specified if metric export to ElasticSearch is enabled.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.metrics.reports.enabled</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Boolean value. Enables metrics reporting. Defaults to false.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.metrics.reports.period</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Seconds between metric reports. Defaults to 60 seconds.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.metrics.reports.index</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Index to publish metrics on. Defaults to <code>james-metrics</code>.</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="sect1">
+<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
+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">
+<caption class="title">Table 5. elasticsearch.properties content</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property name</th>
+<th class="tableblock halign-left valign-top">explanation</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.hostScheme.https.sslValidationStrategy</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Accept only <strong>default</strong>, <strong>ignore</strong>, <strong>override</strong>. Default is <strong>default</strong>. default: Use the default SSL TrustStore of the system.
+ignore: Ignore SSL Validation check (not recommended).
+override: Override the SSL Context to use a custom TrustStore containing ES server&#8217;s certificate.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>In some cases, you want to secure the connection from clients to ES by setting up a <strong>https</strong> protocol
+with a self signed certificate. And you prefer to left the system ca-certificates un touch.
+There are possible solutions to let the ES RestHighLevelClient to trust your self signed certificate.</p>
+</div>
+<div class="paragraph">
+<p>Second solution: importing a TrustStore containing the certificate into SSL context.
+A certificate normally contains two parts: a public part in .crt file, another private part in .key file.
+To trust the server, the client needs to be acknowledged that the server&#8217;s certificate is in the list of
+client&#8217;s TrustStore. Basically, you can create a local TrustStore file containing the public part of a remote server
+by execute this command:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>keytool -import -v -trustcacerts -file certificatePublicFile.crt -keystore trustStoreFileName.jks -keypass fillThePassword -storepass fillThePassword</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>When there is a TrustStore file and the password to read, fill two options <strong>trustStorePath</strong>
+and <strong>trustStorePassword</strong> with the TrustStore location and the password. ES client will accept
+the certificate of ES service.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 6. elasticsearch.properties content</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property name</th>
+<th class="tableblock halign-left valign-top">explanation</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.hostScheme.https.trustStorePath</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Use it when https is configured in elasticsearch.hostScheme, and sslValidationStrategy is <strong>override</strong>
+Configure Elasticsearch rest client to use this trustStore file to recognize nginx&#8217;s ssl certificate.
+Once you chose <strong>override</strong>, you need to specify both trustStorePath and trustStorePassword.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.hostScheme.https.trustStorePassword</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Use it when https is configured in elasticsearch.hostScheme, and sslValidationStrategy is <strong>override</strong>
+Configure Elasticsearch rest client to use this trustStore file with the specified password.
+Once you chose <strong>override</strong>, you need to specify both trustStorePath and trustStorePassword.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>During SSL handshaking, the client can determine whether accept or reject connecting to a remote server by its hostname.
+You can configure to use which HostNameVerifier in the client.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 7. elasticsearch.properties content</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property name</th>
+<th class="tableblock halign-left valign-top">explanation</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">elasticsearch.hostScheme.https.hostNameVerifier</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional. Default is <strong>default</strong>. default: using the default hostname verifier provided by apache http client.
+accept_any_hostname: accept any host (not recommended).</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+</article>
+  </div>
+</main>
+</div>
+<footer class="footer">
+  <p>This page was built using the Antora default UI.</p>
+  <p>The source code for this UI is licensed under the terms of the MPL-2.0 license.</p>
+</footer>
+<script id="site-script" src="../../../_/js/site.js" data-ui-root-path="../../../_"></script>
+<script async src="../../../_/js/vendor/highlight.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/james-project/3.9.0/servers/distributed/configure/extensions.html b/james-distributed-app/3.7.5/configure/extensions.html
similarity index 53%
copy from james-project/3.9.0/servers/distributed/configure/extensions.html
copy to james-distributed-app/3.7.5/configure/extensions.html
index 7fba4d9b6..2b6a30253 100644
--- a/james-project/3.9.0/servers/distributed/configure/extensions.html
+++ b/james-distributed-app/3.7.5/configure/extensions.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Distributed James Server &mdash; extensions.properties :: Apache James</title>
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../../../_/css/site.css">
+    <link rel="canonical" href="https://james.apache.org/james-distributed-app/3.8.1/configure/extensions.html">
+    <meta name="generator" content="Antora 3.1.7">
+    <link rel="stylesheet" href="../../../_/css/site.css">
   </head>
   <body class="article">
 <header class="header">
@@ -61,465 +62,236 @@
   </nav>
 </header>
 <div class="body">
-<div class="nav-container" data-component="james-project" data-version="3.9.0">
+<div class="nav-container" data-component="james-distributed-app" data-version="3.7.5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
     <button class="nav-menu-toggle" aria-label="Toggle expand/collapse all" style="display: none"></button>
-    <h3 class="title"><a href="../../../index.html">Apache James Server</a></h3>
+    <h3 class="title"><a href="../index.html">Apache James Distributed Server</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/index.html">Concepts</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/user/index.html">User Model</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/mail/index.html">Emails</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/messages/index.html">Messages</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/imf.html">IMF</a>
-  </li>
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../../../concepts/messages/mime.html">MIME</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/protocols/index.html">Protocols</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/smtp.html">SMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/pop.html">POP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/imap.html">IMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/jmap.html">JMAP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/esmtp.html">ESMTP</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/protocols/lmtp.html">LMTP</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../concepts/storage/index.html">Storage</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/mailbox.html">Mailboxes</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../concepts/storage/users.html">Users</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/processing/index.html">Processing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/configuration.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../concepts/glossary.html">Glossary</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../index.html">Servers</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../demo.html">Demo</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../5-minute-demo.html">Short Demo</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../15-minute-demo.html">Long Demo</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../basic/index.html">Basic</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/context.html">Context</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/objectives.html">Objectives</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/concepts.html">Concepts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/architecture.html">Architecture</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/conf/index.html">Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../basic/help.html">Help</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../index.html">Distributed James Application</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../objectives.html">Objectives and motivation</a>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../architecture/index.html">Architecture</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
-    <a class="nav-link" href="../architecture/implemented-standards.html">Implemented standards</a>
-  </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/consistency-model.html">Consistency Model</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../architecture/specialized-instances.html">Specialized instances</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/index.html">Run</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-java.html">Run with Java</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../run/run-docker.html">Run with Docker</a>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="../run/run-kubernetes.html">Run with Kubernetes</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-checklist.html">Deployment Checklist</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-logsMetrics.html">Logs &amp; Metrics</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-values.html">values.yaml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="../run/k8s-secrets.html">secrets.yaml</a>
   </li>
 </ul>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="3">
+  <li class="nav-item" data-depth="2">
     <button class="nav-item-toggle"></button>
     <a class="nav-link" href="index.html">Configuration</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Protocols</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="imap.html">imapserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmap.html">jmap.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="jmx.html">jmx.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp.html">smtpserver.xml &amp; lmtpserver.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="smtp-hooks.html">Packaged SMTP hooks</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="pop3.html">pop3server.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="webadmin.html">webadmin.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="ssl.html">SSL &amp; TLS</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="sieve.html">Sieve &amp; ManageSieve</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Storage dependencies</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="blobstore.html">blobstore.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="cassandra.html">cassandra.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="opensearch.html">opensearch.properties</a>
+  <li class="nav-item" data-depth="4">
+    <a class="nav-link" href="elasticsearch.html">elasticsearch.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="rabbitmq.html">rabbitmq.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="redis.html">redis.properties</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="tika.html">tika.properties</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="4">
+  <li class="nav-item" data-depth="3">
     <button class="nav-item-toggle"></button>
     <span class="nav-text">Core components</span>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="batchsizes.html">batchsizes.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="dns.html">dnsservice.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="domainlist.html">domainlist.xml</a>
   </li>
-  <li class="nav-item" data-depth="5">
-    <a class="nav-link" href="droplists.html">DropLists</a>
-  </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
     <a class="nav-link" href="healthcheck.html">healthcheck.properties</a>
   </li>
-  <li class="nav-item" data-depth="5">
+  <li class="nav-item" data-depth="4">
... 175539 lines suppressed ...


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