Rename '*GuideDB' directories to their actual HTML site target names

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

122 files changed, 392 insertions, 268 deletions

diff --git a/docs/adk15ProgGuideDB/ltw.xml b/docs/adk15ProgGuideDB/ltw.xml
deleted file mode 100644
index 4f3212fbc..000000000
--- a/docs/adk15ProgGuideDB/ltw.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<chapter id="ltw" xreflabel="Load-Time Weaving">
-
-    <!--
-    DO NOT MODIFY THIS ONE
-    Do changes in the devGuideDB/ltw.xml instead
-    -->
-
-    <title>Load-Time Weaving</title>
-    
-    <sect1 id="ltw-introduction">
-        <title>Introduction</title>        
-        <para>See Developer's Guide for information on 
-        load-time weaving support in AspectJ 5.</para>            
-    </sect1>
-</chapter>
-
diff --git a/docs/adk15ProgGuideDB/adk15notebook.adoc b/docs/adk15notebook/adk15notebook.adoc
index 9e4594335..9e4594335 100644
--- a/docs/adk15ProgGuideDB/adk15notebook.adoc
+++ b/docs/adk15notebook/adk15notebook.adoc
diff --git a/docs/adk15ProgGuideDB/adk15notebook.xml b/docs/adk15notebook/adk15notebook.xml
index 4f8a131b7..4f8a131b7 100644
--- a/docs/adk15ProgGuideDB/adk15notebook.xml
+++ b/docs/adk15notebook/adk15notebook.xml
diff --git a/docs/adk15ProgGuideDB/annotations.adoc b/docs/adk15notebook/annotations.adoc
index 5fcf74608..5fcf74608 100644
--- a/docs/adk15ProgGuideDB/annotations.adoc
+++ b/docs/adk15notebook/annotations.adoc
diff --git a/docs/adk15ProgGuideDB/annotations.xml b/docs/adk15notebook/annotations.xml
index f9be0d0da..f9be0d0da 100644
--- a/docs/adk15ProgGuideDB/annotations.xml
+++ b/docs/adk15notebook/annotations.xml
diff --git a/docs/adk15ProgGuideDB/aspectj-docs.css b/docs/adk15notebook/aspectj-docs.css
index 9be5a3954..9be5a3954 100644
--- a/docs/adk15ProgGuideDB/aspectj-docs.css
+++ b/docs/adk15notebook/aspectj-docs.css
diff --git a/docs/adk15ProgGuideDB/ataspectj.adoc b/docs/adk15notebook/ataspectj.adoc
index 3b4d2ae59..3b4d2ae59 100644
--- a/docs/adk15ProgGuideDB/ataspectj.adoc
+++ b/docs/adk15notebook/ataspectj.adoc
diff --git a/docs/adk15ProgGuideDB/ataspectj.xml b/docs/adk15notebook/ataspectj.xml
index 7f8152d9c..7f8152d9c 100644
--- a/docs/adk15ProgGuideDB/ataspectj.xml
+++ b/docs/adk15notebook/ataspectj.xml
diff --git a/docs/adk15ProgGuideDB/autoboxing.adoc b/docs/adk15notebook/autoboxing.adoc
index fa3842950..fa3842950 100644
--- a/docs/adk15ProgGuideDB/autoboxing.adoc
+++ b/docs/adk15notebook/autoboxing.adoc
diff --git a/docs/adk15ProgGuideDB/autoboxing.xml b/docs/adk15notebook/autoboxing.xml
index 7a3cdaca1..7a3cdaca1 100644
--- a/docs/adk15ProgGuideDB/autoboxing.xml
+++ b/docs/adk15notebook/autoboxing.xml
diff --git a/docs/adk15ProgGuideDB/covariance.adoc b/docs/adk15notebook/covariance.adoc
index 2349bf52c..2349bf52c 100644
--- a/docs/adk15ProgGuideDB/covariance.adoc
+++ b/docs/adk15notebook/covariance.adoc
diff --git a/docs/adk15ProgGuideDB/covariance.xml b/docs/adk15notebook/covariance.xml
index e8845ddb8..e8845ddb8 100644
--- a/docs/adk15ProgGuideDB/covariance.xml
+++ b/docs/adk15notebook/covariance.xml
diff --git a/docs/adk15ProgGuideDB/dd_arrow.gif b/docs/adk15notebook/dd_arrow.gif
index a16b34c95..a16b34c95 100644
--- a/docs/adk15ProgGuideDB/dd_arrow.gif
+++ b/docs/adk15notebook/dd_arrow.gif
diff --git a/docs/adk15ProgGuideDB/enumeratedtypes.adoc b/docs/adk15notebook/enumeratedtypes.adoc
index 64a96d2f6..64a96d2f6 100644
--- a/docs/adk15ProgGuideDB/enumeratedtypes.adoc
+++ b/docs/adk15notebook/enumeratedtypes.adoc
diff --git a/docs/adk15ProgGuideDB/enumeratedtypes.xml b/docs/adk15notebook/enumeratedtypes.xml
index 717252435..717252435 100644
--- a/docs/adk15ProgGuideDB/enumeratedtypes.xml
+++ b/docs/adk15notebook/enumeratedtypes.xml
diff --git a/docs/adk15ProgGuideDB/generics.adoc b/docs/adk15notebook/generics.adoc
index 8fc99bdbe..8fc99bdbe 100644
--- a/docs/adk15ProgGuideDB/generics.adoc
+++ b/docs/adk15notebook/generics.adoc
diff --git a/docs/adk15ProgGuideDB/generics.xml b/docs/adk15notebook/generics.xml
index f780ff67d..f780ff67d 100644
--- a/docs/adk15ProgGuideDB/generics.xml
+++ b/docs/adk15notebook/generics.xml
diff --git a/docs/adk15ProgGuideDB/grammar.adoc b/docs/adk15notebook/grammar.adoc
index 42b0a0fa5..42b0a0fa5 100644
--- a/docs/adk15ProgGuideDB/grammar.adoc
+++ b/docs/adk15notebook/grammar.adoc
diff --git a/docs/adk15ProgGuideDB/grammar.xml b/docs/adk15notebook/grammar.xml
index 048118c34..048118c34 100644
--- a/docs/adk15ProgGuideDB/grammar.xml
+++ b/docs/adk15notebook/grammar.xml
diff --git a/docs/adk15notebook/index.adoc b/docs/adk15notebook/index.adoc
new file mode 100644
index 000000000..9a69c9e14
--- /dev/null
+++ b/docs/adk15notebook/index.adoc
@@ -0,0 +1,27 @@
+= The AspectJ^TM^ 5 Development Kit Developer's Notebook
+
+:doctype: book
+
+_by the AspectJ Team_
+
+_Copyright (c) 2004, 2005 Contributors. All rights reserved._
+
+This guide describes the changes to the AspectJ language in AspectJ 5. These include support for Java 5 features,
+support for an annotation-based development style for aspects and new reflection and tools APIs. If you are new to
+AspectJ, we recommend you start by reading the programming guide.
+
+**Table of Contents**
+
+* xref:joinpointsignatures.adoc[Join Point Signatures]
+* xref:annotations.adoc[Annotations]
+* xref:generics.adoc[Generics]
+* xref:autoboxing.adoc[Autoboxing and Unboxing]
+* xref:covariance.adoc[Covariance]
+* xref:varargs.adoc[Varargs]
+* xref:enumeratedtypes.adoc[Enumerated Types]
+* xref:pertypewithin.adoc[The `pertypewithin` Aspect Instantiation Model]
+* xref:ataspectj.adoc[An Annotation Based Development Style]
+* xref:reflection.adoc[New Reflection Interfaces]
+* xref:miscellaneous.adoc[Other Changes in AspectJ 5]
+* xref:ltw.adoc[Load-Time Weaving]
+* xref:grammar.adoc[A Grammar for the AspectJ 5 Language]
diff --git a/docs/adk15ProgGuideDB/joinpointsignatures.adoc b/docs/adk15notebook/joinpointsignatures.adoc
index 1ed54baa8..1ed54baa8 100644
--- a/docs/adk15ProgGuideDB/joinpointsignatures.adoc
+++ b/docs/adk15notebook/joinpointsignatures.adoc
diff --git a/docs/adk15ProgGuideDB/joinpointsignatures.xml b/docs/adk15notebook/joinpointsignatures.xml
index e803b9cfd..e803b9cfd 100644
--- a/docs/adk15ProgGuideDB/joinpointsignatures.xml
+++ b/docs/adk15notebook/joinpointsignatures.xml
diff --git a/docs/adk15ProgGuideDB/ltw.adoc b/docs/adk15notebook/ltw.adoc
index 6e8a2adce..c6c3e73f4 100644
--- a/docs/adk15ProgGuideDB/ltw.adoc
+++ b/docs/adk15notebook/ltw.adoc
@@ -4,5 +4,5 @@
 [[ltw-introduction]]
 === Introduction
 
