From 053838eee9cb3dbefaff3b1f5e9d814ca7149155 Mon Sep 17 00:00:00 2001
From: Chris Walker <chris@webtide.com>
Date: Thu, 11 Jul 2019 11:05:15 -0400
Subject: [PATCH] First pass of Jetty 10 doc re-work

Signed-off-by: Chris Walker <chris@webtide.com>
---
 jetty-documentation/pom.xml                   | 356 +++++++++++-------
 .../administration/alpn/alpn.adoc             |   0
 .../administration/alpn/chapter.adoc          |   0
 .../administration/annotations/chapter.adoc   |   0
 .../annotations/quick-annotations-setup.adoc  |   0
 .../using-annotations-embedded.adoc           |   0
 .../annotations/using-annotations.adoc        |   0
 .../extras/balancer-servlet.adoc              |   0
 .../administration/extras/cgi-servlet.adoc    |   0
 .../administration/extras/chapter.adoc        |   0
 .../extras/cross-origin-filter.adoc           |   0
 .../administration/extras/debug-handler.adoc  |   0
 .../extras/default-handler.adoc               |   0
 .../extras/default-servlet.adoc               |   0
 .../administration/extras/dos-filter.adoc     |   0
 .../administration/extras/error-handler.adoc  |   0
 .../administration/extras/gzip-filter.adoc    |   0
 .../administration/extras/header-filter.adoc  |   0
 .../extras/inetaccess-handler.adoc            |   0
 .../extras/ipaccess-handler.adoc              |   0
 .../extras/moved-context-handler.adoc         |   0
 .../administration/extras/proxy-servlet.adoc  |   0
 .../administration/extras/qos-filter.adoc     |   0
 .../extras/resource-handler.adoc              |   0
 .../extras/rewrite-handler.adoc               |   0
 .../extras/shutdown-handler.adoc              |   0
 .../extras/statistics-handler.adoc            |   0
 .../administration/fastcgi/chapter.adoc       |   0
 .../fastcgi/configuring-fastcgi.adoc          |   0
 .../administration/fastcgi/fastcgi-intro.adoc |   0
 .../administration/http2/chapter.adoc         |   0
 .../http2/configuring-haproxy.adoc            |   0
 .../http2/configuring-http2.adoc              |   0
 .../http2/configuring-push.adoc               |   0
 .../administration/http2/enabling-http2.adoc  |   0
 .../administration/http2/introduction.adoc    |   0
 .../administration/jmx/chapter.adoc           |   0
 .../administration/jmx/images/jconsole1.jpg   | Bin
 .../administration/jmx/images/jconsole2.jpg   | Bin
 .../administration/jmx/images/jconsole3.png   | Bin
 .../administration/jmx/images/jmc1.png        | Bin
 .../administration/jmx/images/jmc2.png        | Bin
 .../administration/jmx/images/jmc3.png        | Bin
 .../administration/jmx/jetty-jconsole.adoc    |   0
 .../jmx/jetty-jmx-annotations.adoc            |   0
 .../administration/jmx/using-jmx.adoc         |   0
 .../administration/jndi/chapter.adoc          |   0
 .../jndi/jndi-configuration.adoc              |   0
 .../administration/jndi/jndi-datasources.adoc |   0
 .../administration/jndi/jndi-embedded.adoc    |   0
 .../administration/jndi/quick-jndi-setup.adoc |   0
 .../administration/jndi/using-jndi.adoc       |   0
 .../administration/logging/chapter.adoc       |   0
 .../logging/configuring-jetty-logging.adoc    |   0
 .../configuring-jetty-request-logs.adoc       |   0
 .../logging/configuring-logging-modules.adoc  |   0
 .../default-logging-with-stderrlog.adoc       |   0
 .../administration/logging/dump-tool.adoc     |   0
 .../logging/example-apache-log4j.adoc         |   0
 .../example-java-util-logging-native.adoc     |   0
 .../logging/example-java-util-logging.adoc    |   0
 .../example-logback-centralized-logging.adoc  |   0
 .../logging/example-logback-sifting.adoc      |   0
 .../logging/example-logback.adoc              |   0
 .../example-slf4j-multiple-loggers.adoc       |   0
 .../administration/part.adoc                  |   0
 .../administration/runner/chapter.adoc        |   0
 .../administration/runner/jetty-runner.adoc   |   0
 .../administration/sessions/chapter.adoc      |   0
 .../sessions/images/SessionsHierarchy.png     | Bin
 .../session-clustering-gcloud-datastore.adoc  |   0
 .../legacy/session-clustering-infinispan.adoc |   0
 .../legacy/session-clustering-jdbc.adoc       |   0
 .../legacy/session-clustering-mongodb.adoc    |   0
 .../setting-session-characteristics.adoc      |   0
 .../legacy/using-persistent-sessions.adoc     |   0
 .../session-configuration-file-system.adoc    |   0
 .../session-configuration-gcloud.adoc         |   0
 .../session-configuration-hazelcast.adoc      |   0
 .../session-configuration-housekeeper.adoc    |   0
 .../session-configuration-infinispan.adoc     |   0
 .../sessions/session-configuration-jdbc.adoc  |   0
 ...nfiguration-memcachedsessiondatastore.adoc |   0
 .../session-configuration-memory.adoc         |   0
 .../session-configuration-mongodb.adoc        |   0
 .../session-configuration-sessioncache.adoc   |   0
 .../sessions/session-hierarchy.adoc           |   0
 .../sessions/sessions-details.adoc            |   0
 .../sessions/sessions-usecases.adoc           |   0
 .../administration/startup/chapter.adoc       |   0
 .../startup/custom-modules.adoc               |   0
 .../startup/images/modules-9.3-simplified.dot |   0
 .../startup/images/modules-9.3-simplified.png | Bin
 .../startup/images/windows-service-jetty.png  | Bin
 .../startup/screen-empty-base-listconfig.adoc |   0
 .../startup/screen-empty-base.adoc            |   0
 .../screen-http-webapp-deploy-listconfig.adoc |   0
 .../startup/screen-http-webapp-deploy.adoc    |   0
 .../startup/screen-list-logging-modules.adoc  |   0
 .../startup/screen-list-modules.adoc          |   0
 .../administration/startup/start-jar.adoc     |   0
 .../administration/startup/start-matrix.adoc  |   0
 .../startup/startup-base-vs-home.adoc         |   0
 .../startup/startup-classpath.adoc            |   0
 .../administration/startup/startup-jpms.adoc  |   0
 .../startup/startup-modules.adoc              |   0
 .../startup/startup-overview.adoc             |   0
 .../startup/startup-troubleshooting.adoc      |   0
 .../startup/startup-unix-service.adoc         |   0
 .../startup/startup-windows-service.adoc      |   0
 .../startup/startup-xml-config.adoc           |   0
 .../administration/tuning/chapter.adoc        |   0
 .../tuning/garbage-collection.adoc            |   0
 .../administration/tuning/high-load.adoc      |   0
 .../administration/tuning/limit-load.adoc     |   0
 .../configuring/connectors/chapter.adoc       |   0
 .../connectors/configuring-connectors.adoc    |   0
 .../configuring-ssl-distribution.adoc         |   0
 .../connectors/configuring-ssl.adoc           |   0
 .../connectors/images/certificate-chain.png   | Bin
 .../configuring/contexts/chapter.adoc         |   0
 .../contexts/configuring-virtual-hosts.adoc   |   0
 .../contexts/custom-error-pages.adoc          |   0
 .../serving-webapp-from-particular-port.adoc  |   0
 .../contexts/setting-context-path.adoc        |   0
 .../contexts/setting-form-size.adoc           |   0
 .../contexts/temporary-directories.adoc       |   0
 .../deploying/anatomy-of-a-webapp.adoc        |   0
 .../automatic-webapp-deployment.adoc          |   0
 .../configuring/deploying/chapter.adoc        |   0
 ...onfiguring-specific-webapp-deployment.adoc |   0
 .../deploying/deployment-architecture.adoc    |   0
 .../deployment-processing-webapps.adoc        |   0
 .../configuring/deploying/hot-deployment.adoc |   0
 .../Jetty_DeployManager_AppLifeCycle-1.png    | Bin
 ...loyManager_DefaultAppLifeCycleBindings.png | Bin
 ..._DeployManager_DeploymentManager_Roles.png | Bin
 .../deploying/overlay-deployer.adoc           |   0
 .../deploying/quickstart-webapp.adoc          |   0
 .../deploying/static-content-deployment.adoc  |   0
 .../configuring/jsp/chapter.adoc              |   0
 .../configuring/jsp/configuring-jsp.adoc      |   0
 .../configuring/part.adoc                     |   0
 .../configuring/security/authentication.adoc  |   0
 .../configuring/security/chapter.adoc         |   0
 .../security/configuring-form-size.adoc       |   0
 .../configuring/security/jaas-support.adoc    |   0
 .../security/jetty-home-and-jetty-base.adoc   |   0
 .../security/secure-passwords.adoc            |   0
 .../security/serving-aliased-files.adoc       |   0
 ...tting-port80-access-for-non-root-user.adoc |   0
 .../configuring/security/spnego-support.adoc  |   0
 .../asciidoc/administration-guide/index.adoc  |  80 ++++
 .../contribution-guide/1-introduction.adoc    |  24 ++
 .../contribution-guide/2-community.adoc       |  69 ++++
 .../asciidoc/contribution-guide/3-source.adoc | 257 +++++++++++++
 .../contribution-guide/4-documentation.adoc   | 190 ++++++++++
 .../contribution-guide/5-security.adoc        |  35 ++
 .../contribution-guide/6-conclusion.adoc      |  30 ++
 .../asciidoc/contribution-guide/index.adoc    |  68 ++++
 .../development/ant/chapter.adoc              |   0
 .../development/ant/jetty-ant.adoc            |   0
 .../development/clients/http/chapter.adoc     |   0
 .../clients/http/http-client-api.adoc         |   0
 .../http/http-client-authentication.adoc      |   0
 .../clients/http/http-client-cookie.adoc      |   0
 .../clients/http/http-client-intro.adoc       |   0
 .../clients/http/http-client-proxy.adoc       |   0
 .../clients/http/http-client-transport.adoc   |   0
 .../development/continuations/chapter.adoc    |   0
 .../continuations/continuations-intro.adoc    |   0
 .../continuations/continuations-patterns.adoc |   0
 .../continuations/continuations-using.adoc    |   0
 .../development/embedding/chapter.adoc        |   0
 .../embedding/embedded-examples.adoc          |   0
 .../embedding/embedding-jetty.adoc            |   0
 .../examples/embedded-file-server.adoc        |   0
 .../examples/embedded-many-connectors.adoc    |   0
 .../examples/embedded-minimal-servlet.adoc    |   0
 .../examples/embedded-one-webapp.adoc         |   0
 .../embedded-secured-hello-handler.adoc       |   0
 .../examples/embedded-split-file-server.adoc  |   0
 .../embedding/jetty-helloworld.adoc           |   0
 .../development/frameworks/chapter.adoc       |   0
 .../development/frameworks/metro.adoc         |   0
 .../development/frameworks/osgi.adoc          |   0
 .../development/frameworks/spring-usage.adoc  |   0
 .../development/frameworks/weld.adoc          |   0
 .../development/handlers/chapter.adoc         |   0
 .../handlers/writing-custom-handlers.adoc     |   0
 .../development/maven/chapter.adoc            |   0
 .../maven/jetty-jspc-maven-plugin.adoc        |   0
 .../maven/jetty-maven-helloworld.adoc         |   0
 .../development/maven/jetty-maven-plugin.adoc |   0
 .../maven/jetty-maven-scanning.adoc           |   0
 .../development/part.adoc                     |   0
 .../development/websockets/intro/chapter.adoc |   0
 .../development/websockets/java/chapter.adoc  |   0
 .../java/java-websocket-client-api.adoc       |   0
 .../java/java-websocket-server-api.adoc       |   0
 .../development/websockets/jetty/chapter.adoc |   0
 .../jetty/jetty-websocket-api-adapter.adoc    |   0
 .../jetty-websocket-api-annotations.adoc      |   0
 .../jetty/jetty-websocket-api-events.adoc     |   0
 .../jetty/jetty-websocket-api-listener.adoc   |   0
 .../jetty-websocket-api-send-message.adoc     |   0
 .../jetty/jetty-websocket-api-session.adoc    |   0
 .../websockets/jetty/jetty-websocket-api.adoc |   0
 .../jetty/jetty-websocket-client-api.adoc     |   0
 .../jetty/jetty-websocket-server-api.adoc     |   0
 .../main/asciidoc/developer-guide/index.adoc  |  77 ++++
 .../reference/architecture/1xx-responses.adoc |   0
 .../architecture/basic-architecture.adoc      |   0
 .../reference/architecture/chapter.adoc       |   0
 .../images/basic-architecture-handlers.png    | Bin
 .../basic-architecture-nested-handlers.png    | Bin
 .../images/basic-architecture-patterns.png    | Bin
 .../basic-architecture-servlet-handler.png    | Bin
 .../basic-architecture-web-application.png    | Bin
 .../images/jetty-high-level-architecture.png  | Bin
 .../architecture/jetty-classloading.adoc      |   0
 .../server-side-architecture.adoc             |   0
 .../reference/contributing/bugs.adoc          |   0
 .../reference/contributing/chapter.adoc       |   0
 .../contributing/coding-standards.adoc        |   0
 .../reference/contributing/community.adoc     |   0
 .../reference/contributing/documentation.adoc |   0
 .../reference/contributing/patches.adoc       |   0
 .../contributing/release-testing.adoc         |   0
 .../contributing/releasing-jetty.adoc         |   0
 .../reference/contributing/security.adoc      |   0
 .../reference/contributing/source-build.adoc  |   0
 .../reference/debugging/chapter.adoc          |   0
 .../debugging/debugging-with-eclipse.adoc     |   0
 .../debugging/debugging-with-intellij.adoc    |   0
 .../debugging/enable-remote-debugging.adoc    |   0
 .../debugging/images/debug-eclipse-1.png      | Bin
 .../debugging/images/debug-eclipse-2.png      | Bin
 .../debugging/images/debug-eclipse-3.png      | Bin
 .../debugging/images/intellij_debug_view.png  | Bin
 .../images/intellij_new_remote_config.png     | Bin
 .../images/intellij_select_debug.png          | Bin
 .../images/intellij_set_breakpoint.png        | Bin
 .../reference/faq/chapter.adoc                |   0
 .../reference/jetty-xml/chapter.adoc          |   0
 .../reference/jetty-xml/jetty-env-xml.adoc    |   0
 .../jetty-xml/jetty-web-xml-config.adoc       |   0
 .../reference/jetty-xml/jetty-xml-config.adoc |   0
 .../reference/jetty-xml/jetty-xml-syntax.adoc |   0
 .../reference/jetty-xml/jetty-xml-usage.adoc  |   0
 .../reference/jetty-xml/override-web-xml.adoc |   0
 .../reference/jetty-xml/webdefault-xml.adoc   |   0
 .../{ => developer-guide}/reference/part.adoc |   0
 .../reference/platforms/chapter.adoc          |   0
 .../reference/platforms/cloudfoundry.adoc     |   0
 .../platforms/elastic-beanstalk.adoc          |   0
 .../reference/platforms/fedora.adoc           |   0
 .../reference/platforms/jelastic.adoc         |   0
 .../reference/platforms/ubuntu.adoc           |   0
 .../reference/troubleshooting/chapter.adoc    |   0
 .../preventing-memory-leaks.adoc              |   0
 .../troubleshooting/security-reports.adoc     |   0
 .../troubleshooting/slow-deployment.adoc      |   0
 .../troubleshooting-locked-files.adoc         |   0
 .../troubleshooting-zip-exceptions.adoc       |   0
 .../troubleshooting/watchservice.adoc         |   0
 .../reference/upgrading/chapter.adoc          |   0
 .../reference/upgrading/sample.adoc           |   0
 .../upgrading/upgrading-9.3-to-9.4.adoc       |   0
 .../upgrading/upgrading-from-jetty-9.adoc     |   0
 .../src/main/asciidoc/quick-start/index.adoc  |  62 +++
 271 files changed, 1102 insertions(+), 146 deletions(-)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/alpn/alpn.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/alpn/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/annotations/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/annotations/quick-annotations-setup.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/annotations/using-annotations-embedded.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/annotations/using-annotations.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/balancer-servlet.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/cgi-servlet.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/cross-origin-filter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/debug-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/default-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/default-servlet.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/dos-filter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/error-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/gzip-filter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/header-filter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/inetaccess-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/ipaccess-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/moved-context-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/proxy-servlet.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/qos-filter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/resource-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/rewrite-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/shutdown-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/extras/statistics-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/fastcgi/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/fastcgi/configuring-fastcgi.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/fastcgi/fastcgi-intro.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/http2/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/http2/configuring-haproxy.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/http2/configuring-http2.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/http2/configuring-push.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/http2/enabling-http2.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/http2/introduction.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/images/jconsole1.jpg (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/images/jconsole2.jpg (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/images/jconsole3.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/images/jmc1.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/images/jmc2.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/images/jmc3.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/jetty-jconsole.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/jetty-jmx-annotations.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jmx/using-jmx.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jndi/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jndi/jndi-configuration.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jndi/jndi-datasources.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jndi/jndi-embedded.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jndi/quick-jndi-setup.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/jndi/using-jndi.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/configuring-jetty-logging.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/configuring-jetty-request-logs.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/configuring-logging-modules.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/default-logging-with-stderrlog.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/dump-tool.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/example-apache-log4j.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/example-java-util-logging-native.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/example-java-util-logging.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/example-logback-centralized-logging.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/example-logback-sifting.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/example-logback.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/logging/example-slf4j-multiple-loggers.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/part.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/runner/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/runner/jetty-runner.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/images/SessionsHierarchy.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/legacy/session-clustering-infinispan.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/legacy/session-clustering-jdbc.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/legacy/session-clustering-mongodb.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/legacy/setting-session-characteristics.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/legacy/using-persistent-sessions.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-file-system.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-gcloud.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-hazelcast.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-housekeeper.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-infinispan.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-jdbc.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-memcachedsessiondatastore.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-memory.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-mongodb.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-configuration-sessioncache.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/session-hierarchy.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/sessions-details.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/sessions/sessions-usecases.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/custom-modules.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/images/modules-9.3-simplified.dot (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/images/modules-9.3-simplified.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/images/windows-service-jetty.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/screen-empty-base-listconfig.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/screen-empty-base.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/screen-http-webapp-deploy-listconfig.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/screen-http-webapp-deploy.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/screen-list-logging-modules.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/screen-list-modules.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/start-jar.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/start-matrix.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/startup-base-vs-home.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/startup-classpath.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/startup-jpms.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/startup-modules.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/startup-overview.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/startup-troubleshooting.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/startup-unix-service.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/startup-windows-service.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/startup/startup-xml-config.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/tuning/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/tuning/garbage-collection.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/tuning/high-load.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/administration/tuning/limit-load.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/connectors/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/connectors/configuring-connectors.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/connectors/configuring-ssl-distribution.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/connectors/configuring-ssl.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/connectors/images/certificate-chain.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/contexts/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/contexts/configuring-virtual-hosts.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/contexts/custom-error-pages.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/contexts/serving-webapp-from-particular-port.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/contexts/setting-context-path.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/contexts/setting-form-size.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/contexts/temporary-directories.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/anatomy-of-a-webapp.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/automatic-webapp-deployment.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/configuring-specific-webapp-deployment.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/deployment-architecture.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/deployment-processing-webapps.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/hot-deployment.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/images/Jetty_DeployManager_AppLifeCycle-1.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/images/Jetty_DeployManager_DeploymentManager_Roles.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/overlay-deployer.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/quickstart-webapp.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/deploying/static-content-deployment.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/jsp/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/jsp/configuring-jsp.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/part.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/security/authentication.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/security/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/security/configuring-form-size.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/security/jaas-support.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/security/jetty-home-and-jetty-base.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/security/secure-passwords.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/security/serving-aliased-files.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/security/setting-port80-access-for-non-root-user.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => administration-guide}/configuring/security/spnego-support.adoc (100%)
 create mode 100644 jetty-documentation/src/main/asciidoc/administration-guide/index.adoc
 create mode 100644 jetty-documentation/src/main/asciidoc/contribution-guide/1-introduction.adoc
 create mode 100644 jetty-documentation/src/main/asciidoc/contribution-guide/2-community.adoc
 create mode 100644 jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc
 create mode 100644 jetty-documentation/src/main/asciidoc/contribution-guide/4-documentation.adoc
 create mode 100644 jetty-documentation/src/main/asciidoc/contribution-guide/5-security.adoc
 create mode 100644 jetty-documentation/src/main/asciidoc/contribution-guide/6-conclusion.adoc
 create mode 100644 jetty-documentation/src/main/asciidoc/contribution-guide/index.adoc
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/ant/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/ant/jetty-ant.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/clients/http/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/clients/http/http-client-api.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/clients/http/http-client-authentication.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/clients/http/http-client-cookie.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/clients/http/http-client-intro.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/clients/http/http-client-proxy.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/clients/http/http-client-transport.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/continuations/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/continuations/continuations-intro.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/continuations/continuations-patterns.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/continuations/continuations-using.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/embedded-examples.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/embedding-jetty.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/examples/embedded-file-server.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/examples/embedded-many-connectors.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/examples/embedded-minimal-servlet.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/examples/embedded-one-webapp.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/examples/embedded-secured-hello-handler.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/examples/embedded-split-file-server.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/embedding/jetty-helloworld.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/frameworks/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/frameworks/metro.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/frameworks/osgi.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/frameworks/spring-usage.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/frameworks/weld.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/handlers/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/handlers/writing-custom-handlers.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/maven/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/maven/jetty-jspc-maven-plugin.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/maven/jetty-maven-helloworld.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/maven/jetty-maven-plugin.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/maven/jetty-maven-scanning.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/part.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/intro/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/java/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/java/java-websocket-client-api.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/java/java-websocket-server-api.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/jetty-websocket-api-adapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/jetty-websocket-api-annotations.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/jetty-websocket-api-events.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/jetty-websocket-api-listener.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/jetty-websocket-api-send-message.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/jetty-websocket-api-session.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/jetty-websocket-api.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/jetty-websocket-client-api.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/development/websockets/jetty/jetty-websocket-server-api.adoc (100%)
 create mode 100644 jetty-documentation/src/main/asciidoc/developer-guide/index.adoc
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/1xx-responses.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/basic-architecture.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/images/basic-architecture-handlers.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/images/basic-architecture-nested-handlers.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/images/basic-architecture-patterns.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/images/basic-architecture-servlet-handler.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/images/basic-architecture-web-application.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/images/jetty-high-level-architecture.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/jetty-classloading.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/architecture/server-side-architecture.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/bugs.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/coding-standards.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/community.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/documentation.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/patches.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/release-testing.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/releasing-jetty.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/security.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/contributing/source-build.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/debugging-with-eclipse.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/debugging-with-intellij.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/enable-remote-debugging.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/images/debug-eclipse-1.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/images/debug-eclipse-2.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/images/debug-eclipse-3.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/images/intellij_debug_view.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/images/intellij_new_remote_config.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/images/intellij_select_debug.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/debugging/images/intellij_set_breakpoint.png (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/faq/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/jetty-xml/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/jetty-xml/jetty-env-xml.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/jetty-xml/jetty-web-xml-config.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/jetty-xml/jetty-xml-config.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/jetty-xml/jetty-xml-syntax.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/jetty-xml/jetty-xml-usage.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/jetty-xml/override-web-xml.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/jetty-xml/webdefault-xml.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/part.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/platforms/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/platforms/cloudfoundry.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/platforms/elastic-beanstalk.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/platforms/fedora.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/platforms/jelastic.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/platforms/ubuntu.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/troubleshooting/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/troubleshooting/preventing-memory-leaks.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/troubleshooting/security-reports.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/troubleshooting/slow-deployment.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/troubleshooting/troubleshooting-locked-files.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/troubleshooting/troubleshooting-zip-exceptions.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/troubleshooting/watchservice.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/upgrading/chapter.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/upgrading/sample.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/upgrading/upgrading-9.3-to-9.4.adoc (100%)
 rename jetty-documentation/src/main/asciidoc/{ => developer-guide}/reference/upgrading/upgrading-from-jetty-9.adoc (100%)
 create mode 100644 jetty-documentation/src/main/asciidoc/quick-start/index.adoc

diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml
index c7b394c2015..c0fbd236d9f 100644
--- a/jetty-documentation/pom.xml
+++ b/jetty-documentation/pom.xml
@@ -10,14 +10,93 @@
   <name>Jetty :: Documentation</name>
   <packaging>pom</packaging>
   <properties>
+    <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+    <html.common.directory>${project.build.directory}/html/common</html.common.directory>
+    <html.image.directory>${project.build.directory}/html/common/images</html.image.directory>
+    <javadoc.version>${project.version}</javadoc.version>
+    <asciidoctor.maven.plugin.version>1.5.7.1</asciidoctor.maven.plugin.version>
+    <asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
+    <asciidoctorj.epub.version>1.5.0-alpha.8.1</asciidoctorj.epub.version>
+    <asciidoctorj.version>1.5.8.1</asciidoctorj.version>
+    <jruby.version>1.7.27</jruby.version>
+    <web.resources.version>1.0-SNAPSHOT</web.resources.version>
+    <web.resources.directory>${project.build.directory}/web-resources</web.resources.directory>
+    <!-- old properties -->
     <html.directory>${project.build.directory}/current</html.directory>
     <javadoc.version>${project.version}</javadoc.version>
   </properties>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-jetty-web-resouces</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty.toolchain</groupId>
+                  <artifactId>jetty-web-resources</artifactId>
+                  <version>${web.resources.version}</version>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${web.resources.directory}</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+              <excludes>META-INF/**</excludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
+          <execution>
+            <id>copy-base-html-assets</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>${web.resources.directory}/html</directory>
+                  <includes>
+                    <include>**</include>
+                  </includes>
+                </resource>
+              </resources>
+              <outputDirectory>${html.common.directory}</outputDirectory>
+            </configuration>
+          </execution>
+
+          <!-- TODO resolve image locations -->
+          <execution>
+            <id>copy-topic-image-assets</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>src/main/asciidoc/topics</directory>
+                  <includes>
+                    <include>**/*.jpg</include>
+                    <include>**/*.png</include>
+                  </includes>
+                </resource>
+              </resources>
+              <outputDirectory>${html.image.directory}</outputDirectory>
+            </configuration>
+          </execution>
+          <!-- ^^^^^ -->
+          <!-- legacy resources -->
           <execution>
             <id>copy-assets</id>
             <phase>process-resources</phase>
@@ -36,203 +115,188 @@
               <outputDirectory>${html.directory}</outputDirectory>
             </configuration>
           </execution>
+          <!-- ^^legacy resources^^ -->
         </executions>
       </plugin>
       <plugin>
         <groupId>org.asciidoctor</groupId>
         <artifactId>asciidoctor-maven-plugin</artifactId>
+        <version>${asciidoctor.maven.plugin.version}</version>
+        <configuration>
+          <basedir>${basedir}/src/main/asciidoc</basedir>
+          <attributes>
+            <JDURL>http://www.eclipse.org/jetty/javadoc/${javadoc.version}</JDURL>
+            <JXURL>http://download.eclipse.org/jetty/stable-9/xref</JXURL>
+            <SRCDIR>${basedir}/..</SRCDIR>
+            <GITBROWSEURL>https://github.com/eclipse/jetty.project/tree/master</GITBROWSEURL>
+            <GITDOCURL>https://github.com/eclipse/jetty.project/tree/jetty-10.0.x-doc-refactor/jetty-documentation/src/main/asciidoc</GITDOCURL>
+            <GUIDEBASEURL>https://eclipse.org/jetty/documentation</GUIDEBASEURL>
+            <MVNCENTRAL>http://central.maven.org/maven2</MVNCENTRAL>
+            <VERSION>${project.version}</VERSION>
+            <TIMESTAMP>${maven.build.timestamp}</TIMESTAMP>
+            <DOCINFODIR>${web.resources}</DOCINFODIR>
+          </attributes>
+        </configuration>
         <executions>
-          <execution>
-            <id>output-html</id>
-            <phase>compile</phase>
+         <execution>
+            <id>quickstart-guide</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>process-asciidoc</goal>
             </goals>
             <configuration>
-              <backend>docbook</backend>
-              <doctype>book</doctype>
+              <backend>html5</backend>
+              <!--<templateDir>${web.resources.directory}/asciidoc/template</templateDir>-->
+              <sourceDirectory>${basedir}/src/main/asciidoc/quick-start</sourceDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
-              <attributes>
-                <sub-order>attributes+</sub-order>
-                <imagesdir />
-                <linkcss>true</linkcss>
-                <allow-uri-read>true</allow-uri-read>
-                <toc>true</toc>
-                <revnumber>${project.version}</revnumber>
-                <JDURL>http://www.eclipse.org/jetty/javadoc/${javadoc.version}</JDURL>
-                <JXURL>http://download.eclipse.org/jetty/stable-9/xref</JXURL>
-                <SRCDIR>${basedir}/..</SRCDIR>
-                <GITBROWSEURL>https://github.com/eclipse/jetty.project/tree/jetty-10.0.x</GITBROWSEURL>
-                <MVNCENTRAL>https://repo1.maven.org/maven2</MVNCENTRAL>
-                <VERSION>${project.version}</VERSION>
-              </attributes>
+              <outputDirectory>${project.build.directory}/html/quickstart-guide</outputDirectory>
             </configuration>
           </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>com.agilejava.docbkx</groupId>
-        <artifactId>docbkx-maven-plugin</artifactId>
-        <version>2.0.17</version>
-        <executions>
           <execution>
-            <id>html</id>
-            <phase>compile</phase>
+            <id>admin-guide</id>
+            <phase>generate-resources</phase>
             <goals>
-              <goal>generate-html</goal>
+              <goal>process-asciidoc</goal>
             </goals>
             <configuration>
-              <htmlStylesheet>css/docbook.css</htmlStylesheet>
-              <htmlCustomization>${project.basedir}/src/main/docbkx-stylesheet/html/docbook.xsl</htmlCustomization>
-              <preProcess>
-                <!-- pull over the images from the source material -->
-                <copy todir="target/docbkx/html/images" flatten="true">
-                  <fileset dir="src/main/asciidoc">
-                    <include name="**/*.png" />
-                    <include name="**/*.jpg" />
-                    <include name="**/*.svg" />
-                    <include name="**/*.dot" />
-                  </fileset>
-                </copy>
-                <copy todir="target/docbkx/html/images">
-                  <fileset dir="src/main/docbkx-resources/images" />
-                </copy>
-                <copy todir="target/docbkx/html/css">
-                  <fileset dir="src/main/docbkx-resources/css" />
-                </copy>
-                <copy todir="target/docbkx/html/fonts">
-                  <fileset dir="src/main/docbkx-resources/fonts" />
-                </copy>
-                <copy todir="target/docbkx/html/js">
-                  <fileset dir="src/main/docbkx-resources/js" />
-                </copy>
-              </preProcess>
+              <backend>html5</backend>
+              <!--<<templateDir>${web.resources.directory}/asciidoc/template</templateDir>-->
+              <sourceDirectory>${basedir}/src/main/asciidoc/administration-guide</sourceDirectory>
+              <sourceDocumentName>index.adoc</sourceDocumentName>
+              <outputDirectory>${project.build.directory}/html/administration-guide</outputDirectory>
             </configuration>
           </execution>
-        </executions>
-        <configuration>
-          <!-- shared configuration -->
-          <sourceDirectory>${project.build.directory}/generated-docs</sourceDirectory>
-          <includes>index.xml</includes>
-          <generatedSourceDirectory>${project.build.directory}/docbkx/generated</generatedSourceDirectory>
-          <chunkedOutput>true</chunkedOutput>
-          <highlightSource>true</highlightSource>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>net.sf.docbook</groupId>
-            <artifactId>docbook-xml</artifactId>
-            <version>5.1b4-all</version>
-            <classifier>resources</classifier>
-            <type>zip</type>
-            <scope>runtime</scope>
-          </dependency>
-          <dependency>
-            <groupId>net.sf.xslthl</groupId>
-            <artifactId>xslthl</artifactId>
-            <version>2.0.1</version>
-            <scope>runtime</scope>
-          </dependency>
-          <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-xslt-tools</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/html.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
           <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
+            <id>contribution-guide</id>
+            <phase>generate-resources</phase>
             <goals>
-              <goal>single</goal>
+              <goal>process-asciidoc</goal>
             </goals>
+            <configuration>
+              <backend>html5</backend>
+              <!--<<templateDir>${web.resources.directory}/asciidoc/template</templateDir>-->
+              <sourceDirectory>${basedir}/src/main/asciidoc/contribution-guide</sourceDirectory>
+              <sourceDocumentName>index.adoc</sourceDocumentName>
+              <outputDirectory>${project.build.directory}/html/contribution-guide</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>developer-guide</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>process-asciidoc</goal>
+            </goals>
+            <configuration>
+              <backend>html5</backend>
+              <sourceDirectory>${basedir}/src/main/asciidoc/developer-guide</sourceDirectory>
+              <sourceDocumentName>index.adoc</sourceDocumentName>
+              <outputDirectory>${project.build.directory}/html/developer-guide</outputDirectory>
+            </configuration>
           </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
   <profiles>
-    <!--
-      Couple of different approaches to generating pdf's
-    -->
     <profile>
-      <id>generate-pdf</id>
+      <id>alt-formats</id>
       <build>
         <plugins>
-          <plugin>
-            <groupId>com.agilejava.docbkx</groupId>
-            <artifactId>docbkx-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>generate-pdf</id>
-                <phase>compile</phase>
-                <goals>
-                  <goal>generate-pdf</goal>
-                </goals>
-                <configuration>
-                  <includes>index.xml</includes>
-                  <fop1Extensions>1</fop1Extensions>
-                  <paperType>A4</paperType>
-                  <foCustomization>src/main/docbkx-stylesheet/fo/docbook.xsl</foCustomization>
-                </configuration>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>net.sf.offo</groupId>
-                <artifactId>fop-hyph</artifactId>
-                <version>1.2</version>
-                <scope>runtime</scope>
-              </dependency>
-            </dependencies>
-          </plugin>
           <plugin>
             <groupId>org.asciidoctor</groupId>
             <artifactId>asciidoctor-maven-plugin</artifactId>
+            <version>${asciidoctor.maven.plugin.version}</version>
             <dependencies>
               <dependency>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctorj-pdf</artifactId>
-                <version>1.5.0-alpha.11</version>
+                <version>${asciidoctorj.pdf.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctorj-epub3</artifactId>
+                <version>${asciidoctorj.epub.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.jruby</groupId>
+                <artifactId>jruby-complete</artifactId>
+                <version>${jruby.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctorj</artifactId>
+                <version>${asciidoctorj.version}</version>
               </dependency>
             </dependencies>
+            <configuration>
+              <imagesdir/>
+              <backend>docbook</backend>
+              <basedir>${basedir}/src/main/asciidoc</basedir>
+              <attributes>
+                <revnumber>${project.version}</revnumber>
+                <JDURL>http://www.eclipse.org/jetty/javadoc/${javadoc.version}</JDURL>
+                <JXURL>http://download.eclipse.org/jetty/stable-9/xref</JXURL>
+                <SRCDIR>${basedir}/..</SRCDIR>
+                <GITBROWSEURL>https://github.com/eclipse/jetty.project/tree/master</GITBROWSEURL>
+                <MVNCENTRAL>http://central.maven.org/maven2</MVNCENTRAL>
+                <VERSION>${project.version}</VERSION>
+              </attributes>
+            </configuration>
             <executions>
               <execution>
-                <id>output-pdf</id>
-                <phase>generate-sources</phase>
+                <id>contribution-guide-pdf</id>
+                <phase>generate-resources</phase>
                 <goals>
                   <goal>process-asciidoc</goal>
                 </goals>
                 <configuration>
                   <backend>pdf</backend>
-                  <sourceHighlighter>rouge</sourceHighlighter>
-                  <sourceDocumentName>index.adoc</sourceDocumentName>
+                  <sourceHighlighter>coderay</sourceHighlighter>
                   <attributes>
-                    <imagesdir />
-                    <version>${project.version}</version>
-                    <linkcss>true</linkcss>
-                    <allow-uri-read>true</allow-uri-read>
-                    <toc>true</toc>
-                    <revnumber>${project.version}</revnumber>
-                    <JDURL>http://download.eclipse.org/jetty/stable-9/apidocs</JDURL>
-                    <JXURL>http://download.eclipse.org/jetty/stable-9/xref</JXURL>
-                    <SRCDIR>${basedir}/../jetty.project/</SRCDIR>
-                    <GITBROWSEURL>https://github.com/eclipse/jetty.project/jetty-10.0.x</GITBROWSEURL>
                     <icons>font</icons>
-                    <pagenums />
-                    <toc />
-                    <idprefix />
+                    <pagenums/>
+                    <toc/>
+                    <idprefix/>
                     <idseparator>-</idseparator>
                   </attributes>
+                  <sourceDirectory>${basedir}/src/main/asciidoc/contribution-guide</sourceDirectory>
+                  <sourceDocumentName>index.adoc</sourceDocumentName>
+                  <outputFile>${project.build.directory}/pdf/contribution-guide/contribution-guide.pdf</outputFile>
+                </configuration>
+              </execution>
+              <execution>
+                <id>quickstart-distribution-guide-pdf</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <backend>pdf</backend>
+                  <sourceHighlighter>coderay</sourceHighlighter>
+                  <attributes>
+                    <icons>font</icons>
+                    <pagenums/>
+                    <toc/>
+                    <idprefix/>
+                    <idseparator>-</idseparator>
+                  </attributes>
+                  <sourceDirectory>${basedir}/src/main/asciidoc/quickstart-distribution-guide</sourceDirectory>
+                  <sourceDocumentName>index.adoc</sourceDocumentName>
+                  <outputFile>${project.build.directory}/pdf/quickstart-distribution-guide/quickstart-distribution-guide.pdf</outputFile>
+                </configuration>
+              </execution>
+              <execution>
+                <id>contribution-guide-epub</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <backend>epub3</backend>
+                  <sourceHighlighter>coderay</sourceHighlighter>
+                  <sourceDirectory>${basedir}/src/main/asciidoc/contribution-guide</sourceDirectory>
+                  <sourceDocumentName>index.adoc</sourceDocumentName>
+                  <outputFile>${project.build.directory}/epub/contribution-guide/contribution-guide.epub</outputFile>
                 </configuration>
               </execution>
             </executions>
diff --git a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/alpn/alpn.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/alpn/alpn.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/alpn/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/alpn/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/annotations/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/annotations/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/annotations/quick-annotations-setup.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/annotations/quick-annotations-setup.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/annotations/using-annotations-embedded.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/annotations/using-annotations-embedded.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/annotations/using-annotations.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/annotations/using-annotations.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/balancer-servlet.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/balancer-servlet.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/cgi-servlet.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/cgi-servlet.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/cross-origin-filter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/cross-origin-filter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/debug-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/debug-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/default-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/default-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/default-servlet.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/default-servlet.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/dos-filter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/dos-filter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/error-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/error-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/gzip-filter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/gzip-filter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/header-filter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/header-filter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/header-filter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/header-filter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/inetaccess-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/inetaccess-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/inetaccess-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/inetaccess-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/ipaccess-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/ipaccess-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/moved-context-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/moved-context-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/proxy-servlet.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/proxy-servlet.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/qos-filter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/qos-filter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/resource-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/resource-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/rewrite-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/rewrite-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/shutdown-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/shutdown-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/statistics-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/extras/statistics-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/fastcgi/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/fastcgi/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/fastcgi/configuring-fastcgi.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/fastcgi/configuring-fastcgi.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/fastcgi/fastcgi-intro.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/fastcgi/fastcgi-intro.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/configuring-haproxy.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/configuring-haproxy.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/configuring-http2.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/configuring-http2.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/configuring-push.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/configuring-push.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/enabling-http2.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/enabling-http2.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/introduction.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/http2/introduction.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/images/jconsole1.jpg b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jconsole1.jpg
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/images/jconsole1.jpg
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jconsole1.jpg
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/images/jconsole2.jpg b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jconsole2.jpg
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/images/jconsole2.jpg
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jconsole2.jpg
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/images/jconsole3.png b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jconsole3.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/images/jconsole3.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jconsole3.png
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/images/jmc1.png b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jmc1.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/images/jmc1.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jmc1.png
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/images/jmc2.png b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jmc2.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/images/jmc2.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jmc2.png
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/images/jmc3.png b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jmc3.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/images/jmc3.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/images/jmc3.png
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/jetty-jconsole.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/jetty-jconsole.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/jetty-jmx-annotations.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/jetty-jmx-annotations.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/using-jmx.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jmx/using-jmx.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/jndi-configuration.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/jndi-configuration.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/jndi-datasources.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/jndi-datasources.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/jndi-embedded.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/jndi-embedded.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/quick-jndi-setup.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/quick-jndi-setup.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/using-jndi.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/jndi/using-jndi.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/configuring-jetty-logging.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/configuring-jetty-logging.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/configuring-jetty-request-logs.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/configuring-jetty-request-logs.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-logging-modules.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/configuring-logging-modules.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/configuring-logging-modules.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/configuring-logging-modules.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/default-logging-with-stderrlog.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/default-logging-with-stderrlog.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/dump-tool.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/dump-tool.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-apache-log4j.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-apache-log4j.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-java-util-logging-native.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-java-util-logging-native.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-java-util-logging.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-java-util-logging.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-logback-centralized-logging.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-logback-centralized-logging.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-logback-sifting.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-logback-sifting.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-logback.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-logback.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-slf4j-multiple-loggers.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/logging/example-slf4j-multiple-loggers.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/part.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/part.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/part.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/part.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/runner/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/runner/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/runner/jetty-runner.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/runner/jetty-runner.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/images/SessionsHierarchy.png b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/images/SessionsHierarchy.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/images/SessionsHierarchy.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/images/SessionsHierarchy.png
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/session-clustering-infinispan.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/session-clustering-infinispan.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/session-clustering-jdbc.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/session-clustering-jdbc.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/session-clustering-mongodb.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/session-clustering-mongodb.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/setting-session-characteristics.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/setting-session-characteristics.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/using-persistent-sessions.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/legacy/using-persistent-sessions.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-file-system.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-file-system.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-file-system.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-file-system.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-gcloud.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-gcloud.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-gcloud.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-gcloud.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-hazelcast.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-hazelcast.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-housekeeper.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-housekeeper.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-housekeeper.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-housekeeper.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-infinispan.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-infinispan.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-infinispan.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-infinispan.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-jdbc.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-jdbc.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-jdbc.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-jdbc.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memcachedsessiondatastore.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-memcachedsessiondatastore.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memcachedsessiondatastore.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-memcachedsessiondatastore.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-memory.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-memory.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-mongodb.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-mongodb.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-mongodb.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-mongodb.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-sessioncache.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-sessioncache.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-sessioncache.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-configuration-sessioncache.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-hierarchy.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/session-hierarchy.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-details.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/sessions-details.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/sessions-details.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/sessions-details.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/sessions-usecases.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/sessions/sessions-usecases.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/custom-modules.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/custom-modules.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/custom-modules.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/custom-modules.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/images/modules-9.3-simplified.dot b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/images/modules-9.3-simplified.dot
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/images/modules-9.3-simplified.dot
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/images/modules-9.3-simplified.dot
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/images/modules-9.3-simplified.png b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/images/modules-9.3-simplified.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/images/modules-9.3-simplified.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/images/modules-9.3-simplified.png
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/images/windows-service-jetty.png b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/images/windows-service-jetty.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/images/windows-service-jetty.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/images/windows-service-jetty.png
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-empty-base-listconfig.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-empty-base-listconfig.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-empty-base.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-empty-base.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-http-webapp-deploy-listconfig.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-http-webapp-deploy-listconfig.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-http-webapp-deploy.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-http-webapp-deploy.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-logging-modules.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-list-logging-modules.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/screen-list-logging-modules.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-list-logging-modules.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-list-modules.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/screen-list-modules.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/start-jar.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/start-jar.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/start-matrix.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/start-matrix.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-base-vs-home.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-base-vs-home.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-classpath.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-classpath.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-jpms.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-jpms.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/startup-jpms.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-jpms.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-modules.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-modules.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-overview.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-overview.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-troubleshooting.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-troubleshooting.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-unix-service.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-unix-service.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-windows-service.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-windows-service.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-xml-config.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/startup/startup-xml-config.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/tuning/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/tuning/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/tuning/garbage-collection.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/tuning/garbage-collection.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/tuning/high-load.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/tuning/high-load.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/administration/tuning/limit-load.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/administration/tuning/limit-load.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/configuring-connectors.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/configuring-connectors.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl-distribution.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/configuring-ssl-distribution.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl-distribution.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/configuring-ssl-distribution.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/configuring-ssl.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/configuring-ssl.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/images/certificate-chain.png b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/images/certificate-chain.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/connectors/images/certificate-chain.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/connectors/images/certificate-chain.png
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/configuring-virtual-hosts.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/configuring-virtual-hosts.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/custom-error-pages.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/custom-error-pages.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/serving-webapp-from-particular-port.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/serving-webapp-from-particular-port.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/setting-context-path.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/setting-context-path.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/setting-form-size.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/setting-form-size.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/temporary-directories.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/contexts/temporary-directories.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/anatomy-of-a-webapp.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/anatomy-of-a-webapp.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/automatic-webapp-deployment.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/automatic-webapp-deployment.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/configuring-specific-webapp-deployment.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/configuring-specific-webapp-deployment.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/deployment-architecture.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/deployment-architecture.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/deployment-processing-webapps.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/deployment-processing-webapps.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/hot-deployment.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/hot-deployment.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/images/Jetty_DeployManager_AppLifeCycle-1.png b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/images/Jetty_DeployManager_AppLifeCycle-1.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/images/Jetty_DeployManager_AppLifeCycle-1.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/images/Jetty_DeployManager_AppLifeCycle-1.png
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/images/Jetty_DeployManager_DeploymentManager_Roles.png b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/images/Jetty_DeployManager_DeploymentManager_Roles.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/images/Jetty_DeployManager_DeploymentManager_Roles.png
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/images/Jetty_DeployManager_DeploymentManager_Roles.png
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/overlay-deployer.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/overlay-deployer.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/quickstart-webapp.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/quickstart-webapp.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/static-content-deployment.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/deploying/static-content-deployment.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/jsp/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/jsp/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/jsp/configuring-jsp.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/jsp/configuring-jsp.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/part.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/part.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/part.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/part.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/authentication.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/authentication.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/configuring-form-size.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/configuring-form-size.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/jaas-support.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/jaas-support.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/jetty-home-and-jetty-base.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/jetty-home-and-jetty-base.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/secure-passwords.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/secure-passwords.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/serving-aliased-files.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/serving-aliased-files.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/setting-port80-access-for-non-root-user.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/setting-port80-access-for-non-root-user.adoc
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/spnego-support.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc
rename to jetty-documentation/src/main/asciidoc/administration-guide/configuring/security/spnego-support.adoc
diff --git a/jetty-documentation/src/main/asciidoc/administration-guide/index.adoc b/jetty-documentation/src/main/asciidoc/administration-guide/index.adoc
new file mode 100644
index 00000000000..ad54a137f67
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/administration-guide/index.adoc
@@ -0,0 +1,80 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+:doctitle: Eclipse Jetty: Administration Guide
+:author: Jetty Developers
+:email: jetty-dev@eclipse.org
+:revnumber: 1.0
+:revdate: {TIMESTAMP}
+:toc: left
+:toc-title: Administration Guide
+:toc-image: jetty-logo.svg
+:toc-image-url: /jetty/index.html
+ 
+:imagesdir: ../common/images
+
+// docinfo lets you pull in shared content and/or influence via render type
+//:docinfodir: {DOCINFODIR}/documentation
+//:docinfo1:
+
+// html specific directives
+ifdef::backend-html5[]
+:safe-mode-unsafe:
+:stylesdir: ../common/css
+:stylesheet: jetty.css
+:linkcss:
+:scriptsdir: ../common/js
+endif::[]
+
+// options for special blocks, code snippets, screen, etc
+:sub-order: attributes+
+
+// suppress document footer generation
+//:nofooter:
+
+// suppress Eclipse footer
+:no-eclipse-footer:
+
+// uncomment to allow include::https:// style content inclusion
+//:allow-uri-read: true
+
+// use fonts for admonitions
+:icons: font
+
+// suppress automatic id generation
+:sectids!:
+
+
+
+include::administration/startup/chapter.adoc[]
+include::administration/sessions/chapter.adoc[]
+include::administration/logging/chapter.adoc[]
+include::administration/jndi/chapter.adoc[]
+include::administration/annotations/chapter.adoc[]
+include::administration/jmx/chapter.adoc[]
+include::administration/alpn/chapter.adoc[]
+include::administration/http2/chapter.adoc[]
+include::administration/fastcgi/chapter.adoc[]
+include::administration/extras/chapter.adoc[]
+include::administration/runner/chapter.adoc[]
+include::administration/tuning/chapter.adoc[]
+include::configuring/deploying/chapter.adoc[]
+include::configuring/contexts/chapter.adoc[]
+include::configuring/connectors/chapter.adoc[]
+include::configuring/security/chapter.adoc[]
+include::configuring/jsp/chapter.adoc[]
\ No newline at end of file
diff --git a/jetty-documentation/src/main/asciidoc/contribution-guide/1-introduction.adoc b/jetty-documentation/src/main/asciidoc/contribution-guide/1-introduction.adoc
new file mode 100644
index 00000000000..effe22b282a
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/contribution-guide/1-introduction.adoc
@@ -0,0 +1,24 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+[[cg-introduction]]
+== Welcome!
+
+Eclipse Jetty is an open source project with a long pedigree of contribution.
+Starting over 20 years ago, Jetty has had many committers over the years and owes much of its success to the people that make up the community.
+There are many ways that you may contribute to Jetty and the goal of this guide is help you get there!
diff --git a/jetty-documentation/src/main/asciidoc/contribution-guide/2-community.adoc b/jetty-documentation/src/main/asciidoc/contribution-guide/2-community.adoc
new file mode 100644
index 00000000000..57d0605c40f
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/contribution-guide/2-community.adoc
@@ -0,0 +1,69 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+[[cg-community]]
+== Participate in the Community
+
+One of the best ways to start contribute and work with Eclipse Jetty is to get plugged into one of the existing communities.
+In any one of these you will come across users of neophyte to expert experience and as time permits the developers of Jetty themselves.
+
+[[cg-mailing-lists]]
+=== Mailing Lists
+
+Mailing lists are a wonderful way to interact with the community at large and for a certain class of issue have the best chances of achieving resolution.  There are a number of mailing lists available within the Jetty project and a good rule of thumb to choose between the developer and user lists is to ask yourself if your question is broadly interesting to the community, use the users list and if narrowly focused on Jetty internals or minutiae, then the dev list might be a better option.
+
+* Jetty Developers List
+** Join - https://dev.eclipse.org/mailman/listinfo/jetty-dev
+** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-dev/
+* Jetty Users List
+** Join - https://dev.eclipse.org/mailman/listinfo/jetty-users
+** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-users/
+* Jetty Announcements List
+** Join - https://dev.eclipse.org/mailman/listinfo/jetty-announce
+** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-announce/
+
+[[cg-irc]]
+=== Internet Relay Chat - IRC
+
+IRC has been around for decades and it is hard to beat a communication platform that has such support.  Users are always welcome to come join our IRC channels and talk with us, other users, or just lurk.  Please note that IRC is not necessarily an active support channel, if you have a question by all means ask it but there should be no expectation that you will immediately get a response.  Your best bet is to ask and then lurk.
+
+irc.freenode.org - #jetty::
+  Our primary location, we recommend that if your looking to find folks on IRC you try here.
+
+[[cg-stackoverflow]]
+=== Stack Overflow
+
+From a simple support perspective it is hard to beat http://stackoverflow.com[StackOverflow] for interacting with a Jetty community.  Numerous users have asked and had answered their questions on the platform by other users and developers alike.
+
+* Check out the general https://stackoverflow.com/questions/tagged/jetty[Jetty] tag!
+* The https://stackoverflow.com/questions/tagged/embedded-jetty[Embedded-Jetty] tag has a fair amount of traffic as well.
+
+[[cg-issues]]
+=== Github: Issues and Features
+
+While not necessarily a support channel for solving a specific user problem, the issue tracker for Eclipse Jetty is a great location for addressing issues or suggesting features you want to see (or ideally contribute) in Jetty.
+
+When you file a Github Issue in the Eclipse Jetty project there are a number of *labels* available and we encourage to you use them appropriately.
+
+* http://github.com/eclipse/jetty.project[Issues at Github].
+
+We have additionally identified and labeled a number of issues that may be appropriate for users of different levels of expertise that might want to contribute to Jetty but not have a specific goal or issue in mind.
+
+* https://github.com/eclipse/jetty.project/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22[Help Wanted]
+
+Long story short, if you are interested in getting involved with the community, there are a number of options available and you are encouraged to participate at whatever level you like!
diff --git a/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc b/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc
new file mode 100644
index 00000000000..dab8b50aa37
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc
@@ -0,0 +1,257 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+[[cg-source]]
+== Participate in the Code
+
+If you are more interested in digging into what makes Jetty tick then this some information that you will need to arm yourself with.
+First we start with how to checkout and build Jetty, then on to our general coding standards followed by the actual patch contribution process.
+
+
+[[cg-community-source]]
+=== Source Control
+
+The https://github.com/eclipse/jetty.project[Eclipse Jetty project] is located at https://github.com[Github] under the Eclipse Foundation https://github.com/eclipse[parent project]. There are a number of branches that are generally of interest.
+
+.Active Eclipse Jetty Branches
+[cols="3"]
+|===
+| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Development Branch for Jetty 10 | Java 9+
+| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | Maintenance Branch for Jetty 9.4 (default branch) | Java 8
+| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | Maintenance Branch for Jetty 9.3 | Java 8
+| https://github.com/eclipse/jetty.project/tree/jetty-8.1.x[jetty-8.1.x] | Historical Branch for Jetty 8 | Java 7
+https://github.com/eclipse/jetty.project/tree/jetty-7[jetty-7] | Historical Branch for Jetty 7 | Java 6
+|===
+
+If you are planning on working with a specific issue within Jetty it is important to target the correct branch for a pull request. Pull requests that are targeted at Maintenance Branches are typically merged forward into subsequent branches while historical branches are left alone merge wise.  Depending on the nature of an issue a historical branch may have an issue cherrypicked forward, but maintenance releases are merged wholesale forward as a matter of project policy.
+
+==== Primary SCM
+
+The primary repository for Jetty is:
+
+Jetty Project Repository::
+  https://github.com/eclipse/jetty.project
+
+==== Secondary SCM
+
+These are the URLs for Jetty-related code and metadata.
+These are not needed to use Jetty; these are primarily of use for developers who are working with the open source project within Eclipse.
+
+Administrative pom.xml file::
+  https://github.com/eclipse/jetty.parent
+Build related artifacts that release separately, common assembly descriptors, remote resources, etc.::
+  https://github.com/eclipse/jetty.toolchain
+Files associated with the development of Jetty -- code styles, formatting, iplogs, etc.::
+  http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git
+
+[[t-contributing-build]]
+=== Maven Build
+
+Eclipse Jetty uses http://maven.apache.org/[Apache Maven] for managing the project metadata and controlling the build.
+
+Building Jetty should simply be a matter of changing into the relevant directory and executing the following commands:
+
+[source, screen, subs="{sub-order}"]
+....
+
+$ git clone https://github.com/eclipse/jetty.project.git
+$ cd jetty.project
+$ mvn install
+
+
+....
+
+All relevant dependencies should be downloaded into your local repository automatically and the build should proceed normally.
+
+____
+[NOTE]
+Jetty has a great many test cases that run through the course of its build.  Many of these tests spin up embedded instances of Jetty itself and it is not uncommon to see hundreds or more instances of Jetty start and stop during tests.
+Periodically we find some test cases to be more time dependent than they should be and this results in intermittent test failures.
+You can help track these down by opening an https://github.com/eclipse/jetty.project/issues[Issue].
+____
+
+
+
+[[cg-coding-standards]]
+=== Coding Standards
+
+Jetty uses number of conventions for its source code. The developers of Jetty use a variety of tooling and editors when developing Jetty so standards and conventions are important!
+
+==== Intelli-J
+
+The suggested configuration for Intelli-J when working with Jetty is available here: http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/idea-jetty-codestyle-settings.jar[Intelli-J Codestyle]
+
+==== Eclipse
+
+The Eclipse format configuration can be found here:
+http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-java-format.xml[Eclipse Java Formatting]
+
+There are also some templates available for Eclipse here:
+http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-codetemplates.xml[Eclipse Code Templates]
+
+==== Code Conventions
+
+The following is an example of the Java formatting and naming styles to apply to Jetty:
+
+[source, java, subs="{sub-order}"]
+----
+
+import some.exact.ClassName;      // GOOD
+import some.wildcard.package.*;   // BAD!
+
+package org.always.have.a.package;
+
+/* --------------------------------------------------------- */
+/** Always have some javadoc
+ */
+class MyClassName
+{
+    // indent by 4 spaces.
+    // use spaced to indent
+    // The code must format OK with default tabsize of 8.
+
+    private static final int ALL_CAPS_FOR_PUBLIC_CONSTANTS=1;
+
+    // Field prefixed with __ for static of _ for normal fields.
+    // This convention is no longer mandatory, but any given
+    // class should either consistently use this style or not.
+    private static String __staticField;
+    private Object _privateField;
+
+
+    // use getters and setters rather than public fields.
+    public void setPrivateField(Object privateField)
+    {
+        _privateField=privateField;
+    }
+
+    public Object getPrivateField()
+    {
+        return _privateField;
+    }
+
+    public void doSomething()
+        throws SomeException
+    {
+        Object local_variable = _privateField;
+        if (local_variable==null)
+        {
+             // do Something
+        }
+    }
+}
+
+----
+
+While Eclipse Jetty is an open source project it is also a member of the Eclipse Foundation which carries along some additional responsibilities.
+Intellectual Property is a hallmark concern of the Eclipse Foundation so you are encouraged to understand what that entails before diving in.
+As much as we would like to accept a tremendous pull request, without the proper chain of events being completed our hands are tied.
+That being said, the steps are not particularly onerous and we are happy to work with you to get them accomplished.
+
+
+[[cg-patches]]
+=== Contributing Patches
+
+We love seeing people contribute patches to the Jetty project and the process is relatively simple.
+The requirements to commit are modest but very important to the Eclipse Foundation and the intellectual property of the open source project.
+The following is the general process by which we operate.
+
+* You must have a signed Eclipse Contributor Agreement.
+* This agreement must be under the _same_ email address as the Git pull request originates from.
+* The commit must be signed.
+* When the pull request is made, a git-hook will validate the email address.
+** If the result is a green checkbox then the Jetty committers can review the pull request.
+** If the result is a red X then there is absolutely nothing the Jetty committers can do to accept the commit at this point.
+* This may not be the final form a commit will take, there may be some back and forth and you may be asked to re-issue a pull request.
+
+
+Not everything is specifically relevant since we are at GitHub but the crux of things are detailed there.
+The ECA is *critically* important to the process.
+
+[[cg-contributing-eca]]
+==== Sign an Eclipse Contributor Agreement (ECA)
+
+The Eclipse Foundation has a strong Intellectual Property policy which tracks contributions in detail to ensure that:
+
+1.  Did the contributor author 100% of the content?
+2.  Does the contributor have the rights to contribute this content to Eclipse?
+3.  Is the contribution under the project’s license(s) (e.g. EPL)
+
+A contributor needs to e-sign a Eclipse Contributor Agreement (for more explanation see the http://www.eclipse.org/legal/ecafaq.php[Eclipse ECA FAQ] ) regardless of how their contribution patch is provided.
+You can familiarize yourself with the Eclipse wiki page at http://wiki.eclipse.org/Development_Resources/Contributing_via_Git[Contributing via Git].
+In order to have a pull request accepted by any Eclipse project you *must* complete this agreement.
+____
+[TIP]
+Log into the https://www.eclipse.org[Eclipse home page] (you will need to create an account with the Eclipse Foundation if you have not already done so), click on "Eclipse ECA", and complete the form.
+Be sure to use the _same email address_ when you create any Git commit records.
+____
+
+[[t-contributing-git-config]]
+==== Configuring Git
+
+GitHub has copious amounts of quality documentation on how to interact with the system and you will minimally need to configure the user.email property.
+Check out the following link:https://help.github.com/articles/setting-your-email-in-git[guide on GitHub] for more information.
+
+[[t-contributing-making-the-commit]]
+==== Making the Commit
+
+When making the commit for the pull request it is  _vital_ that you "sign-off" on the commit using `git commit -s` option.
+Without this sign-off, your patch cannot be applied to the Jetty repository because it will be rejected.
+
+You can check out the link:https://help.github.com/articles/signing-tags-using-gpg[guide at Github] for more information.
+____
+[TIP]
+One way to think of this is that when you sign the ECA you are indicating that you are free to contribute to eclipse, but that doesn't mean everything you ever do can be contributed.
+Using the commit signing mechanism indicates that your commit is under the auspices of your agreement.
+____
+
+If a pull request is for a particular issue in our repository then the format of the commit message is important.
+The message should follow the form "Issue #123 <description of the commit>".
+When the Jetty project runs releases we have an automated process that scans for commits with this format for inclusion in our VERSION.txt file.
+
+[source, screen]
+----
+> git commit -s -m "Issue #123 resolving the issue by adding widget"
+----
+
+[[cg-the-pull-request]]
+==== The Pull Request
+
+Pull requests are very much a GitHub process so best link:https://help.github.com/articles/creating-a-pull-request[explained by Github].
+
+[[cg-our-policies]]
+==== Our Policies
+
+We wholeheartedly welcome contributions to Jetty and will do our best to process them in a timely fashion.
+While not every contribution will be accepted, our commitment is to work with interested parties on the things they care about.
+With that in mind, we can only handle pull requests with actively engaged parties.
+We reserve the right to abandon pull requests whose authors do no respond in a timely fashion.
+
+We will generally adhere to the following time frames for contributions:
+
+* Invalid Pull Requests - 1 week
+** These pull requests do not follow the contribution requirements for some reason, be it missing contributor agreement or the wrong email.
+** We will try and follow up with the pull request author to resolve the issue but much of this is out of our hands and are between committer and the Eclipse Foundation.
+** If we do not hear from the contributor after a week we will close the pull request.
+
+* Valid Pull Requests - 2 weeks
+** These pull requests have a green check mark after the commit title.
+** If the pull request can be immediately applied we will do so.
+** There may need to be some conversation on the issue in which case a committer will follow up with the author in the pull request.
+** If the original contributor does not respond within 2 weeks we may close the commit.
+** If we see value in the commit yet the author has not responded after 2 weeks we may make some variation of the commit ourselves.
diff --git a/jetty-documentation/src/main/asciidoc/contribution-guide/4-documentation.adoc b/jetty-documentation/src/main/asciidoc/contribution-guide/4-documentation.adoc
new file mode 100644
index 00000000000..6154b55604a
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/contribution-guide/4-documentation.adoc
@@ -0,0 +1,190 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+[[cg-documentation]]
+== Participate in the Documentation
+
+Another wonderful way to help with Eclipse Jetty is to help contribute to our corpus of documentation.
+We have taken every every to reduce the barriers to contributing to our documentation and many contributors find our documentation as a low key way to participate and learn the process.
+
+
+[[cg-documentation-format]]
+=== Source Control and Maven Build.
+
+The Jetty documentation is a module within the overall Jetty project and is build as a part of the standard build process.
+As such to checkout the documentation you can follow the link:#t-community-source[same process] as checking out Jetty itself.
+
+As a part of the main Jetty project the documentation is build through the link:#t-community-build[same process] as Jetty.
+However, it is a more independent module and can be worked with much simpler by building strictly the jetty-documentation module.
+
+[source, screen, subs="{sub-order}"]
+....
+
+$ git clone https://github.com/eclipse/jetty.project.git
+$ cd jetty.project/jetty-documentation
+$ mvn install
+
+....
+
+While maven is running you may see a lot of files being downloaded.
+If you are not familiar with Maven you are seeing Maven set up the execution environment for generating the documentation.
+
+The build is finished once you see a message akin to:
+
+[source, screen, subs="{sub-order}"]
+....
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 9.272 s
+[INFO] Finished at: 2018-04-09T13:06:10-05:00
+[INFO] Final Memory: 74M/247M
+[INFO] ------------------------------------------------------------------------
+....
+
+At this point you open your web browser and view the produced documentation (under the target/html directory)!
+
+[TIP]
+====
+Pay close attention to the build output for lines like:
+
+....
+asciidoctor: WARNING: 9-jsp.adoc: line 0: id assigned to section already in use: ag-http2
+....
+
+This indicates that an ID is being reused and should be resolved or else deep linking will work correctly.
+====
+
+[[cg-documentation-render]]
+=== The Render Chain Explained
+
+The Jetty documentation is all written in https://asciidoctor.org/docs/user-manual/[asciidoc].
+The maven build uses the asciidoctor-maven-plugin to process specific index.adoc[] files which act as the root structure for various guides (Administrative, Developer, QuickStart, etc).
+The main pom.xml file also provides a maven profile which when activated can produce the guides in both pdf and epub formats.
+
+[[cg-documentation-structure]]
+=== Project Structure
+
+It may be useful to understand the layout of the documentation before digging into the details.
+The following table lists some helpful directories and their purpose.
+
+.Documentation Layout
+[cols="2"]
+|===
+| src/main/asciidoc | asciidoc source root (*.adoc files)
+| src/main/asciidoc/*-guide | root structure for each individual guide
+| src/main/asciidoc/topics | primary repository for documentation organized by topic
+| src/main/resources | common html resources
+| target/html | post build, where the rendered html files will appear
+| target/pdf | post build (-Palt-formats) pdf files
+| target/epub | post build (-Palt-formats) epub files
+|===
+
+[[cg-documentation-guide]]
+=== Guide Structure
+
+Each guide starts with an *index.adoc* file which acts as the point of origin for the document structure.
+It will declare useful metadata for the proper rendering of the overall guide and use the asciidoc *include* directive to pull in content for each chapter which are conveniently named by chapter number and name.
+
+The individual chapter *adoc* files contain the narrative structure of each guide and in turn use the *include* directive to pull in specific topic content.
+he topic content is all located within the *src/main/asciidoc/topics* structure and is intended to be context free and unrelated to any specific guide.
+In this way, any narrative requirements that setup or weave together topics are located in their associated guide chapters and any topics can stand on their own.
+
+[[cg-documentation-conventions]]
+=== Conventions
+
+Below is list of conventions that should be followed when developing documentation within this framework.
+These are not set in stone but you are encouraged to follow them when possible.
+
+ventilated prose::
+  Each sentence should generally be on its own line with a hard return at the end of the line.
+  Asciidoc rendering does not treat this style as separate lines and will produce paragraphs correctly.
+  The primary benefit is that you can easily see changes between versions of files, and it makes it trivial to quickly look through a pull request.
+  Additional benefits are the ability to comment out a sentence mid paragraph or move sentences around within a paragraph.
+  Enabling Soft Line Wrap in your favorite editor can make this a bit easier to stomach.
+
+id's::
+  Critically important for being able to generate url's that can be used in a persistent fashion.
+  Without sane id's the chapters and sections will have generated id which are rooted in some obscure location based
+  voodoo.
+  A url using these 'e12c8673' type links will not be durable across generations of the documentation.
+  These id's need to be used on chapters and sections two deep, and anywhere that you intend to cross link deeper.
+  The id values go into a global namespace so they must be unique across the entire document or the last example will win and any cross links will go there.
+  Links inside of a guides narrative structure should be prefixed with an acronym (contributor guide = cg-) while any links within the topics structure should be prefixed with t- and ideally the name of the topic it corresponds to.
+
+link vs xref::
+  The `link:` item should be generally used for linking around the document when you want to choose the text that will be rendered in the link itself.
+  However if you are linking to a section and want to use the title itself as the link text, use the `xref:` tag without the hashmark in front of the link id.
+
+version differences::
+  In general differences in functionality within a release should go into nested sections and use titles like 'Prior to: ##' or 'In version: ##'.
+
+license blocks::
+  Each adoc file should contain the license block that exists in the index.adoc file and a copy has been added to the bottom of this page as well for reference.
+
+....
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+....
+
+Some admonition examples:
+
+______________________________________________
+[NOTE]
+A note about the previous case to be aware of.
+______________________________________________
+
+________________________________________
+[IMPORTANT]
+Important notes are marked with an icon.
+________________________________________
+
+________________________________
+[TIP]
+Tips that make your life easier.
+________________________________
+
+_______________________________________________________
+[CAUTION]
+Places where you have to be careful what you are doing.
+_______________________________________________________
+
+__________________________________________________________________________________________________________________
+[WARNING]
+Where extreme care has to be taken. Data corruption or other nasty
+things may occur if these warnings are ignored.
+__________________________________________________________________________________________________________________
+
+==== Oddities
+
+* If an included file ends with a list entry, it needs to have two empty lines at the end of the file in order for the section rendering to work correctly.
diff --git a/jetty-documentation/src/main/asciidoc/contribution-guide/5-security.adoc b/jetty-documentation/src/main/asciidoc/contribution-guide/5-security.adoc
new file mode 100644
index 00000000000..e698bdb4c1a
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/contribution-guide/5-security.adoc
@@ -0,0 +1,35 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+[[cg-security]]
+== Security
+
+[[cg-security-reporting]]
+=== Reporting Security Issues
+
+There are a number of avenues for reporting security issues to the Jetty project available.
+If the issue is directly related to Jetty itself then reporting to the Jetty developers is encouraged.
+The most direct method is to send e-mail to _security@webtide.com_.
+Since Webtide is comprised of the active committers of the Jetty project this is our preferred reporting method.
+We are generally flexible in how we work with reporters of security issues from an attribution perspective but we reserve the right to act in the interests of the Jetty project in all circumstances.
+
+If the issue is related to Eclipse or its Jetty integration then we encourage you to reach out to _security@eclipse.org_.
+
+If the issue is related to some third party integration with Jetty we are happy to work with you to identify the proper entity and worth with them to properly address any issue so either of the above outreaches is fine.
+
+We prefer that security issues are reported directly to Jetty developers via email as opposed through GitHub Issues since there is currently no facility for _private_ issues.  There is an https://github.com/isaacs/github/issues/37[unofficial thread] for this support at github you are welcome to follow along on.
diff --git a/jetty-documentation/src/main/asciidoc/contribution-guide/6-conclusion.adoc b/jetty-documentation/src/main/asciidoc/contribution-guide/6-conclusion.adoc
new file mode 100644
index 00000000000..cf54fb32af0
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/contribution-guide/6-conclusion.adoc
@@ -0,0 +1,30 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+[[cg-conclusion]]
+== Thank you!
+
+Your interest in contributing to Eclipse Jetty is welcome and if there is anything you feel this guide is lacking please let us know.
+Feel free to open an Issue as described in this document and perhaps even contribute your suggestion to {GITDOCURL}/contribution-guide[this document] itself!
+
+[[cg-contributing-guides]]
+
+Our current guides are:
+
+* {GUIDEBASEURL}/quickstart/[Distribution Quickstart Guide]
+* {GUIDEBASEURL}/contribution/[Contribution Guide]
diff --git a/jetty-documentation/src/main/asciidoc/contribution-guide/index.adoc b/jetty-documentation/src/main/asciidoc/contribution-guide/index.adoc
new file mode 100644
index 00000000000..3d195fca628
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/contribution-guide/index.adoc
@@ -0,0 +1,68 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+:doctitle: Eclipse Jetty: Contribution Guide
+:author: Jetty Developers
+:email: jetty-dev@eclipse.org
+:revnumber: 1.0
+:revdate: {TIMESTAMP}
+:toc: left
+:toc-title: Contribution Guide
+:toc-image: jetty-logo.svg
+:toc-image-url: /jetty/index.html
+
+:imagesdir: ../common/images
+
+// docinfo lets you pull in shared content and/or influence via render type
+//:docinfodir: {DOCINFODIR}/documentation
+//:docinfo1:
+
+// html specific directives
+ifdef::backend-html5[]
+:safe-mode-unsafe:
+:stylesdir: ../common/css
+:stylesheet: jetty.css
+:linkcss:
+:scriptsdir: ../common/js
+endif::[]
+
+// options for special blocks, code snippets, screen, etc
+:sub-order: attributes+
+
+// suppress document footer generation
+//:nofooter:
+
+// suppress Eclipse footer
+:no-eclipse-footer:
+
+// uncomment to allow include::https:// style content inclusion
+//:allow-uri-read: true
+
+// use fonts for admonitions
+:icons: font
+
+// suppress automatic id generation
+:sectids!:
+
+
+include::1-introduction.adoc[]
+include::2-community.adoc[]
+include::3-source.adoc[]
+include::4-documentation.adoc[]
+include::5-security.adoc[]
+include::6-conclusion.adoc[]
diff --git a/jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/ant/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/ant/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/ant/jetty-ant.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/ant/jetty-ant.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-api.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-api.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-authentication.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-authentication.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-cookie.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-cookie.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-intro.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-intro.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-proxy.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-proxy.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-transport.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/clients/http/http-client-transport.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/continuations/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/continuations/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/continuations/continuations-intro.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/continuations/continuations-intro.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/continuations/continuations-patterns.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/continuations/continuations-patterns.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/continuations/continuations-using.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/continuations/continuations-using.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/embedded-examples.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/embedded-examples.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/embedding-jetty.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/embedding-jetty.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-file-server.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-file-server.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-many-connectors.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-many-connectors.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-minimal-servlet.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-minimal-servlet.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-one-webapp.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-one-webapp.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-secured-hello-handler.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-secured-hello-handler.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-split-file-server.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/examples/embedded-split-file-server.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/jetty-helloworld.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/embedding/jetty-helloworld.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/metro.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/metro.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/osgi.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/osgi.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/spring-usage.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/spring-usage.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/weld.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/frameworks/weld.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/handlers/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/handlers/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/handlers/writing-custom-handlers.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/handlers/writing-custom-handlers.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/maven/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/maven/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/maven/jetty-jspc-maven-plugin.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/maven/jetty-jspc-maven-plugin.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/maven/jetty-maven-helloworld.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/maven/jetty-maven-helloworld.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/maven/jetty-maven-plugin.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/maven/jetty-maven-plugin.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/maven/jetty-maven-scanning.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/maven/jetty-maven-scanning.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/part.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/part.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/part.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/part.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/intro/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/intro/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/java/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/java/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/java/java-websocket-client-api.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/java/java-websocket-client-api.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/java/java-websocket-server-api.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/java/java-websocket-server-api.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-adapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-adapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-annotations.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-annotations.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-events.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-events.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-listener.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-listener.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-send-message.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-send-message.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-session.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api-session.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-api.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-client-api.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-client-api.adoc
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-server-api.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/development/websockets/jetty/jetty-websocket-server-api.adoc
diff --git a/jetty-documentation/src/main/asciidoc/developer-guide/index.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/index.adoc
new file mode 100644
index 00000000000..b93b6550f3c
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/developer-guide/index.adoc
@@ -0,0 +1,77 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+:doctitle: Eclipse Jetty: Development Guide
+:author: Jetty Developers
+:email: jetty-dev@eclipse.org
+:revnumber: 1.0
+:revdate: {TIMESTAMP}
+:toc: left
+:toc-title: Development Guide
+:toc-image: jetty-logo.svg
+:toc-image-url: /jetty/index.html
+
+:imagesdir: ../common/images
+
+// docinfo lets you pull in shared content and/or influence via render type
+//:docinfodir: {DOCINFODIR}/documentation
+//:docinfo1:
+
+// html specific directives
+ifdef::backend-html5[]
+:safe-mode-unsafe:
+:stylesdir: ../common/css
+:stylesheet: jetty.css
+:linkcss:
+:scriptsdir: ../common/js
+endif::[]
+
+// options for special blocks, code snippets, screen, etc
+:sub-order: attributes+
+
+// suppress document footer generation
+//:nofooter:
+
+// suppress Eclipse footer
+:no-eclipse-footer:
+
+// uncomment to allow include::https:// style content inclusion
+//:allow-uri-read: true
+
+// use fonts for admonitions
+:icons: font
+
+// suppress automatic id generation
+:sectids!:
+
+include::development/embedding/chapter.adoc[]
+include::development/clients/http/chapter.adoc[]
+include::development/maven/chapter.adoc[]
+include::development/ant/chapter.adoc[]
+include::development/handlers/chapter.adoc[]
+include::development/websockets/intro/chapter.adoc[]
+include::development/websockets/jetty/chapter.adoc[]
+include::development/continuations/chapter.adoc[]
+include::development/frameworks/chapter.adoc[]
+include::reference/architecture/chapter.adoc[]
+include::reference/platforms/chapter.adoc[]
+include::reference/jetty-xml/chapter.adoc[]
+include::reference/troubleshooting/chapter.adoc[]
+include::reference/debugging/chapter.adoc[]
+include::reference/contributing/chapter.adoc[]
+include::reference/upgrading/chapter.adoc[]
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/1xx-responses.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/1xx-responses.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/basic-architecture.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/basic-architecture.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-handlers.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-handlers.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-handlers.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-handlers.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-nested-handlers.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-nested-handlers.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-nested-handlers.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-nested-handlers.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-patterns.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-patterns.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-patterns.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-patterns.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-servlet-handler.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-servlet-handler.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-servlet-handler.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-servlet-handler.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-web-application.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-web-application.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/images/basic-architecture-web-application.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/basic-architecture-web-application.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/images/jetty-high-level-architecture.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/jetty-high-level-architecture.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/images/jetty-high-level-architecture.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/images/jetty-high-level-architecture.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/jetty-classloading.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/jetty-classloading.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/server-side-architecture.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/architecture/server-side-architecture.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/bugs.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/bugs.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/coding-standards.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/coding-standards.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/community.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/community.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/documentation.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/documentation.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/patches.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/patches.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/release-testing.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/release-testing.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/releasing-jetty.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/releasing-jetty.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/security.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/security.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/source-build.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/contributing/source-build.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/debugging-with-eclipse.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/debugging-with-eclipse.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/debugging-with-intellij.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/debugging-with-intellij.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/enable-remote-debugging.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/enable-remote-debugging.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-1.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/debug-eclipse-1.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-1.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/debug-eclipse-1.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-2.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/debug-eclipse-2.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-2.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/debug-eclipse-2.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-3.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/debug-eclipse-3.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-3.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/debug-eclipse-3.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_debug_view.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/intellij_debug_view.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_debug_view.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/intellij_debug_view.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_new_remote_config.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/intellij_new_remote_config.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_new_remote_config.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/intellij_new_remote_config.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_select_debug.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/intellij_select_debug.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_select_debug.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/intellij_select_debug.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_set_breakpoint.png b/jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/intellij_set_breakpoint.png
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_set_breakpoint.png
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/debugging/images/intellij_set_breakpoint.png
diff --git a/jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/faq/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/faq/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-env-xml.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-env-xml.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-web-xml-config.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-web-xml-config.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-xml-config.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-xml-config.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-xml-syntax.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-xml-syntax.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-xml-usage.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/jetty-xml-usage.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/override-web-xml.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/override-web-xml.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/webdefault-xml.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/jetty-xml/webdefault-xml.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/part.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/part.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/part.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/part.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/cloudfoundry.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/cloudfoundry.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/elastic-beanstalk.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/elastic-beanstalk.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/fedora.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/fedora.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/jelastic.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/jelastic.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/ubuntu.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/platforms/ubuntu.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/preventing-memory-leaks.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/preventing-memory-leaks.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/security-reports.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/security-reports.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/slow-deployment.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/slow-deployment.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/troubleshooting-locked-files.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/troubleshooting-locked-files.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/troubleshooting-zip-exceptions.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/troubleshooting-zip-exceptions.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/watchservice.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/watchservice.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/troubleshooting/watchservice.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/troubleshooting/watchservice.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/upgrading/chapter.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/upgrading/chapter.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/upgrading/sample.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/upgrading/sample.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/upgrading/upgrading-9.3-to-9.4.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/upgrading/upgrading-9.3-to-9.4.adoc
diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-from-jetty-9.adoc b/jetty-documentation/src/main/asciidoc/developer-guide/reference/upgrading/upgrading-from-jetty-9.adoc
similarity index 100%
rename from jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-from-jetty-9.adoc
rename to jetty-documentation/src/main/asciidoc/developer-guide/reference/upgrading/upgrading-from-jetty-9.adoc
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/index.adoc b/jetty-documentation/src/main/asciidoc/quick-start/index.adoc
new file mode 100644
index 00000000000..a49b287684c
--- /dev/null
+++ b/jetty-documentation/src/main/asciidoc/quick-start/index.adoc
@@ -0,0 +1,62 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+:doctitle: Eclipse Jetty: Quickstart Guide
+:author: Jetty Developers
+:email: jetty-dev@eclipse.org
+:revnumber: 1.0
+:revdate: {TIMESTAMP}
+:toc: left
+:toc-title: Quickstart Guide
+:toc-image: jetty-logo.svg
+:toc-image-url: /jetty/index.html
+
+:imagesdir: ../common/images
+
+// docinfo lets you pull in shared content and/or influence via render type
+//:docinfodir: {DOCINFODIR}/documentation
+//:docinfo1:
+
+// html specific directives
+ifdef::backend-html5[]
+:safe-mode-unsafe:
+:stylesdir: ../common/css
+:stylesheet: jetty.css
+:linkcss:
+:scriptsdir: ../common/js
+endif::[]
+
+// options for special blocks, code snippets, screen, etc
+:sub-order: attributes+
+
+// suppress document footer generation
+//:nofooter:
+:no-eclipse-footer:
+
+// uncomment to allow include::https:// style content inclusion
+//:allow-uri-read: true
+
+// use fonts for admonitions
+:icons: font
+
+// suppress automatic id generation
+:sectids!:
+
+include::introduction/chapter.adoc[]
+include::getting-started/chapter.adoc[]
+include::configuring/chapter.adoc[]