merge from 9.3.x

jetty-distribution/pom.xml

@@ -292,6 +292,26 @@
               <excludes>META-INF/**</excludes>
             </configuration>
           </execution>
+          <execution>
+            <id>unpack-documentation</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty</groupId>
+                  <artifactId>jetty-documentation</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>html</classifier>
+                  <type>zip</type>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${assembly-directory}/demo-base/webapps/doc</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -398,5 +418,40 @@
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
+<<<<<<< HEAD
+=======
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jaspi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-infinispan</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.gcloud</groupId>
+      <artifactId>jetty-gcloud-session-manager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.gcloud</groupId>
+      <artifactId>jetty-gcloud-memcached-session-manager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-nosql</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-documentation</artifactId>
+      <version>${project.version}</version>
+      <classifier>html</classifier>
+      <type>zip</type>
+    </dependency>
+>>>>>>> jetty-9.3.x
   </dependencies>
 </project>

jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html

@@ -44,7 +44,7 @@
           <h2>information ...</h2>
           <ul>
             <li><a href="http://www.eclipse.org/jetty/">Jetty Homepage</a></li>
-            <li><a href="http://www.eclipse.org/jetty/documentation/current">Jetty Documentation</a></li>
+            <li><a href="http://www.eclipse.org/jetty/documentation/current">Jetty Documentation</a> (<a href="/doc/">local</a>)</li>
             <li><a href="/proxy/apidocs/">Javadoc</a> (via transparent proxy)</li>
             <li><a href="/proxy/xref/">Xref</a> (via transparent proxy)</li>
             <li><a

jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc

@@ -29,4 +29,4 @@ include::static-content-deployment.adoc[]
 include::hot-deployment.adoc[]
 include::deployment-architecture.adoc[]
 include::quickstart-webapp.adoc[]
-include::overlay-deployer.adoc[]
+//include::overlay-deployer.adoc[]