diff --git a/docs/contributors.html b/docs/contributors.html
index bf6f8ad00..c0b3ab30e 100644
--- a/docs/contributors.html
+++ b/docs/contributors.html
@@ -207,9 +207,6 @@ symposiums</a> as well as other venues.  Erik is the President of
 <a href="http://www.ehatchersolutions.com">eHatcher Solutions, Inc</a>.
 </p>
                                 <p>
-                <b>Diane Holt</b><br />
-            </p>
-                                <p>
                 <b>Donald Leslie</b><br />
             </p>
                                 <p>
@@ -270,6 +267,9 @@ was one of the rabble-rousers within Sun that helped make the Jakarta
 Project a reality and served as the first Chairman of the Jakarta PMC.
 </p>
                                 <p>
+                <b>Diane Holt</b><br />
+            </p>
+                                <p>
                 <b>Jon Skeet</b><br />
             </p>
                                       <h3 class="section">
diff --git a/docs/external.html b/docs/external.html
index 8a44299d9..0cee84ca8 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -284,6 +284,60 @@
       valign="top" align="left">
           Apache Software License
       </td>
+      </tr>
+        </table>
+                                                    <h4 class="subsection">
+        <a name="AntDoc"></a>
+        AntDoc
+      </h4>
+                        <p>AntDoc is a tool that generates HTML documentation from Ant
+        buildfiles; the generated HTML is inspired from what javadoc
+        yields.  AntDocGUI offers a simple Ant target launcher named
+        AntDoc GUI. Ant targets may be launched from the generated
+        AntDoc HTML pages. Integration to various IDEs is in
+        progress.</p>
+                                <p>AntDoc can be run via an Ant task, AntDoc GUI can be run
+        via an Ant task, or via a JVM launch.</p>
+                                      <table class="ForrestTable" cellspacing="1" cellpadding="4">
+              <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Compatibility:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Ant 1.4.1 and higher
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          URL:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="http://antdoc.free.fr/">http://antdoc.free.fr/</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Contact:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Edouard Mercier
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          License:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          The Apache Software License
+      </td>
       </tr>
         </table>
                                                     <h4 class="subsection">
@@ -2101,6 +2155,45 @@
       valign="top" align="left">
           GNU General Public License (GPL)
       </td>
+      </tr>
+        </table>
+                                                    <h4 class="subsection">
+        <a name="JindentTask"></a>
+        JindentTask
+      </h4>
+                        <p>JindentTask is a very straightforward wrapping of the
+        Jindent tool, a vendor code beautifier. It enables to use
+        Jindent natively from Ant.</p>
+                                      <table class="externals" cellspacing="1" cellpadding="4">
+              <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Compatibility:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Ant 1.4.1 and higher
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          URL:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="http://the.edouard.mercier.free.fr/Jindent_content.php">http://the.edouard.mercier.free.fr/Jindent_content.php</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Contact:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Edouard Mercier
+      </td>
       </tr>
         </table>
                                                     <h4 class="subsection">
diff --git a/docs/projects.html b/docs/projects.html
index 8ee820da9..b4c450c55 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -278,59 +278,6 @@
       valign="top" align="left">
           Apache Software Foundation license
       </td>
-      </tr>
-        </table>
-                                                    <h4 class="subsection">
-        <a name="AntDoc"></a>
-        AntDoc
-      </h4>
-                        <p>AntDoc is a tool that generates HTML documentation from Ant
-        buildfiles; the generated HTML is inspired from what javadoc
-        yields. It also offers a simple Ant target launcher named
-        AntDoc GUI. Ant targets may be launched from the generated
-        AntDoc HTML pages.</p>
-                                <p>AntDoc can be run via an Ant task, AntDoc GUI can be run
-        via an Ant task, or via a JVM launch.</p>
-                                      <table class="ForrestTable" cellspacing="1" cellpadding="4">
-              <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Compatibility:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          Ant 1.4.1 and higher
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          URL:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          <a href="http://antdoc.free.fr/">http://antdoc.free.fr/</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Contact:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          <a href="mailto:antdoc@noos.fr">Edouard Mercier</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          License:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          The Apache Software License
-      </td>
       </tr>
         </table>
                                                     <h4 class="subsection">
diff --git a/xdocs/contributors.xml b/xdocs/contributors.xml
index 1cc8be020..4facac2f2 100644
--- a/xdocs/contributors.xml
+++ b/xdocs/contributors.xml
@@ -41,10 +41,6 @@ symposiums</a> as well as other venues.  Erik is the President of
 <a href="http://www.ehatchersolutions.com">eHatcher Solutions, Inc</a>.
 </p>
 
