diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/part.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/administration/part.adoc deleted file mode 100644 index 382c90a4058..00000000000 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/part.adoc +++ /dev/null @@ -1,34 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2019 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. -// ======================================================================== -// - -[[jetty-admin-guide]] - -= Jetty Administration Guide - -include::startup/chapter.adoc[] -include::sessions/chapter.adoc[] -include::logging/chapter.adoc[] -include::jndi/chapter.adoc[] -include::annotations/chapter.adoc[] -include::jmx/chapter.adoc[] -include::alpn/chapter.adoc[] -include::http2/chapter.adoc[] -include::fastcgi/chapter.adoc[] -include::extras/chapter.adoc[] -include::runner/chapter.adoc[] -include::tuning/chapter.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/alpn/alpn.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/alpn/alpn.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/alpn/alpn.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/alpn/alpn.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/alpn/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/alpn/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/alpn/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/alpn/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/annotations/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/annotations/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/annotations/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/annotations/quick-annotations-setup.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/quick-annotations-setup.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/annotations/quick-annotations-setup.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/annotations/quick-annotations-setup.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/annotations/using-annotations-embedded.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations-embedded.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/annotations/using-annotations-embedded.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations-embedded.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/annotations/using-annotations.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/annotations/using-annotations.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/part.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/part.adoc deleted file mode 100644 index 620243d697e..00000000000 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/part.adoc +++ /dev/null @@ -1,27 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2019 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. -// ======================================================================== -// - -[[jetty-config-guide]] - -= Jetty Configuration Guide - -include::deploying/chapter.adoc[] -include::contexts/chapter.adoc[] -include::connectors/chapter.adoc[] -include::security/chapter.adoc[] -include::jsp/chapter.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/connectors/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/connectors/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/configuring-connectors.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-connectors.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/configuring-connectors.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-connectors.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/configuring-ssl-distribution.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-ssl-distribution.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/configuring-ssl-distribution.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-ssl-distribution.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/configuring-ssl.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-ssl.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/configuring-ssl.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-ssl.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/images/certificate-chain.png b/jetty-documentation/src/main/asciidoc/distribution-guide/connectors/images/certificate-chain.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/connectors/images/certificate-chain.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/connectors/images/certificate-chain.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/contexts/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/contexts/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/configuring-virtual-hosts.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/contexts/configuring-virtual-hosts.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/configuring-virtual-hosts.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/contexts/configuring-virtual-hosts.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/custom-error-pages.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/contexts/custom-error-pages.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/custom-error-pages.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/contexts/custom-error-pages.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/serving-webapp-from-particular-port.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/contexts/serving-webapp-from-particular-port.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/serving-webapp-from-particular-port.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/contexts/serving-webapp-from-particular-port.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/setting-context-path.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/contexts/setting-context-path.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/setting-context-path.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/contexts/setting-context-path.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/setting-form-size.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/contexts/setting-form-size.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/setting-form-size.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/contexts/setting-form-size.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/temporary-directories.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/contexts/temporary-directories.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/contexts/temporary-directories.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/contexts/temporary-directories.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/anatomy-of-a-webapp.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/anatomy-of-a-webapp.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/anatomy-of-a-webapp.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/anatomy-of-a-webapp.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/automatic-webapp-deployment.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/automatic-webapp-deployment.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/automatic-webapp-deployment.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/automatic-webapp-deployment.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/configuring-specific-webapp-deployment.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/configuring-specific-webapp-deployment.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/configuring-specific-webapp-deployment.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/configuring-specific-webapp-deployment.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/deployment-architecture.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/deployment-architecture.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/deployment-architecture.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/deployment-architecture.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/deployment-processing-webapps.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/deployment-processing-webapps.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/deployment-processing-webapps.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/deployment-processing-webapps.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/hot-deployment.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/hot-deployment.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/hot-deployment.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/hot-deployment.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/images/Jetty_DeployManager_AppLifeCycle-1.png b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/images/Jetty_DeployManager_AppLifeCycle-1.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/images/Jetty_DeployManager_AppLifeCycle-1.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/images/Jetty_DeployManager_AppLifeCycle-1.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/images/Jetty_DeployManager_DefaultAppLifeCycleBindings.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/images/Jetty_DeployManager_DeploymentManager_Roles.png b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/images/Jetty_DeployManager_DeploymentManager_Roles.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/images/Jetty_DeployManager_DeploymentManager_Roles.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/images/Jetty_DeployManager_DeploymentManager_Roles.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/overlay-deployer.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/overlay-deployer.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/overlay-deployer.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/overlay-deployer.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/quickstart-webapp.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/quickstart-webapp.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/quickstart-webapp.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/quickstart-webapp.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/static-content-deployment.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/deploying/static-content-deployment.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/deploying/static-content-deployment.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/deploying/static-content-deployment.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/balancer-servlet.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/balancer-servlet.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/balancer-servlet.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/balancer-servlet.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/cgi-servlet.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/cgi-servlet.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/cgi-servlet.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/cgi-servlet.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/cross-origin-filter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/cross-origin-filter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/cross-origin-filter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/cross-origin-filter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/debug-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/debug-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/debug-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/debug-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/default-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/default-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/default-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/default-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/default-servlet.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/default-servlet.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/default-servlet.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/default-servlet.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/dos-filter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/dos-filter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/dos-filter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/dos-filter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/error-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/error-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/error-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/error-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/gzip-filter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/gzip-filter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/gzip-filter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/gzip-filter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/header-filter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/header-filter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/header-filter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/header-filter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/inetaccess-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/inetaccess-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/inetaccess-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/inetaccess-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/ipaccess-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/ipaccess-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/ipaccess-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/ipaccess-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/moved-context-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/moved-context-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/moved-context-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/moved-context-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/proxy-servlet.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/proxy-servlet.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/proxy-servlet.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/proxy-servlet.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/qos-filter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/qos-filter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/qos-filter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/qos-filter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/resource-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/resource-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/resource-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/resource-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/rewrite-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/rewrite-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/rewrite-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/rewrite-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/shutdown-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/shutdown-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/shutdown-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/shutdown-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/statistics-handler.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/extras/statistics-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/extras/statistics-handler.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/extras/statistics-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/fastcgi/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/fastcgi/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/fastcgi/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/fastcgi/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/fastcgi/configuring-fastcgi.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/fastcgi/configuring-fastcgi.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/fastcgi/configuring-fastcgi.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/fastcgi/configuring-fastcgi.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/fastcgi/fastcgi-intro.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/fastcgi/fastcgi-intro.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/fastcgi/fastcgi-intro.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/fastcgi/fastcgi-intro.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/http2/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/http2/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/configuring-haproxy.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/http2/configuring-haproxy.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/configuring-haproxy.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/http2/configuring-haproxy.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/configuring-http2.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/http2/configuring-http2.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/configuring-http2.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/http2/configuring-http2.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/configuring-push.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/http2/configuring-push.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/configuring-push.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/http2/configuring-push.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/enabling-http2.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/http2/enabling-http2.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/enabling-http2.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/http2/enabling-http2.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/introduction.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/http2/introduction.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/http2/introduction.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/http2/introduction.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/index.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/index.adoc index ad54a137f67..f2bae17adde 100644 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/index.adoc +++ b/jetty-documentation/src/main/asciidoc/distribution-guide/index.adoc @@ -25,7 +25,7 @@ :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 @@ -61,20 +61,20 @@ endif::[] -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 +include::startup/chapter.adoc[] +include::sessions/chapter.adoc[] +include::logging/chapter.adoc[] +include::jndi/chapter.adoc[] +include::annotations/chapter.adoc[] +include::jmx/chapter.adoc[] +include::alpn/chapter.adoc[] +include::http2/chapter.adoc[] +include::fastcgi/chapter.adoc[] +include::extras/chapter.adoc[] +include::runner/chapter.adoc[] +include::tuning/chapter.adoc[] +include::deploying/chapter.adoc[] +include::contexts/chapter.adoc[] +include::connectors/chapter.adoc[] +include::security/chapter.adoc[] +include::jsp/chapter.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jconsole1.jpg b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jconsole1.jpg similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jconsole1.jpg rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jconsole1.jpg diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jconsole2.jpg b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jconsole2.jpg similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jconsole2.jpg rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jconsole2.jpg diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jconsole3.png b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jconsole3.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jconsole3.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jconsole3.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jmc1.png b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jmc1.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jmc1.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jmc1.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jmc2.png b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jmc2.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jmc2.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jmc2.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jmc3.png b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jmc3.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/images/jmc3.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/images/jmc3.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/jetty-jconsole.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/jetty-jconsole.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/jetty-jconsole.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/jetty-jconsole.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/jetty-jmx-annotations.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/jetty-jmx-annotations.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/jetty-jmx-annotations.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/jetty-jmx-annotations.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/using-jmx.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jmx/using-jmx.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jmx/using-jmx.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jmx/using-jmx.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jndi/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jndi/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/jndi-configuration.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jndi/jndi-configuration.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/jndi-configuration.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jndi/jndi-configuration.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/jndi-datasources.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jndi/jndi-datasources.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/jndi-datasources.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jndi/jndi-datasources.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/jndi-embedded.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jndi/jndi-embedded.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/jndi-embedded.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jndi/jndi-embedded.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/quick-jndi-setup.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jndi/quick-jndi-setup.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/quick-jndi-setup.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jndi/quick-jndi-setup.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/using-jndi.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jndi/using-jndi.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/jndi/using-jndi.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jndi/using-jndi.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/jsp/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jsp/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/jsp/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jsp/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/jsp/configuring-jsp.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/jsp/configuring-jsp.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/jsp/configuring-jsp.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/jsp/configuring-jsp.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/configuring-jetty-logging.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/configuring-jetty-logging.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/configuring-jetty-logging.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/configuring-jetty-logging.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/configuring-jetty-request-logs.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/configuring-jetty-request-logs.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/configuring-jetty-request-logs.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/configuring-jetty-request-logs.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/configuring-logging-modules.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/configuring-logging-modules.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/configuring-logging-modules.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/configuring-logging-modules.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/default-logging-with-stderrlog.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/default-logging-with-stderrlog.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/default-logging-with-stderrlog.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/default-logging-with-stderrlog.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/dump-tool.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/dump-tool.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/dump-tool.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/dump-tool.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-apache-log4j.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-apache-log4j.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-apache-log4j.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-apache-log4j.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-java-util-logging-native.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-java-util-logging-native.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-java-util-logging-native.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-java-util-logging-native.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-java-util-logging.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-java-util-logging.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-java-util-logging.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-java-util-logging.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-logback-centralized-logging.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-logback-centralized-logging.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-logback-centralized-logging.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-logback-centralized-logging.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-logback-sifting.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-logback-sifting.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-logback-sifting.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-logback-sifting.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-logback.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-logback.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-logback.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-logback.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-slf4j-multiple-loggers.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-slf4j-multiple-loggers.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/logging/example-slf4j-multiple-loggers.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/logging/example-slf4j-multiple-loggers.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/runner/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/runner/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/runner/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/runner/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/runner/jetty-runner.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/runner/jetty-runner.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/runner/jetty-runner.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/runner/jetty-runner.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/authentication.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/security/authentication.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/authentication.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/security/authentication.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/security/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/security/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/configuring-form-size.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/security/configuring-form-size.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/configuring-form-size.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/security/configuring-form-size.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/jaas-support.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/security/jaas-support.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/jaas-support.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/security/jaas-support.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/jetty-home-and-jetty-base.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/security/jetty-home-and-jetty-base.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/jetty-home-and-jetty-base.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/security/jetty-home-and-jetty-base.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/secure-passwords.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/security/secure-passwords.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/secure-passwords.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/security/secure-passwords.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/serving-aliased-files.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/security/serving-aliased-files.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/serving-aliased-files.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/security/serving-aliased-files.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/setting-port80-access-for-non-root-user.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/security/setting-port80-access-for-non-root-user.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/setting-port80-access-for-non-root-user.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/security/setting-port80-access-for-non-root-user.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/spnego-support.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/security/spnego-support.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/configuring/security/spnego-support.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/security/spnego-support.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/images/SessionsHierarchy.png b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/images/SessionsHierarchy.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/images/SessionsHierarchy.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/images/SessionsHierarchy.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/session-clustering-gcloud-datastore.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/session-clustering-gcloud-datastore.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/session-clustering-infinispan.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/session-clustering-infinispan.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/session-clustering-infinispan.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/session-clustering-infinispan.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/session-clustering-jdbc.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/session-clustering-jdbc.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/session-clustering-jdbc.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/session-clustering-jdbc.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/session-clustering-mongodb.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/session-clustering-mongodb.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/session-clustering-mongodb.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/session-clustering-mongodb.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/setting-session-characteristics.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/setting-session-characteristics.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/setting-session-characteristics.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/setting-session-characteristics.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/using-persistent-sessions.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/using-persistent-sessions.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/legacy/using-persistent-sessions.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/legacy/using-persistent-sessions.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-file-system.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-file-system.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-file-system.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-file-system.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-gcloud.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-gcloud.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-gcloud.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-gcloud.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-hazelcast.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-hazelcast.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-hazelcast.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-hazelcast.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-housekeeper.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-housekeeper.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-housekeeper.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-housekeeper.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-infinispan.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-infinispan.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-infinispan.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-infinispan.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-jdbc.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-jdbc.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-jdbc.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-jdbc.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-memcachedsessiondatastore.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-memcachedsessiondatastore.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-memcachedsessiondatastore.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-memcachedsessiondatastore.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-memory.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-memory.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-memory.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-memory.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-mongodb.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-mongodb.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-mongodb.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-mongodb.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-sessioncache.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-sessioncache.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-configuration-sessioncache.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-sessioncache.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-hierarchy.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-hierarchy.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/session-hierarchy.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-hierarchy.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/sessions-details.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/sessions-details.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/sessions-details.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/sessions-details.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/sessions-usecases.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/sessions/sessions-usecases.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/sessions/sessions-usecases.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/sessions/sessions-usecases.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/custom-modules.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/custom-modules.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/custom-modules.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/custom-modules.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/images/modules-9.3-simplified.dot b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/images/modules-9.3-simplified.dot similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/images/modules-9.3-simplified.dot rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/images/modules-9.3-simplified.dot diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/images/modules-9.3-simplified.png b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/images/modules-9.3-simplified.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/images/modules-9.3-simplified.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/images/modules-9.3-simplified.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/images/windows-service-jetty.png b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/images/windows-service-jetty.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/images/windows-service-jetty.png rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/images/windows-service-jetty.png diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-empty-base-listconfig.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-empty-base-listconfig.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-empty-base-listconfig.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-empty-base-listconfig.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-empty-base.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-empty-base.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-empty-base.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-empty-base.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-http-webapp-deploy-listconfig.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-http-webapp-deploy-listconfig.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-http-webapp-deploy-listconfig.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-http-webapp-deploy-listconfig.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-http-webapp-deploy.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-http-webapp-deploy.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-http-webapp-deploy.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-http-webapp-deploy.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-list-logging-modules.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-list-logging-modules.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-list-logging-modules.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-list-logging-modules.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-list-modules.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-list-modules.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/screen-list-modules.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/screen-list-modules.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/start-jar.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/start-jar.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/start-jar.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/start-jar.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/start-matrix.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/start-matrix.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/start-matrix.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/start-matrix.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-base-vs-home.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-base-vs-home.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-classpath.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-classpath.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-jpms.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-jpms.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-jpms.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-jpms.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-modules.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-modules.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-modules.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-modules.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-overview.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-overview.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-overview.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-overview.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-troubleshooting.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-troubleshooting.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-troubleshooting.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-troubleshooting.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-unix-service.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-unix-service.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-unix-service.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-unix-service.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-windows-service.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-windows-service.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-windows-service.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-windows-service.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-xml-config.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-xml-config.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/startup/startup-xml-config.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-xml-config.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/tuning/chapter.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/tuning/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/tuning/chapter.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/tuning/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/tuning/garbage-collection.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/tuning/garbage-collection.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/tuning/garbage-collection.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/tuning/garbage-collection.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/tuning/high-load.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/tuning/high-load.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/tuning/high-load.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/tuning/high-load.adoc diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/administration/tuning/limit-load.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/tuning/limit-load.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/distribution-guide/administration/tuning/limit-load.adoc rename to jetty-documentation/src/main/asciidoc/distribution-guide/tuning/limit-load.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/ant/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/ant/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/ant/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/ant/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/ant/jetty-ant.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/ant/jetty-ant.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/ant/jetty-ant.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/ant/jetty-ant.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/1xx-responses.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/1xx-responses.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/1xx-responses.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/1xx-responses.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/basic-architecture.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/basic-architecture.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/basic-architecture.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/basic-architecture.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-handlers.png b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-handlers.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-handlers.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-handlers.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-nested-handlers.png b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-nested-handlers.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-nested-handlers.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-nested-handlers.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-patterns.png b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-patterns.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-patterns.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-patterns.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-servlet-handler.png b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-servlet-handler.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-servlet-handler.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-servlet-handler.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-web-application.png b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-web-application.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/basic-architecture-web-application.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/basic-architecture-web-application.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/jetty-high-level-architecture.png b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/jetty-high-level-architecture.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/images/jetty-high-level-architecture.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/images/jetty-high-level-architecture.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/jetty-classloading.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/jetty-classloading.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/jetty-classloading.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/jetty-classloading.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/server-side-architecture.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/architecture/server-side-architecture.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/architecture/server-side-architecture.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/architecture/server-side-architecture.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-api.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-api.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-api.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-api.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-authentication.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-authentication.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-authentication.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-authentication.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-cookie.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-cookie.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-cookie.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-cookie.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-intro.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-intro.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-intro.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-intro.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-proxy.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-proxy.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-proxy.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-proxy.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-transport.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-transport.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/clients/http/http-client-transport.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/clients/http/http-client-transport.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/continuations/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/continuations/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/continuations/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/continuations/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/continuations/continuations-intro.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/continuations/continuations-intro.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/continuations/continuations-intro.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/continuations/continuations-intro.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/continuations/continuations-patterns.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/continuations/continuations-patterns.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/continuations/continuations-patterns.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/continuations/continuations-patterns.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/continuations/continuations-using.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/continuations/continuations-using.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/continuations/continuations-using.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/continuations/continuations-using.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/bugs.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/bugs.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/bugs.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/bugs.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/coding-standards.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/coding-standards.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/coding-standards.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/coding-standards.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/community.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/community.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/community.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/community.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/documentation.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/documentation.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/documentation.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/documentation.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/patches.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/patches.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/patches.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/patches.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/release-testing.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/release-testing.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/release-testing.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/release-testing.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/releasing-jetty.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/releasing-jetty.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/releasing-jetty.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/releasing-jetty.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/security.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/security.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/security.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/security.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/source-build.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/contributing/source-build.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/contributing/source-build.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/contributing/source-build.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/debugging-with-eclipse.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/debugging-with-eclipse.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/debugging-with-eclipse.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/debugging-with-eclipse.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/debugging-with-intellij.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/debugging-with-intellij.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/debugging-with-intellij.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/debugging-with-intellij.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/enable-remote-debugging.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/enable-remote-debugging.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/enable-remote-debugging.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/enable-remote-debugging.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/debug-eclipse-1.png b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/debug-eclipse-1.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/debug-eclipse-1.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/debug-eclipse-1.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/debug-eclipse-2.png b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/debug-eclipse-2.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/debug-eclipse-2.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/debug-eclipse-2.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/debug-eclipse-3.png b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/debug-eclipse-3.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/debug-eclipse-3.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/debug-eclipse-3.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/intellij_debug_view.png b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/intellij_debug_view.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/intellij_debug_view.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/intellij_debug_view.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/intellij_new_remote_config.png b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/intellij_new_remote_config.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/intellij_new_remote_config.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/intellij_new_remote_config.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/intellij_select_debug.png b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/intellij_select_debug.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/intellij_select_debug.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/intellij_select_debug.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/intellij_set_breakpoint.png b/jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/intellij_set_breakpoint.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/debugging/images/intellij_set_breakpoint.png rename to jetty-documentation/src/main/asciidoc/embedded-guide/debugging/images/intellij_set_breakpoint.png diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/part.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/development/part.adoc deleted file mode 100644 index 1ef5a9d996f..00000000000 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/development/part.adoc +++ /dev/null @@ -1,32 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2019 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. -// ======================================================================== -// - -[[jetty-dev-guide]] - -= Jetty Development Guide - -include::embedding/chapter.adoc[] -include::clients/http/chapter.adoc[] -include::maven/chapter.adoc[] -include::ant/chapter.adoc[] -include::handlers/chapter.adoc[] -include::websockets/intro/chapter.adoc[] -include::websockets/jetty/chapter.adoc[] -//include::websockets/java/chapter.adoc[] -include::continuations/chapter.adoc[] -include::frameworks/chapter.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/embedded-examples.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/embedded-examples.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/embedded-examples.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/embedded-examples.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/embedding-jetty.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/embedding-jetty.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/embedding-jetty.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/embedding-jetty.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-file-server.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-file-server.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-file-server.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-file-server.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-many-connectors.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-many-connectors.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-many-connectors.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-many-connectors.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-minimal-servlet.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-minimal-servlet.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-minimal-servlet.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-minimal-servlet.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-one-webapp.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-one-webapp.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-one-webapp.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-one-webapp.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-secured-hello-handler.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-secured-hello-handler.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-secured-hello-handler.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-secured-hello-handler.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-split-file-server.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-split-file-server.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/examples/embedded-split-file-server.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/examples/embedded-split-file-server.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/jetty-helloworld.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/embedding/jetty-helloworld.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/embedding/jetty-helloworld.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/embedding/jetty-helloworld.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/faq/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/faq/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/faq/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/faq/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/metro.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/metro.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/metro.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/metro.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/osgi.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/osgi.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/osgi.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/osgi.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/spring-usage.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/spring-usage.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/spring-usage.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/spring-usage.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/weld.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/weld.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/frameworks/weld.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/frameworks/weld.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/handlers/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/handlers/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/handlers/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/handlers/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/handlers/writing-custom-handlers.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/handlers/writing-custom-handlers.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/handlers/writing-custom-handlers.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/handlers/writing-custom-handlers.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/index.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/index.adoc index b93b6550f3c..e714a763c44 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/index.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/index.adoc @@ -59,19 +59,19 @@ endif::[] // 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[] +include::embedding/chapter.adoc[] +include::clients/http/chapter.adoc[] +include::maven/chapter.adoc[] +include::ant/chapter.adoc[] +include::handlers/chapter.adoc[] +include::websockets/intro/chapter.adoc[] +include::websockets/jetty/chapter.adoc[] +include::continuations/chapter.adoc[] +include::frameworks/chapter.adoc[] +include::architecture/chapter.adoc[] +include::platforms/chapter.adoc[] +include::jetty-xml/chapter.adoc[] +include::troubleshooting/chapter.adoc[] +include::debugging/chapter.adoc[] +include::contributing/chapter.adoc[] +include::upgrading/chapter.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-env-xml.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-env-xml.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-env-xml.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-env-xml.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-web-xml-config.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-web-xml-config.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-web-xml-config.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-web-xml-config.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-xml-config.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-xml-config.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-xml-config.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-xml-config.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-xml-syntax.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-xml-syntax.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-xml-syntax.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-xml-syntax.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-xml-usage.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-xml-usage.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/jetty-xml-usage.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/jetty-xml-usage.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/override-web-xml.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/override-web-xml.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/override-web-xml.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/override-web-xml.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/webdefault-xml.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/webdefault-xml.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/jetty-xml/webdefault-xml.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/jetty-xml/webdefault-xml.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/maven/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/maven/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/jetty-jspc-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/maven/jetty-jspc-maven-plugin.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/jetty-jspc-maven-plugin.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/maven/jetty-jspc-maven-plugin.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/jetty-maven-helloworld.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/maven/jetty-maven-helloworld.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/jetty-maven-helloworld.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/maven/jetty-maven-helloworld.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/jetty-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/maven/jetty-maven-plugin.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/jetty-maven-plugin.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/maven/jetty-maven-plugin.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/jetty-maven-scanning.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/maven/jetty-maven-scanning.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/maven/jetty-maven-scanning.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/maven/jetty-maven-scanning.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/platforms/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/platforms/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/cloudfoundry.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/platforms/cloudfoundry.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/cloudfoundry.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/platforms/cloudfoundry.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/elastic-beanstalk.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/platforms/elastic-beanstalk.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/elastic-beanstalk.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/platforms/elastic-beanstalk.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/fedora.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/platforms/fedora.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/fedora.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/platforms/fedora.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/jelastic.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/platforms/jelastic.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/jelastic.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/platforms/jelastic.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/ubuntu.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/platforms/ubuntu.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/platforms/ubuntu.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/platforms/ubuntu.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/part.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/reference/part.adoc deleted file mode 100644 index 29b9b87567d..00000000000 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/part.adoc +++ /dev/null @@ -1,29 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2019 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. -// ======================================================================== -// - -[[jetty-ref-guide]] - -= Jetty Reference Guide - -include::architecture/chapter.adoc[] -include::platforms/chapter.adoc[] -include::jetty-xml/chapter.adoc[] -include::troubleshooting/chapter.adoc[] -include::debugging/chapter.adoc[] -include::contributing/chapter.adoc[] -include::upgrading/chapter.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/preventing-memory-leaks.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/preventing-memory-leaks.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/preventing-memory-leaks.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/preventing-memory-leaks.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/security-reports.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/security-reports.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/security-reports.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/security-reports.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/slow-deployment.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/slow-deployment.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/slow-deployment.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/slow-deployment.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/troubleshooting-locked-files.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/troubleshooting-locked-files.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/troubleshooting-locked-files.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/troubleshooting-locked-files.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/troubleshooting-zip-exceptions.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/troubleshooting-zip-exceptions.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/troubleshooting-zip-exceptions.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/troubleshooting-zip-exceptions.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/watchservice.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/watchservice.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/troubleshooting/watchservice.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/troubleshooting/watchservice.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/upgrading/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/upgrading/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/upgrading/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/upgrading/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/upgrading/sample.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/upgrading/sample.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/upgrading/sample.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/upgrading/sample.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/upgrading/upgrading-9.3-to-9.4.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/upgrading/upgrading-9.3-to-9.4.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/upgrading/upgrading-9.3-to-9.4.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/upgrading/upgrading-9.3-to-9.4.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/reference/upgrading/upgrading-from-jetty-9.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/upgrading/upgrading-from-jetty-9.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/reference/upgrading/upgrading-from-jetty-9.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/upgrading/upgrading-from-jetty-9.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/intro/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/intro/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/intro/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/intro/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/java/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/java/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/java/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/java/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/java/java-websocket-client-api.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/java/java-websocket-client-api.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/java/java-websocket-client-api.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/java/java-websocket-client-api.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/java/java-websocket-server-api.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/java/java-websocket-server-api.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/java/java-websocket-server-api.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/java/java-websocket-server-api.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/chapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-adapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-adapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-adapter.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-adapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-annotations.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-annotations.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-annotations.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-annotations.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-events.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-events.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-events.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-events.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-listener.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-listener.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-listener.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-listener.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-send-message.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-send-message.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-send-message.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-send-message.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-session.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-session.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api-session.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api-session.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-api.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-api.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-client-api.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-client-api.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-client-api.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-client-api.adoc diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-server-api.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-server-api.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/embedded-guide/development/websockets/jetty/jetty-websocket-server-api.adoc rename to jetty-documentation/src/main/asciidoc/embedded-guide/websockets/jetty/jetty-websocket-server-api.adoc diff --git a/jetty-documentation/src/main/asciidoc/quickstart-guide/part.adoc b/jetty-documentation/src/main/asciidoc/quickstart-guide/part.adoc deleted file mode 100644 index b445cbc3d64..00000000000 --- a/jetty-documentation/src/main/asciidoc/quickstart-guide/part.adoc +++ /dev/null @@ -1,25 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2019 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. -// ======================================================================== -// - -[[quick-start]] - -= Getting Started With Jetty - -include::introduction/chapter.adoc[] -include::getting-started/chapter.adoc[] -include::configuring/chapter.adoc[]