16 files changed, 19 insertions, 20 deletions
diff --git a/docs/build.xml b/docs/build.xml
index 70799f969..e0083ec38 100644
--- a/docs/build.xml
+++ b/docs/build.xml
@@ -59,7 +59,7 @@
                   location="${aspectj.modules.dir}/ajde/src/main/resources/org/aspectj/ajde/resources/actions"
         />
         <property name="include.devguide.icons"
-                  value="build.gif,openConfig.gif,browseroptions.gif"
+                  value="build.png,openConfig.png,browseroptions.png"
         />
 
         <!-- callers of xml-html use these by default -->
@@ -289,7 +289,7 @@
             <param name="guide.dir" value="progguide" />
             <param name="guide.name" value="progguide" />
             <param name="xml-html-copy"
-          	            value="dd_arrow.gif,aspects.gif,figureUML.gif,overview.gif,telecom.gif,aspectj-docs.css"/>
+          	            value="dd_arrow.png,aspects.png,figureUML.png,overview.png,telecom.png,aspectj-docs.css"/>
         </antcall>
     </target>
 
@@ -298,7 +298,7 @@
             <param name="guide.dir" value="adk15notebook" />
             <param name="guide.name" value="adk15notebook" />
             <param name="xml-html-copy"
-    	            value="dd_arrow.gif,aspectj-docs.css"/>
+    	            value="dd_arrow.png,aspectj-docs.css"/>
         </antcall>
     </target>
 
@@ -313,7 +313,7 @@
 
         <antcall target="build-guide">
             <param name="xml-html-copy"
-                   value="dd_arrow.gif,aspectj-docs.css,ajbrowser-building.gif,ajbrowser-options.gif,${include.devguide.icons}"
+                   value="dd_arrow.png,aspectj-docs.css,ajbrowser-building.png,ajbrowser-options.png,${include.devguide.icons}"
             />
             <param name="guide.dir" value="devguide" />
             <param name="guide.name" value="devguide" />
@@ -335,7 +335,7 @@
 
         <antcall target="build-guide">
             <param name="xml-html-copy"
-                   value="dd_arrow.gif,aspectj-docs.css,ajbrowser-building.gif,ajbrowser-options.gif,${include.pdguide.icons}"
+                   value="dd_arrow.png,aspectj-docs.css,ajbrowser-building.png,ajbrowser-options.png,${include.pdguide.icons}"
             />
             <param name="guide.dir" value="pdguide" />
             <param name="guide.name" value="pdguide" />
@@ -415,7 +415,7 @@
 
         <antcall target="build-pdf">
             <param name="xml-html-copy"
-                   value="ajbrowser-building.gif,ajbrowser-options.gif,${include.devguide.icons}"
+                   value="ajbrowser-building.png,ajbrowser-options.png,${include.devguide.icons}"
             />
             <param name="guide.dir" value="devguide" />
             <param name="guide.name" value="devguide" />
diff --git a/docs/developer/compiler-weaver.adoc b/docs/developer/compiler-weaver.adoc
index a98061b06..ba1b28260 100644
--- a/docs/developer/compiler-weaver.adoc
+++ b/docs/developer/compiler-weaver.adoc
@@ -21,7 +21,7 @@ for AspectJ-1.2.
 runtime and must be redistributed with any system built using AspectJ.
 This module has no external dependencies and produces a tiny ~30KB jar.
 
-image:images/overview.gif[image]
+image:images/overview.png[image]
 
 The AspectJ compiler accepts both AspectJ bytecode and source code and
 produces pure Java bytecode as a result. Internally it has two stages.
