diff --git a/docs/antlibs/bindownload.html b/docs/antlibs/bindownload.html
index 4d3bec252..c68973b20 100644
--- a/docs/antlibs/bindownload.html
+++ b/docs/antlibs/bindownload.html
@@ -52,17 +52,17 @@
                   <div class="tab">
               <table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                                  <td width="8"><img alt="" height="5" width="8" src="../images/spacer.gif"></td><td valign="bottom">
-                      <table summary="selected tab" style="height: 1.5em" border="0" cellpadding="0" cellspacing="0">
+                                  <td width="5"><img alt="" height="8" width="8" src="../images/spacer.gif"></td><td valign="bottom">
+                      <table summary="non selected tab" style="height: 1.4em" border="0" cellpadding="0" cellspacing="0">
                         <tr>
-                        <td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b>Home</b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../images/tabSel-right.gif"></td>
+                          <td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a href="../index.html"><font size="2" face="Arial, Helvetica, Sans-serif">Home</font></a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../images/tab-right.gif"></td>
                         </tr>
                       </table>
                     </td>
-                                    <td width="5"><img alt="" height="8" width="8" src="../images/spacer.gif"></td><td valign="bottom">
-                      <table summary="non selected tab" style="height: 1.4em" border="0" cellpadding="0" cellspacing="0">
+                                    <td width="8"><img alt="" height="5" width="8" src="../images/spacer.gif"></td><td valign="bottom">
+                      <table summary="selected tab" style="height: 1.5em" border="0" cellpadding="0" cellspacing="0">
                         <tr>
-                          <td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a href="../projects/index.html"><font size="2" face="Arial, Helvetica, Sans-serif">Projects</font></a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../images/tab-right.gif"></td>
+                        <td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b>Projects</b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../images/tabSel-right.gif"></td>
                         </tr>
                       </table>
                     </td>
@@ -71,88 +71,31 @@
             </div>
 
       <div class="bluebar"></div>
-                    
+                                                              
   <div class="menucontainer">
 
     <div class="menu">
       <ul>
-              <li class="menuheader">Apache Ant
-          <ul>
-                            <li>
-                                    <a href="../index.html">Welcome</a>
-                                </li>
-                            <li>
-                                    <a href="../license.html">License</a>
-                                </li>
-                            <li>
-                                    <a href="../antnews.html">News</a>
-                                </li>
-                      </ul>
-        </li>
-              <li class="menuheader">Documentation
-          <ul>
-                            <li>
-                                    <a href="../manual/index.html">Manual</a>
-                                </li>
-                            <li>
-                                    <a href="../projects.html">Related Projects</a>
-                                </li>
-                            <li>
-                                    <a href="../external.html">External Tools and Tasks</a>
-                                </li>
-                            <li>
-                                    <a href="../resources.html">Resources</a>
-                                </li>
-                            <li>
-                                    <a href="../faq.html">Frequently Asked Questions</a>
-                                </li>
-                            <li>
-                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
-                                </li>
-                            <li>
-                                    <a href="../problems.html">Having Problems?</a>
-                                </li>
-                      </ul>
-        </li>
-              <li class="menuheader">Download
+              <li class="menuheader">Projects
           <ul>
                             <li>
-                              <span class="sel">Binary Distributions</span>
-                              </li>
-                            <li>
-                                    <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
-                                </li>
-                      </ul>
-        </li>
-              <li class="menuheader">Contributing
-          <ul>
-                            <li>
-                                    <a href="../mail.html">Mailing Lists</a>
-                                </li>
-                            <li>
-                                    <a href="../svn.html">Subversion Repositories</a>
-                                </li>
-                            <li>
-                                    <a href="../bugs.html">Bug Database</a>
-                                </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
+                                    <a href="../projects/index.html">Welcome</a>
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">Project Management
+              <li class="menuheader">Ant Libraries
           <ul>
                             <li>
-                                    <a href="../contributors.html">Contributors</a>
+                                    <a href="../antlibs/index.html">Introduction</a>
                                 </li>
                             <li>
-                                    <a href="../mission.html">Apache Ant Mission</a>
+                                    <a href="../antlibs/charter.html">Charter</a>
                                 </li>
                             <li>
-                                    <a href="../bylaws.html">Project Bylaws</a>
+                                    <a href="../antlibs/proper.html">Ant Libraries</a>
                                 </li>
                             <li>
-                                    <a href="../legal.html">Legal</a>
+                                    <a href="../antlibs/sandbox.html">Sandbox Ant Libraries</a>
                                 </li>
                       </ul>
         </li>
diff --git a/docs/antlibs/srcdownload.html b/docs/antlibs/srcdownload.html
index 31370a211..7973814fe 100644
--- a/docs/antlibs/srcdownload.html
+++ b/docs/antlibs/srcdownload.html
@@ -52,17 +52,17 @@
                   <div class="tab">
               <table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                                  <td width="8"><img alt="" height="5" width="8" src="../images/spacer.gif"></td><td valign="bottom">
