98 files changed, 123 insertions, 123 deletions
diff --git a/docs/dist/doc/examples/bean/BoundPoint.java b/docs/examples/bean/BoundPoint.java
index 36c85819c..36c85819c 100644
--- a/docs/dist/doc/examples/bean/BoundPoint.java
+++ b/docs/examples/bean/BoundPoint.java
diff --git a/docs/dist/doc/examples/bean/Demo.java b/docs/examples/bean/Demo.java
index e16be245e..e16be245e 100644
--- a/docs/dist/doc/examples/bean/Demo.java
+++ b/docs/examples/bean/Demo.java
diff --git a/docs/dist/doc/examples/bean/Point.java b/docs/examples/bean/Point.java
index a6ea703cd..a6ea703cd 100644
--- a/docs/dist/doc/examples/bean/Point.java
+++ b/docs/examples/bean/Point.java
diff --git a/docs/dist/doc/examples/bean/files.lst b/docs/examples/bean/files.lst
index 12ac0eb39..12ac0eb39 100644
--- a/docs/dist/doc/examples/bean/files.lst
+++ b/docs/examples/bean/files.lst
diff --git a/docs/dist/doc/examples/build.xml b/docs/examples/build.xml
index 958c72727..958c72727 100644
--- a/docs/dist/doc/examples/build.xml
+++ b/docs/examples/build.xml
diff --git a/docs/dist/doc/examples/coordination/Condition.java b/docs/examples/coordination/Condition.java
index 18bbafee2..18bbafee2 100644
--- a/docs/dist/doc/examples/coordination/Condition.java
+++ b/docs/examples/coordination/Condition.java
diff --git a/docs/dist/doc/examples/coordination/CoordinationAction.java b/docs/examples/coordination/CoordinationAction.java
index 7825b95b7..7825b95b7 100644
--- a/docs/dist/doc/examples/coordination/CoordinationAction.java
+++ b/docs/examples/coordination/CoordinationAction.java
diff --git a/docs/dist/doc/examples/coordination/Coordinator.java b/docs/examples/coordination/Coordinator.java
index ea0522d6b..ea0522d6b 100644
--- a/docs/dist/doc/examples/coordination/Coordinator.java
+++ b/docs/examples/coordination/Coordinator.java
diff --git a/docs/dist/doc/examples/coordination/Exclusion.java b/docs/examples/coordination/Exclusion.java
index 9179cd6e0..9179cd6e0 100644
--- a/docs/dist/doc/examples/coordination/Exclusion.java
+++ b/docs/examples/coordination/Exclusion.java
diff --git a/docs/dist/doc/examples/coordination/MethodState.java b/docs/examples/coordination/MethodState.java
index 03a44378a..03a44378a 100644
--- a/docs/dist/doc/examples/coordination/MethodState.java
+++ b/docs/examples/coordination/MethodState.java
diff --git a/docs/dist/doc/examples/coordination/Mutex.java b/docs/examples/coordination/Mutex.java
index 2472137c6..2472137c6 100644
--- a/docs/dist/doc/examples/coordination/Mutex.java
+++ b/docs/examples/coordination/Mutex.java
diff --git a/docs/dist/doc/examples/coordination/Selfex.java b/docs/examples/coordination/Selfex.java
index ff73afd61..ff73afd61 100644
--- a/docs/dist/doc/examples/coordination/Selfex.java
+++ b/docs/examples/coordination/Selfex.java
diff --git a/docs/dist/doc/examples/coordination/TimeoutException.java b/docs/examples/coordination/TimeoutException.java
index e16aa7f09..e16aa7f09 100644
--- a/docs/dist/doc/examples/coordination/TimeoutException.java
+++ b/docs/examples/coordination/TimeoutException.java
diff --git a/docs/dist/doc/examples/coordination/lib.lst b/docs/examples/coordination/lib.lst
index 2d85cad90..2d85cad90 100644
--- a/docs/dist/doc/examples/coordination/lib.lst
+++ b/docs/examples/coordination/lib.lst
diff --git a/docs/dist/doc/examples/introduction/CloneablePoint.java b/docs/examples/introduction/CloneablePoint.java
index c34509850..c34509850 100644
--- a/docs/dist/doc/examples/introduction/CloneablePoint.java
+++ b/docs/examples/introduction/CloneablePoint.java
diff --git a/docs/dist/doc/examples/introduction/ComparablePoint.java b/docs/examples/introduction/ComparablePoint.java
index a2893dba0..a2893dba0 100644
--- a/docs/dist/doc/examples/introduction/ComparablePoint.java
+++ b/docs/examples/introduction/ComparablePoint.java
diff --git a/docs/dist/doc/examples/introduction/HashablePoint.java b/docs/examples/introduction/HashablePoint.java
index 39eb33ba4..39eb33ba4 100644
--- a/docs/dist/doc/examples/introduction/HashablePoint.java
+++ b/docs/examples/introduction/HashablePoint.java
diff --git a/docs/dist/doc/examples/introduction/Point.java b/docs/examples/introduction/Point.java
index 4de01359b..4de01359b 100644
--- a/docs/dist/doc/examples/introduction/Point.java
+++ b/docs/examples/introduction/Point.java
diff --git a/docs/dist/doc/examples/introduction/files.lst b/docs/examples/introduction/files.lst
index 09a031d4b..09a031d4b 100644
--- a/docs/dist/doc/examples/introduction/files.lst
+++ b/docs/examples/introduction/files.lst
diff --git a/docs/dist/doc/examples/ltw/HelloWorld.java b/docs/examples/ltw/HelloWorld.java
index 1d44b8b82..1d44b8b82 100644
--- a/docs/dist/doc/examples/ltw/HelloWorld.java
+++ b/docs/examples/ltw/HelloWorld.java
diff --git a/docs/dist/doc/examples/ltw/README b/docs/examples/ltw/README
index f749692ac..43868a2e2 100644
--- a/docs/dist/doc/examples/ltw/README
+++ b/docs/examples/ltw/README
@@ -1,42 +1,42 @@
-
-For users of JDK 1.4 the bin directory of your AspectJ distribution 
-contains a script "aj" to perform load-time weaving. Java classes on 
-the CLASSPATH are loaded and woven with aspects also on the CLASSPATH 
-which are declared in an aop.xml file. This file is either created by
-the user or generated by the compiler. Alternatively aspects can be 
-loaded from an explicitly defined ASPECTPATH. 
-
-For users of JDK 1.5 the bin directory of your AspectJ distribution 
-contains a script "aj5" to perform load-time weaving using an agent. 
-This uses an aop.xml as described above.
-
---To compile the HelloWorld program--
-
- ajc -outjar hello.jar HelloWorld.java
-
---To compile the Tracing aspect--
-
- ajc -outjar tracing.jar -outxml Tracing.aj
-
---To run the example--
-
- set CLASSPATH to include hello.jar
-
- aj HelloWorld
-
---To run the example with tracing--
-
- set CLASSPATH to include "tracing.jar"
-
- aj HelloWorld
-
---To run the example with tracing using ASPECTPATH--
-
- set ASPECTPATH=tracing.jar
-
- aj HelloWorld
-
---To run the example with tracing using an agent--
-
- aj5 HelloWorld
-
+
+For users of JDK 1.4 the bin directory of your AspectJ distribution 
+contains a script "aj" to perform load-time weaving. Java classes on 
+the CLASSPATH are loaded and woven with aspects also on the CLASSPATH 
+which are declared in an aop.xml file. This file is either created by
+the user or generated by the compiler. Alternatively aspects can be 
+loaded from an explicitly defined ASPECTPATH. 
+
+For users of JDK 1.5 the bin directory of your AspectJ distribution 
+contains a script "aj5" to perform load-time weaving using an agent. 
+This uses an aop.xml as described above.
+
+--To compile the HelloWorld program--
+
+ ajc -outjar hello.jar HelloWorld.java
+
+--To compile the Tracing aspect--
+
+ ajc -outjar tracing.jar -outxml Tracing.aj
+
+--To run the example--
+
+ set CLASSPATH to include hello.jar
+
+ aj HelloWorld
+
+--To run the example with tracing--
+
+ set CLASSPATH to include "tracing.jar"
+
+ aj HelloWorld
+
+--To run the example with tracing using ASPECTPATH--
+
+ set ASPECTPATH=tracing.jar
+
+ aj HelloWorld
+
+--To run the example with tracing using an agent--
+
+ aj5 HelloWorld
+
diff --git a/docs/dist/doc/examples/ltw/Tracing.aj b/docs/examples/ltw/Tracing.aj
index de20c5403..de20c5403 100644
--- a/docs/dist/doc/examples/ltw/Tracing.aj
+++ b/docs/examples/ltw/Tracing.aj
diff --git a/docs/dist/doc/examples/observer/Button.java b/docs/examples/observer/Button.java
index 79b33caa9..79b33caa9 100644
--- a/docs/dist/doc/examples/observer/Button.java
+++ b/docs/examples/observer/Button.java
diff --git a/docs/dist/doc/examples/observer/ColorLabel.java b/docs/examples/observer/ColorLabel.java
index 5709545f2..5709545f2 100644
--- a/docs/dist/doc/examples/observer/ColorLabel.java
+++ b/docs/examples/observer/ColorLabel.java
diff --git a/docs/dist/doc/examples/observer/Demo.java b/docs/examples/observer/Demo.java
index 03be6a614..03be6a614 100644
--- a/docs/dist/doc/examples/observer/Demo.java
+++ b/docs/examples/observer/Demo.java
diff --git a/docs/dist/doc/examples/observer/Display.java b/docs/examples/observer/Display.java
index 67ed2cb5b..67ed2cb5b 100644
--- a/docs/dist/doc/examples/observer/Display.java
+++ b/docs/examples/observer/Display.java
diff --git a/docs/dist/doc/examples/observer/Observer.java b/docs/examples/observer/Observer.java
index 2851ebe17..2851ebe17 100644
--- a/docs/dist/doc/examples/observer/Observer.java
+++ b/docs/examples/observer/Observer.java
diff --git a/docs/dist/doc/examples/observer/Subject.java b/docs/examples/observer/Subject.java
index d6c144e38..d6c144e38 100644
--- a/docs/dist/doc/examples/observer/Subject.java
+++ b/docs/examples/observer/Subject.java
diff --git a/docs/dist/doc/examples/observer/SubjectObserverProtocol.java b/docs/examples/observer/SubjectObserverProtocol.java
index 05e54d76c..05e54d76c 100644
--- a/docs/dist/doc/examples/observer/SubjectObserverProtocol.java
+++ b/docs/examples/observer/SubjectObserverProtocol.java
diff --git a/docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java b/docs/examples/observer/SubjectObserverProtocolImpl.java
index 2bc75918c..2bc75918c 100644
--- a/docs/dist/doc/examples/observer/SubjectObserverProtocolImpl.java
+++ b/docs/examples/observer/SubjectObserverProtocolImpl.java
diff --git a/docs/dist/doc/examples/observer/files.lst b/docs/examples/observer/files.lst
index 9b800286e..9b800286e 100644
--- a/docs/dist/doc/examples/observer/files.lst
+++ b/docs/examples/observer/files.lst
diff --git a/docs/dist/doc/examples/spacewar/Bullet.java b/docs/examples/spacewar/Bullet.java
index 6581dbbf7..6581dbbf7 100644
--- a/docs/dist/doc/examples/spacewar/Bullet.java
+++ b/docs/examples/spacewar/Bullet.java
diff --git a/docs/dist/doc/examples/spacewar/Debug.java b/docs/examples/spacewar/Debug.java
index a3afb1dda..a3afb1dda 100644
--- a/docs/dist/doc/examples/spacewar/Debug.java
+++ b/docs/examples/spacewar/Debug.java
diff --git a/docs/dist/doc/examples/spacewar/Display.java b/docs/examples/spacewar/Display.java
index 4236407ee..4236407ee 100644
--- a/docs/dist/doc/examples/spacewar/Display.java
+++ b/docs/examples/spacewar/Display.java
diff --git a/docs/dist/doc/examples/spacewar/Display1.java b/docs/examples/spacewar/Display1.java
index 622f7d051..622f7d051 100644
--- a/docs/dist/doc/examples/spacewar/Display1.java
+++ b/docs/examples/spacewar/Display1.java
diff --git a/docs/dist/doc/examples/spacewar/Display2.java b/docs/examples/spacewar/Display2.java
index 0430a1cc5..0430a1cc5 100644
--- a/docs/dist/doc/examples/spacewar/Display2.java
+++ b/docs/examples/spacewar/Display2.java
diff --git a/docs/dist/doc/examples/spacewar/EnergyPacket.java b/docs/examples/spacewar/EnergyPacket.java
index d7bc4f9ec..d7bc4f9ec 100644
--- a/docs/dist/doc/examples/spacewar/EnergyPacket.java
+++ b/docs/examples/spacewar/EnergyPacket.java
diff --git a/docs/dist/doc/examples/spacewar/EnergyPacketProducer.java b/docs/examples/spacewar/EnergyPacketProducer.java
index efd276042..efd276042 100644
--- a/docs/dist/doc/examples/spacewar/EnergyPacketProducer.java
+++ b/docs/examples/spacewar/EnergyPacketProducer.java
diff --git a/docs/dist/doc/examples/spacewar/EnsureShipIsAlive.java b/docs/examples/spacewar/EnsureShipIsAlive.java
index f7b949a92..f7b949a92 100644
--- a/docs/dist/doc/examples/spacewar/EnsureShipIsAlive.java
+++ b/docs/examples/spacewar/EnsureShipIsAlive.java
diff --git a/docs/dist/doc/examples/spacewar/Game.java b/docs/examples/spacewar/Game.java
index 54b1bf2ac..54b1bf2ac 100644
--- a/docs/dist/doc/examples/spacewar/Game.java
+++ b/docs/examples/spacewar/Game.java
diff --git a/docs/dist/doc/examples/spacewar/GameSynchronization.java b/docs/examples/spacewar/GameSynchronization.java
index dcf42e904..dcf42e904 100644
--- a/docs/dist/doc/examples/spacewar/GameSynchronization.java
+++ b/docs/examples/spacewar/GameSynchronization.java
diff --git a/docs/dist/doc/examples/spacewar/Makefile b/docs/examples/spacewar/Makefile
index 108d3c8c4..e425dfd55 100644
--- a/docs/dist/doc/examples/spacewar/Makefile
+++ b/docs/examples/spacewar/Makefile
@@ -1,12 +1,12 @@
-SHELL=bash
-ACJOPTS=-verbose -nosymbols
-AJC=ajc
-
-.PHONY: demo debug
-
-demo:
-	$(AJC) $(ACJOPTS) @demo.lst
-
-debug:
-	$(AJC) $(ACJOPTS) @debug.lst
-
+SHELL=bash
+ACJOPTS=-verbose -nosymbols
+AJC=ajc
+
+.PHONY: demo debug
+
+demo:
+	$(AJC) $(ACJOPTS) @demo.lst
+
+debug:
+	$(AJC) $(ACJOPTS) @debug.lst
+
diff --git a/docs/dist/doc/examples/spacewar/Pilot.java b/docs/examples/spacewar/Pilot.java
index 330d860bf..330d860bf 100644
--- a/docs/dist/doc/examples/spacewar/Pilot.java
+++ b/docs/examples/spacewar/Pilot.java
diff --git a/docs/dist/doc/examples/spacewar/Player.java b/docs/examples/spacewar/Player.java
index 3899c6d52..3899c6d52 100644
--- a/docs/dist/doc/examples/spacewar/Player.java
+++ b/docs/examples/spacewar/Player.java
diff --git a/docs/dist/doc/examples/spacewar/README.adoc b/docs/examples/spacewar/README.adoc
index 9991867a3..9991867a3 100644
--- a/docs/dist/doc/examples/spacewar/README.adoc
+++ b/docs/examples/spacewar/README.adoc
diff --git a/docs/dist/doc/examples/spacewar/Registry.java b/docs/examples/spacewar/Registry.java
index a9cec0418..a9cec0418 100644
--- a/docs/dist/doc/examples/spacewar/Registry.java
+++ b/docs/examples/spacewar/Registry.java
diff --git a/docs/dist/doc/examples/spacewar/RegistrySynchronization.java b/docs/examples/spacewar/RegistrySynchronization.java
index 986e4bd30..986e4bd30 100644
--- a/docs/dist/doc/examples/spacewar/RegistrySynchronization.java
+++ b/docs/examples/spacewar/RegistrySynchronization.java
diff --git a/docs/dist/doc/examples/spacewar/Robot.java b/docs/examples/spacewar/Robot.java
index 05f276108..05f276108 100644
--- a/docs/dist/doc/examples/spacewar/Robot.java
+++ b/docs/examples/spacewar/Robot.java
diff --git a/docs/dist/doc/examples/spacewar/SWFrame.java b/docs/examples/spacewar/SWFrame.java
index 6dfb9f6f6..6dfb9f6f6 100644
--- a/docs/dist/doc/examples/spacewar/SWFrame.java
+++ b/docs/examples/spacewar/SWFrame.java
diff --git a/docs/dist/doc/examples/spacewar/Ship.java b/docs/examples/spacewar/Ship.java
index 9978fe694..9978fe694 100644
--- a/docs/dist/doc/examples/spacewar/Ship.java
+++ b/docs/examples/spacewar/Ship.java
diff --git a/docs/dist/doc/examples/spacewar/SpaceObject.java b/docs/examples/spacewar/SpaceObject.java
index ee3afabcc..ee3afabcc 100644
--- a/docs/dist/doc/examples/spacewar/SpaceObject.java
+++ b/docs/examples/spacewar/SpaceObject.java
diff --git a/docs/dist/doc/examples/spacewar/Timer.java b/docs/examples/spacewar/Timer.java
index 1f4a992a7..1f4a992a7 100644
--- a/docs/dist/doc/examples/spacewar/Timer.java
+++ b/docs/examples/spacewar/Timer.java
diff --git a/docs/dist/doc/examples/spacewar/debug.lst b/docs/examples/spacewar/debug.lst
index 3de8ddafe..3de8ddafe 100644
--- a/docs/dist/doc/examples/spacewar/debug.lst
+++ b/docs/examples/spacewar/debug.lst
diff --git a/docs/dist/doc/examples/spacewar/demo.lst b/docs/examples/spacewar/demo.lst
index dd188af83..dd188af83 100644
--- a/docs/dist/doc/examples/spacewar/demo.lst
+++ b/docs/examples/spacewar/demo.lst
diff --git a/docs/dist/doc/examples/telecom/AbstractSimulation.java b/docs/examples/telecom/AbstractSimulation.java
index 1c44af7a7..1c44af7a7 100644
--- a/docs/dist/doc/examples/telecom/AbstractSimulation.java
+++ b/docs/examples/telecom/AbstractSimulation.java
diff --git a/docs/dist/doc/examples/telecom/BasicSimulation.java b/docs/examples/telecom/BasicSimulation.java
index ab7426376..ab7426376 100644
--- a/docs/dist/doc/examples/telecom/BasicSimulation.java
+++ b/docs/examples/telecom/BasicSimulation.java
diff --git a/docs/dist/doc/examples/telecom/Billing.java b/docs/examples/telecom/Billing.java
index 651d64b36..651d64b36 100644
--- a/docs/dist/doc/examples/telecom/Billing.java
+++ b/docs/examples/telecom/Billing.java
diff --git a/docs/dist/doc/examples/telecom/BillingSimulation.java b/docs/examples/telecom/BillingSimulation.java
index 09f273ff6..09f273ff6 100644
--- a/docs/dist/doc/examples/telecom/BillingSimulation.java
+++ b/docs/examples/telecom/BillingSimulation.java
diff --git a/docs/dist/doc/examples/telecom/Call.java b/docs/examples/telecom/Call.java
index 3d3489e86..3d3489e86 100644
--- a/docs/dist/doc/examples/telecom/Call.java
+++ b/docs/examples/telecom/Call.java
diff --git a/docs/dist/doc/examples/telecom/Connection.java b/docs/examples/telecom/Connection.java
index 7d54ec843..7d54ec843 100644
--- a/docs/dist/doc/examples/telecom/Connection.java
+++ b/docs/examples/telecom/Connection.java
diff --git a/docs/dist/doc/examples/telecom/Customer.java b/docs/examples/telecom/Customer.java
index 1e099984c..1e099984c 100644
--- a/docs/dist/doc/examples/telecom/Customer.java
+++ b/docs/examples/telecom/Customer.java
diff --git a/docs/dist/doc/examples/telecom/Local.java b/docs/examples/telecom/Local.java
index e0bc02679..e0bc02679 100644
--- a/docs/dist/doc/examples/telecom/Local.java
+++ b/docs/examples/telecom/Local.java
diff --git a/docs/dist/doc/examples/telecom/LongDistance.java b/docs/examples/telecom/LongDistance.java
index b2ed6eb7d..b2ed6eb7d 100644
--- a/docs/dist/doc/examples/telecom/LongDistance.java
+++ b/docs/examples/telecom/LongDistance.java
diff --git a/docs/dist/doc/examples/telecom/Timer.java b/docs/examples/telecom/Timer.java
index 813ae3a0d..813ae3a0d 100644
--- a/docs/dist/doc/examples/telecom/Timer.java
+++ b/docs/examples/telecom/Timer.java
diff --git a/docs/dist/doc/examples/telecom/TimerLog.java b/docs/examples/telecom/TimerLog.java
index c736625b5..c736625b5 100644
--- a/docs/dist/doc/examples/telecom/TimerLog.java
+++ b/docs/examples/telecom/TimerLog.java
diff --git a/docs/dist/doc/examples/telecom/Timing.java b/docs/examples/telecom/Timing.java
index 29eba02ea..29eba02ea 100644
--- a/docs/dist/doc/examples/telecom/Timing.java
+++ b/docs/examples/telecom/Timing.java
diff --git a/docs/dist/doc/examples/telecom/TimingSimulation.java b/docs/examples/telecom/TimingSimulation.java
index 309563769..309563769 100644
--- a/docs/dist/doc/examples/telecom/TimingSimulation.java
+++ b/docs/examples/telecom/TimingSimulation.java
diff --git a/docs/dist/doc/examples/telecom/basic.lst b/docs/examples/telecom/basic.lst
index 018a679ac..018a679ac 100644
--- a/docs/dist/doc/examples/telecom/basic.lst
+++ b/docs/examples/telecom/basic.lst
diff --git a/docs/dist/doc/examples/telecom/billing.lst b/docs/examples/telecom/billing.lst
index 7b2cf087c..7b2cf087c 100644
--- a/docs/dist/doc/examples/telecom/billing.lst
+++ b/docs/examples/telecom/billing.lst
diff --git a/docs/dist/doc/examples/telecom/timing.lst b/docs/examples/telecom/timing.lst
index 3ca514f85..3ca514f85 100644
--- a/docs/dist/doc/examples/telecom/timing.lst
+++ b/docs/examples/telecom/timing.lst
diff --git a/docs/dist/doc/examples/tjp/Demo.java b/docs/examples/tjp/Demo.java
index 64d249c82..64d249c82 100644
--- a/docs/dist/doc/examples/tjp/Demo.java
+++ b/docs/examples/tjp/Demo.java
diff --git a/docs/dist/doc/examples/tjp/GetInfo.java b/docs/examples/tjp/GetInfo.java
index 0d38a3766..0d38a3766 100644
--- a/docs/dist/doc/examples/tjp/GetInfo.java
+++ b/docs/examples/tjp/GetInfo.java
diff --git a/docs/dist/doc/examples/tjp/files.lst b/docs/examples/tjp/files.lst
index 0cfc34bdf..0cfc34bdf 100644
--- a/docs/dist/doc/examples/tjp/files.lst
+++ b/docs/examples/tjp/files.lst
diff --git a/docs/dist/doc/examples/tracing/Circle.java b/docs/examples/tracing/Circle.java
index 76b73e20a..76b73e20a 100644
--- a/docs/dist/doc/examples/tracing/Circle.java
+++ b/docs/examples/tracing/Circle.java
diff --git a/docs/dist/doc/examples/tracing/ExampleMain.java b/docs/examples/tracing/ExampleMain.java
index 93cc465b7..93cc465b7 100644
--- a/docs/dist/doc/examples/tracing/ExampleMain.java
+++ b/docs/examples/tracing/ExampleMain.java
diff --git a/docs/dist/doc/examples/tracing/README b/docs/examples/tracing/README
index 6bf89328b..bf8e70390 100644
--- a/docs/dist/doc/examples/tracing/README
+++ b/docs/examples/tracing/README
@@ -1,32 +1,32 @@
-
-This directory contains several examples of tracing aspects,
-including a reusable tracing library and examples of 
-using that library.
-
-A lesson in the AspectJ Primer explains all of this code.
-
-To work with these (or any other examples), first be sure .../examples
-is on your classpath, where ... is where you have installed AspectJ.
-
-
---To compile and run the example without tracing--
-
- ajc @.../examples/tracing/notrace.lst
-
- java tracing.ExampleMain
-
-
---To compile and run the example with tracing version<N>--
-
- ajc @.../examples/tracing/tracev<N>.lst
-
- java tracing.version<N>.TraceMyClasses
-
-where <N> is 1, 2, 3 or 4
-
---To use the tracing.lib.AbstractTrace aspect--
-
- Make sure .../examples is in your classpath.
-
- In order to use this aspect, please read the documentation under
- tracing/doc
+
+This directory contains several examples of tracing aspects,
+including a reusable tracing library and examples of 
+using that library.
+
+A lesson in the AspectJ Primer explains all of this code.
+
+To work with these (or any other examples), first be sure .../examples
+is on your classpath, where ... is where you have installed AspectJ.
+
+
+--To compile and run the example without tracing--
+
+ ajc @.../examples/tracing/notrace.lst
+
+ java tracing.ExampleMain
+
+
+--To compile and run the example with tracing version<N>--
+
+ ajc @.../examples/tracing/tracev<N>.lst
+
+ java tracing.version<N>.TraceMyClasses
+
+where <N> is 1, 2, 3 or 4
+
+--To use the tracing.lib.AbstractTrace aspect--
+
+ Make sure .../examples is in your classpath.
+
+ In order to use this aspect, please read the documentation under
+ tracing/doc
diff --git a/docs/dist/doc/examples/tracing/Square.java b/docs/examples/tracing/Square.java
index 78b36882d..78b36882d 100644
--- a/docs/dist/doc/examples/tracing/Square.java
+++ b/docs/examples/tracing/Square.java
diff --git a/docs/dist/doc/examples/tracing/TwoDShape.java b/docs/examples/tracing/TwoDShape.java
index 531b6f120..531b6f120 100644
--- a/docs/dist/doc/examples/tracing/TwoDShape.java
+++ b/docs/examples/tracing/TwoDShape.java
diff --git a/docs/dist/doc/examples/tracing/lib/AbstractTrace.java b/docs/examples/tracing/lib/AbstractTrace.java
index 8c67b12c3..8c67b12c3 100644
--- a/docs/dist/doc/examples/tracing/lib/AbstractTrace.java
+++ b/docs/examples/tracing/lib/AbstractTrace.java
diff --git a/docs/dist/doc/examples/tracing/lib/TraceMyClasses.java b/docs/examples/tracing/lib/TraceMyClasses.java
index 95c3a859c..95c3a859c 100644
--- a/docs/dist/doc/examples/tracing/lib/TraceMyClasses.java
+++ b/docs/examples/tracing/lib/TraceMyClasses.java
diff --git a/docs/dist/doc/examples/tracing/notrace.lst b/docs/examples/tracing/notrace.lst
index ebd820352..ebd820352 100644
--- a/docs/dist/doc/examples/tracing/notrace.lst
+++ b/docs/examples/tracing/notrace.lst
diff --git a/docs/dist/doc/examples/tracing/tracelib.lst b/docs/examples/tracing/tracelib.lst
index a9a494d10..a9a494d10 100644
--- a/docs/dist/doc/examples/tracing/tracelib.lst
+++ b/docs/examples/tracing/tracelib.lst
diff --git a/docs/dist/doc/examples/tracing/tracev1.lst b/docs/examples/tracing/tracev1.lst
index 35a95c46f..35a95c46f 100644
--- a/docs/dist/doc/examples/tracing/tracev1.lst
+++ b/docs/examples/tracing/tracev1.lst
diff --git a/docs/dist/doc/examples/tracing/tracev2.lst b/docs/examples/tracing/tracev2.lst
index e37fe1a11..e37fe1a11 100644
--- a/docs/dist/doc/examples/tracing/tracev2.lst
+++ b/docs/examples/tracing/tracev2.lst
diff --git a/docs/dist/doc/examples/tracing/tracev3.lst b/docs/examples/tracing/tracev3.lst
index 2804f306d..2804f306d 100644
--- a/docs/dist/doc/examples/tracing/tracev3.lst
+++ b/docs/examples/tracing/tracev3.lst
diff --git a/docs/dist/doc/examples/tracing/version1/Trace.java b/docs/examples/tracing/version1/Trace.java
index 97b5edb3f..97b5edb3f 100644
--- a/docs/dist/doc/examples/tracing/version1/Trace.java
+++ b/docs/examples/tracing/version1/Trace.java
diff --git a/docs/dist/doc/examples/tracing/version1/TraceMyClasses.java b/docs/examples/tracing/version1/TraceMyClasses.java
index 736e96413..736e96413 100644
--- a/docs/dist/doc/examples/tracing/version1/TraceMyClasses.java
+++ b/docs/examples/tracing/version1/TraceMyClasses.java
diff --git a/docs/dist/doc/examples/tracing/version2/Trace.java b/docs/examples/tracing/version2/Trace.java
index 6c43d60f8..6c43d60f8 100644
--- a/docs/dist/doc/examples/tracing/version2/Trace.java
+++ b/docs/examples/tracing/version2/Trace.java
diff --git a/docs/dist/doc/examples/tracing/version2/TraceMyClasses.java b/docs/examples/tracing/version2/TraceMyClasses.java
index d9ba21c54..d9ba21c54 100644
--- a/docs/dist/doc/examples/tracing/version2/TraceMyClasses.java
+++ b/docs/examples/tracing/version2/TraceMyClasses.java
diff --git a/docs/dist/doc/examples/tracing/version3/Trace.java b/docs/examples/tracing/version3/Trace.java
index 8fc9d8613..8fc9d8613 100644
--- a/docs/dist/doc/examples/tracing/version3/Trace.java
+++ b/docs/examples/tracing/version3/Trace.java
diff --git a/docs/dist/doc/examples/tracing/version3/TraceMyClasses.java b/docs/examples/tracing/version3/TraceMyClasses.java
index c986d2615..c986d2615 100644
--- a/docs/dist/doc/examples/tracing/version3/TraceMyClasses.java
+++ b/docs/examples/tracing/version3/TraceMyClasses.java
diff --git a/docs/index.adoc b/docs/index.adoc
index 34dc1c780..eeefa6296 100644
--- a/docs/index.adoc
+++ b/docs/index.adoc
@@ -18,7 +18,7 @@ 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[API] and link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/dist/doc/examples[example code].
+link:runtime-api/index.html[API] and link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/examples[example code].
 
 |xref:#distributions[Distributions]
 |https://eclipse.org/aspectj[AspectJ]; development environment support
