From ed3168a57be6a040310b945c1c46a70b2992a609 Mon Sep 17 00:00:00 2001 From: WalkerWatch Date: Mon, 8 Aug 2016 17:09:57 -0400 Subject: [PATCH] Doc flow cleanup. Signed-off-by: WalkerWatch --- .../src/main/asciidoc/development/part.adoc | 3 +-- .../debugging/chapter.adoc | 0 .../debugging/debugging-with-eclipse.adoc | 0 .../debugging/debugging-with-intellij.adoc | 0 .../debugging/enable-remote-debugging.adoc | 0 .../debugging/images/debug-eclipse-1.png | Bin .../debugging/images/debug-eclipse-2.png | Bin .../debugging/images/debug-eclipse-3.png | Bin .../debugging/images/intellij_debug_view.png | Bin .../debugging/images/intellij_new_remote_config.png | Bin .../debugging/images/intellij_select_debug.png | Bin .../debugging/images/intellij_set_breakpoint.png | Bin .../main/asciidoc/reference/jetty-xml/chapter.adoc | 4 ++-- .../src/main/asciidoc/reference/part.adoc | 6 ++++-- 14 files changed, 7 insertions(+), 6 deletions(-) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/chapter.adoc (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/debugging-with-eclipse.adoc (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/debugging-with-intellij.adoc (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/enable-remote-debugging.adoc (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/images/debug-eclipse-1.png (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/images/debug-eclipse-2.png (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/images/debug-eclipse-3.png (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/images/intellij_debug_view.png (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/images/intellij_new_remote_config.png (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/images/intellij_select_debug.png (100%) rename jetty-documentation/src/main/asciidoc/{development => reference}/debugging/images/intellij_set_breakpoint.png (100%) diff --git a/jetty-documentation/src/main/asciidoc/development/part.adoc b/jetty-documentation/src/main/asciidoc/development/part.adoc index ee74f986530..5beeab3e6c5 100644 --- a/jetty-documentation/src/main/asciidoc/development/part.adoc +++ b/jetty-documentation/src/main/asciidoc/development/part.adoc @@ -20,11 +20,10 @@ include::embedding/chapter.adoc[] include::clients/http/chapter.adoc[] include::maven/chapter.adoc[] +include::ant/chapter.adoc[] include::handlers/chapter.adoc[] -include::debugging/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[] -include::ant/chapter.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/chapter.adoc rename to jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/debugging-with-eclipse.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/debugging-with-eclipse.adoc rename to jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/debugging-with-intellij.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/debugging-with-intellij.adoc rename to jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/enable-remote-debugging.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/enable-remote-debugging.adoc rename to jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/images/debug-eclipse-1.png b/jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-1.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/images/debug-eclipse-1.png rename to jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-1.png diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/images/debug-eclipse-2.png b/jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-2.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/images/debug-eclipse-2.png rename to jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-2.png diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/images/debug-eclipse-3.png b/jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-3.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/images/debug-eclipse-3.png rename to jetty-documentation/src/main/asciidoc/reference/debugging/images/debug-eclipse-3.png diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/images/intellij_debug_view.png b/jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_debug_view.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/images/intellij_debug_view.png rename to jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_debug_view.png diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/images/intellij_new_remote_config.png b/jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_new_remote_config.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/images/intellij_new_remote_config.png rename to jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_new_remote_config.png diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/images/intellij_select_debug.png b/jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_select_debug.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/images/intellij_select_debug.png rename to jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_select_debug.png diff --git a/jetty-documentation/src/main/asciidoc/development/debugging/images/intellij_set_breakpoint.png b/jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_set_breakpoint.png similarity index 100% rename from jetty-documentation/src/main/asciidoc/development/debugging/images/intellij_set_breakpoint.png rename to jetty-documentation/src/main/asciidoc/reference/debugging/images/intellij_set_breakpoint.png diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc index 957a6f63200..2d709361d85 100644 --- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc @@ -15,7 +15,7 @@ // ======================================================================== [[reference-section]] -== Reference Section +== Jetty XML Reference include::jetty-xml-syntax.adoc[] include::jetty-xml-usage.adoc[] @@ -23,4 +23,4 @@ include::jetty-xml-config.adoc[] include::jetty-web-xml-config.adoc[] include::jetty-env-xml.adoc[] include::webdefault-xml.adoc[] -include::override-web-xml.adoc[] \ No newline at end of file +include::override-web-xml.adoc[] diff --git a/jetty-documentation/src/main/asciidoc/reference/part.adoc b/jetty-documentation/src/main/asciidoc/reference/part.adoc index afd7990c6d2..baea4ef2518 100644 --- a/jetty-documentation/src/main/asciidoc/reference/part.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/part.adoc @@ -13,12 +13,14 @@ // // You may elect to redistribute this code under either of these licenses. // ======================================================================== +// #TODO Remove chapter in Jetty 10 [[jetty-ref-guide]] = Jetty Reference Guide -include::platforms/chapter.adoc[] include::architecture/chapter.adoc[] -include::contributing/chapter.adoc[] +include::platforms/chapter.adoc[] include::jetty-xml/chapter.adoc[] include::troubleshooting/chapter.adoc[] +include::debugging/chapter.adoc[] +include::contributing/chapter.adoc[]