14 files changed, 80 insertions, 78 deletions
diff --git a/docs/modules/ROOT/pages/developer/images/EclipseSoftwareSitesAJDT.png b/docs/modules/ROOT/images/EclipseSoftwareSitesAJDT.png
index 9ab1e13b3..9ab1e13b3 100644
--- a/docs/modules/ROOT/pages/developer/images/EclipseSoftwareSitesAJDT.png
+++ b/docs/modules/ROOT/images/EclipseSoftwareSitesAJDT.png
diff --git a/docs/modules/ROOT/pages/developer/images/advice-dec.png b/docs/modules/ROOT/images/advice-dec.png
index 4261f8b10..4261f8b10 100644
--- a/docs/modules/ROOT/pages/developer/images/advice-dec.png
+++ b/docs/modules/ROOT/images/advice-dec.png
diff --git a/docs/modules/ROOT/pages/developer/images/ajdt-uml.png b/docs/modules/ROOT/images/ajdt-uml.png
index a8ac5b410..a8ac5b410 100644
--- a/docs/modules/ROOT/pages/developer/images/ajdt-uml.png
+++ b/docs/modules/ROOT/images/ajdt-uml.png
diff --git a/docs/modules/ROOT/pages/developer/images/ajdt-uml.vsd b/docs/modules/ROOT/images/ajdt-uml.vsd
index d3fa03dea..d3fa03dea 100644
--- a/docs/modules/ROOT/pages/developer/images/ajdt-uml.vsd
+++ b/docs/modules/ROOT/images/ajdt-uml.vsd
diff --git a/docs/modules/ROOT/pages/developer/images/overview.png b/docs/modules/ROOT/images/overview.png
index f03e01c9f..f03e01c9f 100644
--- a/docs/modules/ROOT/pages/developer/images/overview.png
+++ b/docs/modules/ROOT/images/overview.png
diff --git a/docs/modules/ROOT/pages/developer/images/overview.vsd b/docs/modules/ROOT/images/overview.vsd
index 5636872df..5636872df 100644
--- a/docs/modules/ROOT/pages/developer/images/overview.vsd
+++ b/docs/modules/ROOT/images/overview.vsd
diff --git a/docs/modules/ROOT/pages/developer/images/pointcut-dec.png b/docs/modules/ROOT/images/pointcut-dec.png
index a59676d66..a59676d66 100644
--- a/docs/modules/ROOT/pages/developer/images/pointcut-dec.png
+++ b/docs/modules/ROOT/images/pointcut-dec.png
diff --git a/docs/modules/ROOT/pages/developer/images/top-tree.png b/docs/modules/ROOT/images/top-tree.png
index 51632c435..51632c435 100644
--- a/docs/modules/ROOT/pages/developer/images/top-tree.png
+++ b/docs/modules/ROOT/images/top-tree.png
diff --git a/docs/modules/ROOT/pages/LICENSE-AspectJ.adoc b/docs/modules/ROOT/pages/LICENSE-AspectJ.adoc
index 8f3a4ac30..387a985e5 100644
--- a/docs/modules/ROOT/pages/LICENSE-AspectJ.adoc
+++ b/docs/modules/ROOT/pages/LICENSE-AspectJ.adoc
@@ -1,4 +1,4 @@
-= *AspectJ^TM^ Compiler and Core Tools License*
+= AspectJ^TM^ Compiler and Core Tools License
 
 This is a binary-only release. Source code is available from
 https://eclipse.org/aspectj
@@ -7,7 +7,7 @@ The Eclipse Foundation makes available all content in this distribution
 ("Content"). Unless otherwise indicated below, the Content is provided
 to you under the terms and conditions of the Eclipse Public License
 Version v 2.0 ("EPL"). A copy of the EPL is available at
-xref:../../org/documents/epl-2.0/EPL-2.0.txt[https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt].
+link:[https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt].
 For purposes of the EPL, "Program" will mean the Content.
 
 If you did not receive this Content directly from the Eclipse
@@ -17,7 +17,7 @@ use of any object code in the Content. Check the Redistributor's license
 that was provided with the Content. If no such license exists, contact
 the Redistributor. Unless otherwise indicated below, the terms and
 conditions of the EPL still apply to any source code in the Content and