-            <p>
-                <b>Diane Holt</b><br/>
-            </p>
-
             <p>
                 <b>Donald Leslie</b><br/>
             </p>
@@ -112,6 +108,10 @@ was one of the rabble-rousers within Sun that helped make the Jakarta
 Project a reality and served as the first Chairman of the Jakarta PMC.
 </p>
 
+            <p>
+                <b>Diane Holt</b><br/>
+            </p>
+
             <p>
                 <b>Jon Skeet</b><br/>
             </p>
diff --git a/xdocs/external.xml b/xdocs/external.xml
index d07205ea3..f62093be8 100644
--- a/xdocs/external.xml
+++ b/xdocs/external.xml
@@ -77,6 +77,38 @@
         </table>
       </subsection>
 
+      <subsection name="AntDoc">
+
+        <p>AntDoc is a tool that generates HTML documentation from Ant
+        buildfiles; the generated HTML is inspired from what javadoc
+        yields.  AntDocGUI offers a simple Ant target launcher named
+        AntDoc GUI. Ant targets may be launched from the generated
+        AntDoc HTML pages. Integration to various IDEs is in
+        progress.</p>
+
+        <p>AntDoc can be run via an Ant task, AntDoc GUI can be run
+        via an Ant task, or via a JVM launch.</p>
+
+        <table>
+          <tr>
+            <th>Compatibility:</th>
+            <td>Ant 1.4.1 and higher</td>
+          </tr>
+          <tr>
+            <th>URL:</th>
+            <td><a href="http://antdoc.free.fr/">http://antdoc.free.fr/</a></td>
+          </tr>
+          <tr>
+            <th>Contact:</th>
+            <td>Edouard Mercier</td>
+          </tr>
+          <tr>
+            <th>License:</th>
+            <td>The Apache Software License</td>
+          </tr>
+        </table>
+      </subsection>
+
       <subsection name="Anteater">
 
         <p>Anteater is a set of Ant tasks for the functional testing of websites
@@ -1082,6 +1114,28 @@
         </table>
       </subsection>
 
+      <subsection name="JindentTask">
+
+        <p>JindentTask is a very straightforward wrapping of the
+        Jindent tool, a vendor code beautifier. It enables to use
+        Jindent natively from Ant.</p>
+
+        <table class="externals">
+          <tr>
+            <th>Compatibility:</th>
+            <td>Ant 1.4.1 and higher</td>
+          </tr>
+          <tr>
+            <th>URL:</th>
+            <td><a href="http://the.edouard.mercier.free.fr/Jindent_content.php">http://the.edouard.mercier.free.fr/Jindent_content.php</a></td>
+          </tr>
+          <tr>
+            <th>Contact:</th>
+            <td>Edouard Mercier</td>
+          </tr>
+        </table>
+      </subsection>
+
       <subsection name="Jing Task">
 
         <p> Validates XML files against the RELAX NG alternative to XML Schema.
diff --git a/xdocs/projects.xml b/xdocs/projects.xml
index 75f222db3..a8107ed85 100644
--- a/xdocs/projects.xml
+++ b/xdocs/projects.xml
@@ -69,37 +69,6 @@
         </table>
       </subsection>
 
-      <subsection name="AntDoc">
-
-        <p>AntDoc is a tool that generates HTML documentation from Ant
-        buildfiles; the generated HTML is inspired from what javadoc
-        yields. It also offers a simple Ant target launcher named
-        AntDoc GUI. Ant targets may be launched from the generated
-        AntDoc HTML pages.</p>
-
-        <p>AntDoc can be run via an Ant task, AntDoc GUI can be run
-        via an Ant task, or via a JVM launch.</p>
-
-        <table>
-          <tr>
-            <th>Compatibility:</th>
-            <td>Ant 1.4.1 and higher</td>
-          </tr>
-          <tr>
-            <th>URL:</th>
-            <td><a href="http://antdoc.free.fr/">http://antdoc.free.fr/</a></td>
-          </tr>
-          <tr>
-            <th>Contact:</th>
-            <td><a href="mailto:antdoc@noos.fr">Edouard Mercier</a></td>
-          </tr>
-          <tr>
-            <th>License:</th>
-            <td>The Apache Software License</td>
-          </tr>
-        </table>
-      </subsection>
-
       <subsection name="Antelope">
 
         <p>A GUI for running Ant and editing build files, can run as