-See xref:../devGuideDB/ltw.adoc#ltw[Developer's Guide] for information on
+See xref:../devguide/ltw.adoc#ltw[Developer's Guide] for information on
 load-time weaving support in AspectJ 5.
diff --git a/docs/adk15notebook/ltw.xml b/docs/adk15notebook/ltw.xml
new file mode 100644
index 000000000..ede34eeb1
--- /dev/null
+++ b/docs/adk15notebook/ltw.xml
@@ -0,0 +1,15 @@
+<chapter id="ltw" xreflabel="Load-Time Weaving">
+
+    <!--
+    DO NOT MODIFY THIS ONE
+    Do changes in the devguide/ltw.xml instead
+    -->
+
+    <title>Load-Time Weaving</title>
+
+    <sect1 id="ltw-introduction">
+        <title>Introduction</title>
+        <para>See Developer's Guide for information on
+        load-time weaving support in AspectJ 5.</para>
+    </sect1>
+</chapter>
diff --git a/docs/adk15ProgGuideDB/miscellaneous.adoc b/docs/adk15notebook/miscellaneous.adoc
index a61f704b8..a61f704b8 100644
--- a/docs/adk15ProgGuideDB/miscellaneous.adoc
+++ b/docs/adk15notebook/miscellaneous.adoc
diff --git a/docs/adk15ProgGuideDB/miscellaneous.xml b/docs/adk15notebook/miscellaneous.xml
index df9aa3f87..df9aa3f87 100644
--- a/docs/adk15ProgGuideDB/miscellaneous.xml
+++ b/docs/adk15notebook/miscellaneous.xml
diff --git a/docs/adk15ProgGuideDB/pertypewithin.adoc b/docs/adk15notebook/pertypewithin.adoc
index 32295fc1f..32295fc1f 100644
--- a/docs/adk15ProgGuideDB/pertypewithin.adoc
+++ b/docs/adk15notebook/pertypewithin.adoc
diff --git a/docs/adk15ProgGuideDB/pertypewithin.xml b/docs/adk15notebook/pertypewithin.xml
index 3d901a2f7..3d901a2f7 100644
--- a/docs/adk15ProgGuideDB/pertypewithin.xml
+++ b/docs/adk15notebook/pertypewithin.xml
diff --git a/docs/adk15ProgGuideDB/reflection.adoc b/docs/adk15notebook/reflection.adoc
index b39919229..b39919229 100644
--- a/docs/adk15ProgGuideDB/reflection.adoc
+++ b/docs/adk15notebook/reflection.adoc
diff --git a/docs/adk15ProgGuideDB/reflection.xml b/docs/adk15notebook/reflection.xml
index 3ae05e698..3ae05e698 100644
--- a/docs/adk15ProgGuideDB/reflection.xml
+++ b/docs/adk15notebook/reflection.xml
diff --git a/docs/adk15ProgGuideDB/varargs.adoc b/docs/adk15notebook/varargs.adoc
index 3f13ab31a..3f13ab31a 100644
--- a/docs/adk15ProgGuideDB/varargs.adoc
+++ b/docs/adk15notebook/varargs.adoc
diff --git a/docs/adk15ProgGuideDB/varargs.xml b/docs/adk15notebook/varargs.xml
index 31dddde80..31dddde80 100644
--- a/docs/adk15ProgGuideDB/varargs.xml
+++ b/docs/adk15notebook/varargs.xml
diff --git a/docs/build.xml b/docs/build.xml
index 2bfab1a0e..1f969df44 100644
--- a/docs/build.xml
+++ b/docs/build.xml
@@ -286,7 +286,7 @@
 
     <target name="progguide" depends="init">
         <antcall target="build-guide">
-            <param name="guide.dir" value="progGuideDB" />
+            <param name="guide.dir" value="progguide" />
             <param name="guide.name" value="progguide" />
             <param name="xml-html-copy"
           	            value="dd_arrow.gif,aspects.gif,figureUML.gif,overview.gif,telecom.gif,aspectj-docs.css"/>
@@ -295,7 +295,7 @@
 
     <target name="adk15guide" depends="init">
         <antcall target="build-guide">
-            <param name="guide.dir" value="adk15ProgGuideDB" />
+            <param name="guide.dir" value="adk15notebook" />
             <param name="guide.name" value="adk15notebook" />
             <param name="xml-html-copy"
     	            value="dd_arrow.gif,aspectj-docs.css"/>
@@ -305,7 +305,7 @@
 
     <target name="devguide" depends="init">
 
-        <copy todir="${docs.src.dir}/devGuideDB" filtering="off">
+        <copy todir="${docs.src.dir}/devguide" filtering="off">
             <fileset dir="${devguide.icons.dir}"
                      includes="${include.devguide.icons}"
             />
@@ -315,11 +315,11 @@
             <param name="xml-html-copy"
                    value="dd_arrow.gif,aspectj-docs.css,ajbrowser-building.gif,ajbrowser-options.gif,${include.devguide.icons}"
             />
-            <param name="guide.dir" value="devGuideDB" />
+            <param name="guide.dir" value="devguide" />
             <param name="guide.name" value="devguide" />
         </antcall>
         <delete quiet="on">
-            <fileset dir="${docs.src.dir}/devGuideDB"
+            <fileset dir="${docs.src.dir}/devguide"
                      includes="${include.devguide.icons}"
             />
         </delete>
@@ -327,7 +327,7 @@
 
     <target name="pdguide" depends="init">
 
-        <copy todir="${docs.src.dir}/pdGuideDB" filtering="off">
+        <copy todir="${docs.src.dir}/pdguide" filtering="off">
             <fileset dir="${devguide.icons.dir}"
                      includes="${include.pdguide.icons}"
             />
@@ -337,11 +337,11 @@
             <param name="xml-html-copy"
                    value="dd_arrow.gif,aspectj-docs.css,ajbrowser-building.gif,ajbrowser-options.gif,${include.pdguide.icons}"
             />
-            <param name="guide.dir" value="pdGuideDB" />
+            <param name="guide.dir" value="pdguide" />
             <param name="guide.name" value="pdguide" />
         </antcall>
         <delete quiet="on">
-            <fileset dir="${docs.src.dir}/pdGuideDB"
+            <fileset dir="${docs.src.dir}/pdguide"
                      includes="${include.pdguide.icons}"
             />
         </delete>
@@ -399,15 +399,15 @@
         <!-- NPE in fop task when building programming guide.
         see patch at https://bugs.eclipse.org/bugs/show_bug.cgi?id=81654
         <antcall target="build-pdf">
-            <param name="guide.dir" value="progGuideDB" />
+            <param name="guide.dir" value="progguide" />
             <param name="guide.name" value="progguide" />
         </antcall>
 		-->
         <antcall target="build-pdf">
-            <param name="guide.dir" value="adk15ProgGuideDB" />
+            <param name="guide.dir" value="adk15notebook" />
             <param name="guide.name" value="adk15notebook" />
         </antcall>
-        <copy todir="${docs.src.dir}/devGuideDB" filtering="off">
+        <copy todir="${docs.src.dir}/devguide" filtering="off">
             <fileset dir="${devguide.icons.dir}"
                      includes="${include.devguide.icons}"
             />
@@ -417,7 +417,7 @@
             <param name="xml-html-copy"
                    value="ajbrowser-building.gif,ajbrowser-options.gif,${include.devguide.icons}"
             />