@@ -94,7 +94,7 @@ aspect A {
 
 When parsed, this program will produce the following tree.
 
-image:images/top-tree.gif[image]
+image:images/top-tree.png[image]
 
 ==== PointcutDeclaration processing
 
@@ -105,7 +105,7 @@ Let's look more closely at the pointcut declaration:
 pointcut entries(Main o): execution(void doit()) && this(o);
 ....
 
-image:images/pointcut-dec.gif[image]
+image:images/pointcut-dec.png[image]
 
 The pointcut declaration is implemented as a subtype of a method
 declaration. The actual pointcut is parsed by the weaver module. This
@@ -131,7 +131,7 @@ postParse, the selector is filled in and several additional arguments
 are added for the special thisJoinPoint forms that could be used in the
 body.
 
-image:images/advice-dec.gif[image]
+image:images/advice-dec.png[image]
 
 At this point the statements field which will hold the body of the
 advice is still null. This field is not filled in until the second stage
@@ -142,7 +142,7 @@ prelude to generating the classfile.
 
 The main classes in this module are shown in the following diagram:
 
-image:images/ajdt-uml.gif[image]
+image:images/ajdt-uml.png[image]
 
 === Weaving back-end (weaver)
 
diff --git a/docs/developer/images/advice-dec.png b/docs/developer/images/advice-dec.png
index 43f540a4f..4261f8b10 100644
--- a/docs/developer/images/advice-dec.png
+++ b/docs/developer/images/advice-dec.png
diff --git a/docs/developer/images/ajdt-uml.png b/docs/developer/images/ajdt-uml.png
index 3a6ff797d..a8ac5b410 100644
--- a/docs/developer/images/ajdt-uml.png
+++ b/docs/developer/images/ajdt-uml.png
diff --git a/docs/developer/images/overview.png b/docs/developer/images/overview.png
index b32f11b15..f03e01c9f 100644
--- a/docs/developer/images/overview.png
+++ b/docs/developer/images/overview.png
diff --git a/docs/developer/images/pointcut-dec.png b/docs/developer/images/pointcut-dec.png
index fed640d36..a59676d66 100644
--- a/docs/developer/images/pointcut-dec.png
+++ b/docs/developer/images/pointcut-dec.png
diff --git a/docs/developer/images/top-tree.png b/docs/developer/images/top-tree.png
index d8e2b26ff..51632c435 100644
--- a/docs/developer/images/top-tree.png
+++ b/docs/developer/images/top-tree.png
diff --git a/docs/progguide/examples.adoc b/docs/progguide/examples.adoc
index ca4fc2fdb..caa74a620 100644
--- a/docs/progguide/examples.adoc
+++ b/docs/progguide/examples.adoc
@@ -287,7 +287,7 @@ aspects, though simple, are not totally trivial.
 The diagram below gives an overview of the aspects and their interaction
 with the class `Point`.
 
-image:images/aspects.gif[image]
+image:images/aspects.png[image]
 
 ===== The `CloneablePoint` aspect
 
@@ -1314,7 +1314,7 @@ is used to connect them. Conference calls between more than two
 customers will involve more than one connection. A customer may be
 involved in many calls at one time.
 
-image:images/telecom.gif[image]
+image:images/telecom.png[image]
 
 ===== The `Customer` class
 
diff --git a/docs/progguide/gettingstarted.adoc b/docs/progguide/gettingstarted.adoc
index 3f0889915..b7de29e59 100644
--- a/docs/progguide/gettingstarted.adoc
+++ b/docs/progguide/gettingstarted.adoc
@@ -60,7 +60,7 @@ The features are presented using a simple figure editor system. A
 is also a `Display`. Most example programs later in this chapter are
 based on this system as well.
 
-image:images/figureUML.gif[ UML for the `FigureEditor` example ]
+image:images/figureUML.png[ UML for the `FigureEditor` example ]
 
 The motivation for AspectJ (and likewise for aspect-oriented
 programming) is the realization that there are issues or concerns that
diff --git a/docs/progguide/images/aspects.png b/docs/progguide/images/aspects.png
index 8bca684ad..38f688371 100644
--- a/docs/progguide/images/aspects.png
+++ b/docs/progguide/images/aspects.png
diff --git a/docs/progguide/images/figureUML.png b/docs/progguide/images/figureUML.png
index c4bf8db9a..d4de81f14 100644
--- a/docs/progguide/images/figureUML.png
+++ b/docs/progguide/images/figureUML.png
diff --git a/docs/progguide/images/overview.png b/docs/progguide/images/overview.png
index 7b1d6c8d6..f9395f887 100644
--- a/docs/progguide/images/overview.png
+++ b/docs/progguide/images/overview.png
diff --git a/docs/progguide/images/telecom.png b/docs/progguide/images/telecom.png
index 89a7207f3..66f998b77 100644
--- a/docs/progguide/images/telecom.png
+++ b/docs/progguide/images/telecom.png
diff --git a/docs/teaching/exercises/build.xml b/docs/teaching/exercises/build.xml
index cc12be52e..d35fd5e2a 100755
--- a/docs/teaching/exercises/build.xml
+++ b/docs/teaching/exercises/build.xml
@@ -1,4 +1,4 @@
-<!-- 
+<!--
 
 This build script will create a directory called burn that is
 _almost_ suitable for burning onto a CD.  However, there
@@ -49,7 +49,7 @@ and a clean AspectJ installer.
     <delete dir="${printdir}/exercises.pdf.contents" />
     <mkdir dir="${printdir}/exercises.pdf.contents" />
     <copy toDir="${printdir}/exercises.pdf.contents" file="index.html" />
-    <copy toDir="${printdir}/exercises.pdf.contents" file="figures_classes.gif" />
+    <copy toDir="${printdir}/exercises.pdf.contents" file="figures_classes.pdf" />
     <copy toDir="${printdir}/exercises.pdf.contents" file="${aj.home}/doc/quick.pdf" />
 
     <delete dir="${printdir}/install.pdf.contents" />
@@ -68,7 +68,7 @@ and a clean AspectJ installer.
   </target>
 
   <target name="event" depends="tools,exercises">
-    <filter token="aj.event" value="${aj.event}" /> 
+    <filter token="aj.event" value="${aj.event}" />
     <copy file="install.txt" toDir="${eventdir}" filtering="yes" />
   </target>
 
@@ -82,7 +82,7 @@ and a clean AspectJ installer.
 
   <target name="tools" depends="skeleton">
     <mkdir dir="${eventdir}/aspectj" />
-    <filter token="aj.event" value="${aj.event}" /> 
+    <filter token="aj.event" value="${aj.event}" />
 
     <copy toDir="${eventdir}/aspectj">
       <fileset dir="${aj.home}" excludes="bin/**" />
@@ -118,4 +118,3 @@ and a clean AspectJ installer.
   </target>
 
 </project>
-
diff --git a/docs/teaching/exercises/figures_classes.png b/docs/teaching/exercises/figures_classes.png
index 3440bbff8..0e3c65065 100644
--- a/docs/teaching/exercises/figures_classes.png
+++ b/docs/teaching/exercises/figures_classes.png
diff --git a/docs/teaching/exercises/index.html b/docs/teaching/exercises/index.html
index 85be67805..5212f6e42 100644
--- a/docs/teaching/exercises/index.html
+++ b/docs/teaching/exercises/index.html
@@ -684,6 +684,6 @@ an active user community for AspectJ at</p>
 
 </div>
 
-<img style="newpage" src="figures_classes.gif" height="900" alt="" />
+<img style="newpage" src="figures_classes.png" height="900" alt="" />
 
 </body> </html>