-                      <table summary="selected tab" style="height: 1.5em" border="0" cellpadding="0" cellspacing="0">
+                                  <td width="5"><img alt="" height="8" width="8" src="../images/spacer.gif"></td><td valign="bottom">
+                      <table summary="non selected tab" style="height: 1.4em" border="0" cellpadding="0" cellspacing="0">
                         <tr>
-                        <td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b>Home</b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../images/tabSel-right.gif"></td>
+                          <td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a href="../index.html"><font size="2" face="Arial, Helvetica, Sans-serif">Home</font></a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../images/tab-right.gif"></td>
                         </tr>
                       </table>
                     </td>
-                                    <td width="5"><img alt="" height="8" width="8" src="../images/spacer.gif"></td><td valign="bottom">
-                      <table summary="non selected tab" style="height: 1.4em" border="0" cellpadding="0" cellspacing="0">
+                                    <td width="8"><img alt="" height="5" width="8" src="../images/spacer.gif"></td><td valign="bottom">
+                      <table summary="selected tab" style="height: 1.5em" border="0" cellpadding="0" cellspacing="0">
                         <tr>
-                          <td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a href="../projects/index.html"><font size="2" face="Arial, Helvetica, Sans-serif">Projects</font></a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../images/tab-right.gif"></td>
+                        <td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b>Projects</b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../images/tabSel-right.gif"></td>
                         </tr>
                       </table>
                     </td>
@@ -71,88 +71,31 @@
             </div>
 
       <div class="bluebar"></div>
-                    
+                                                              
   <div class="menucontainer">
 
     <div class="menu">
       <ul>
-              <li class="menuheader">Apache Ant
-          <ul>
-                            <li>
-                                    <a href="../index.html">Welcome</a>
-                                </li>
-                            <li>
-                                    <a href="../license.html">License</a>
-                                </li>
-                            <li>
-                                    <a href="../antnews.html">News</a>
-                                </li>
-                      </ul>
-        </li>
-              <li class="menuheader">Documentation
-          <ul>
-                            <li>
-                                    <a href="../manual/index.html">Manual</a>
-                                </li>
-                            <li>
-                                    <a href="../projects.html">Related Projects</a>
-                                </li>
-                            <li>
-                                    <a href="../external.html">External Tools and Tasks</a>
-                                </li>
-                            <li>
-                                    <a href="../resources.html">Resources</a>
-                                </li>
-                            <li>
-                                    <a href="../faq.html">Frequently Asked Questions</a>
-                                </li>
-                            <li>
-                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
-                                </li>
-                            <li>
-                                    <a href="../problems.html">Having Problems?</a>
-                                </li>
-                      </ul>
-        </li>
-              <li class="menuheader">Download
+              <li class="menuheader">Projects
           <ul>
                             <li>
-                                    <a href="http://ant.apache.org/bindownload.cgi">Binary Distributions</a>
-                                </li>
-                            <li>
-                              <span class="sel">Source Distributions</span>
-                              </li>
-                      </ul>
-        </li>
-              <li class="menuheader">Contributing
-          <ul>
-                            <li>
-                                    <a href="../mail.html">Mailing Lists</a>
-                                </li>
-                            <li>
-                                    <a href="../svn.html">Subversion Repositories</a>
-                                </li>
-                            <li>
-                                    <a href="../bugs.html">Bug Database</a>
-                                </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
+                                    <a href="../projects/index.html">Welcome</a>
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">Project Management
+              <li class="menuheader">Ant Libraries
           <ul>
                             <li>
-                                    <a href="../contributors.html">Contributors</a>
+                                    <a href="../antlibs/index.html">Introduction</a>
                                 </li>
                             <li>
-                                    <a href="../mission.html">Apache Ant Mission</a>
+                                    <a href="../antlibs/charter.html">Charter</a>
                                 </li>
                             <li>
-                                    <a href="../bylaws.html">Project Bylaws</a>
+                                    <a href="../antlibs/proper.html">Ant Libraries</a>
                                 </li>
                             <li>
-                                    <a href="../legal.html">Legal</a>
+                                    <a href="../antlibs/sandbox.html">Sandbox Ant Libraries</a>
                                 </li>
                       </ul>
         </li>
diff --git a/xdocs/antlibs/bindownload.xml b/xdocs/antlibs/bindownload.xml
index fac20e333..acba0efc1 100644
--- a/xdocs/antlibs/bindownload.xml
+++ b/xdocs/antlibs/bindownload.xml
@@ -16,7 +16,7 @@
 
   <properties>
     <title>Binary Distributions</title>
-    <base/>
+    <index value="1"/>
   </properties>
 
 <body>
diff --git a/xdocs/antlibs/srcdownload.xml b/xdocs/antlibs/srcdownload.xml
index d0c3b27e9..4db4e3e71 100644
--- a/xdocs/antlibs/srcdownload.xml
+++ b/xdocs/antlibs/srcdownload.xml
@@ -16,7 +16,7 @@
 
   <properties>
     <title>Source Distributions</title>
-    <base/>
+    <index value="1"/>
   </properties>
 
 <body>