-            <param name="guide.dir" value="devGuideDB" />
+            <param name="guide.dir" value="devguide" />
             <param name="guide.name" value="devguide" />
         </antcall>
     </target>
diff --git a/docs/devGuideDB/aj.adoc b/docs/devguide/aj.adoc
index 0a7b53108..0a7b53108 100644
--- a/docs/devGuideDB/aj.adoc
+++ b/docs/devguide/aj.adoc
diff --git a/docs/devGuideDB/aj.xml b/docs/devguide/aj.xml
index fd250d055..fd250d055 100644
--- a/docs/devGuideDB/aj.xml
+++ b/docs/devguide/aj.xml
diff --git a/docs/devGuideDB/ajbrowser.adoc b/docs/devguide/ajbrowser.adoc
index 734545496..734545496 100644
--- a/docs/devGuideDB/ajbrowser.adoc
+++ b/docs/devguide/ajbrowser.adoc
diff --git a/docs/devGuideDB/ajc.adoc b/docs/devguide/ajc.adoc
index 7fbc4053a..7fbc4053a 100644
--- a/docs/devGuideDB/ajc.adoc
+++ b/docs/devguide/ajc.adoc
diff --git a/docs/devGuideDB/ajc.xml b/docs/devguide/ajc.xml
index 763c54fba..763c54fba 100644
--- a/docs/devGuideDB/ajc.xml
+++ b/docs/devguide/ajc.xml
diff --git a/docs/devGuideDB/ajdb.adoc b/docs/devguide/ajdb.adoc
index 4e45cbc80..4e45cbc80 100644
--- a/docs/devGuideDB/ajdb.adoc
+++ b/docs/devguide/ajdb.adoc
diff --git a/docs/devGuideDB/ajdb.xml b/docs/devguide/ajdb.xml
index 3af587e4c..3af587e4c 100644
--- a/docs/devGuideDB/ajdb.xml
+++ b/docs/devguide/ajdb.xml
diff --git a/docs/devGuideDB/ajdee.adoc b/docs/devguide/ajdee.adoc
index ca6df3d66..ca6df3d66 100644
--- a/docs/devGuideDB/ajdee.adoc
+++ b/docs/devguide/ajdee.adoc
diff --git a/docs/devGuideDB/ajdee.gif b/docs/devguide/ajdee.gif
index e50832d0a..e50832d0a 100644
--- a/docs/devGuideDB/ajdee.gif
+++ b/docs/devguide/ajdee.gif
diff --git a/docs/devGuideDB/ajdee.xml b/docs/devguide/ajdee.xml
index 652a82f7b..652a82f7b 100644
--- a/docs/devGuideDB/ajdee.xml
+++ b/docs/devguide/ajdee.xml
diff --git a/docs/devGuideDB/ajdeforte.adoc b/docs/devguide/ajdeforte.adoc
index a03946aae..a03946aae 100644
--- a/docs/devGuideDB/ajdeforte.adoc
+++ b/docs/devguide/ajdeforte.adoc
diff --git a/docs/devGuideDB/ajdeforte.xml b/docs/devguide/ajdeforte.xml
index 910f62d81..910f62d81 100644
--- a/docs/devGuideDB/ajdeforte.xml
+++ b/docs/devguide/ajdeforte.xml
diff --git a/docs/devGuideDB/ajdejbuilder.adoc b/docs/devguide/ajdejbuilder.adoc
index facfc766f..facfc766f 100644
--- a/docs/devGuideDB/ajdejbuilder.adoc
+++ b/docs/devguide/ajdejbuilder.adoc
diff --git a/docs/devGuideDB/ajdejbuilder.xml b/docs/devguide/ajdejbuilder.xml
index f8071acc1..f8071acc1 100644
--- a/docs/devGuideDB/ajdejbuilder.xml
+++ b/docs/devguide/ajdejbuilder.xml
diff --git a/docs/devGuideDB/ajdoc.adoc b/docs/devguide/ajdoc.adoc
index 6bea2ff16..6bea2ff16 100644
--- a/docs/devGuideDB/ajdoc.adoc
+++ b/docs/devguide/ajdoc.adoc
diff --git a/docs/devGuideDB/ajdoc.xml b/docs/devguide/ajdoc.xml
index d2a763d59..d2a763d59 100644
--- a/docs/devGuideDB/ajdoc.xml
+++ b/docs/devguide/ajdoc.xml
diff --git a/docs/devGuideDB/antsupport.adoc b/docs/devguide/antsupport.adoc
index 6c8217930..6c8217930 100644
--- a/docs/devGuideDB/antsupport.adoc
+++ b/docs/devguide/antsupport.adoc
diff --git a/docs/devGuideDB/antsupport.xml b/docs/devguide/antsupport.xml
index 85f856e1a..85f856e1a 100644
--- a/docs/devGuideDB/antsupport.xml
+++ b/docs/devguide/antsupport.xml
diff --git a/docs/devGuideDB/aspectj-docs.css b/docs/devguide/aspectj-docs.css
index 9c2f5d4fc..9c2f5d4fc 100644
--- a/docs/devGuideDB/aspectj-docs.css
+++ b/docs/devguide/aspectj-docs.css
diff --git a/docs/devGuideDB/aspectj-mode.adoc b/docs/devguide/aspectj-mode.adoc
index 4c585ed2c..4c585ed2c 100644
--- a/docs/devGuideDB/aspectj-mode.adoc
+++ b/docs/devguide/aspectj-mode.adoc
diff --git a/docs/devGuideDB/aspectj-mode.gif b/docs/devguide/aspectj-mode.gif
index 9b07fdb33..9b07fdb33 100644
--- a/docs/devGuideDB/aspectj-mode.gif
+++ b/docs/devguide/aspectj-mode.gif
diff --git a/docs/devGuideDB/aspectj-mode.xml b/docs/devguide/aspectj-mode.xml
index e2ee862db..e2ee862db 100644
--- a/docs/devGuideDB/aspectj-mode.xml
+++ b/docs/devguide/aspectj-mode.xml
diff --git a/docs/devGuideDB/aspectj-mode2.gif b/docs/devguide/aspectj-mode2.gif
index f9e718385..f9e718385 100644
--- a/docs/devGuideDB/aspectj-mode2.gif
+++ b/docs/devguide/aspectj-mode2.gif
diff --git a/docs/devGuideDB/compatibility.adoc b/docs/devguide/compatibility.adoc
index 63822e003..63822e003 100644
--- a/docs/devGuideDB/compatibility.adoc
+++ b/docs/devguide/compatibility.adoc
diff --git a/docs/devGuideDB/compatibility.xml b/docs/devguide/compatibility.xml
index cbdacefde..cbdacefde 100644
--- a/docs/devGuideDB/compatibility.xml
+++ b/docs/devguide/compatibility.xml
diff --git a/docs/devGuideDB/dd_arrow.gif b/docs/devguide/dd_arrow.gif
index a16b34c95..a16b34c95 100644
--- a/docs/devGuideDB/dd_arrow.gif
+++ b/docs/devguide/dd_arrow.gif
diff --git a/docs/devGuideDB/devguide.adoc b/docs/devguide/devguide.adoc
index f7d32246b..2602b29da 100644
--- a/docs/devGuideDB/devguide.adoc
+++ b/docs/devguide/devguide.adoc
@@ -8,7 +8,7 @@ _Copyright (c) 1998-2001 Xerox Corporation, 2002 Palo Alto Research Center, Inco
 All rights reserved._
 
 This guide describes how to build and deploy AspectJ programs using the AspectJ tools and facilities. See also the
