Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.

jetty-documentation/pom.xml

@@ -165,9 +165,9 @@
             <SRCDIR>${basedir}/..</SRCDIR>
             <GITBROWSEURL>https://github.com/eclipse/jetty.project/tree/master</GITBROWSEURL>
             <GITDOCURL>https://github.com/eclipse/jetty.project/tree/jetty-10.0.x-doc-refactor/jetty-documentation/src/main/asciidoc</GITDOCURL>
-            <DISTGUIDE>../distribution-guide/index.html</DISTGUIDE>
-            <EMBEDGUIDE>../embedded-guide/index.html</EMBEDGUIDE>
-            <QUICKGUIDE>../quickstart-guide/index.html</QUICKGUIDE>
+            <OPGUIDE>../operation-guide/index.html</OPGUIDE>
+            <PROGGUIDE>../programming-guide/index.html</PROGGUIDE>
+            <GSTARTGUIDE>../gettingstarted-guide/index.html</GSTARTGUIDE>
             <CONTRIBGUIDE>../contribution-guide/index.html</CONTRIBGUIDE>
             <MVNCENTRAL>http://central.maven.org/maven2</MVNCENTRAL>
             <VERSION>${project.version}</VERSION>
@@ -176,7 +176,7 @@
         </configuration>
         <executions>
           <execution>
-            <id>quickstart-guide</id>
+            <id>gettingstarted-guide</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>process-asciidoc</goal>
@@ -184,13 +184,13 @@
             <configuration>
               <backend>html5</backend>
               <templateDir>${web.resources.directory}/asciidoc/slim-template</templateDir>
-              <sourceDirectory>${basedir}/src/main/asciidoc/quickstart-guide</sourceDirectory>
+              <sourceDirectory>${basedir}/src/main/asciidoc/gettingstarted-guide</sourceDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
-              <outputDirectory>${project.build.directory}/html/quickstart-guide</outputDirectory>
+              <outputDirectory>${project.build.directory}/html/gettingstarted-guide</outputDirectory>
             </configuration>
           </execution>
           <execution>
-            <id>distribution-guide</id>
+            <id>operation-guide</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>process-asciidoc</goal>
@@ -198,9 +198,9 @@
             <configuration>
               <backend>html5</backend>
               <templateDir>${web.resources.directory}/asciidoc/slim-template</templateDir>
-              <sourceDirectory>${basedir}/src/main/asciidoc/distribution-guide</sourceDirectory>
+              <sourceDirectory>${basedir}/src/main/asciidoc/operation-guide</sourceDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
-              <outputDirectory>${project.build.directory}/html/distribution-guide</outputDirectory>
+              <outputDirectory>${project.build.directory}/html/operation-guide</outputDirectory>
             </configuration>
           </execution>
           <execution>
@@ -219,7 +219,7 @@
             </configuration>
           </execution>
           <execution>
-            <id>embedded-guide</id>
+            <id>programming-guide</id>
             <phase>prepare-package</phase>
             <goals>
               <goal>process-asciidoc</goal>
@@ -227,9 +227,9 @@
             <configuration>
               <backend>html5</backend>
               <templateDir>${web.resources.directory}/asciidoc/slim-template</templateDir>
-              <sourceDirectory>${basedir}/src/main/asciidoc/embedded-guide</sourceDirectory>
+              <sourceDirectory>${basedir}/src/main/asciidoc/programming-guide</sourceDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
-              <outputDirectory>${project.build.directory}/html/embedded-guide</outputDirectory>
+              <outputDirectory>${project.build.directory}/html/programming-guide</outputDirectory>
               <sourceHighlighter>coderay</sourceHighlighter>
               <requires>
                 <require>asciidoctor-diagram</require>

jetty-documentation/src/main/asciidoc/gettingstarted-guide/index.adoc

@@ -16,20 +16,20 @@
 // ========================================================================
 //
 
-:doctitle: Eclipse Jetty: Quickstart Guide
+:doctitle: Eclipse Jetty: Getting Started Guide
 :author: Jetty Developers
 :email: jetty-dev@eclipse.org
 :revnumber: 1.0
 :revdate: {TIMESTAMP}
 :toc: left
-:toc-title: Quickstart Guide
+:toc-title: Getting Started Guide
 :toc-style:
 
 :header-style: eclipse-thin
 :breadcrumb-style: eclipse-thin
 :footer-style: default
 
-:breadcrumb: Home:../index.html | Quickstart Guide:./index.html
+:breadcrumb: Home:../index.html | Getting Started Guide:./index.html
 
 // html specific directives
 ifdef::backend-html5[]
@@ -54,4 +54,4 @@ endif::[]
 
 include::introduction/chapter.adoc[]
 include::getting-started/chapter.adoc[]
-include::configuring/chapter.adoc[]
+

jetty-documentation/src/main/asciidoc/gettingstarted-guide/introduction/what-is-jetty.adoc

@@ -23,15 +23,15 @@ Eclipse Jetty is an open-source project providing an HTTP server, HTTP client, a
 
 The Jetty documentation is broken up in to four parts:
 
-* The link:{QUICKGUIDE}[Quick Start Guide] emphasizes beginning to use Jetty.
+* The link:{GSTARTEDGUIDE}[Getting Started Guide] emphasizes beginning to use Jetty.
 It provides information about what Jetty is and where you can download it, and where to find Jetty in repositories like Central Maven.
 It also provides a Quick Start guide on how to get Jetty up and running as well as an overview of how and what to configure in Jetty.
 
-* The link:{DISTGUIDE}[Distribution Guide] details configuring Jetty as a distributed package at a more granular level.
+* The link:{OPGUIDE}[Operation Guide] details configuring Jetty as a distributed package at a more granular level.
 From server startup to session management, logging, HTTP/2 support and Jetty optimization, these chapters will help administrators get the most out of their distributed Jetty server instances.
 This section also covers configuring many of the most common servlet container features such as JNDI and JMX.
 
-* Aimed at advanced users of Jetty, the link:{EMBEDGUIDE}[Embedded Guide] focuses on Jetty development.
+* Aimed at advanced users of Jetty, the link:{PROGGUIDE}[Programming Guide] focuses on Jetty development.
 A large portion of this section is focused on using Jetty as an embedded server in existing applications.
 It contains several examples and how-to guides for making the most out of the Jetty framework.
 This section also includes a guide on using the Jetty Maven plugin as well as information on debugging Jetty.

jetty-documentation/src/main/asciidoc/operation-guide/index.adoc

@@ -16,19 +16,19 @@
 // ========================================================================
 //
 
-:doctitle: Eclipse Jetty: Distribution Guide
+:doctitle: Eclipse Jetty: Operation Guide
 :author: Jetty Developers
 :email: jetty-dev@eclipse.org
 :revnumber: 1.0
 :revdate: {TIMESTAMP}
 :toc: left
-:toc-title: Distribution Guide
+:toc-title: Operation Guide
 :toc-style:
 
 :header-style: eclipse-thin
 :breadcrumb-style: eclipse-thin
 :footer-style: default
-:breadcrumb: Home:../index.html | Distribution Guide:./index.html
+:breadcrumb: Home:../index.html | Operation Guide:./index.html
 
 // docinfo lets you pull in shared content and/or influence via render type
 //:docinfodir: {DOCINFODIR}/documentation