diff --git a/docs/cvs.html b/docs/cvs.html
index 1135dd1cd..b206ad18a 100644
--- a/docs/cvs.html
+++ b/docs/cvs.html
@@ -211,6 +211,14 @@ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout [module-name]</p
                                 <p>Modules available for access are (click the links to view the
       CVS tree via ViewCVS):</p>
                                 <ul>
+<!--
+        <li><a href="http://cvs.apache.org/viewcvs/ant/">ant</a> - The
+        &quot;main&quot; Ant module.</li>
+
+        <li><a
+        href="http://cvs.apache.org/viewcvs/ant-antidote/">ant-antidote</a>
+        - Antidote, a GUI frontend to Ant.</li>
+-->
         <li><a href="http://cvs.apache.org/viewcvs/jakarta-ant/">jakarta-ant</a> -
         The "main" Ant module.</li>
 
diff --git a/docs/faq.html b/docs/faq.html
index 7e12dfccb..54455dd2f 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -451,6 +451,9 @@
         </td></tr>
       </table>
                   <p>The page you are looking it is generated from 
+<!--
+          <a href="http://cvs.apache.org/viewcvs.cgi/~checkout~/ant/xdocs/faq.xml">this</a>
+-->
           <a href="http://cvs.apache.org/viewcvs.cgi/~checkout~/jakarta-ant/xdocs/faq.xml">this</a>
           document.  If you want to add a new question, please submit
           a patch against this document to one of Ant's mailing lists;
@@ -476,6 +479,7 @@
                         <p>The Velocity stylesheets used to process the XML files can
         be found in the <code>xdocs/stylesheets</code> subdirectory of
         Ant's CVS repository - the build file
+<!--        <code>docs.xml</code> at the top level of the ant CVS -->
         <code>docs.xml</code> at the top level of the jakarta-ant CVS
         module is used to drive Anakia.</p>
                         <p>This file assumes that you have the
@@ -1708,7 +1712,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun
                   <p>This problem has been reported only hours after Ant 1.5 has
         been released, see <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10664">Bug
         10664</a> and all it's duplicates.</p>
-                        <p>A fixed version of the wrapper script can be found <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.5/errata/">here</a>.
+                        <p>A fixed version of the wrapper script can be found <a href="http://ant.apache.org/old-releases/v1.5/errata/">here</a>.
         Simply replace your script with this version.</p>
                   
                     </div>
diff --git a/docs/index.html b/docs/index.html
index 57e652f4a..718a33745 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -273,6 +273,9 @@ Comprehensive documentation is included in the source and binary distributions.
   </table>
                         <p>
     If you wish to use the latest Ant features, you can try downloading a nightly 
+<!--
+    build from <a href="http://cvs.apache.org/builds/ant/nightly/">here</a>
+-->
     build from <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">here</a>
     </p>
                       <br/>
diff --git a/docs/mail.html b/docs/mail.html
index da35a6847..602942fa0 100644
--- a/docs/mail.html
+++ b/docs/mail.html
@@ -221,6 +221,11 @@
       </table>
                         <p>
           <b>Medium Traffic</b> 
+<!--
+          <a href="mailto:user-subscribe@ant.apache.org">Subscribe</a>  
+          <a href="mailto:user-unsubscribe@ant.apache.org">Unsubscribe</a> 
+          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-user@jakarta.apache.org">Archive</a> 
+-->
           <a href="mailto:ant-user-subscribe@jakarta.apache.org">Subscribe</a>  
           <a href="mailto:ant-user-unsubscribe@jakarta.apache.org">Unsubscribe</a> 
           <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-user@jakarta.apache.org">Archive</a> 
@@ -239,6 +244,11 @@
       </table>
                         <p>
           <b>High Traffic</b> 
+<!--
+          <a href="mailto:dev-subscribe@ant.apache.org">Subscribe</a>  
+          <a href="mailto:dev-unsubscribe@ant.apache.org">Unsubscribe</a> 
+          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-dev@jakarta.apache.org">Archive</a> 
+-->
           <a href="mailto:ant-dev-subscribe@jakarta.apache.org">Subscribe</a>  
           <a href="mailto:ant-dev-unsubscribe@jakarta.apache.org">Unsubscribe</a> 
           <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-dev@jakarta.apache.org">Archive</a> 
diff --git a/docs/problems.html b/docs/problems.html
index ab9f8a350..7b6990867 100644
--- a/docs/problems.html
+++ b/docs/problems.html
@@ -349,6 +349,10 @@ D:\src\java\Unset.java<br />
             been fixed. The next step, therefore, may be to try a nightly build
             of Ant to see if the problem has been fixed. Nightly builds for Ant
             are available from the 