-xref:../progGuideDB/progguide.adoc[AspectJ Programming Guide], the documentation available with the AspectJ support
+xref:../progguide/progguide.adoc[AspectJ Programming Guide], the documentation available with the AspectJ support
 available for various integrated development environments (e.g. https://www.eclipse.org/ajdt/[Eclipse AJDT]), and the
 most-recent documentation available from the https://eclipse.org/aspectj[AspectJ project page].
 
@@ -16,18 +16,18 @@ most-recent documentation available from the https://eclipse.org/aspectj[AspectJ
 ATTENTION: Please do not remove blank lines in between 'include::' statements. Otherwise, section numbers in the
 table of contents (TOC) can be wrong and the first section of each document missing completely.
 ////
-include::tools-intro.adoc[]
+include::tools-intro.adoc[Introduction to the AspectJ tools]
 
-include::ajc.adoc[]
+include::ajc.adoc[`ajc`, the AspectJ compiler/weaver]
 
-include::ajdoc.adoc[]
+include::ajdoc.adoc[`ajdoc`, the AspectJ API documentation generator]
 
-include::aj.adoc[]
+include::aj.adoc[`aj`, the AspectJ load-time weaving launcher]
 
-include::ajbrowser.adoc[]
+include::ajbrowser.adoc[AspectJ Browser]
 
-include::antsupport.adoc[]
+include::antsupport.adoc[AspectJ Ant Tasks]
 
-include::ltw.adoc[]
+include::ltw.adoc[Load-Time Weaving]
 
-include::compatibility.adoc[]
+include::compatibility.adoc[AspectJ version compatibility]
diff --git a/docs/devGuideDB/devguide.pdf b/docs/devguide/devguide.pdf
index 6bc12d82c..6bc12d82c 100644
--- a/docs/devGuideDB/devguide.pdf
+++ b/docs/devguide/devguide.pdf
diff --git a/docs/devGuideDB/devguide.xml b/docs/devguide/devguide.xml
index f526e5e87..f526e5e87 100644
--- a/docs/devGuideDB/devguide.xml
+++ b/docs/devguide/devguide.xml
diff --git a/docs/devguide/index.adoc b/docs/devguide/index.adoc
new file mode 100644
index 000000000..38d20ec64
--- /dev/null
+++ b/docs/devguide/index.adoc
@@ -0,0 +1,24 @@
+= The AspectJ^TM^ Development Environment Guide
+
+:doctype: book
+
+_by the AspectJ Team_
+
+_Copyright (c) 1998-2001 Xerox Corporation, 2002 Palo Alto Research Center, Incorporated, 2003-2005 Contributors.
+All rights reserved._
+
+This guide describes how to build and deploy AspectJ programs using the AspectJ tools and facilities. See also the
+xref:../progguide/progguide.adoc[AspectJ Programming Guide], the documentation available with the AspectJ support
+available for various integrated development environments (e.g. https://www.eclipse.org/ajdt/[Eclipse AJDT]), and the
+most-recent documentation available from the https://eclipse.org/aspectj[AspectJ project page].
+
+**Table of Contents**
+
+* xref:tools-intro.adoc[Introduction to the AspectJ tools]
+* xref:ajc.adoc[`ajc`, the AspectJ compiler/weaver]
+* xref:ajdoc.adoc[`ajdoc`, the AspectJ API documentation generator]
+* xref:aj.adoc[`aj`, the AspectJ load-time weaving launcher]
+* xref:ajbrowser.adoc[AspectJ Browser]
+* xref:antsupport.adoc[AspectJ Ant Tasks]
+* xref:ltw.adoc[Load-Time Weaving]
+* xref:compatibility.adoc[AspectJ version compatibility]
diff --git a/docs/devGuideDB/jbuilder-buildOptions.gif b/docs/devguide/jbuilder-buildOptions.gif
index 5a34c9309..5a34c9309 100644
--- a/docs/devGuideDB/jbuilder-buildOptions.gif
+++ b/docs/devguide/jbuilder-buildOptions.gif
diff --git a/docs/devGuideDB/jbuilder-building.gif b/docs/devguide/jbuilder-building.gif
index 63fe151a2..63fe151a2 100644
--- a/docs/devGuideDB/jbuilder-building.gif
+++ b/docs/devguide/jbuilder-building.gif
diff --git a/docs/devGuideDB/jbuilder-configs.gif b/docs/devguide/jbuilder-configs.gif
index 1a262c1cf..1a262c1cf 100644
--- a/docs/devGuideDB/jbuilder-configs.gif
+++ b/docs/devguide/jbuilder-configs.gif
diff --git a/docs/devGuideDB/jbuilder-structureNavigation.gif b/docs/devguide/jbuilder-structureNavigation.gif
index bdd7ce815..bdd7ce815 100644
--- a/docs/devGuideDB/jbuilder-structureNavigation.gif
+++ b/docs/devguide/jbuilder-structureNavigation.gif
diff --git a/docs/devGuideDB/ltw.adoc b/docs/devguide/ltw.adoc
index 81d25ee3c..81d25ee3c 100644
--- a/docs/devGuideDB/ltw.adoc
+++ b/docs/devguide/ltw.adoc
diff --git a/docs/devGuideDB/ltw.xml b/docs/devguide/ltw.xml
index 79569ad38..79569ad38 100644
--- a/docs/devGuideDB/ltw.xml
+++ b/docs/devguide/ltw.xml
diff --git a/docs/devGuideDB/netbeans-buildOptions.gif b/docs/devguide/netbeans-buildOptions.gif
index 5cd5e75d2..5cd5e75d2 100644
--- a/docs/devGuideDB/netbeans-buildOptions.gif
+++ b/docs/devguide/netbeans-buildOptions.gif
diff --git a/docs/devGuideDB/netbeans-building.gif b/docs/devguide/netbeans-building.gif
index 7ef8f4500..7ef8f4500 100644
--- a/docs/devGuideDB/netbeans-building.gif
+++ b/docs/devguide/netbeans-building.gif
diff --git a/docs/devGuideDB/tools-intro.adoc b/docs/devguide/tools-intro.adoc
index 329378b2a..329378b2a 100644
--- a/docs/devGuideDB/tools-intro.adoc
+++ b/docs/devguide/tools-intro.adoc
diff --git a/docs/devGuideDB/tools-intro.xml b/docs/devguide/tools-intro.xml
index 521fac7a1..521fac7a1 100644
--- a/docs/devGuideDB/tools-intro.xml
+++ b/docs/devguide/tools-intro.xml
diff --git a/docs/dist/doc/README-150.adoc b/docs/dist/doc/README-150.adoc
index 1fddafaf3..e3f7c1196 100644
--- a/docs/dist/doc/README-150.adoc
+++ b/docs/dist/doc/README-150.adoc
@@ -4,7 +4,7 @@ _© Copyright 2005 Contributors. All rights reserved._
 
 AspectJ 5 introduces several important changes to the language and tools
 in order to support Java 5 and extend the capabilities of AspectJ in
-general. For language changes, see xref:../../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook]. For tools changes, see the
+general. For language changes, see xref:../../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook]. For tools changes, see the
 link:devguide/index.html[AspectJ Development Environment Guide],
 especially the section on link:devguide/ltw.html[Load-time weaving]. The
 changes are summarized in the faq.html#q:aspectj5features[FAQ entry on
diff --git a/docs/dist/doc/changes.adoc b/docs/dist/doc/changes.adoc
index 11ff5bfa6..9034ac0d1 100644
--- a/docs/dist/doc/changes.adoc
+++ b/docs/dist/doc/changes.adoc
@@ -86,7 +86,7 @@ Bugzilla
 
 This release contains nearly 400 bug fixes and enhancements since the
 1.2.1 release. Major updates to the language are documented in the
-xref:../../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook]. There are
+xref:../../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook]. There are
 also a number of enhancements to accompanying tools documented in the
 link:devguide/index.html[Developer's Guide]
 
diff --git a/docs/dist/doc/index.adoc b/docs/dist/doc/index.adoc
index 53f047719..8576bba57 100644
--- a/docs/dist/doc/index.adoc
+++ b/docs/dist/doc/index.adoc
@@ -14,7 +14,7 @@ for AspectJ 5.
 
 |xref:#documentation[Documentation] |xref:../../faq/faq.adoc#faq[FAQ], link:quick5.pdf[Quick
 Reference (AspectJ 5)], link:quick.pdf[Quick Reference (1.2.1)],
-xref:../../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook],
+xref:../../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook],
 link:progguide/index.html[programming],
 link:devguide/index.html[development] and
 link:pdguide/index.html[problem diagnosis] guides,
@@ -44,7 +44,7 @@ reference for the AspectJ 5 language.
 |link:quick.pdf[AspectJ Quick Reference] |This is a two-page quick
 reference for the AspectJ language.
 
