From 4fda18ea4b2322e0bf5c3ca7d4a1f88c2cb2a537 Mon Sep 17 00:00:00 2001
From: Chris Walker <chris@webtide.com>
Date: Tue, 23 Jul 2019 09:50:11 -0400
Subject: [PATCH] Fixed TOC image rendering and Distro guide content.

---
 .../asciidoc/contribution-guide/index.adoc    |  3 +-
 .../asciidoc/distribution-guide/index.adoc    | 38 +++++++++----------
 .../main/asciidoc/quickstart-guide/index.adoc |  4 +-
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/jetty-documentation/src/main/asciidoc/contribution-guide/index.adoc b/jetty-documentation/src/main/asciidoc/contribution-guide/index.adoc
index 821f509a3b7..13eb5f7a31d 100644
--- a/jetty-documentation/src/main/asciidoc/contribution-guide/index.adoc
+++ b/jetty-documentation/src/main/asciidoc/contribution-guide/index.adoc
@@ -23,9 +23,10 @@
 :revdate: {TIMESTAMP}
 :toc: left
 :toc-title: Contribution Guide
-:toc-image: ../common/images/jetty-logo.svg
+:toc-image: jetty-logo.svg
 :toc-image-url: /jetty/index.html
 
+:imagesdir: ../common/images
 
 // docinfo lets you pull in shared content and/or influence via render type
 //:docinfodir: {DOCINFODIR}/documentation
diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/index.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/index.adoc
index 0bf7fc07d6e..4d67ef626c2 100644
--- a/jetty-documentation/src/main/asciidoc/distribution-guide/index.adoc
+++ b/jetty-documentation/src/main/asciidoc/distribution-guide/index.adoc
@@ -24,9 +24,10 @@
 :revdate: {TIMESTAMP}
 :toc: left
 :toc-title: Administration Guide
-:toc-image: ../common/images/jetty-logo.svg
+:toc-image: jetty-logo.svg
 :toc-image-url: /jetty/index.html
 
+:imagesdir: ../common/images
 
 // docinfo lets you pull in shared content and/or influence via render type
 //:docinfodir: {DOCINFODIR}/documentation
@@ -60,21 +61,20 @@ endif::[]
 :sectids!:
 
 
-
-include::administration/startup/chapter.adoc[]
-include::administration/sessions/chapter.adoc[]
-include::administration/logging/chapter.adoc[]
-include::administration/jndi/chapter.adoc[]
-include::administration/annotations/chapter.adoc[]
-include::administration/jmx/chapter.adoc[]
-include::administration/alpn/chapter.adoc[]
-include::administration/http2/chapter.adoc[]
-include::administration/fastcgi/chapter.adoc[]
-include::administration/extras/chapter.adoc[]
-include::administration/runner/chapter.adoc[]
-include::administration/tuning/chapter.adoc[]
-include::configuring/deploying/chapter.adoc[]
-include::configuring/contexts/chapter.adoc[]
-include::configuring/connectors/chapter.adoc[]
-include::configuring/security/chapter.adoc[]
-include::configuring/jsp/chapter.adoc[]
+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/quickstart-guide/index.adoc b/jetty-documentation/src/main/asciidoc/quickstart-guide/index.adoc
index 97c3f572f07..d34290f9d07 100644
--- a/jetty-documentation/src/main/asciidoc/quickstart-guide/index.adoc
+++ b/jetty-documentation/src/main/asciidoc/quickstart-guide/index.adoc
@@ -24,13 +24,15 @@
 :revdate: {TIMESTAMP}
 :toc: left
 :toc-title: Quickstart Guide
-:toc-image: ../common/images/jetty-logo.svg
+:toc-image: jetty-logo.svg
 :toc-image-url: /jetty/index.html
 
 // docinfo lets you pull in shared content and/or influence via render type
 //:docinfodir: {DOCINFODIR}/documentation
 //:docinfo1:
 
+:imagesdir: ../common/images
+
 // html specific directives
 ifdef::backend-html5[]
 :safe-mode-unsafe: