ensure every section has an assigned id so that urls in generated html remain stable across builds.

14 files changed, 118 insertions, 104 deletions

diff --git a/docs/adk15ProgGuideDB/annotations.xml b/docs/adk15ProgGuideDB/annotations.xml
index 4094a6e61..a49da8ddd 100644
--- a/docs/adk15ProgGuideDB/annotations.xml
+++ b/docs/adk15ProgGuideDB/annotations.xml
@@ -12,8 +12,8 @@
 		documentation for the Java 5 SDK.
 	</para>
 
-	<sect2>
-		<title>Using Annotations</title>
+	<sect2 id="using-annotations" xreflabel="using-annotations">
+			<title>Using Annotations</title>
 	
 	    <para>
 	      Java 5 introduces <emphasis>annotation types</emphasis> which can
@@ -70,8 +70,8 @@
 		
 	</sect2>
 
-	<sect2>
-	 <title>Retention Policies</title>			
+	<sect2 id="retention-policies" xreflabel="retention-policies">
+		 <title>Retention Policies</title>			
 	 
 	    <para>
 	      Annotations can have one of three retention policies:
@@ -119,8 +119,8 @@
 	    regardless of the retention policy set on the annotation type. See JLS 9.6.1.2.</para>
     </sect2>		
 
-    <sect2>
-    	<title>Accessing Annotations at Runtime</title>
+    <sect2 id="accessing-annotations-at-runtime" xreflabel="accessing-annotations-at-runtime">
+        	<title>Accessing Annotations at Runtime</title>
     	
     	<para>
     		Java 5 supports a new interface, 
@@ -138,7 +138,7 @@
     	
     </sect2>
     
-    <sect2>
+    <sect2 id="annotation-inheritance" xreflabel="annotation-inheritance">
     	<title>Annotation Inheritance</title>
     	
     	<para>
@@ -305,7 +305,7 @@
   	of advice.
   </para>
   	
-  <sect2>
+  <sect2 id="annotation-patterns" xreflabel="annotation-patterns">
     <title>Annotation Patterns</title>
   
       <para>
@@ -402,7 +402,7 @@
     
   </sect2>
   
-  <sect2>
+  <sect2 id="type-patterns" xreflabel="type-patterns">
   	<title>Type Patterns</title>
   	
 	<para>AspectJ 1.5 extends type patterns to allow an optional <literal>AnnotationPattern</literal>
@@ -690,7 +690,7 @@
 
   </sect2>
   
-  <sect2>
+  <sect2 id="example-pointcuts" xreflabel="example-pointcuts">
   	<title>Example Pointcuts</title>
 
    <variablelist>
@@ -763,7 +763,7 @@
 
   </sect2>
 
-   <sect2>
+   <sect2 id="runtime-type-matching-and-context-exposure" xreflabel="runtime-type-matching-and-context-exposure">
   	<title>Runtime type matching and context exposure</title>
 
     <para>AspectJ 5 supports a set of "@" pointcut designators which
@@ -1005,7 +1005,7 @@
     
   </sect2>
 
-  <sect2>
+  <sect2 id="package-and-parameter-annotations" xreflabel="package-and-parameter-annotations">
       <title>Package and Parameter Annotations</title>
 
       <para>
@@ -1133,7 +1133,7 @@
      
   </sect2>
 
-  <sect2>
+  <sect2 id="annotation-inheritance-and-pointcut-matching" xreflabel="annotation-inheritance-and-pointcut-matching">
   	<title>Annotation Inheritance and pointcut matching</title>
   	
   	<para>
@@ -1190,7 +1190,7 @@
   	
   </sect2>
   
-  <sect2>
+  <sect2 id="limitations" xreflabel="limitations">
     <title>Limitations</title>
     <para>
         It would be useful to be able to match join points based on  
@@ -1210,7 +1210,7 @@
   <sect1 id="annotations-decp">
     <title>Using Annotations with declare statements</title>
   
-   <sect2>
+   <sect2 id="declare-error-and-declare-warning" xreflabel="declare-error-and-declare-warning">
   	<title>Declare error and declare warning</title>
   	
   	<para>
@@ -1235,7 +1235,7 @@
   </sect2>
     
   
-  	<sect2>
+  	<sect2 id="declare-parents" xreflabel="declare-parents">
   		<title>declare parents</title>
   
   	<para>