-such source code may be obtained at link:/[https://www.eclipse.org].
+such source code may be obtained at link:[https://www.eclipse.org].
 
 == Third Party Content
 
@@ -27,8 +27,6 @@ Eclipse Foundation, the following is provided for informational purposes
 only, and you should look to the Redistributor's license for terms and
 conditions of use.
 
-__
-
 === BCEL v5.1
 
 This product contains software developed by the Apache Software
diff --git a/docs/modules/ROOT/pages/developer/IDE.md b/docs/modules/ROOT/pages/developer/IDE.md
index d34f1c404..1772f509f 100644
--- a/docs/modules/ROOT/pages/developer/IDE.md
+++ b/docs/modules/ROOT/pages/developer/IDE.md
@@ -58,7 +58,7 @@ update sites:
 
 Your AspectJ-related list of Eclipse update sites could look like this for Eclipse 2023-12:
 
-![Eclipse IDE filtered list of update sites](images/EclipseSoftwareSitesAJDT.png)
+![Eclipse IDE filtered list of update sites](../../images/EclipseSoftwareSitesAJDT.png)
 
 ### IntelliJ IDEA
 
@@ -113,7 +113,7 @@ Guide.
 ### Command line
 
 If you wish to install AspectJ in a separate directory and use it from the command line without any extra build tools,
-feel free to download the **AspectJ installer**. It is and executable JAR installer. It requires Java and possibly admin
+feel free to download the **AspectJ installer**. It is an executable JAR installer, requires Java and possibly admin
 rights, if e.g. under Windows you want to install AspectJ to _C:/Program Files/AspectJ_. You execute it from a command
 prompt via `java -jar installer-<version>.jar` and select your installation options. Then you add `<ASPECTJ_HOME>/bin`
 to your path and are good to go. You can now call tools like the Aspectj compiler `ajc` or the AspectJ documentation
diff --git a/docs/modules/ROOT/pages/developer/compiler-weaver.adoc b/docs/modules/ROOT/pages/developer/compiler-weaver.adoc
index be3eb0a94..718215508 100644
--- a/docs/modules/ROOT/pages/developer/compiler-weaver.adoc
+++ b/docs/modules/ROOT/pages/developer/compiler-weaver.adoc
@@ -1,4 +1,8 @@
 = Guide for Developers of the AspectJ Compiler and Weaver
+:doctype: book
+:leveloffset: +1
+
+= Guide for Developers of the AspectJ Compiler and Weaver
 
 _Latest (non-license) content update: 2004-02-20 by jhugunin_
 
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
index 32a8d2001..37ea5464c 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -10,10 +10,10 @@ materials, see https://eclipse.org/aspectj. Not all of these materials have been
 |+++Section+++ |+++Contents+++
 
 |xref:#documentation[Documentation]
-|xref:faq/faq.adoc#faq[FAQ], xref:quickref/quick5.pdf[Quick Reference (AspectJ 5)],
-xref:quickref/quick.pdf[Quick Reference (1.2.1)], xref:adk15notebook/index.adoc[AspectJ 5 Developer's Notebook],
-xref:progguide/index.adoc[programming], xref:devguide/index.adoc[development] and
-xref:pdguide/index.adoc[problem diagnosis] guides, link:runtime-api/index.html[runtime API],
+|xref:faq:faq.adoc#faq[FAQ], xref:quickref/quick5.pdf[Quick Reference (AspectJ 5)],
+xref:quickref/quick.pdf[Quick Reference (1.2.1)], xref:adk15notebook:index.adoc[AspectJ 5 Developer's Notebook],
+xref:progguide:index.adoc[programming], xref:devguide:index.adoc[development] and
+xref:pdguide:index.adoc[problem diagnosis] guides, link:runtime-api/index.html[runtime API],
 link:weaver-api/index.html[weaver API] and link:examples[example code]
 
 |xref:#distributions[Distributions]
@@ -42,39 +42,39 @@ mailto:aspectj-users@eclipse.org[users] and mailto:aspectj-dev@eclipse.org[devel
 
 a|AspectJ 5 Developer's Notebook
 
-* xref:adk15notebook/index.adoc[HTML multi-page]
-* xref:adk15notebook/adk15notebook.adoc[HTML single page]
+* xref:adk15notebook:index.adoc[HTML multi-page]
+* xref:adk15notebook:adk15notebook.adoc[HTML single page]
 * xref:adk15notebook/adk15notebook.pdf[PDF]
 |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 in the programming guide or quick reference.
 
 a|Programming Guide
 
-* xref:progguide/index.adoc[HTML multi-page]
-* xref:progguide/progguide.adoc[HTML single page]
+* xref:progguide:index.adoc[HTML multi-page]
+* xref:progguide:progguide.adoc[HTML single page]
 * xref:progguide/progguide.pdf[PDF]
-|Introduces AOP and the AspectJ language. xref:progguide/gettingstarted.adoc[Getting Started] describes basic semantics
-and shows development- and production-time applications. xref:progguide/language.adoc[The AspectJ Language] describes
-join points, pointcuts, advice, and introduction, all features new to AOP. xref:progguide/examples.adoc[Examples] walks
+|Introduces AOP and the AspectJ language. xref:progguide:gettingstarted.adoc[Getting Started] describes basic semantics
+and shows development- and production-time applications. xref:progguide:language.adoc[The AspectJ Language] describes
+join points, pointcuts, advice, and introduction, all features new to AOP. xref:progguide:examples.adoc[Examples] walks
 you through the examples included with the documentation, and there are two short chapters on useful
-xref:progguide/idioms.adoc[Idioms] and a few xref:progguide/pitfalls.html[Pitfalls]. +
-The appendices have reference information: the xref:progguide/quickreference.adoc[Quick Reference] summarizes AspectJ
-syntax, the xref:progguide/semantics.adoc[Language Semantics] best describes AspectJ usage, and
-xref:progguide/implementation.adoc[Implementation Notes] describes how the current version is limited to code the
+xref:progguide:idioms.adoc[Idioms] and a few xref:progguide:pitfalls.adoc[Pitfalls]. +
+The appendices have reference information: the xref:progguide:quickreference.adoc[Quick Reference] summarizes AspectJ
+syntax, the xref:progguide:semantics.adoc[Language Semantics] best describes AspectJ usage, and
+xref:progguide:implementation.adoc[Implementation Notes] describes how the current version is limited to code the
 compiler controls.
 
 a|Development Environment Guide
 
-* xref:devguide/index.adoc[HTML multi-page]
-* xref:devguide/devguide.adoc[HTML single page]
+* xref:devguide:index.adoc[HTML multi-page]
+* xref:devguide:devguide.adoc[HTML single page]
 * xref:devguide/devguide.pdf[PDF]
-|Guide to the command-line compiler xref:devguide/ajc.adoc[ajc] and the xref:devguide/antsupport.adoc[Ant tasks] for
+|Guide to the command-line compiler xref:devguide:ajc.adoc[ajc] and the xref:devguide:antsupport.adoc[Ant tasks] for
 building AspectJ programs
 
 a|Problem Diagnosis Guide
 
-* xref:pdguide/index.adoc[HTML multi-page]
-* xref:pdguide/pdguide.adoc[HTML single page]
+* xref:pdguide:index.adoc[HTML multi-page]
+* xref:pdguide:pdguide.adoc[HTML single page]
 * xref:pdguide/pdguide.pdf[PDF]
 |Guide to various debugging features available, such as messages and trace to help you both solve problems with you own
 programs and report bugs to the AspectJ team
@@ -88,46 +88,46 @@ programs and report bugs to the AspectJ team
 used for byte code weaving, both during compilation from source code and binary weaving during post-compile and
 load-time weaving.
 
-|xref:faq/faq.adoc#faq[FAQ]
+|xref:faq:faq.adoc#faq[FAQ]
 |Frequently asked questions about the AspectJ language, tools, and project
 
-|xref:release/JavaVersionCompatibility.adoc[Java version compatibility]
+|xref:release:JavaVersionCompatibility.adoc[Java version compatibility]
 |Compatibility matrix, explaining which AspectJ compiler version supports which Java language version and needs which
 JDK to run
 
 |Release notes |Release notes, describing new features, improvements, bugfixes per AspectJ version: +
  +
-xref:release/README-1.9.21.adoc[1.9.21],
-xref:release/README-1.9.20.adoc[1.9.20 and 1.9.20.1], xref:release/README-1.9.19.adoc[1.9.19],
-xref:release/README-1.9.9.adoc[1.9.9 and 1.9.9.1], xref:release/README-1.9.8.adoc[1.9.8],
-xref:release/README-1.9.7.adoc[1.9.7], xref:release/README-1.9.6.adoc[1.9.6],
-xref:release/README-1.9.5.adoc[1.9.5], xref:release/README-1.9.4.adoc[1.9.4],
-xref:release/README-1.9.3.adoc[1.9.3], xref:release/README-1.9.2.adoc[1.9.2],
-xref:release/README-1.9.1.adoc[1.9.1], xref:release/README-1.9.0.adoc[1.9.0],
-xref:release/README-1.8.11.adoc[1.8.11], xref:release/README-1.8.10.adoc[1.8.10],
-xref:release/README-1.8.9.adoc[1.8.9], xref:release/README-1.8.8.adoc[1.8.8],
-xref:release/README-1.8.7.adoc[1.8.7], xref:release/README-1.8.6.adoc[1.8.6],
-xref:release/README-1.8.5.adoc[1.8.5], xref:release/README-1.8.4.adoc[1.8.4],
-xref:release/README-1.8.3.adoc[1.8.3], xref:release/README-1.8.2.adoc[1.8.2],
-xref:release/README-1.8.1.adoc[1.8.1], xref:release/README-1.8.0.adoc[1.8.0],
-xref:release/README-1.7.4.adoc[1.7.4], xref:release/README-1.7.3.adoc[1.7.3],
-xref:release/README-1.7.2.adoc[1.7.2], xref:release/README-1.7.1.adoc[1.7.1],
-xref:release/README-1.7.0.adoc[1.7.0], xref:release/README-1.6.12.adoc[1.6.12],
-xref:release/README-1.6.11.adoc[1.6.11], xref:release/README-1.6.10.adoc[1.6.10],
-xref:release/README-1.6.9.adoc[1.6.9], xref:release/README-1.6.8.adoc[1.6.8],
-xref:release/README-1.6.7.adoc[1.6.7], xref:release/README-1.6.6.adoc[1.6.6],
-xref:release/README-1.6.5.adoc[1.6.5], xref:release/README-1.6.4.adoc[1.6.4],
-xref:release/README-1.6.3.adoc[1.6.3], xref:release/README-1.6.2.adoc[1.6.2],
-xref:release/README-1.6.1.adoc[1.6.1], xref:release/README-1.6.0.adoc[1.6.0],
-xref:release/README-1.5.4.adoc[1.5.4], xref:release/README-1.5.3.adoc[1.5.3],
-xref:release/README-1.5.2.adoc[1.5.2], xref:release/README-1.5.1.adoc[1.5.1],
-xref:release/README-1.5.0.adoc[1.5.0], xref:release/README-1.2.1.adoc[1.2.1],
-xref:release/README-1.2.adoc[1.2], xref:release/README-1.1.adoc[1.1].
-
-|xref:release/changes.adoc[Changes] (historical)
+xref:release:README-1.9.21.adoc[1.9.21],
+xref:release:README-1.9.20.adoc[1.9.20 and 1.9.20.1], xref:release:README-1.9.19.adoc[1.9.19],
+xref:release:README-1.9.9.adoc[1.9.9 and 1.9.9.1], xref:release:README-1.9.8.adoc[1.9.8],
+xref:release:README-1.9.7.adoc[1.9.7], xref:release:README-1.9.6.adoc[1.9.6],
+xref:release:README-1.9.5.adoc[1.9.5], xref:release:README-1.9.4.adoc[1.9.4],
+xref:release:README-1.9.3.adoc[1.9.3], xref:release:README-1.9.2.adoc[1.9.2],
+xref:release:README-1.9.1.adoc[1.9.1], xref:release:README-1.9.0.adoc[1.9.0],
+xref:release:README-1.8.11.adoc[1.8.11], xref:release:README-1.8.10.adoc[1.8.10],
+xref:release:README-1.8.9.adoc[1.8.9], xref:release:README-1.8.8.adoc[1.8.8],
+xref:release:README-1.8.7.adoc[1.8.7], xref:release:README-1.8.6.adoc[1.8.6],
+xref:release:README-1.8.5.adoc[1.8.5], xref:release:README-1.8.4.adoc[1.8.4],
+xref:release:README-1.8.3.adoc[1.8.3], xref:release:README-1.8.2.adoc[1.8.2],
+xref:release:README-1.8.1.adoc[1.8.1], xref:release:README-1.8.0.adoc[1.8.0],
+xref:release:README-1.7.4.adoc[1.7.4], xref:release:README-1.7.3.adoc[1.7.3],
+xref:release:README-1.7.2.adoc[1.7.2], xref:release:README-1.7.1.adoc[1.7.1],
+xref:release:README-1.7.0.adoc[1.7.0], xref:release:README-1.6.12.adoc[1.6.12],
+xref:release:README-1.6.11.adoc[1.6.11], xref:release:README-1.6.10.adoc[1.6.10],
+xref:release:README-1.6.9.adoc[1.6.9], xref:release:README-1.6.8.adoc[1.6.8],
+xref:release:README-1.6.7.adoc[1.6.7], xref:release:README-1.6.6.adoc[1.6.6],
+xref:release:README-1.6.5.adoc[1.6.5], xref:release:README-1.6.4.adoc[1.6.4],
+xref:release:README-1.6.3.adoc[1.6.3], xref:release:README-1.6.2.adoc[1.6.2],
+xref:release:README-1.6.1.adoc[1.6.1], xref:release:README-1.6.0.adoc[1.6.0],
+xref:release:README-1.5.4.adoc[1.5.4], xref:release:README-1.5.3.adoc[1.5.3],
+xref:release:README-1.5.2.adoc[1.5.2], xref:release:README-1.5.1.adoc[1.5.1],
+xref:release:README-1.5.0.adoc[1.5.0], xref:release:README-1.2.1.adoc[1.2.1],
+xref:release:README-1.2.adoc[1.2], xref:release:README-1.1.adoc[1.1].
+
+|xref:release:changes.adoc[Changes] (historical)
 |Changes between historical releases up to 1.6.0
 
-|xref:release/porting.adoc[Porting guide] (historical)
+|xref:release:porting.adoc[Porting guide] (historical)
 |Porting guide for historical releases to 1.2
 
 |link:examples[Examples]
@@ -158,7 +158,7 @@ documentation and examples.
 |https://eclipse.org/aspectj[AspectJ source code]
 |Source code for AspectJ is available under the open-source
 https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt[Eclipse Public License v 2.0] license from the Git
-repositories for the AspectJ project. See the xref:faq/faq.adoc#buildingsource[FAQ entry].
+repositories for the AspectJ project. See the xref:faq:faq.adoc#buildingsource[FAQ entry].
 
 |https://eclipse.org/ajdt[AspectJ for Eclipse]
 |AspectJ Development Environment support for Eclipse is available under Eclipse Public License v 1.0 from the
@@ -189,28 +189,28 @@ https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Ant[Ant] (fo
 https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Docs[Docs] (for the documentation).
 Bugs all users should know about are
 https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&keywords=info[flagged with the "info" keyword].
-See the xref:faq/faq.adoc#ajcbugs[FAQ entry] for instructions on submitting compiler bugs.
+See the xref:faq:faq.adoc#ajcbugs[FAQ entry] for instructions on submitting compiler bugs.
 |===
 
 [[paths]]
 == Suggested learning paths for those new to AspectJ
 
-To learn the AspectJ language, read the xref:progguide/index.adoc[Programming Guide], keeping the
-xref:progguide/semantics.adoc[Semantics appendix] nearby as the best reference for AspectJ usage. Focus initially on the
+To learn the AspectJ language, read the xref:progguide:index.adoc[Programming Guide], keeping the
+xref:progguide:semantics.adoc[Semantics appendix] nearby as the best reference for AspectJ usage. Focus initially on the
 join point model and pointcuts, concepts AOP adds to OOP. To read about how the link:examples[examples] work, see the
-xref:progguide/examples.adoc[Examples] section in the xref:progguide/index.adoc[Programming Guide]. View and navigate
+xref:progguide:examples.adoc[Examples] section in the xref:progguide:index.adoc[Programming Guide]. View and navigate
 the crosscutting structure using https://eclipse.org/ajdt[AJDT].
 
 To start using AspectJ with your own code, modify the example aspects to apply to your classes. As you learn, use the
 compiler's `-Xlint` flags to catch some common mistakes. (Understand that the
-xref:progguide/implementation.adoc[current implementation] is limited to code the compiler controls.)
-
-To plan how to adopt AspectJ into a project, read the xref:progguide/index.adoc[Programming Guide] on development- and
-production-time aspects and the FAQ entries for xref:faq/faq.adoc#howToStartUsing[How should I start using AspectJ?],
-xref:faq/faq.adoc#adoption[Deciding to adopt AspectJ], the Development tools sections
-(xref:faq/faq.adoc#integrateWithDevTools[How does AspectJ integrate with existing Java development tools?],
-xref:faq/faq.adoc#devtools[Integrating AspectJ into your development environment],
-xref:faq/faq.adoc#ltw[Load-time weaving]), and xref:faq/faq.adoc#opensource[AspectJ as open-source]).
+xref:progguide:implementation.adoc[current implementation] is limited to code the compiler controls.)
+
+To plan how to adopt AspectJ into a project, read the xref:progguide:index.adoc[Programming Guide] on development- and
+production-time aspects and the FAQ entries for xref:faq:faq.adoc#howToStartUsing[How should I start using AspectJ?],
+xref:faq:faq.adoc#adoption[Deciding to adopt AspectJ], the Development tools sections
+(xref:faq:faq.adoc#integrateWithDevTools[How does AspectJ integrate with existing Java development tools?],
+xref:faq:faq.adoc#devtools[Integrating AspectJ into your development environment],
+xref:faq:faq.adoc#ltw[Load-time weaving]), and xref:faq:faq.adoc#opensource[AspectJ as open-source]).
 
 Enjoy the language!
 
diff --git a/docs/modules/ROOT/pages/sandbox/trails/j2ee.adoc b/docs/modules/ROOT/pages/sandbox/trails/j2ee.adoc
index efca55e77..c862b53d0 100644
--- a/docs/modules/ROOT/pages/sandbox/trails/j2ee.adoc
+++ b/docs/modules/ROOT/pages/sandbox/trails/j2ee.adoc
@@ -21,19 +21,19 @@ In Tomcat, you can deploy application servlets in WAR's or in exploded
 web directories and share code across applications.
 
 . Use `ajc` to compile the servlets, and deploy the classes as usual
-  into `{WebRoot}/WEB-INF/classes`.
+  into `\{WebRoot}/WEB-INF/classes`.
 . If your web applications or aspects do not interact, deploy
-  `aspectjrt.jar` into `{WebRoot}/WEB-INF/lib`.
+  `aspectjrt.jar` into `\{WebRoot}/WEB-INF/lib`.
 . If your web applications or aspects might interact, deploy them to
-`${CATALINA_BASE}/shared/lib`.
+`$\{CATALINA_BASE}/shared/lib`.
 
 Tomcat 4.x uses the Jasper engine based on Ant to compile JSP's. To set
 up ajc as the compiler, do the following before starting Tomcat:
 
-. Put `aspectjtools.jar` in `${CATALINA_HOME}/common/lib` so that it can
+. Put `aspectjtools.jar` in `$\{CATALINA_HOME}/common/lib` so that it can
   be loaded by Jasper.
 
-. Update Jasper servlet parameters in `${CATALINA_HOME}/conf/web.xml` to
+. Update Jasper servlet parameters in `$\{CATALINA_HOME}/conf/web.xml` to
   tell Ant to use `ajc` by setting the compiler property to the AspectJ
   compiler adapter:
 +
@@ -50,7 +50,7 @@ up ajc as the compiler, do the following before starting Tomcat:
 ....
 
 . The classpath is dynamically generated from the webapp deployment, so
-  `aspectjrt.jar` should be in `{webapp}/WEB-INF/lib` or some shared or
+  `aspectjrt.jar` should be in `\{webapp}/WEB-INF/lib` or some shared or
   common directory supported by the server.
 
 . Alternatively, you can precompile JSP's using
diff --git a/docs/modules/ROOT/pages/sandbox/trails/links.adoc b/docs/modules/ROOT/pages/sandbox/trails/links.adoc
index 7ec1e7459..7dadc56e6 100644
--- a/docs/modules/ROOT/pages/sandbox/trails/links.adoc
+++ b/docs/modules/ROOT/pages/sandbox/trails/links.adoc
@@ -26,7 +26,7 @@ AspectJ web site as ubc-design-patterns.zip. The latest version is
 checked into the CVS repository along with other sample code at
 `org.aspectj/modules/docs/sandbox/ubc-design-patterns`. For instructions
 on downloading code from the CVS repository, see the FAQ entry
-xref:../../faq/faq.adoc#buildingsource[How do I get and compile the source code for AspectJ?].
+xref:faq:faq.adoc#buildingsource[How do I get and compile the source code for AspectJ?].
 
 The https://atrack.dev.java.net/[*aTrack project*] aims to create an open
 source bug tracking application that demonstrates use of Aspect-Oriented