-|xref:../../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook] +
+|xref:../../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook] +
 (printable link:adk15notebook/printable.html[html]) |This describes the
 changes to the AspectJ language and tools introduced in the AspectJ 5
 Development Kit. These changes are additive, and are not yet reflected
diff --git a/docs/faq/faq.adoc b/docs/faq/faq.adoc
index 1a5f727ae..edc265c11 100644
--- a/docs/faq/faq.adoc
+++ b/docs/faq/faq.adoc
@@ -2591,7 +2591,7 @@ JBuilder, and NetBeans through a common API, AJDE.
 *Q:* What are the new features of AspectJ 5?
 
 *A:* All the new features are documented in the
-xref:../adk15ProgGuideDB/adk15notebook.adoc[AspectJ 5 Developer's Notebook] and the
+xref:../adk15notebook/adk15notebook.adoc[AspectJ 5 Developer's Notebook] and the
 link:devguide/index.html[AspectJ Development Environment Guide]. To
 summarize:
 
diff --git a/docs/pdGuideDB/ajcore.adoc b/docs/pdguide/ajcore.adoc
index 5928d372d..5928d372d 100644
--- a/docs/pdGuideDB/ajcore.adoc
+++ b/docs/pdguide/ajcore.adoc
diff --git a/docs/pdGuideDB/ajcore.xml b/docs/pdguide/ajcore.xml
index 7207df3cc..7207df3cc 100644
--- a/docs/pdGuideDB/ajcore.xml
+++ b/docs/pdguide/ajcore.xml
diff --git a/docs/progGuideDB/aspectj-docs.css b/docs/pdguide/aspectj-docs.css
index 9c2f5d4fc..9c2f5d4fc 100644
--- a/docs/progGuideDB/aspectj-docs.css
+++ b/docs/pdguide/aspectj-docs.css
diff --git a/docs/pdguide/index.adoc b/docs/pdguide/index.adoc
new file mode 100644
index 000000000..79940f9ff
--- /dev/null
+++ b/docs/pdguide/index.adoc
@@ -0,0 +1,44 @@
+= The AspectJ^TM^ Problem Diagnosis Guide
+
+:doctype: book
+
+_by the AspectJ Team_
+
+_Copyright (c) 2006 IBM Corporation and others. 2006 Contributors. All rights reserved._
+
+This guide describes how to configure the AspectJ compiler/weaver to provide
+information for diagnosing problems in the input programs, the
+compiler/weaver or its configuration.
+
+The AspectJ compiler and weaver can provide lots of information for diagnosing
+problems in building AspectJ programs. For problems in the input program,
+there are a number of default warning and error messages, as well as many
+configurable "lint" messages, all of which can be emitted normally,
+logged using standard facilities, or intercepted programmatically.
+These are discussed in xref:messages.adoc#messages[Messages]. Since most errors
+relate to writing pointcuts incorrectly, there is a section on
+xref:pointcuts.adoc#pointcuts[Debugging Pointcuts].
+
+For problems with the compiler/weaver itself there are three facilities
+that enable the AspectJ developers to resolve bugs even when it is
+too hard to deliver a reproducible test case:
+
+* xref:trace.adoc#trace[Tracing] can be enabled to track progress up to the time of a failure;
+* xref:ajcore.adoc#ajcore[AspectJ Core Files] can give a relatively complete picture of the state of
+  the world at the time of a failure; and
+* xref:ltwdump.adoc#ltwdump[Dumping classes during load-time weaving] is a way to capture both input and output classes during load-time weaving.
+
+This guide describes how to configure messages to get the right information
+and how to configure traces, dumps, and core files. Although the compiler/weaver
+operates in roughly three modes (from the command-line, embedded in an IDE,
+and enabled as load-time weaving), the principles are basically the same for
+all modes. The differences lie in how to set up diagnostics and what
+information is likely to be relevant.
+
+**Table of Contents**
+
+* xref:messages.adoc[Messages]
+* xref:pointcuts.adoc[Debugging Pointcuts]
+* xref:trace.adoc[Tracing]
+* xref:ajcore.adoc[AspectJ Core Files]
+* xref:ltwdump.adoc[Dumping classes during load-time weaving]
diff --git a/docs/pdGuideDB/ltwdump.adoc b/docs/pdguide/ltwdump.adoc
index 627be6635..8442a36a3 100644
--- a/docs/pdGuideDB/ltwdump.adoc
+++ b/docs/pdguide/ltwdump.adoc
@@ -20,7 +20,7 @@ configure the weaver to dump the input classes as well.
 
 For details of how to configure byte-code dumping, see the AspectJ
 Development Environment Guide section on
-xref:../devguide/ltw-configuration.html#configuring-load-time-weaving-with-aopxml-files[Configuring
+xref:../devguide/ltw.html#configuring-load-time-weaving-with-aopxml-files[Configuring
 Load-time Weaving]. Following is a simple example.
 
 [[ltwdump-examples]]
diff --git a/docs/pdGuideDB/ltwdump.xml b/docs/pdguide/ltwdump.xml
index 72554d043..72554d043 100644
--- a/docs/pdGuideDB/ltwdump.xml
+++ b/docs/pdguide/ltwdump.xml
diff --git a/docs/pdGuideDB/messages.adoc b/docs/pdguide/messages.adoc
index efff9be24..b9b1779d5 100644
--- a/docs/pdGuideDB/messages.adoc
+++ b/docs/pdguide/messages.adoc
@@ -19,9 +19,9 @@ summarizes some of the more relevant messages.
 The compiler offers `-verbose`, `-warning`, and `-XLint` options when
 invoked using the command-line, Ant, or embedded in an IDE. All options
 are listed in the AspectJ Development Environment Guide sections for
-xref:../devGuideDB/ajc.adoc#ajc[Ajc] and
-xref:../devGuideDB/antsupport.adoc#antTasks[Ant Tasks]. The
-xref:../devGuideDB/ltw.adoc#ltw[Load-time Weaving] section describes how to
+xref:../devguide/ajc.adoc#ajc[Ajc] and
+xref:../devguide/antsupport.adoc#antTasks[Ant Tasks]. The
+xref:../devguide/ltw.adoc#ltw[Load-time Weaving] section describes how to
 use XML configuration files and system properties to pass options to the
 weaver. (You can also pass options to the weaver using system properties
 in build- time weaving.) The `-verbose` option has the effect of
@@ -38,9 +38,9 @@ compiler and weaver messages.
 The tables below list some options, System Properties (for LTW only) and
 Java 5 annotations used to control AspectJ messages. The method of
 configuration depends on your environment so please refer to the
-relevant documentation for xref:../devGuideDB/ajc.adoc[ajc],
-xref:../devGuideDB/antsupport.adoc#antTasks[Ant] or
-xref:../devGuideDB/ltw.adoc#weaver-options[LTW].
+relevant documentation for xref:../devguide/ajc.adoc[ajc],
+xref:../devguide/antsupport.adoc#antTasks[Ant] or
+xref:../devguide/ltw.adoc#weaver-options[LTW].
 
 [cols=",",options="header",]
 |===
@@ -59,9 +59,9 @@ output .class files.)
 
 |`messageHolderClass`/ `-XmessageHolderClass:` |In Ant tasks and LTW
 respectively specify the class to receive all messages. See
-xref:../devGuideDB/antsupport.adoc#antTasks-iajc-options[iajc task
+xref:../devguide/antsupport.adoc#antTasks-iajc-options[iajc task
 options] or
-xref:../devGuideDB/ltw.adoc#weaver-options[Weaver Options].
+xref:../devguide/ltw.adoc#weaver-options[Weaver Options].
 |===
 
 [cols=",",options="header",]