@@ -116,7 +116,7 @@ xref:dist/doc/porting.adoc[1.0].
 
 |xref:dist/doc/changes.adoc[Changes] |Changes between historical releases up to 1.6.0.
 
-|link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/dist/doc/examples[Examples] |AspectJ code to demonstrate some language
+|link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/examples[Examples] |AspectJ code to demonstrate some language
 features and implement JavaBean properties, the Observer pattern, a
 tracing library, and a game application where aspects handle display
 updating.
@@ -190,7 +190,7 @@ 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:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/dist/doc/examples[examples] work, see the
+link:https://github.com/eclipse-aspectj/aspectj/tree/master/docs/examples[examples] work, see the
 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].
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java
index 4af03a479..35965a5d6 100644
--- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java
@@ -69,7 +69,7 @@ public class WorkingTestMain {
 		TestUtil.runMain("out;../lib/test/testing-client.jar", "org.schmidmeier.unittests.cache.AllTimeCacheTests");
 	}
 
-	private static String examplesDir = "../docs/dist/doc/examples/";
+	private static String examplesDir = "../docs/examples/";
 	private static void example(String[] argfiles, String[] classes) {
 		List args = new ArrayList();
 		args.add("-verbose");
diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
index 42762fc17..c84581a33 100644
--- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
+++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
@@ -92,7 +92,7 @@ public class Ajc11CompilerAdapterTest extends TestCase {
     }
 
     void setupTracingJava(Javac javac) { // XXX assumes module dir, doc loc
-        String exDir = "../docs/dist/doc/examples";
+        String exDir = "../docs/examples";
         javac.setSrcdir(new Path(javac.getProject(), exDir));
         javac.setIncludes("tracing/*.java"); // XXX assumes tracing example
     }
diff --git a/tests/ajcTestsExamples.xml b/tests/ajcTestsExamples.xml
index bacd407cf..0c49275d4 100644
--- a/tests/ajcTestsExamples.xml
+++ b/tests/ajcTestsExamples.xml
@@ -1,14 +1,14 @@
 
 <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
 
-<!-- 
+<!--
 	Test documentation examples.
-	Results unverified except for compiler messages, 
+	Results unverified except for compiler messages,
 	runtime exceptions, System.exit codes, and System.err
 	messages (the latter not for all tests).
 
   To run the example classes using a forked 1.1 vm:
-	
+
   java -Djavarun.fork=true \
        -Djavarun.java.home=d:\\jdk11 \
        -Djavarun.java=d:\\jdk11\\bin\\javaw \
@@ -16,20 +16,20 @@
        -jar ../aj-build/jars/testing-drivers-all.jar \
        ajcTestsExamples.xml \
        -ajctestSkipKeywords=knownLimitation-run11 \
-       -logFail 
+       -logFail
 
 -->
 <suite>
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples"
 		title="bean example">
         <compile argfiles="bean/files.lst"/>
         <run class="bean.Demo"
 			errStreamIsError="false"/>
 		<!-- ??: error security properties not found. using defaults. -->
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples,knownLimitation-run11"
 		title="introduction">
         <compile argfiles="introduction/files.lst"/>
@@ -37,84 +37,84 @@
         <run vm="1.2" class="introduction.CloneablePoint"/>
         <run vm="1.2" class="introduction.ComparablePoint"/>
         <run vm="1.2" class="introduction.HashablePoint"/>
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples"
 		title="observer example">
         <compile argfiles="observer/files.lst"/>
         <!-- GUI run class="observer.Demo"/ -->
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples"
 		title="spacewar example">
         <compile argfiles="spacewar/debug.lst"/>
         <compile argfiles="spacewar/demo.lst"/>
         <!-- GUI run class="spacewar.Game"/ -->
-    </ajc-test>   
+    </ajc-test>
 
 	<!--
   	TODO: change 1.2 API's in telecom to 1.1:
   	(Vector.[add|remove](..) to [add|remove]Element(..))
   	then remove the knownLimitation-run11 keywords
-	-->			
-    <ajc-test dir="../docs/dist/doc/examples"
+	-->
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples,knownLimitation-run11"
 		title="telecom basic example">
         <compile argfiles="telecom/basic.lst"/>
         <run class="telecom.BasicSimulation"/>
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples,knownLimitation-run11"
 		title="telecom billing example">
         <compile argfiles="telecom/billing.lst"/>
         <run class="telecom.BillingSimulation"/>
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples,knownLimitation-run11"
 		title="telecom timing example">
         <compile argfiles="telecom/timing.lst"/>
         <run class="telecom.TimingSimulation"/>
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples"
 		title="thisJoinPoint example">
         <compile argfiles="tjp/files.lst"/>
         <run class="tjp.Demo"/>
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples"
 		title="tracing example - none">
         <compile argfiles="tracing/notrace.lst"/>
         <run class="tracing.ExampleMain"/>
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples"
 		title="tracing example - version 1">
         <compile argfiles="tracing/tracev1.lst"/>
         <run class="tracing.version1.TraceMyClasses"
 			errStreamIsError="false"/>
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples"
 		title="tracing example - version 2">
         <compile argfiles="tracing/tracev2.lst"/>
         <run class="tracing.version2.TraceMyClasses"
 			errStreamIsError="false"/>
-    </ajc-test>   
+    </ajc-test>
 
-    <ajc-test dir="../docs/dist/doc/examples"
+    <ajc-test dir="../docs/examples"
     	keywords="doc-examples"
 		title="tracing example - version 3">
         <compile argfiles="tracing/tracev3.lst"/>
         <run class="tracing.version3.TraceMyClasses"
 			errStreamIsError="false"/>
-    </ajc-test>   
+    </ajc-test>
 </suite>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml
index 63313f624..6ce13fb0d 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -1569,7 +1569,7 @@
 
     <!-- end of atOverride tests with ITDs -->
 
-    <ajc-test dir="../docs/dist/doc/examples/introduction" title="introduction sample" vm="1.5">
+    <ajc-test dir="../docs/examples/introduction" title="introduction sample" vm="1.5">
         <compile files="CloneablePoint.java,ComparablePoint.java,HashablePoint.java,Point.java" options="-1.5 -Xlint:ignore"/>
     </ajc-test>
 
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml
index dede00f0a..79a942447 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml
@@ -1569,7 +1569,7 @@
 
     <!-- end of atOverride tests with ITDs -->
 
-    <ajc-test dir="../docs/dist/doc/examples/introduction" title="introduction sample" vm="1.5">
+    <ajc-test dir="../docs/examples/introduction" title="introduction sample" vm="1.5">
         <compile files="CloneablePoint.java,ComparablePoint.java,HashablePoint.java,Point.java" options="-1.9 -Xlint:ignore"/>
     </ajc-test>
 
diff --git a/tests/test-other-systems.xml b/tests/test-other-systems.xml
index 09c2b82e6..b43736021 100644
--- a/tests/test-other-systems.xml
+++ b/tests/test-other-systems.xml
@@ -683,7 +683,7 @@
           location="${aj.otherSystems.dir}/examples"/>
     <mkdir dir="${aj.tempExamples.dir}"/>
     <copy todir="${aj.tempExamples.dir}">
-      <fileset dir="../docs/dist/doc/examples"/>
+      <fileset dir="../docs/examples"/>
     </copy>
     <!-- copy to temp.examples.dir -->
     <ajctest testId="examples"