@@ -1288,7 +1288,7 @@
 
   	</sect2>
 
-	<sect2>
+	<sect2 id="declare-precedence" xreflabel="declare-precedence">
 		<title>declare precedence</title>
 
 	<para>
@@ -1410,3 +1410,4 @@
   
 </chapter>
 
+
diff --git a/docs/adk15ProgGuideDB/ataspectj.xml b/docs/adk15ProgGuideDB/ataspectj.xml
index 720d21b61..2836c5e08 100644
--- a/docs/adk15ProgGuideDB/ataspectj.xml
+++ b/docs/adk15ProgGuideDB/ataspectj.xml
@@ -75,7 +75,7 @@
      public aspect Foo perthis(execution(* abc..*(..))) {}
          ]]></programlisting>
 
-    <sect2>
+    <sect2 id="limitations" xreflabel="limitations">
       <title>Limitations</title>
       
        <para>Privileged aspects are not supported by the annotation style.</para>
@@ -105,7 +105,7 @@
             <literal>Around</literal> annotations.
         </para>
 
-        <sect2>
+        <sect2 id="pointcuts" xreflabel="pointcuts">
             <title>Pointcuts</title>
 
             <para>
@@ -307,7 +307,7 @@
 
         </sect2>
 
-        <sect2>
+        <sect2 id="advice" xreflabel="advice">
             <title>Advice</title>
 
             <para>In this section we first discuss the use of annotations for
@@ -831,3 +831,4 @@
     </sect1>
 </chapter>
 
+
diff --git a/docs/adk15ProgGuideDB/generics.xml b/docs/adk15ProgGuideDB/generics.xml
index dcbbd09f2..429f110ec 100644
--- a/docs/adk15ProgGuideDB/generics.xml
+++ b/docs/adk15ProgGuideDB/generics.xml
@@ -14,7 +14,7 @@
 		documentation for the Java 5 SDK.
 	</para>
 
-	<sect2>
+	<sect2 id="declaring-generic-types" xreflabel="declaring-generic-types">
 		<title>Declaring Generic Types</title>
 		
         <para>
@@ -99,7 +99,7 @@
                 
 	</sect2>
 	
-	<sect2>
+	<sect2 id="using-generic-and-parameterized-types" xreflabel="using-generic-and-parameterized-types">
 	    <title>Using Generic and Parameterized Types</title>
 	    
 	    <para>You declare a variable (or a method/constructor argument) of a parameterized type  by specifying a concrete type specfication for each type parameter in
@@ -223,7 +223,7 @@
 	    be a subtype of two interface types which are different parameterizations of the same interface.</para>
 	</sect2>
 	
-	<sect2>
+	<sect2 id="subtypes-supertypes-and-assignability" xreflabel="subtypes-supertypes-and-assignability">
 	    <title>Subtypes, Supertypes, and Assignability</title>
 	    
 	    <para>
@@ -263,7 +263,7 @@
 	    
 	</sect2>
 	
-	<sect2>
+	<sect2 id="generic-methods-and-constructors" xreflabel="generic-methods-and-constructors">
 	    <title>Generic Methods and Constructors</title>
 	    <para>
 	      A static method may be declared with one or more type parameters as in the following declaration:
@@ -290,7 +290,7 @@
 	    	    
 	</sect2>
 	
-	<sect2>
+	<sect2 id="erasure" xreflabel="erasure">
 	  <title>Erasure</title>
 	  <para>Generics in Java are implemented using a technique called <emphasis>erasure</emphasis>. All
 	  type parameter information is erased from the run-time type system. Asking an object of a parameterized
@@ -312,7 +312,7 @@
         also provided for generic <emphasis>abstract</emphasis> aspects.
       </para>
       
-      <sect2>
+      <sect2 id="matching-generic-and-parameterized-types-in-pointcut-expressions" xreflabel="matching-generic-and-parameterized-types-in-pointcut-expressions">
           <title>Matching generic and parameterized types in pointcut expressions</title>
           
           <para>
@@ -899,7 +899,7 @@
   
       </sect2>
       
-      <sect2>
+      <sect2 id="inter-type-declarations" xreflabel="inter-type-declarations">
           <title>Inter-type Declarations</title>
           
           <para>
@@ -996,7 +996,7 @@
       
       </sect2>
  