diff --git a/docs/pdGuideDB/messages.xml b/docs/pdguide/messages.xml
index 9d2caf0b5..9d2caf0b5 100644
--- a/docs/pdGuideDB/messages.xml
+++ b/docs/pdguide/messages.xml
diff --git a/docs/pdGuideDB/pdguide.adoc b/docs/pdguide/pdguide.adoc
index dcbcfc331..dcbcfc331 100644
--- a/docs/pdGuideDB/pdguide.adoc
+++ b/docs/pdguide/pdguide.adoc
diff --git a/docs/pdGuideDB/pdguide.xml b/docs/pdguide/pdguide.xml
index 619f54052..619f54052 100644
--- a/docs/pdGuideDB/pdguide.xml
+++ b/docs/pdguide/pdguide.xml
diff --git a/docs/pdGuideDB/pointcuts.adoc b/docs/pdguide/pointcuts.adoc
index 7f17ae94b..ecd964c57 100644
--- a/docs/pdGuideDB/pointcuts.adoc
+++ b/docs/pdguide/pointcuts.adoc
@@ -49,7 +49,7 @@ each join point? This translates to `this()`, `target()`, `args()`,
 . Are there any advice or implementation limitations at issue? This
 involves knowing the few constraints on AspectJ imposed by Java bytecode
 as listed in the AspectJ Programming Guide section on
