aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Clement <aclement@pivotal.io>2020-09-09 14:38:15 -0700
committerGitHub <noreply@github.com>2020-09-09 14:38:15 -0700
commita6b0448a0ec9ce353d0e95d90759037a5425f304 (patch)
treecd6a830e89e7a7fb4683fa6c9aeceb9a497599bf
parent611e94990f628999c99c75e112d065608cf9df11 (diff)
parent4b2e7df5d368ba4d5eb79a6da3599e6836d3461f (diff)
downloadaspectj-a6b0448a0ec9ce353d0e95d90759037a5425f304.tar.gz
aspectj-a6b0448a0ec9ce353d0e95d90759037a5425f304.zip
Merge pull request #19 from jamesjer/master
Give docbook IDs unique names
-rw-r--r--docs/adk15ProgGuideDB/generics.xml2
-rw-r--r--docs/adk15ProgGuideDB/miscellaneous.xml4
-rw-r--r--docs/progGuideDB/gettingstarted.xml4
-rw-r--r--docs/progGuideDB/semantics.xml2
4 files changed, 6 insertions, 6 deletions
diff --git a/docs/adk15ProgGuideDB/generics.xml b/docs/adk15ProgGuideDB/generics.xml
index 09f19e8eb..89370fee6 100644
--- a/docs/adk15ProgGuideDB/generics.xml
+++ b/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>
diff --git a/docs/adk15ProgGuideDB/miscellaneous.xml b/docs/adk15ProgGuideDB/miscellaneous.xml
index 532cf4348..d7aceb851 100644
--- a/docs/adk15ProgGuideDB/miscellaneous.xml
+++ b/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
diff --git a/docs/progGuideDB/gettingstarted.xml b/docs/progGuideDB/gettingstarted.xml
index e81db668f..7ddbe00dc 100644
--- a/docs/progGuideDB/gettingstarted.xml
+++ b/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>
diff --git a/docs/progGuideDB/semantics.xml b/docs/progGuideDB/semantics.xml
index fd282faec..23d1fb2d6 100644
--- a/docs/progGuideDB/semantics.xml
+++ b/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>