+<!--
+            <a href="http://cvs.apache.org/builds/ant/nightly/">
+            Ant web site</a>. While Ant nightly builds are typically quite
+-->
             <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">
             Ant web site</a>. While Ant nightly builds are typically quite
             stable and are used by
@@ -358,6 +362,10 @@ D:\src\java\Unset.java<br />
             do not build many of the optional tasks the come with Ant.
             A snapshot of these optional tasks is occasionally uploaded to
             the nightly download
+<!--
+            <a href="http://cvs.apache.org/builds/ant/nightly/optional/">
+            area</a>. However, even this snapshot does not contain every
+-->
             <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/optional/">
             area</a>. However, even this snapshot does not contain every
             optional task.
diff --git a/xdocs/bindownload.xml b/xdocs/bindownload.xml
index 63ffb1b5b..6530fb1ff 100644
--- a/xdocs/bindownload.xml
+++ b/xdocs/bindownload.xml
@@ -81,6 +81,11 @@ Other mirrors: <select name="Preferred">
 
 <section name="Nightly Builds">
 
+<!--
+<p>If you wish to use the latest Ant features, you can try downloading a
+<a href="http://cvs.apache.org/builds/ant/nightly/">nightly build</a>.
+</p>
+-->
 <p>If you wish to use the latest Ant features, you can try downloading a
 <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">nightly build</a>.
 </p>
diff --git a/xdocs/cvs.xml b/xdocs/cvs.xml
index b21b079c8..ee4c9ec41 100644
--- a/xdocs/cvs.xml
+++ b/xdocs/cvs.xml
@@ -24,6 +24,14 @@ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout [module-name]</s
       CVS tree via ViewCVS):</p>
 
       <ul>
+<!--
+        <li><a href="http://cvs.apache.org/viewcvs/ant/">ant</a> - The
+        &quot;main&quot; Ant module.</li>
+
+        <li><a
+        href="http://cvs.apache.org/viewcvs/ant-antidote/">ant-antidote</a>
+        - Antidote, a GUI frontend to Ant.</li>
+-->
         <li><a
         href="http://cvs.apache.org/viewcvs/jakarta-ant/">jakarta-ant</a> -
         The &quot;main&quot; Ant module.</li>
@@ -37,6 +45,9 @@ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout [module-name]</s
       href="http://jakarta.apache.org/site/cvsindex.html">Jakarta's
       CVS page</a> may hold many helpful hints.</p>
 
+<!--
+      <p>Nightly snapshots of the CVS tree are available at <a href="http://cvs.apache.org/snapshots/ant/">http://cvs.apache.org/snapshots/ant/</a>.</p>
+-->
       <p>Nightly snapshots of the CVS tree are available at <a href="http://cvs.apache.org/snapshots/jakarta-ant/">http://cvs.apache.org/snapshots/jakarta-ant/</a>.</p>
   </section>
   </body>
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index c4f6c98ac..7c107a943 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -20,6 +20,9 @@
       <question>How can I contribute to this FAQ?</question>
       <answer>
         <p>The page you are looking it is generated from 
+<!--
+          <a href="http://cvs.apache.org/viewcvs.cgi/~checkout~/ant/xdocs/faq.xml">this</a>
+-->
           <a href="http://cvs.apache.org/viewcvs.cgi/~checkout~/jakarta-ant/xdocs/faq.xml">this</a>
           document.  If you want to add a new question, please submit
           a patch against this document to one of Ant&apos;s mailing lists;
@@ -43,6 +46,7 @@
         <p>The Velocity stylesheets used to process the XML files can
         be found in the <code>xdocs/stylesheets</code> subdirectory of
         Ant&apos;s CVS repository - the build file
+<!--        <code>docs.xml</code> at the top level of the ant CVS -->
         <code>docs.xml</code> at the top level of the jakarta-ant CVS
         module is used to drive Anakia.</p>
 
@@ -208,6 +212,11 @@
           tool/task</li>
         </ul>
 
+<!--
+        <p>The preferred format for this information is a patch to <a
+        href="http://cvs.apache.org/viewcvs.cgi/~checkout~/ant/xdocs/external.xml">this</a>
+        document.</p>
+-->
         <p>The preferred format for this information is a patch to <a
         href="http://cvs.apache.org/viewcvs.cgi/~checkout~/jakarta-ant/xdocs/external.xml">this</a>
         document.</p>
@@ -840,6 +849,11 @@ while(<STDIN>) {
          ant -logger org.apache.tools.ant.listener.MailLogger
 ]]></source>
 
