Merge pull request #19 from jamesjer/master

Give docbook IDs unique names

docs/adk15ProgGuideDB/generics.xml

@@ -994,7 +994,7 @@
       
       </sect2>
  
-      <sect2 id="declare-parents" xreflabel="declare-parents">
+      <sect2 id="declare-parents-java5" xreflabel="declare-parents-java5">
           <title>Declare Parents</title>
           
           <para>Both generic and parameterized types can be used as the parent type in a <literal>declare parents</literal>

docs/adk15ProgGuideDB/miscellaneous.xml

@@ -2,7 +2,7 @@
 
   <title>Other Changes in AspectJ 5</title>
   
-  <sect1 id="pointcuts">
+  <sect1 id="pointcuts-change">
       <title>Pointcuts</title>
       
           <para>
@@ -26,7 +26,7 @@
            
   </sect1>
   
-  <sect1 id="declare-soft">
+  <sect1 id="declare-soft-change">
       <title>Declare Soft</title>
       <para>
           The semantics of the <literal>declare soft</literal> statement have been 

docs/progGuideDB/gettingstarted.xml

@@ -217,7 +217,7 @@
 
 <!-- ============================== -->
 
-    <sect2 id="pointcuts" xreflabel="pointcuts">
+    <sect2 id="pointcuts-starting" xreflabel="pointcuts-starting">
       <title>Pointcuts</title>
 
       <para>
@@ -350,7 +350,7 @@ cflow(move())
 
 <!-- ============================== -->
 
-    <sect2 id="advice" xreflabel="advice">
+    <sect2 id="advice-starting" xreflabel="advice-starting">
       <title>Advice</title>
 
       <para>

docs/progGuideDB/semantics.xml

@@ -2748,7 +2748,7 @@ ModifiersPattern =
 
     </sect2>
 
-    <sect2 id="advice-precedence" xreflabel="advice-precedence">
+    <sect2 id="advice-precedence-cross" xreflabel="advice-precedence-cross">
       <title>Advice Precedence</title>
 
       <para>