-xref:../progGuideDB/implementation.adoc#implementation[Implementation Notes].
+xref:../progguide/implementation.adoc#implementation[Implementation Notes].
 
 It's much faster to iterate a pointcut at compile-time using declare
 warning (even better, some errors are identified at parse-time in the
diff --git a/docs/pdGuideDB/pointcuts.xml b/docs/pdguide/pointcuts.xml
index ecf3cf662..ecf3cf662 100644
--- a/docs/pdGuideDB/pointcuts.xml
+++ b/docs/pdguide/pointcuts.xml
diff --git a/docs/pdGuideDB/trace.adoc b/docs/pdguide/trace.adoc
index a752e0262..a752e0262 100644
--- a/docs/pdGuideDB/trace.adoc
+++ b/docs/pdguide/trace.adoc
diff --git a/docs/pdGuideDB/trace.xml b/docs/pdguide/trace.xml
index 6ff915738..6ff915738 100644
--- a/docs/pdGuideDB/trace.xml
+++ b/docs/pdguide/trace.xml
diff --git a/docs/pdGuideDB/aspectj-docs.css b/docs/progguide/aspectj-docs.css
index 98842dfcd..9c2f5d4fc 100644
--- a/docs/pdGuideDB/aspectj-docs.css
+++ b/docs/progguide/aspectj-docs.css
@@ -1,89 +1,89 @@
-body { 

-  font-family: "Lucida Grande", "Trebuchet MS", sans-serif;

-  line-height: 1.1em;

- }

-

-h1 {

-  margin-bottom: 3px;

-  padding-bottom: 0px;

-  line-height: 1.1em;

-}

-

-h2 { 

-     font-size: 130%; 

-     font-weight: bold ; 

-     line-height: 16px;

-     color: #FFFFFF;

-     background-color: #0080C0;

-     padding: 5px;

-}

-

-h3 { 

-     font-size: 110%; 

-     font-weight: bold ; 

-     line-height: 14px;

-     color: #FFFFFF;

-     background-color: orange;

-     padding: 5px;

-}

-

-tt { 

-  font-size: 120%;

-  color: #00AAF0;

- }

-

-tt tt { 

-  font-size: 100%;

- }

-

-.programlisting {

-  padding-top: 5px; 

-  border: 2px solid #ccc;

-  background: #eee;

-  font-size: 120%;

-  color: #111199;

-

- }

-

-.term { 

-  color: #111199;

- }

-

-.variablelist dd { 

-  margin-left: 18px;

-  padding-left: 20px;

-  background: url(dd_arrow.gif) no-repeat 0 2px;

- }

-

-.toc dt { 

-  font-size: 110%;

-  padding-bottom: 0px;

-  margin-bottom: 5px;

- }

-

-.toc dl dd dt { 

-  font-size: 100%;

- }

-

-.toc dt { 

-  font-size: 100%

-  margin-bottom: 0;

- }

-

-.informaltable table { 

-  margin-left: 5%;

- }

-

-.informaltable th { 

-  background-color: orange;

-  padding: 1px;

- }

-

-ul li { 

-  line-height: 1.2em; 

- }

-

-.keyword { 

-  font-weight: bold;

-  color: purple;

+body { 
+  font-family: "Lucida Grande", "Trebuchet MS", sans-serif;
+  line-height: 1.1em;
+ }
+
+h1 {
+  margin-bottom: 3px;
+  padding-bottom: 0px;
+  line-height: 1.1em;
+}
+
+h2 { 
+     font-size: 130%; 
+     font-weight: bold ; 
+     line-height: 16px;
+     color: #FFFFFF;
+     background-color: #0080C0;
+     padding: 5px;
+}
+
+h3 { 
+     font-size: 110%; 
+     font-weight: bold ; 
+     line-height: 14px;
+     color: #FFFFFF;
+     background-color: orange;
+     padding: 5px;
+}
+
+tt { 
+  font-size: 120%;
+  color: #00AAF0;
+ }
+
+tt tt { 
+  font-size: 100%;
+ }
+
+.programlisting {
+  padding-top: 5px; 
+  border: 2px solid #ccc;
+  background: #eee;
+  font-size: 120%;
+  color: #111199;
+
+ }
+
+.term { 
+  color: #111199;
+ }
+
+.variablelist dd { 
+  margin-left: 18px;
+  padding-left: 20px;
+  background: url(dd_arrow.gif) no-repeat 0 2px;
+ }
+
+.toc dt { 
+  font-size: 110%;
+  padding-bottom: 0px;
+  margin-bottom: 5px;
+ }
+
+.toc dl dd dt { 
+  font-size: 100%;
+ }
+
+.toc dt { 
+  font-size: 100%
+  margin-bottom: 0;
+ }
+
+.informaltable table { 
+  margin-left: 5%;
+ }
+
+.informaltable th { 
+  background-color: orange;
+  padding: 1px;
+ }
+
+ul li { 
+  line-height: 1.2em; 
+ }
+
+.keyword { 
+  font-weight: bold;
+  color: purple;
  }
\ No newline at end of file
diff --git a/docs/progGuideDB/aspectjdoc.dsl b/docs/progguide/aspectjdoc.dsl
index 37ce64bd6..4db3b678e 100644
--- a/docs/progGuideDB/aspectjdoc.dsl
+++ b/docs/progguide/aspectjdoc.dsl
@@ -1,124 +1,124 @@
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [

-  <!ENTITY html-ss PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>

-  <!ENTITY print-ss PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL>

-]>

-

-<style-sheet>

-

-<!-- Customizations for the HTML version -->

-

-<style-specification id="html" use="html-stylesheet">

-<style-specification-body>

-

-;; Specify the CSS stylesheet to use

-(define %stylesheet% "../../style.css")

-

-;; Suppress Lists of Tables, Examples, ...

-(define ($generate-book-lot-list$)

-  '())

-

-;; Display only the first two section levels in the table of contents

-(define (toc-depth nd)

-  (if (string=? (gi nd) (normalize "book"))

-      2

-      1))

-

-;; Make references be appendices (or chapters), not parts.

-(define (en-label-number-format-list)

-  (list

-   (list (normalize "set")		"1")

-   (list (normalize "book")		"1")

-   (list (normalize "prefix")		"1")

-   (list (normalize "part")		"I")

-   (list (normalize "chapter")		"1")

-   (list (normalize "appendix")		"A")

-   ;;(list (normalize "reference")	"1") ; references-as-chapters

-   (list (normalize "reference")	"A") ; references-as-appendices

-   (list (normalize "example")		"1")

-   (list (normalize "figure")		"1")

-   (list (normalize "table")		"1")

-   (list (normalize "procedure")	"1")

-   (list (normalize "step")		"1")

-   (list (normalize "refsect1")		"1")

-   (list (normalize "refsect2")		"1")

-   (list (normalize "refsect3")		"1")

-   (list (normalize "sect1")		"1")

-   (list (normalize "sect2")		"1")

-   (list (normalize "sect3")		"1")

-   (list (normalize "sect4")		"1")

-   (list (normalize "sect5")		"1")

-   (list (normalize "section")		"1")

-   ))

-  ;;; for references-as-appendices

-  (define (reference-number-sibling-list cmp) (list (normalize "appendix")))

-  (define (appendix-number-sibling-list cmp)  (list (normalize "reference")))

-  ;;; for references-as-chapters

-  ;;(define (reference-number-sibling-list cmp) (list (normalize "chapter")))

-  ;;(define (chapter-number-sibling-list cmp)  (list (normalize "reference")))

-

-

-</style-specification-body>

-</style-specification>

-<external-specification id="html-stylesheet"  document="html-ss">

-

-

-<!-- Customizations for the print version -->

-

-<style-specification id="print" use="print-stylesheet">

-<style-specification-body>

-

-;; Suppress Lists of Tables, Examples, ...

-(define ($generate-book-lot-list$)

-  '())

-

-;; Display only the first two section levels in the table of contents

-(define (toc-depth nd)

-  (if (string=? (gi nd) (normalize "book"))

-      2

-      1))

-

-(define %two-side% #t)

-(define bop-footnotes #t)		; doesn't seem to work

-

-;; Make references be appendices (or chapters), not parts.

-(define (en-label-number-format-list)

-  (list

-   (list (normalize "set")		"1")

-   (list (normalize "book")		"1")

-   (list (normalize "prefix")		"1")

-   (list (normalize "part")		"I")

-   (list (normalize "chapter")		"1")

-   (list (normalize "appendix")		"A")

-   ;;(list (normalize "reference")	"1") ; references-as-chapters

-   (list (normalize "reference")	"A") ; references-as-appendices

-   (list (normalize "example")		"1")

-   (list (normalize "figure")		"1")

-   (list (normalize "table")		"1")

-   (list (normalize "procedure")	"1")

-   (list (normalize "step")		"1")

-   (list (normalize "refsect1")		"1")

-   (list (normalize "refsect2")		"1")

-   (list (normalize "refsect3")		"1")

-   (list (normalize "sect1")		"1")

-   (list (normalize "sect2")		"1")

-   (list (normalize "sect3")		"1")

-   (list (normalize "sect4")		"1")

-   (list (normalize "sect5")		"1")

-   (list (normalize "section")		"1")

-   ))

-  ;;; for references-as-appendices

-  (define (reference-number-sibling-list cmp) (list (normalize "appendix")))

-  (define (appendix-number-sibling-list cmp)  (list (normalize "reference")))

-  ;;; for references-as-chapters

-  ;;(define (reference-number-sibling-list cmp) (list (normalize "chapter")))

-  ;;(define (chapter-number-sibling-list cmp)  (list (normalize "reference")))

-

-</style-specification-body>

-</style-specification>

-<external-specification id="print-stylesheet" document="print-ss">

-

-</style-sheet>

-

-<!-- Local Variables -->

-<!-- mode: scheme -->

-<!-- End -->

+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+  <!ENTITY html-ss PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
+  <!ENTITY print-ss PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL>
+]>
+
+<style-sheet>
+
+<!-- Customizations for the HTML version -->
+
+<style-specification id="html" use="html-stylesheet">
+<style-specification-body>
+
+;; Specify the CSS stylesheet to use
+(define %stylesheet% "../../style.css")
+
+;; Suppress Lists of Tables, Examples, ...
+(define ($generate-book-lot-list$)
+  '())
+
+;; Display only the first two section levels in the table of contents
+(define (toc-depth nd)
+  (if (string=? (gi nd) (normalize "book"))
+      2
+      1))
+
+;; Make references be appendices (or chapters), not parts.
+(define (en-label-number-format-list)
+  (list
+   (list (normalize "set")		"1")
+   (list (normalize "book")		"1")
+   (list (normalize "prefix")		"1")
+   (list (normalize "part")		"I")
+   (list (normalize "chapter")		"1")
+   (list (normalize "appendix")		"A")
+   ;;(list (normalize "reference")	"1") ; references-as-chapters
+   (list (normalize "reference")	"A") ; references-as-appendices
+   (list (normalize "example")		"1")
+   (list (normalize "figure")		"1")
+   (list (normalize "table")		"1")
+   (list (normalize "procedure")	"1")
+   (list (normalize "step")		"1")
+   (list (normalize "refsect1")		"1")
+   (list (normalize "refsect2")		"1")
+   (list (normalize "refsect3")		"1")
+   (list (normalize "sect1")		"1")
+   (list (normalize "sect2")		"1")
+   (list (normalize "sect3")		"1")
+   (list (normalize "sect4")		"1")
+   (list (normalize "sect5")		"1")
+   (list (normalize "section")		"1")
+   ))
+  ;;; for references-as-appendices
+  (define (reference-number-sibling-list cmp) (list (normalize "appendix")))
+  (define (appendix-number-sibling-list cmp)  (list (normalize "reference")))
+  ;;; for references-as-chapters
+  ;;(define (reference-number-sibling-list cmp) (list (normalize "chapter")))
+  ;;(define (chapter-number-sibling-list cmp)  (list (normalize "reference")))
+
+
+</style-specification-body>
+</style-specification>
+<external-specification id="html-stylesheet"  document="html-ss">
+
+
+<!-- Customizations for the print version -->
+
+<style-specification id="print" use="print-stylesheet">
+<style-specification-body>
+
+;; Suppress Lists of Tables, Examples, ...
+(define ($generate-book-lot-list$)
+  '())
+
+;; Display only the first two section levels in the table of contents
+(define (toc-depth nd)
+  (if (string=? (gi nd) (normalize "book"))
+      2
+      1))
+
+(define %two-side% #t)
+(define bop-footnotes #t)		; doesn't seem to work
+
+;; Make references be appendices (or chapters), not parts.
+(define (en-label-number-format-list)
+  (list
+   (list (normalize "set")		"1")
+   (list (normalize "book")		"1")
+   (list (normalize "prefix")		"1")
+   (list (normalize "part")		"I")
+   (list (normalize "chapter")		"1")
+   (list (normalize "appendix")		"A")
+   ;;(list (normalize "reference")	"1") ; references-as-chapters
+   (list (normalize "reference")	"A") ; references-as-appendices
+   (list (normalize "example")		"1")
+   (list (normalize "figure")		"1")
+   (list (normalize "table")		"1")
+   (list (normalize "procedure")	"1")
+   (list (normalize "step")		"1")
+   (list (normalize "refsect1")		"1")
+   (list (normalize "refsect2")		"1")
+   (list (normalize "refsect3")		"1")
+   (list (normalize "sect1")		"1")
+   (list (normalize "sect2")		"1")
+   (list (normalize "sect3")		"1")
+   (list (normalize "sect4")		"1")
+   (list (normalize "sect5")		"1")
+   (list (normalize "section")		"1")
+   ))
+  ;;; for references-as-appendices
+  (define (reference-number-sibling-list cmp) (list (normalize "appendix")))
+  (define (appendix-number-sibling-list cmp)  (list (normalize "reference")))
+  ;;; for references-as-chapters
+  ;;(define (reference-number-sibling-list cmp) (list (normalize "chapter")))
+  ;;(define (chapter-number-sibling-list cmp)  (list (normalize "reference")))
+
+</style-specification-body>
+</style-specification>
+<external-specification id="print-stylesheet" document="print-ss">
+
+</style-sheet>
+
+<!-- Local Variables -->
+<!-- mode: scheme -->
+<!-- End -->
diff --git a/docs/progGuideDB/aspects.gif b/docs/progguide/aspects.gif
index 8bca684ad..8bca684ad 100644
--- a/docs/progGuideDB/aspects.gif
+++ b/docs/progguide/aspects.gif
diff --git a/docs/progGuideDB/build.sh b/docs/progguide/build.sh
index 19499ff3b..19499ff3b 100644
--- a/docs/progGuideDB/build.sh
+++ b/docs/progguide/build.sh
diff --git a/docs/progGuideDB/dd_arrow.gif b/docs/progguide/dd_arrow.gif
index a16b34c95..a16b34c95 100644
--- a/docs/progGuideDB/dd_arrow.gif
+++ b/docs/progguide/dd_arrow.gif
diff --git a/docs/progGuideDB/examples.adoc b/docs/progguide/examples.adoc
index f01ae46d8..f01ae46d8 100644
--- a/docs/progGuideDB/examples.adoc
+++ b/docs/progguide/examples.adoc
diff --git a/docs/progGuideDB/examples.xml b/docs/progguide/examples.xml
index 05645ab04..05645ab04 100644
--- a/docs/progGuideDB/examples.xml
+++ b/docs/progguide/examples.xml
diff --git a/docs/progGuideDB/figureUML.gif b/docs/progguide/figureUML.gif
index c4bf8db9a..c4bf8db9a 100644
--- a/docs/progGuideDB/figureUML.gif
+++ b/docs/progguide/figureUML.gif
diff --git a/docs/progGuideDB/gettingstarted.adoc b/docs/progguide/gettingstarted.adoc
index ca05f782b..ca05f782b 100644
--- a/docs/progGuideDB/gettingstarted.adoc
+++ b/docs/progguide/gettingstarted.adoc
diff --git a/docs/progGuideDB/gettingstarted.xml b/docs/progguide/gettingstarted.xml
index 6429d017f..6429d017f 100644
--- a/docs/progGuideDB/gettingstarted.xml
+++ b/docs/progguide/gettingstarted.xml
diff --git a/docs/progGuideDB/idioms.adoc b/docs/progguide/idioms.adoc
index e27395a48..e27395a48 100644
--- a/docs/progGuideDB/idioms.adoc
+++ b/docs/progguide/idioms.adoc
diff --git a/docs/progGuideDB/idioms.xml b/docs/progguide/idioms.xml
index c6297c90b..c6297c90b 100644
--- a/docs/progGuideDB/idioms.xml
+++ b/docs/progguide/idioms.xml
diff --git a/docs/progGuideDB/implementation.adoc b/docs/progguide/implementation.adoc
index 42ee2e37e..42ee2e37e 100644
--- a/docs/progGuideDB/implementation.adoc
+++ b/docs/progguide/implementation.adoc
diff --git a/docs/progGuideDB/implementation.xml b/docs/progguide/implementation.xml
index e1fa05f2b..e1fa05f2b 100644
--- a/docs/progGuideDB/implementation.xml
+++ b/docs/progguide/implementation.xml
diff --git a/docs/progguide/index.adoc b/docs/progguide/index.adoc
new file mode 100644
index 000000000..eb1b42375
--- /dev/null
+++ b/docs/progguide/index.adoc
@@ -0,0 +1,30 @@
+= The AspectJ^TM^ Programming Guide
+
+:doctype: book
+
+_by the AspectJ Team_
+
+_Copyright (c) 1998-2001 Xerox Corporation, 2002 Palo Alto Research Center, Incorporated, 2003-2005 Contributors.
+All rights reserved._
+
+This programming guide describes the AspectJ language. A companion guide describes the tools which are part of the
+AspectJ development environment.
+
+* If you are completely new to AspectJ, please read the xref:gettingstarted.adoc#starting[getting started] chapter for a
+  broad overview of AspectJ programming.
+* If you are already familiar with AspectJ, but want a deeper understanding, you can learn more about the
+  xref:language.adoc#language[AspectJ language] and look at the examples in the chapter.
+* If you want a more formal definition of AspectJ, please refer to the xref:semantics.adoc#semantics[language semantics]
+  section.
+
+**Table of Contents**
+
+* xref:preface.adoc[Preface]
+* xref:gettingstarted.adoc[Getting Started with AspectJ]
+* xref:language.adoc[The AspectJ Language]
+* xref:examples.adoc[Examples]
+* xref:idioms.adoc[Idioms]
+* xref:pitfalls.adoc[Pitfalls]
+* xref:quickreference.adoc[AspectJ Quick Reference]
+* xref:semantics.adoc[Language Semantics]
+* xref:implementation.adoc[Implementation Notes]
diff --git a/docs/progGuideDB/language.adoc b/docs/progguide/language.adoc
index 14b662aad..14b662aad 100644
--- a/docs/progGuideDB/language.adoc
+++ b/docs/progguide/language.adoc
diff --git a/docs/progGuideDB/language.xml b/docs/progguide/language.xml
index 48b0fa62d..48b0fa62d 100644
--- a/docs/progGuideDB/language.xml
+++ b/docs/progguide/language.xml
diff --git a/docs/progGuideDB/overview.gif b/docs/progguide/overview.gif
index 7b1d6c8d6..7b1d6c8d6 100644
--- a/docs/progGuideDB/overview.gif
+++ b/docs/progguide/overview.gif
diff --git a/docs/progGuideDB/pitfalls.adoc b/docs/progguide/pitfalls.adoc
index eb9e15315..eb9e15315 100644
--- a/docs/progGuideDB/pitfalls.adoc
+++ b/docs/progguide/pitfalls.adoc
diff --git a/docs/progGuideDB/pitfalls.xml b/docs/progguide/pitfalls.xml
index daf08f801..daf08f801 100644
--- a/docs/progGuideDB/pitfalls.xml
+++ b/docs/progguide/pitfalls.xml
diff --git a/docs/progGuideDB/preface.adoc b/docs/progguide/preface.adoc
index efeb18637..efeb18637 100644
--- a/docs/progGuideDB/preface.adoc
+++ b/docs/progguide/preface.adoc
diff --git a/docs/progGuideDB/preface.xml b/docs/progguide/preface.xml
index 5484fe5b3..5484fe5b3 100644
--- a/docs/progGuideDB/preface.xml
+++ b/docs/progguide/preface.xml
diff --git a/docs/progGuideDB/progguide.adoc b/docs/progguide/progguide.adoc
index 2e595edb6..2e595edb6 100644
--- a/docs/progGuideDB/progguide.adoc
+++ b/docs/progguide/progguide.adoc
diff --git a/docs/progGuideDB/progguide.html.xsl b/docs/progguide/progguide.html.xsl
index 7f6a669fb..7f6a669fb 100644
--- a/docs/progGuideDB/progguide.html.xsl
+++ b/docs/progguide/progguide.html.xsl
diff --git a/docs/progGuideDB/progguide.xml b/docs/progguide/progguide.xml
index 433d71585..433d71585 100644
--- a/docs/progGuideDB/progguide.xml
+++ b/docs/progguide/progguide.xml
diff --git a/docs/progGuideDB/quickreference.adoc b/docs/progguide/quickreference.adoc
index 3920b5ef2..3920b5ef2 100644
--- a/docs/progGuideDB/quickreference.adoc
+++ b/docs/progguide/quickreference.adoc
diff --git a/docs/progGuideDB/quickreference.xml b/docs/progguide/quickreference.xml
index ef5c3cb80..ef5c3cb80 100644
--- a/docs/progGuideDB/quickreference.xml
+++ b/docs/progguide/quickreference.xml
diff --git a/docs/progGuideDB/semantics.adoc b/docs/progguide/semantics.adoc
index 0cb513ad0..0cb513ad0 100644
--- a/docs/progGuideDB/semantics.adoc
+++ b/docs/progguide/semantics.adoc
diff --git a/docs/progGuideDB/semantics.xml b/docs/progguide/semantics.xml
index 6bba37818..6bba37818 100644
--- a/docs/progGuideDB/semantics.xml
+++ b/docs/progguide/semantics.xml
diff --git a/docs/progGuideDB/telecom.gif b/docs/progguide/telecom.gif
index 89a7207f3..89a7207f3 100644
--- a/docs/progGuideDB/telecom.gif
+++ b/docs/progguide/telecom.gif
diff --git a/docs/readme-docs-module.adoc b/docs/readme-docs-module.adoc
index 6eda74250..34a2bc077 100644
--- a/docs/readme-docs-module.adoc
+++ b/docs/readme-docs-module.adoc
@@ -6,9 +6,9 @@ This module contains the sources for the documentation delivered with
 the AspectJ distribution and for various internal, teaching, and online
 works:
 
-* `devGuideDB`: DocBook sources for the AspectJ Development Environment Guide
-* `progGuideDB`: DocBook sources for the AspectJ Programming Language Guide
-* `faq`: DocBook sources for the AspectJ Frequently Asked Questions
+* `devguide`: AsciiDoc sources for the AspectJ Development Environment Guide
+* `progguide`: AsciiDoc sources for the AspectJ Programming Language Guide
+* `faq`: AsciiDoc sources for the AspectJ Frequently Asked Questions
 * `sandbox`: a collection of sample AspectJ programs, tools built on the
   AspectJ API's, script snippets, and instructional trails, all intended
   to serve as sources for documentation. See xref:sandbox/readme-sandbox.adoc[].