+<!--
+        <p>See the <a href="http://cvs.apache.org/viewcvs/~checkout~/ant/docs/manual/listeners.html?content-type=text/html">Listeners
+        &amp; Loggers</a> documentation for details on the properties
+        required.</p>
+-->
         <p>See the <a href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-ant/docs/manual/listeners.html?content-type=text/html">Listeners
         &amp; Loggers</a> documentation for details on the properties
         required.</p>
@@ -1202,7 +1216,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun
         10664</a> and all it's duplicates.</p>
 
         <p>A fixed version of the wrapper script can be found <a
-        href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.5/errata/">here</a>.
+        href="http://ant.apache.org/old-releases/v1.5/errata/">here</a>.
         Simply replace your script with this version.</p>
       </answer>
     </faq>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index a8a887ce5..a98f70895 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -86,6 +86,9 @@ Comprehensive documentation is included in the source and binary distributions.
   <section name="Nightly Builds">
     <p>
     If you wish to use the latest Ant features, you can try downloading a nightly 
+<!--
+    build from <a href="http://cvs.apache.org/builds/ant/nightly/">here</a>
+-->
     build from <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">here</a>
     </p>
     
diff --git a/xdocs/mail.xml b/xdocs/mail.xml
index 59bb04eaa..900daa6df 100644
--- a/xdocs/mail.xml
+++ b/xdocs/mail.xml
@@ -26,6 +26,11 @@
       <subsection name="User List">
         <p>
           <b>Medium Traffic</b> 
+<!--
+          <a href="mailto:user-subscribe@ant.apache.org">Subscribe</a>  
+          <a href="mailto:user-unsubscribe@ant.apache.org">Unsubscribe</a> 
+          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-user@jakarta.apache.org">Archive</a> 
+-->
           <a href="mailto:ant-user-subscribe@jakarta.apache.org">Subscribe</a>  
           <a href="mailto:ant-user-unsubscribe@jakarta.apache.org">Unsubscribe</a> 
           <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-user@jakarta.apache.org">Archive</a> 
@@ -39,6 +44,11 @@
       <subsection name="Developer List">
         <p>
           <b>High Traffic</b> 
+<!--
+          <a href="mailto:dev-subscribe@ant.apache.org">Subscribe</a>  
+          <a href="mailto:dev-unsubscribe@ant.apache.org">Unsubscribe</a> 
+          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-dev@jakarta.apache.org">Archive</a> 
+-->
           <a href="mailto:ant-dev-subscribe@jakarta.apache.org">Subscribe</a>  
           <a href="mailto:ant-dev-unsubscribe@jakarta.apache.org">Unsubscribe</a> 
           <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-dev@jakarta.apache.org">Archive</a> 
diff --git a/xdocs/problems.xml b/xdocs/problems.xml
index fe37facd2..61540a13d 100644
--- a/xdocs/problems.xml
+++ b/xdocs/problems.xml
@@ -130,6 +130,10 @@ D:\src\java\Unset.java<br></br>
             been fixed. The next step, therefore, may be to try a nightly build
             of Ant to see if the problem has been fixed. Nightly builds for Ant
             are available from the 
+<!--
+            <a href="http://cvs.apache.org/builds/ant/nightly/">
+            Ant web site</a>. While Ant nightly builds are typically quite
+-->
             <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">
             Ant web site</a>. While Ant nightly builds are typically quite
             stable and are used by
@@ -139,6 +143,10 @@ D:\src\java\Unset.java<br></br>
             do not build many of the optional tasks the come with Ant.
             A snapshot of these optional tasks is occasionally uploaded to
             the nightly download
+<!--
+            <a href="http://cvs.apache.org/builds/ant/nightly/optional/">
+            area</a>. However, even this snapshot does not contain every
+-->
             <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/optional/">
             area</a>. However, even this snapshot does not contain every
             optional task.
diff --git a/xdocs/srcdownload.xml b/xdocs/srcdownload.xml
index a5b9a1d91..2bda1fc91 100644
--- a/xdocs/srcdownload.xml
+++ b/xdocs/srcdownload.xml
@@ -77,6 +77,11 @@ Other mirrors: <select name="Preferred">
 
 <section name="Nightly Builds">
 
+<!--
+<p>If you wish to use the latest Ant features, you can try downloading a
+<a href="http://cvs.apache.org/builds/ant/nightly/">nightly build</a>.
+</p>
+-->
 <p>If you wish to use the latest Ant features, you can try downloading a
 <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">nightly build</a>.
 </p>