-      <sect2>
+      <sect2 id="declare-parents" xreflabel="declare-parents">
           <title>Declare Parents</title>
           
           <para>Both generic and parameterized types can be used as the parent type in a <literal>declare parents</literal>
@@ -1020,13 +1020,13 @@
 
       </sect2>
       
-      <sect2>
+      <sect2 id="declare-soft" xreflabel="declare-soft">
           <title>Declare Soft</title>
           <para>It is an error to use a generic or parameterized type as the softened exception type in a declare soft statement. Java 5 does
           not permit a generic class to be a direct or indirect subtype of <literal>Throwable</literal> (JLS 8.1.2).</para>
       </sect2>
 
-      <sect2>
+      <sect2 id="generic-aspects" xreflabel="generic-aspects">
           <title>Generic Aspects</title>
           
           <para><emphasis>This feature will not be fully implemented until AspectJ5 M4.</emphasis></para>
@@ -1302,3 +1302,4 @@
   
 </chapter>
 
+
diff --git a/docs/adk15ProgGuideDB/joinpointsignatures.xml b/docs/adk15ProgGuideDB/joinpointsignatures.xml
index ea702a2f8..377397848 100644
--- a/docs/adk15ProgGuideDB/joinpointsignatures.xml
+++ b/docs/adk15ProgGuideDB/joinpointsignatures.xml
@@ -203,7 +203,7 @@
         <para>The following sections examine signatures for these join points 
         in more detail.</para>
         
-        <sect2>
+        <sect2 id="method-call-join-point-signatures" xreflabel="method-call-join-point-signatures">
             <title>Method call join point signatures</title>
 
         <para>
@@ -276,7 +276,7 @@
         
        </sect2>
       
-      <sect2>
+      <sect2 id="method-execution-join-point-signatures" xreflabel="method-execution-join-point-signatures">
           <title>Method execution join point signatures</title>
           
           <para>Join point signatures for execution join points are defined
@@ -325,7 +325,7 @@
 
       </sect2>
 
-       <sect2>
+       <sect2 id="field-get-and-set-join-point-signatures" xreflabel="field-get-and-set-join-point-signatures">
             <title>Field get and set join point signatures</title>
 
         <para>
@@ -536,3 +536,4 @@
       </sect1>
   
 </chapter>
+
diff --git a/docs/adk15ProgGuideDB/ltw.xml b/docs/adk15ProgGuideDB/ltw.xml
index 6297959a4..5731e4e7b 100644
--- a/docs/adk15ProgGuideDB/ltw.xml
+++ b/docs/adk15ProgGuideDB/ltw.xml
@@ -29,7 +29,7 @@
             classes). AspectJ 5 does not provide explicit support for run-time weaving although
             simple coding patterns can support dynamically enabling and disabling advice in aspects. </para>
         
-        <sect2>
+        <sect2 id="weaving-class-files-more-than-once" xreflabel="weaving-class-files-more-than-once">
             <title>Weaving class files more than once</title>
         
             <para> By default a class file that has been woven by the AspectJ compiler cannot
@@ -72,7 +72,7 @@
         types will be woven. Additional diagnostic options allow the user to debug the configuration and 
         weaving process. </para>
         
-        <sect2>
+        <sect2 id="enabling-load-time-weaving" xreflabel="enabling-load-time-weaving">
             <title>Enabling Load-time Weaving</title>
             <para> AspectJ 5 supports several different ways of enabling load-time weaving for
             an application: agents, a command-line launch script, and a set of interfaces for
@@ -122,7 +122,7 @@
             </variablelist>
         </sect2>
         
-        <sect2>
+        <sect2 id="configuring-load-time-weaving-with-aopxml-files" xreflabel="configuring-load-time-weaving-with-aopxml-files">
             <title>Configuring Load-time Weaving with aop.xml files</title>
             
             <para>The weaver is configured using one or more <literal>META-INF/aop.xml</literal>
@@ -255,7 +255,7 @@
 
         <!-- TODO someone implement that -->
         <!--
-        <sect2>
+        <sect2 id="configuring-load-time-weaving-with-properties-files" xreflabel="configuring-load-time-weaving-with-properties-files">
             <title>Configuring Load-time Weaving with Properties Files</title>
             <para> For memory constrained environments or those without support for XML a simple
                 Java Properties file can be used to configure LTW. Just like XML files,
@@ -273,7 +273,7 @@
         </sect2>
         -->
 
