diff --git a/docs/bugs.html b/docs/bugs.html
index 90454c6f7..82e07d1ca 100644
--- a/docs/bugs.html
+++ b/docs/bugs.html
@@ -297,7 +297,9 @@
             If you have a patch to submit and are sending it to the
             <code>dev</code> mailing list,
             prefix "[PATCH]"
-            to your message subject. Please include any relevant bug numbers.
+            to your message subject (this is also a good idea for
+            a subject line in the bug database).
+            Please include any relevant bug numbers.
             Patch files should be created with the <code>-u</code>
             option of the
             <code>diff</code> or <code>svn diff</code> command. For
diff --git a/docs/external.html b/docs/external.html
index 352ad2f6f..2df9b3689 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -886,6 +886,55 @@
       valign="top" align="left">
           Apache Software License 2.0
       </td>
+      </tr>
+          </table>
+                                                          <h4 class="subsection">
+        <a name="AntXtras"></a>
+        AntXtras
+      </h4>
+                        <p>A collection of powerful Ant extensions components
+        organized into five categories: fixture-control,
+        execution-rules, flow-control, feedback, and helpers.</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.6.5
+      </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://antxtras.sourceforge.net/">AntXtras Home</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="http://antxtras.sourceforge.net">SSMC</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          License:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          GNU Lesser General Public License (LGPL 2.1)
+      </td>
       </tr>
           </table>
                                                           <h4 class="subsection">
@@ -3643,57 +3692,6 @@
       valign="top" align="left">
           Apache License 1.1.
       </td>
-      </tr>
-          </table>
-                                                          <h4 class="subsection">
-        <a name="AntXtras"></a>
-        AntXtras
-      </h4>
-                        <p>
-                A collection of powerful Ant extensions components organized into
-                five categories: fixture-control, execution-rules, flow-control,
-                feedback, and helpers.
-            </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.6.5
-      </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://antxtras.sourceforge.net/">AntXtras Home</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="http://antxtras.sourceforge.net">SSMC</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          License:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          GNU Lesser General Public License (LGPL 2.1)
-      </td>
       </tr>
           </table>
                                                           <h4 class="subsection">
diff --git a/xdocs/external.xml b/xdocs/external.xml
index c883f7ec3..88419a536 100644
--- a/xdocs/external.xml
+++ b/xdocs/external.xml
@@ -427,6 +427,32 @@
         </table>
       </subsection>
 
+      <subsection name="AntXtras">
+
+        <p>A collection of powerful Ant extensions components
+        organized into five categories: fixture-control,
+        execution-rules, flow-control, feedback, and helpers.</p>
+
+        <table class="externals">
+          <tr>
+            <th>Compatibility:</th>
+            <td>Ant 1.6.5</td>
+          </tr>
+          <tr>
+            <th>URL:</th>
+            <td><a href="http://antxtras.sourceforge.net/">AntXtras Home</a></td>
+          </tr>
+          <tr>
+            <th>Contact:</th>
+            <td><a href="http://antxtras.sourceforge.net">SSMC</a></td>
+          </tr>
+          <tr>
+            <th>License:</th>
+            <td>GNU Lesser General Public License (LGPL 2.1)</td>
+          </tr>
+        </table>
+      </subsection>
+
       <subsection name="Checkstyle">
 
         <p>Checkstyle is a development tool to help programmers write
@@ -1974,32 +2000,6 @@
         </table>
       </subsection>
 
-        <subsection name="AntXtras">
-            <p>
-                A collection of powerful Ant extensions components organized into
-                five categories: fixture-control, execution-rules, flow-control,
-                feedback, and helpers.
-            </p>
-            <table class="externals">
-                <tr>
-                    <th>Compatibility:</th>
-                    <td>Ant 1.6.5</td>
-                </tr>
-                <tr>
-                    <th>URL:</th>
-                    <td><a href="http://antxtras.sourceforge.net/">AntXtras Home</a></td>
-                </tr>
-                <tr>
-                    <th>Contact:</th>
-                    <td><a href="http://antxtras.sourceforge.net">SSMC</a></td>
-                </tr>
-                <tr>
-                    <th>License:</th>
-                    <td>GNU Lesser General Public License (LGPL 2.1)</td>
-                </tr>
-            </table>
-        </subsection>
-
       <subsection name="Kanaputs">
 
         <p>Kanaputs is a parser for java based scripting. It is an