From 1635bc6b128643b4319c5c42e9f2ed3e56fe6467 Mon Sep 17 00:00:00 2001
From: WalkerWatch <ctwalker@gmail.com>
Date: Wed, 17 Aug 2016 11:00:45 -0400
Subject: [PATCH 1/2] Resolves #843

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
---
 .../src/main/asciidoc/configuring/deploying/chapter.adoc        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc
index c6362e87a69..777516f6804 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc
+++ b/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[]

From 81549aa6dc04638ed4156fdeb62eb3529b545997 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Thu, 18 Aug 2016 10:05:03 -0500
Subject: [PATCH 2/2] Issue #732 add documentation to distribution demo-base

---
 jetty-distribution/pom.xml                    | 28 ++++++++++++++++++-
 .../demo-base/webapps/ROOT/index.html         |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index f49c571fed5..dc0d7c3755b 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -303,7 +303,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>
           <execution>
             <id>copy-lib-deps</id>
             <phase>generate-resources</phase>
@@ -814,5 +833,12 @@
       <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>
   </dependencies>
 </project>
diff --git a/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html b/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html
index 30368ba8c53..5b13252f2ac 100644
--- a/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html
+++ b/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