-        <sect2>
+        <sect2 id="weaver-options" xreflabel="weaver-options">
             <title>Weaver Options</title>
             <para> The table below lists the AspectJ options supported by LTW. All other options
                 will be ignored and a warning issued. </para>
@@ -404,7 +404,7 @@
     
     <sect1 id="ltw-agents">
         <title>Supported Agents</title>
-        <sect2>
+        <sect2 id="jvmti" xreflabel="jvmti">
             <title>JVMTI</title>
             <para> When using Java 5 the JVMTI agent can be used by starting the JVM with the
                 following option (adapt according to the path to aspectjweaver.jar): </para>
@@ -412,7 +412,7 @@
 			-javaagent:pathto/aspectjweaver.jar
 		  ]]></programlisting>
         </sect2>
-        <sect2>
+        <sect2 id="jrockit" xreflabel="jrockit">
             <title>JRockit with Java 1.3/1.4 (use JVMTI on Java 5)</title>
             <para> The JRockit agent is configured with the following JVM option: </para>
             <programlisting><![CDATA[
@@ -421,3 +421,4 @@
         </sect2>
     </sect1>
 </chapter>
+
diff --git a/docs/adk15ProgGuideDB/miscellaneous.xml b/docs/adk15ProgGuideDB/miscellaneous.xml
index 24a677cf7..70a630e7d 100644
--- a/docs/adk15ProgGuideDB/miscellaneous.xml
+++ b/docs/adk15ProgGuideDB/miscellaneous.xml
@@ -5,7 +5,7 @@
   <sect1>
       <title>Pointcuts</title>
       
-      <sect2>
+      <sect2 id="binding-of-formals" xreflabel="binding-of-formals">
           <title>Binding of formals</title>
           <para>
            AspectJ 5 is more liberal than AspectJ 1.2.1 in accepting pointcut expressions
@@ -28,7 +28,7 @@
            
       </sect2>
       
-      <sect2>
+      <sect2 id="additional-lint-warnings" xreflabel="additional-lint-warnings">
           <title>Additional lint warnings</title>
           <para>
             Discuss detection of common errors -> warning/error, eg. conjunction of more than one
@@ -95,7 +95,7 @@
    <sect1>
       <title>Tools</title>
       
-      <sect2>
+      <sect2 id="aspectpath" xreflabel="aspectpath">
           <title>Aspectpath</title>
           
           <para>AspectJ 5 allows the specification of directories (containing .class files) on the aspectpath in
@@ -105,3 +105,4 @@
     </sect1>
 </chapter>
 
+
diff --git a/docs/adk15ProgGuideDB/varargs.xml b/docs/adk15ProgGuideDB/varargs.xml
index 38d0fe24d..487a8c01d 100644
--- a/docs/adk15ProgGuideDB/varargs.xml
+++ b/docs/adk15ProgGuideDB/varargs.xml
@@ -21,7 +21,7 @@
             this must always be the last declared argument in the signature.
         </para>
 
-        <sect2>
+        <sect2 id="calling-methods-and-constructors-with-variable-length-arguments" xreflabel="calling-methods-and-constructors-with-variable-length-arguments">
             <title>Calling Methods and Constructors with variable-length arguments</title>
             
             <para>
@@ -71,7 +71,7 @@
         bound as formals in advice.
         </para>
         
-        <sect2>
+        <sect2 id="matching-signatures-based-on-variable-length-argument-types" xreflabel="matching-signatures-based-on-variable-length-argument-types">
             <title>Matching signatures based on variable length argument types</title>
             
             <para>
@@ -155,7 +155,7 @@
                
         </sect2>
         
-        <sect2>
+        <sect2 id="exposing-variable-length-arguments-as-context-in-pointcuts-and-advice" xreflabel="exposing-variable-length-arguments-as-context-in-pointcuts-and-advice">
             <title>Exposing variable-length arguments as context in pointcuts and advice</title>
             
             <para>
@@ -206,3 +206,4 @@
   
 </chapter>
 
+
diff --git a/docs/devGuideDB/ajbrowser.xml b/docs/devGuideDB/ajbrowser.xml
index 491da7d15..768cd2452 100644
--- a/docs/devGuideDB/ajbrowser.xml
+++ b/docs/devGuideDB/ajbrowser.xml
@@ -39,7 +39,7 @@
 
     <sect1>
         <title>Building Programs</title>
-	    <sect2>
+	    <sect2 id="build-configurations" xreflabel="build-configurations">
         <title>Build Configurations</title>
 
         <para>A build configuration is a set of files to compile for a
@@ -81,7 +81,7 @@
         <para>The following sections walk through a build.
         </para>
 	    </sect2>
-	    <sect2>
+	    <sect2 id="compiling-a-program-build-configuration" xreflabel="compiling-a-program-build-configuration">
     	<title>Compiling a Program Build Configuration</title>
 
     <para>
@@ -133,7 +133,7 @@
 		</inlinemediaobject>
     </para>
 
-  	<sect2>
+  	<sect2 id="example" xreflabel="example">
         <title>Example: Exploring the "Spacewar" sample code </title>
         <para>
         <itemizedlist>
@@ -412,3 +412,4 @@
 <!-- sgml-local-ecat-files: devguide.ced -->
 <!-- sgml-parent-document:("devguide.sgml" "book" "refentry") -->
 <!-- End: -->
+
diff --git a/docs/devGuideDB/antsupport.xml b/docs/devGuideDB/antsupport.xml
index d0a4876c6..bf295e4b7 100644
--- a/docs/devGuideDB/antsupport.xml
+++ b/docs/devGuideDB/antsupport.xml
@@ -904,7 +904,7 @@
 		</para>
   	</sect2>
 
-  	<sect2>
+  	<sect2 id="programmatically-handling-compiler-messages" xreflabel="programmatically-handling-compiler-messages">
     <title>Programmatically handling compiler messages</title>
     <para>
 	Users may specify a message holder to which the compiler will pass 
@@ -1605,3 +1605,4 @@
 <!-- sgml-local-ecat-files: devguide.ced -->
 <!-- sgml-parent-document:("devguide.sgml" "book" "refentry") -->
 <!-- End: -->
+
diff --git a/docs/progGuideDB/examples.xml b/docs/progGuideDB/examples.xml
index 762a4ef08..12c6d1ccc 100644
--- a/docs/progGuideDB/examples.xml
+++ b/docs/progGuideDB/examples.xml
@@ -620,7 +620,7 @@ public aspect HashablePoint {
   <sect1 id="examples-development">
     <title>Development Aspects</title>
 
-    <sect2>
+    <sect2 id="tracing-using-aspects" xreflabel="tracing-using-aspects">
       <title>Tracing using aspects</title>
 
       <para>
@@ -1086,7 +1086,7 @@ abstract aspect Trace {
 
     <!--  ==================== -->
 
-    <sect2><!-- A Bean Aspect -->
+    <sect2 id="a-bean-aspect" xreflabel="a-bean-aspect"><!-- A Bean Aspect -->
       <title>A Bean Aspect</title>
 
       <para>
@@ -1367,7 +1367,7 @@ java bean.Demo
 
     <!--  ==================== -->
 
-    <sect2>
+    <sect2 id="the-subject-observer-protocol" xreflabel="the-subject-observer-protocol">
       <title>The Subject/Observer Protocol</title>
 
       <para>
@@ -1607,7 +1607,7 @@ aspect SubjectObserverProtocolImpl extends SubjectObserverProtocol {
 
     <!--  ==================== -->
 
-    <sect2>
+    <sect2 id="a-simple-telecom-simulation" xreflabel="a-simple-telecom-simulation">
       <title>A Simple Telecom Simulation</title>
 
       <para>
@@ -2166,7 +2166,7 @@ public aspect Billing {
   <sect1 id="examples-reusable">
     <title>Reusable Aspects</title>
 
-    <sect2>
+    <sect2 id="tracing-using-aspects-revisited" xreflabel="tracing-using-aspects-revisited">
       <title>Tracing using Aspects, Revisited</title>
 
       <para>
@@ -2436,3 +2436,4 @@ s1.toString(): Square side = 1.0 @ (1.0, 2.0)
     </sect2>
   </sect1>
 </chapter>
+
diff --git a/docs/progGuideDB/gettingstarted.xml b/docs/progGuideDB/gettingstarted.xml
index c9ac6ad36..e81db668f 100644
--- a/docs/progGuideDB/gettingstarted.xml
+++ b/docs/progGuideDB/gettingstarted.xml
@@ -183,7 +183,7 @@
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="the-dynamic-join-point-model" xreflabel="the-dynamic-join-point-model">
       <title>The Dynamic Join Point Model</title>
 
       <para>
@@ -217,7 +217,7 @@
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="pointcuts" xreflabel="pointcuts">
       <title>Pointcuts</title>
 
       <para>
@@ -350,7 +350,7 @@ cflow(move())
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="advice" xreflabel="advice">
       <title>Advice</title>
 
       <para>
@@ -501,7 +501,7 @@ after(FigureElement fe, int x, int y) returning: setXY(fe, x, y) {
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="inter-type-declarations" xreflabel="inter-type-declarations">
       <title>Inter-type declarations</title>
 
       <para>
@@ -612,7 +612,7 @@ aspect PointObserving {
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="aspects" xreflabel="aspects">
       <title>Aspects</title>
 
       <para>
@@ -674,7 +674,7 @@ aspect Logging {
       possible to easily enable and disable the functionality when desired.
     </para>
 
-    <sect2>
+    <sect2 id="tracing" xreflabel="tracing">
       <title>Tracing</title>
 
       <para>
@@ -744,7 +744,7 @@ Entering: call(void FigureElement.draw(GraphicsContext))
       </para>
     </sect2>
 
-    <sect2>
+    <sect2 id="profiling-and-logging" xreflabel="profiling-and-logging">
       <title>Profiling and Logging</title>
 
       <para>
@@ -807,7 +807,7 @@ aspect SetsInRotateCounting {
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="pre-and-post-conditions" xreflabel="pre-and-post-conditions">
       <title>Pre- and Post-Conditions</title>
 
       <para>
@@ -873,7 +873,7 @@ aspect PointBoundsChecking {
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="contract-enforcement" xreflabel="contract-enforcement">
       <title>Contract Enforcement</title>
 
       <para>
@@ -944,7 +944,7 @@ aspect RegistrationProtection {
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="configuration-management" xreflabel="configuration-management">
       <title>Configuration Management</title>
 
       <para>
@@ -984,7 +984,7 @@ aspect RegistrationProtection {
         maintain.
       </para>
 
-    <sect2>
+    <sect2 id="change-monitoring" xreflabel="change-monitoring">
       <title>Change Monitoring</title>
 
       <para>
@@ -1098,7 +1098,7 @@ aspect MoveTracking {
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="context-passing" xreflabel="context-passing">
       <title>Context Passing</title>
 
       <para>
@@ -1308,3 +1308,4 @@ aspect ContextFilling {
     </para>
   </sect1>
 </chapter>
+
diff --git a/docs/progGuideDB/implementation.xml b/docs/progGuideDB/implementation.xml
index d654eb44e..f83e7dd8c 100644
--- a/docs/progGuideDB/implementation.xml
+++ b/docs/progGuideDB/implementation.xml
@@ -148,7 +148,7 @@
 <sect1>
   <title>Bytecode Notes</title>
 
-  <sect2>
+  <sect2 id="the-class-expression-and-string" xreflabel="the-class-expression-and-string">
     <title>The .class expression and String +</title>
 
     <para> The java language form <literal>Foo.class</literal> is
@@ -186,7 +186,7 @@
 
   </sect2>
 
-  <sect2>
+  <sect2 id="the-handler-join-point" xreflabel="the-handler-join-point">
     <title>The Handler join point</title>
 
 
@@ -249,7 +249,7 @@
 
   </sect2>
 
-  <sect2>
+  <sect2 id="initializers-and-inter-type-constructors" xreflabel="initializers-and-inter-type-constructors">
     <title>Initializers and Inter-type Constructors</title>
 
   <para>
@@ -358,3 +358,4 @@
 </appendix>
 
 
+
diff --git a/docs/progGuideDB/language.xml b/docs/progGuideDB/language.xml
index e337d79ec..29b6dcfb9 100644
--- a/docs/progGuideDB/language.xml
+++ b/docs/progGuideDB/language.xml
@@ -31,7 +31,7 @@
       be exposed to the new terminology introduced by AspectJ.
     </para>
 
-    <sect2>
+    <sect2 id="an-example-aspect" xreflabel="an-example-aspect">
       <title>An Example Aspect</title>
 
       <para>
@@ -81,7 +81,7 @@
       </para>
     </sect2>
 
-    <sect2>
+    <sect2 id="pointcuts" xreflabel="pointcuts">
       <title>Pointcuts</title>
 
       <para>
@@ -149,7 +149,7 @@ pointcut services(Server s): target(s) && call(public * *(..))
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="advice" xreflabel="advice">
       <title>Advice</title>
 
       <para>
@@ -291,7 +291,7 @@ pointcut ioHandler(): within(MyClass) && handler(IOException);
       happen).  The right-hand side consists of the pointcut itself.
     </para>
 
-    <sect2>
+    <sect2 id="some-example-pointcuts" xreflabel="some-example-pointcuts">
       <title>Some Example Pointcuts</title>
 
       <para>
@@ -549,7 +549,7 @@ interface MyInterface { ... }
       </itemizedlist>
     </sect2>
 
-    <sect2>
+    <sect2 id="call-vs-execution" xreflabel="call-vs-execution">
       <title>call vs. execution</title>
 
       <para>
@@ -601,7 +601,7 @@ interface MyInterface { ... }
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="pointcut-composition" xreflabel="pointcut-composition">
       <title>Pointcut composition</title>
 
       <para>
@@ -724,7 +724,7 @@ aspect A  {
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="pointcut-parameters" xreflabel="pointcut-parameters">
       <title>Pointcut Parameters</title>
 
       <para>
@@ -841,7 +841,7 @@ pointcut setter(Point p, int newval): target(p) &&
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="example" xreflabel="example">
       <title>Example: <literal>HandleLiveness</literal></title>
 
       <para>
@@ -1139,7 +1139,7 @@ void around(Point p, int x): target(p)
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="inter-type-scope" xreflabel="inter-type-scope">
       <title>Inter-type Scope</title>
 
       <para>
@@ -1169,7 +1169,7 @@ void around(Point p, int x): target(p)
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="example-pointassertions" xreflabel="example-pointassertions">
       <title>Example: <literal>PointAssertions</literal></title>
 
       <para>
@@ -1307,3 +1307,4 @@ void around(Point p, int x): target(p)
 
   </sect1>
 </chapter>
+
diff --git a/docs/progGuideDB/semantics.xml b/docs/progGuideDB/semantics.xml
index cf5740fde..fe4d11322 100644
--- a/docs/progGuideDB/semantics.xml
+++ b/docs/progGuideDB/semantics.xml
@@ -544,7 +544,7 @@
       </varlistentry>
     </variablelist>
 
-    <sect2>
+    <sect2 id="pointcut-definition" xreflabel="pointcut-definition">
       <title>Pointcut definition</title>
 
       <para>
@@ -625,7 +625,7 @@
 </programlisting>
     </sect2>
 
-    <sect2>
+    <sect2 id="context-exposure" xreflabel="context-exposure">
       <title>Context exposure</title>
 
       <para>
@@ -736,7 +736,7 @@
 
     </sect2>
 
-    <sect2>
+    <sect2 id="primitive-pointcuts" xreflabel="primitive-pointcuts">
       <title>Primitive pointcuts</title>
 
       <sect3>
@@ -1089,7 +1089,7 @@ aspect A {
       </sect3>
     </sect2>
 
-    <sect2>
+    <sect2 id="signatures" xreflabel="signatures">
       <title>Signatures</title>
 
       <para>
@@ -1180,7 +1180,7 @@ aspect A {
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="matching" xreflabel="matching">
       <title>Matching</title>
 
       <para>
@@ -1503,7 +1503,7 @@ aspect A {
       </sect3>
     </sect2>
 
-    <sect2>
+    <sect2 id="type-patterns" xreflabel="type-patterns">
       <title>Type patterns</title>
 
       <para>
@@ -1705,7 +1705,7 @@ aspect A {
       </sect3>
     </sect2>
 
-    <sect2>
+    <sect2 id="pattern-summary" xreflabel="pattern-summary">
       <title>Pattern Summary</title>
 
       <para>
@@ -1974,7 +1974,7 @@ ModifiersPattern =
       advice.
     </para>
 
-    <sect2>
+    <sect2 id="advice-modifiers" xreflabel="advice-modifiers">
       <title>Advice modifiers</title>
 
       <para>
@@ -1984,7 +1984,7 @@ ModifiersPattern =
       </para>
     </sect2>
 
-    <sect2>
+    <sect2 id="advice-and-checked-exceptions" xreflabel="advice-and-checked-exceptions">
       <title>Advice and checked exceptions</title>
 
       <para>
@@ -2083,7 +2083,7 @@ ModifiersPattern =
 
     </sect2>
 
-    <sect2>
+    <sect2 id="advice-precedence" xreflabel="advice-precedence">
       <title>Advice precedence</title>
 
       <para>
@@ -2185,7 +2185,7 @@ ModifiersPattern =
       </sect3>
     </sect2>
 
-    <sect2>
+    <sect2 id="reflective-access-to-the-join-point" xreflabel="reflective-access-to-the-join-point">
       <title>Reflective access to the join point</title>
 
       <para>
@@ -2255,7 +2255,7 @@ ModifiersPattern =
       inter-type member declarations and other <literal>declare</literal> forms.
     </para>
 
-    <sect2>
+    <sect2 id="inter-type-member-declarations" xreflabel="inter-type-member-declarations">
       <title>Inter-type member declarations</title>
 
         <para>
@@ -2383,7 +2383,7 @@ ModifiersPattern =
         declaration.
       </para>
 
-    <sect2>
+    <sect2 id="access-modifiers" xreflabel="access-modifiers">
       <title>Access modifiers</title>
 
       <para>
@@ -2424,7 +2424,7 @@ ModifiersPattern =
       </para>
     </sect2>
 
-    <sect2>
+    <sect2 id="conflicts" xreflabel="conflicts">
       <title>Conflicts</title>
 
       <para>
@@ -2511,7 +2511,7 @@ ModifiersPattern =
 
     </sect2>
 
-    <sect2>
+    <sect2 id="extension-and-implementation" xreflabel="extension-and-implementation">
       <title>Extension and Implementation</title>
 
       <para>
@@ -2543,7 +2543,7 @@ ModifiersPattern =
 
     </sect2>
 
-    <sect2>
+    <sect2 id="interfaces-with-members" xreflabel="interfaces-with-members">
       <title>Interfaces with members</title>
 
       <para>
@@ -2589,7 +2589,7 @@ ModifiersPattern =
 
 <!-- ============================== -->
 
-    <sect2>
+    <sect2 id="warnings-and-errors" xreflabel="warnings-and-errors">
       <title>Warnings and Errors</title>
 
       <para>An aspect may specify that a particular join point should never be
@@ -2607,7 +2607,7 @@ ModifiersPattern =
 
     </sect2>
 
-    <sect2>
+    <sect2 id="softened-exceptions" xreflabel="softened-exceptions">
       <title>Softened exceptions</title>
 
       <para>An aspect may specify that a particular kind of exception, if
@@ -2669,7 +2669,7 @@ ModifiersPattern =
 
     </sect2>
 
-    <sect2>
+    <sect2 id="advice-precedence" xreflabel="advice-precedence">
       <title>Advice Precedence</title>
 
       <para>
@@ -2823,7 +2823,7 @@ ModifiersPattern =
     </sect2>
 
 
-    <sect2>
+    <sect2 id="statically-determinable-pointcuts" xreflabel="statically-determinable-pointcuts">
       <title>Statically determinable pointcuts</title>
 
       <para>Pointcuts that appear inside of <literal>declare</literal> forms
@@ -2856,7 +2856,7 @@ ModifiersPattern =
       declaration. 
     </para>
 
-    <sect2>
+    <sect2 id="aspect-declaration" xreflabel="aspect-declaration">
       <title>Aspect Declaration</title>
 
       <para>
@@ -2902,7 +2902,7 @@ ModifiersPattern =
       </sect3> 
     </sect2>
 
-    <sect2>
+    <sect2 id="aspect-extension" xreflabel="aspect-extension">
       <title>Aspect Extension</title>
 
       <para>
@@ -2942,7 +2942,7 @@ ModifiersPattern =
       </sect3>
     </sect2>
 
-    <sect2>
+    <sect2 id="aspect-instantiation" xreflabel="aspect-instantiation">
       <title>Aspect instantiation</title>
 
       <para>
@@ -3106,7 +3106,7 @@ ModifiersPattern =
       </sect3>
     </sect2>
 
-    <sect2>
+    <sect2 id="aspect-privilege" xreflabel="aspect-privilege">
       <title>Aspect privilege</title>
 
       <itemizedlist>
@@ -3183,3 +3183,4 @@ ModifiersPattern =
 </appendix>
 
 
+