diff --git a/docs/antlibs/charter.html b/docs/antlibs/charter.html
index 0dbd21612..92aeecf5a 100644
--- a/docs/antlibs/charter.html
+++ b/docs/antlibs/charter.html
@@ -74,9 +74,9 @@
                                                               
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/antlibs/index.html b/docs/antlibs/index.html
index 5347d898d..3f8650715 100644
--- a/docs/antlibs/index.html
+++ b/docs/antlibs/index.html
@@ -74,9 +74,9 @@
                                                               
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/antlibs/proper.html b/docs/antlibs/proper.html
index 8f247b9db..6253fb656 100644
--- a/docs/antlibs/proper.html
+++ b/docs/antlibs/proper.html
@@ -74,9 +74,9 @@
                                                               
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/antlibs/sandbox.html b/docs/antlibs/sandbox.html
index a2b9fda3a..b78398d73 100644
--- a/docs/antlibs/sandbox.html
+++ b/docs/antlibs/sandbox.html
@@ -74,9 +74,9 @@
                                                               
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/antnews.html b/docs/antnews.html
index c5f0ee0bc..47bf7484e 100644
--- a/docs/antnews.html
+++ b/docs/antnews.html
@@ -82,9 +82,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/bindownload.html b/docs/bindownload.html
index cf8e5e1f2..ca7dad8f6 100644
--- a/docs/bindownload.html
+++ b/docs/bindownload.html
@@ -74,9 +74,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/bylaws.html b/docs/bylaws.html
index 598cb3299..41fc35066 100644
--- a/docs/bylaws.html
+++ b/docs/bylaws.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
@@ -360,7 +360,7 @@
               <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>+1</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -374,7 +374,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>+0</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -388,7 +388,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>-0</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -402,7 +402,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>-1</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -441,7 +441,7 @@
               <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>Consensus</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -456,7 +456,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>Lazy Consensus</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -468,7 +468,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>Lazy Majority</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -481,7 +481,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>Lazy Approval</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -495,7 +495,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>2/3 Majority</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -557,7 +557,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>Code Change</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -583,7 +583,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>Release Plan</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -608,7 +608,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>Product Release</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -634,7 +634,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>Adoption of New Codebase</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -667,7 +667,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>New Committer</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -691,7 +691,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>New PMC Member</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -715,7 +715,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>Committer Removal</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
@@ -742,7 +742,7 @@
                   <tr>
                       <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <strong>PMC Member Removal</strong>
       </td>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
diff --git a/docs/contributors.html b/docs/contributors.html
index 98d51635b..65b503ff6 100644
--- a/docs/contributors.html
+++ b/docs/contributors.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/external.html b/docs/external.html
index 9ef8992b9..0a594e8d3 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
@@ -219,7 +219,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.eclipse.org/aspectj/">http://www.eclipse.org/aspectj/</a>
       </td>
       </tr>
                   <tr>
@@ -229,7 +229,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.eclipse.org/aspectj/">project mailing lists</a>
       </td>
       </tr>
                   <tr>
@@ -267,7 +267,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jakarta.apache.org/velocity/anakia.html">http://jakarta.apache.org/velocity/anakia.html</a>
       </td>
       </tr>
                   <tr>
@@ -277,7 +277,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jakarta.apache.org/site/mail2.html">Velocity mailing lists</a>
       </td>
       </tr>
                   <tr>
@@ -316,7 +316,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://andariel.uworks.net/">http://andariel.uworks.net/</a>
       </td>
       </tr>
                   <tr>
@@ -367,7 +367,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.spiritedsw.com/ant2svg/">http://www.spiritedsw.com/ant2svg/</a>
       </td>
       </tr>
                   <tr>
@@ -419,7 +419,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://ant4eclipse.sf.net">http://ant4eclipse.sf.net</a>
       </td>
       </tr>
                   <tr>
@@ -475,7 +475,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antdoc.free.fr/">http://antdoc.free.fr/</a>
       </td>
       </tr>
                   <tr>
@@ -528,7 +528,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://aft.sourceforge.net/">http://aft.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -538,7 +538,8 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://lists.sourceforge.net/lists/listinfo/aft-devel">developer
+                mailing list</a>
       </td>
       </tr>
                   <tr>
@@ -576,7 +577,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antforms.sourceforge.net/">http://antforms.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -586,7 +587,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:rene_ghosh@yahoo.com">René Ghosh</a>
       </td>
       </tr>
                   <tr>
@@ -623,7 +624,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.russet.org.uk/antmerge.html">http://www.russet.org.uk/antmerge.html</a>
       </td>
       </tr>
                   <tr>
@@ -633,7 +634,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:antmerge@russet.org.uk">Phillip Lord</a>
       </td>
       </tr>
                   <tr>
@@ -678,7 +679,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antprettybuild.free.fr/">http://antprettybuild.free.fr/</a>
       </td>
       </tr>
                   <tr>
@@ -688,7 +689,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antprettybuild.free.fr/">Charbel BITAR (Project's Contact Page)</a>
       </td>
       </tr>
                   <tr>
@@ -791,7 +792,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:mario@jeckle.de">mario@jeckle.de</a>
       </td>
       </tr>
                   <tr>
@@ -830,7 +831,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://ant-jnlp-war.sourceforge.net/">http://ant-jnlp-war.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -872,7 +873,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://checkstyle.sourceforge.net/">http://checkstyle.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -882,7 +883,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:checkstyle@puppycrawl.com">Oliver Burn</a>
       </td>
       </tr>
                   <tr>
@@ -973,7 +974,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.cleanimports.tombrus.nl">http://www.cleanimports.tombrus.nl</a>
       </td>
       </tr>
                   <tr>
@@ -983,7 +984,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:cleanimports@tombrus.nl">Tom Brus</a>
       </td>
       </tr>
                   <tr>
@@ -1023,7 +1024,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.cenqua.com/clover/">http://www.cenqua.com/clover/</a>
       </td>
       </tr>
                   <tr>
@@ -1033,7 +1034,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:clover-support@cenqua.com">clover-support@cenqua.com</a>
       </td>
       </tr>
                   <tr>
@@ -1073,7 +1074,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://cmsdeploy.sourceforge.net">http://cmsdeploy.sourceforge.net</a>
       </td>
       </tr>
                   <tr>
@@ -1083,7 +1084,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:masogato@users.sourceforge.net">masogato@users.sourceforge.net</a>
       </td>
       </tr>
                   <tr>
@@ -1127,7 +1128,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://cocoon.apache.org/2.1/">http://cocoon.apache.org/2.1/</a>
       </td>
       </tr>
                   <tr>
@@ -1137,7 +1138,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://cocoon.apache.org/2.1/userdocs/offiline/ant.html">http://cocoon.apache.org/2.1/userdocs/offline/ant.html</a>
       </td>
       </tr>
                   <tr>
@@ -1147,7 +1148,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:users.at.cocoon.apache.org">users at cocoon.apache.org</a>
       </td>
       </tr>
                   <tr>
@@ -1190,7 +1191,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.dsdelft.nl/~lemval/ant/">http://www.dsdelft.nl/~lemval/ant/</a>
       </td>
       </tr>
                   <tr>
@@ -1200,7 +1201,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:lemval@dsdelft.nl">M.J.P. van Leeuwen</a>
       </td>
       </tr>
                   <tr>
@@ -1242,7 +1243,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://cvsgrab.sourceforge.net/">http://cvsgrab.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1252,7 +1253,8 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:cvsgrab-users@lists.sourceforge.net">CVSGrab
+            user mailing list</a>
       </td>
       </tr>
                   <tr>
@@ -1292,7 +1294,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.httpunit.org/doc/dependencies.html">http://www.httpunit.org/doc/dependencies.html</a>
       </td>
       </tr>
                   <tr>
@@ -1302,7 +1304,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:russgold@httpunit.org">Russell Gold</a>
       </td>
       </tr>
                   <tr>
@@ -1348,7 +1350,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://depfind.sourceforge.net/">http://depfind.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1358,7 +1360,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:jeantessier@users.sourceforge.net">Jean Tessier</a>
       </td>
       </tr>
                   <tr>
@@ -1396,7 +1398,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.bgw.org/projects/java/ant/">http://www.bgw.org/projects/java/ant/</a>
       </td>
       </tr>
                   <tr>
@@ -1406,7 +1408,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:mortis@voicenet.com">Kyle R. Burton</a>
       </td>
       </tr>
                   <tr>
@@ -1439,7 +1441,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://ant-doxygen.sourceforge.net/">http://ant-doxygen.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1449,7 +1451,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:akkumar@users.sourceforge.net">Karthik A Kumar</a>
       </td>
       </tr>
                   <tr>
@@ -1487,7 +1489,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://dtddoc.sourceforge.net/">http://dtddoc.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1497,7 +1499,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/mail/?group_id=53704">Project Mailing List</a>
       </td>
       </tr>
                   <tr>
@@ -1538,7 +1540,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://emma.sourceforge.net/">http://emma.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1548,7 +1550,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:emma-users@lists.sourceforge.net">Mailinglist</a>
       </td>
       </tr>
                   <tr>
@@ -1593,7 +1595,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://fmpp.sourceforge.net/">http://fmpp.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1630,7 +1632,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://genjar.sourceforge.net/">http://genjar.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1640,7 +1642,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:jesse_dev@yahoo.com">Jesse Stockall</a>
       </td>
       </tr>
                   <tr>
@@ -1681,7 +1683,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.ggtools.net/grand/">http://www.ggtools.net/grand/</a>
       </td>
       </tr>
                   <tr>
@@ -1734,7 +1736,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://greebo.sourceforge.net/">http://greebo.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1744,7 +1746,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/mail/?group_id=73733">project mailing lists</a>
       </td>
       </tr>
                   <tr>
@@ -1786,7 +1788,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://groboutils.sourceforge.net/codecoverage/">http://groboutils.sourceforge.net/codecoverage/</a>
       </td>
       </tr>
                   <tr>
@@ -1796,7 +1798,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/mail/?group_id=22594">project mailing lists</a>
       </td>
       </tr>
                   <tr>
@@ -1836,7 +1838,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.hammurapi.org">http://www.hammurapi.org</a>
       </td>
       </tr>
                   <tr>
@@ -1846,7 +1848,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.hammurapi.org/content/menu.show@id=Hammurapi.4.html">Project's Contact Page</a>
       </td>
       </tr>
                   <tr>
@@ -1895,7 +1897,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://grasia.fdi.ucm.es/~luismi/idldepend/">http://grasia.fdi.ucm.es/~luismi/idldepend/</a>
       </td>
       </tr>
                   <tr>
@@ -1905,7 +1907,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:luismpena@gmx.net">luismpena@gmx.net</a>
       </td>
       </tr>
                   <tr>
@@ -1957,7 +1959,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.mullassery.com/software/ANT/">http://www.mullassery.com/software/ANT/</a>
       </td>
       </tr>
                   <tr>
@@ -1989,7 +1991,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.mullassery.com">Abey Mullassery</a>
       </td>
       </tr>
                   <tr>
@@ -2026,7 +2028,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://importscrubber.sourceforge.net/">http://importscrubber.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -2036,7 +2038,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:tomcopeland@users.sourceforge.net">Tom Copeland</a>
       </td>
       </tr>
                   <tr>
@@ -2074,7 +2076,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://imtask.sourceforge.net/">http://imtask.sourceforge.net</a>
       </td>
       </tr>
                   <tr>
@@ -2084,7 +2086,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:djallstar@users.sourceforge.net">Jon Madison</a>
       </td>
       </tr>
                   <tr>
@@ -2122,7 +2124,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://incanto.sourceforge.net/">http://incanto.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -2132,7 +2134,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:alexrk@users.sourceforge.net">Alexander Karnstedt</a>
       </td>
       </tr>
                   <tr>
@@ -2171,7 +2173,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.kasisoft.de/build/ant/interactive/">http://www.kasisoft.de/build/ant/interactive/</a>
       </td>
       </tr>
                   <tr>
@@ -2181,7 +2183,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:support@kasisoft.de">Daniel Kasmeroglu</a>
       </td>
       </tr>
                   <tr>
@@ -2220,7 +2222,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://isvalidator.sourceforge.net/en/isDirValidator.htm">http://isvalidator.sourceforge.net/en/isDirValidator.htm</a>
       </td>
       </tr>
                   <tr>
@@ -2230,7 +2232,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:news@inigoserrano.com">Iñigo Serrano</a>
       </td>
       </tr>
                   <tr>
@@ -2270,7 +2272,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://ivy.jayasoft.org/">http://ivy.jayasoft.org/</a>
       </td>
       </tr>
                   <tr>
@@ -2333,7 +2335,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antenna.sourceforge.net/">http://antenna.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -2343,7 +2345,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:joerg@pleumann.de">Jörg Pleumann</a>
       </td>
       </tr>
                   <tr>
@@ -2397,7 +2399,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:support@smartkey.co.uk">smartkey.co.uk</a>
       </td>
       </tr>
                   <tr>
@@ -2434,7 +2436,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.dribin.org/dave/j2me_ant/">http://www.dribin.org/dave/j2me_ant/</a>
       </td>
       </tr>
                   <tr>
@@ -2444,7 +2446,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:drib@enteract.com">Dave Dribin</a>
       </td>
       </tr>
                   <tr>
@@ -2493,7 +2495,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.j2mepolish.org/">http://www.j2mepolish.org/</a>
       </td>
       </tr>
                   <tr>
@@ -2503,7 +2505,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:j2mepolish@enough.de">Enough Software</a>
       </td>
       </tr>
                   <tr>
@@ -2541,7 +2543,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.stampysoft.com/ant/">http://www.stampysoft.com/ant/</a>
       </td>
       </tr>
                   <tr>
@@ -2551,7 +2553,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:jeckels@stampysoft.com">Josh Eckels</a>
       </td>
       </tr>
                   <tr>
@@ -2591,7 +2593,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jacson.sourceforge.net/">http://jacson.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -2601,7 +2603,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:jacson-user@lists.sourceforge.de">jacson-user@lists.sourceforge.de</a>
       </td>
       </tr>
                   <tr>
@@ -2639,7 +2641,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jalopy.sourceforge.net/">http://jalopy.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -2649,7 +2651,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jalopy.sf.net/contact.html">http://jalopy.sf.net/contact.html</a>
       </td>
       </tr>
                   <tr>
@@ -2692,7 +2694,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.loomcom.com/jarbundler/">http://www.loomcom.com/jarbundler/</a>
       </td>
       </tr>
                   <tr>
@@ -2702,7 +2704,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:sethm@loomcom.com">Seth Morabito</a>
       </td>
       </tr>
                   <tr>
@@ -2744,7 +2746,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://perso.club-internet.fr/sjobic/ant/">http://perso.club-internet.fr/sjobic/ant/</a>
       </td>
       </tr>
                   <tr>
@@ -2754,7 +2756,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:norbert.barbosa@laposte.net">Norbert Barbosa</a>
       </td>
       </tr>
                   <tr>
@@ -2815,7 +2817,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://virtualschool.edu/java+/">http://virtualschool.edu/java+/</a>
       </td>
       </tr>
                   <tr>
@@ -2825,7 +2827,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:bcox@virtualschool.edu">Brad Cox</a>
       </td>
       </tr>
                   <tr>
@@ -2868,7 +2870,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.java2html.de/">http://www.java2html.de/</a>
       </td>
       </tr>
                   <tr>
@@ -2878,7 +2880,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:java2html@jave.de">java2html@jave.de</a>
       </td>
       </tr>
                   <tr>
@@ -2913,7 +2915,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.java2html.com/java2html_ant_task.html">http://www.java2html.com/java2html_ant_task.html</a>
       </td>
       </tr>
                   <tr>
@@ -2923,7 +2925,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:support@java2html.com">support@java2html.com</a>
       </td>
       </tr>
                   <tr>
@@ -2963,7 +2965,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.experimentalstuff.com/Technologies/JavaMake/index.html">http://www.experimentalstuff.com/Technologies/JavaMake/index.html</a>
       </td>
       </tr>
                   <tr>
@@ -2973,7 +2975,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:Mikhail.Dmitriev@eng.sun.com">Mikhail Dmitriev</a>
       </td>
       </tr>
                   <tr>
@@ -3011,7 +3013,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://glezen.org/javarec/">http://glezen.org/javarec/</a>
       </td>
       </tr>
                   <tr>
@@ -3021,7 +3023,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:pglezen@us.ibm.com">Paul Glezen</a>
       </td>
       </tr>
                   <tr>
@@ -3061,7 +3063,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jcsc.sourceforge.net/">http://jcsc.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -3071,7 +3073,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:rjocham72@netscape.net">Ralph Jocham</a>
       </td>
       </tr>
                   <tr>
@@ -3163,7 +3165,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jflex.de/">http://jflex.de/</a>
       </td>
       </tr>
                   <tr>
@@ -3173,7 +3175,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.jflex.de/mailing.html">jflex-users mailing list</a>
       </td>
       </tr>
                   <tr>
@@ -3212,7 +3214,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://the.edouard.mercier.free.fr/Jindent_content.php">http://the.edouard.mercier.free.fr/Jindent_content.php</a>
       </td>
       </tr>
                   <tr>
@@ -3252,7 +3254,8 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.thaiopensource.com/relaxng/jing-ant.html">
+            http://www.thaiopensource.com/relaxng/jing-ant.html</a>
       </td>
       </tr>
                   <tr>
@@ -3417,7 +3420,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jnipp.sf.net/">http://jnipp.sf.net/</a>
       </td>
       </tr>
                   <tr>
@@ -3427,7 +3430,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:ptrewhella@users.sf.net">Phillip E. Trewhella</a>
       </td>
       </tr>
                   <tr>
@@ -3470,7 +3473,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jreleaseinfo.sourceforge.net/">HomePage on SourceForge</a>
       </td>
       </tr>
                   <tr>
@@ -3480,7 +3483,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/projects/jreleaseinfo/">Forums/Tracker on SourceForge</a>
       </td>
       </tr>
                   <tr>
@@ -3522,7 +3525,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://dynamic.macromedia.com/bin/MM/software/trial/hwswrec.jsp?product=jrun_sp">http://dynamic.macromedia.com/bin/MM/software/trial/hwswrec.jsp?product=jrun_sp</a>
       </td>
       </tr>
                   <tr>
@@ -3532,7 +3535,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:bdeitte@macromedia.com">Brian Deitte</a>
       </td>
       </tr>
                   <tr>
@@ -3575,7 +3578,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.judoscript.com/articles/ant.html">http://www.judoscript.com/articles/ant.html</a>
       </td>
       </tr>
                   <tr>
@@ -3585,7 +3588,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:judoscript@hotmail.com">James Jianbo Huang</a>
       </td>
       </tr>
                   <tr>
@@ -3624,7 +3627,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://just4log.sourceforge.net">http://just4log.sourceforge.net</a>
       </td>
       </tr>
                   <tr>
@@ -3634,7 +3637,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:lbruand@wanadoo.fr">Lucas Bruand</a>
       </td>
       </tr>
                   <tr>
@@ -3678,7 +3681,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.antxtras.info/">http://www.antxtras.info/</a>
       </td>
       </tr>
                   <tr>
@@ -3688,7 +3691,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:contact@jware.info">contact@jware.info</a>
       </td>
       </tr>
                   <tr>
@@ -3797,7 +3800,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://innig.net/macker/">http://innig.net/macker/</a>
       </td>
       </tr>
                   <tr>
@@ -3807,7 +3810,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://innig.net/macker/contact.html">Paul Cantrell</a>
       </td>
       </tr>
                   <tr>
@@ -3847,7 +3850,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://mtxslt.sourceforge.net/">http://mtxslt.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -3857,7 +3860,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:abcoates@theOffice.net">Anthony B. Coates</a>
       </td>
       </tr>
                   <tr>
@@ -3900,7 +3903,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.nurflugel.com/webstart/AntScriptVisualizer/">http://www.nurflugel.com/webstart/AntScriptVisualizer/</a>
       </td>
       </tr>
                   <tr>
@@ -3954,7 +3957,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/projects/ovanttasks">http://sourceforge.net/projects/ovanttasks</a>
       </td>
       </tr>
                   <tr>
@@ -3964,7 +3967,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:info@roxes.com">info@roxes.com</a>
       </td>
       </tr>
                   <tr>
@@ -4002,7 +4005,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sadun-util.sourceforge.net/pack.html">http://sadun-util.sourceforge.net/pack.html</a>
       </td>
       </tr>
                   <tr>
@@ -4012,7 +4015,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:cristiano@xtractor.com">Cristiano Sadun</a>
       </td>
       </tr>
                   <tr>
@@ -4050,7 +4053,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://pct.sourceforge.net">http://pct.sourceforge.net</a>
       </td>
       </tr>
                   <tr>
@@ -4060,7 +4063,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:justus_phenix@users.sourceforge.net">Gilles QUERRET</a>
       </td>
       </tr>
                   <tr>
@@ -4101,7 +4104,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.pestercat.com/">http://www.pestercat.com/</a>
       </td>
       </tr>
                   <tr>
@@ -4139,7 +4142,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://pmd.sf.net/">http://pmd.sf.net/</a>
       </td>
       </tr>
                   <tr>
@@ -4149,7 +4152,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:tcopeland@apache.org">Tom Copeland</a>
       </td>
       </tr>
                   <tr>
@@ -4188,7 +4191,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://mseries.sourceforge.net">http://mseries.sourceforge.net</a>
       </td>
       </tr>
                   <tr>
@@ -4198,7 +4201,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://web.ukonline.co.uk/mseries/contact.html">MSeries</a>
       </td>
       </tr>
                   <tr>
@@ -4292,7 +4295,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://properties2java.jayefem.de/">http://properties2java.jayefem.de/</a>
       </td>
       </tr>
                   <tr>
@@ -4302,7 +4305,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:properties2java@jayefem.de">Jan-Friedrich Mutter</a>
       </td>
       </tr>
                   <tr>
@@ -4342,7 +4345,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.dallaway.com/ant/">http://www.dallaway.com/ant/</a>
       </td>
       </tr>
                   <tr>
@@ -4352,7 +4355,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:purge@dallaway.com">Richard Dallaway</a>
       </td>
       </tr>
                   <tr>
@@ -4392,7 +4395,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.refactorit.com/">http://www.refactorit.com/</a>
       </td>
       </tr>
                   <tr>
@@ -4402,7 +4405,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:support@refactorit.com">support@refactorit.com</a>
       </td>
       </tr>
                   <tr>
@@ -4440,7 +4443,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/projects/reflectant/">http://sourceforge.net/projects/reflectant/</a>
       </td>
       </tr>
                   <tr>
@@ -4450,7 +4453,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:sv_ant@mail.bg">sv_ant@mail.bg</a>
       </td>
       </tr>
                   <tr>
@@ -4495,7 +4498,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.martiansoftware.com/lab/index.html#rundoc">http://www.martiansoftware.com/lab/index.html#rundoc</a>
       </td>
       </tr>
                   <tr>
@@ -4505,7 +4508,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.martiansoftware.com/contact.html">Marty Lamb</a>
       </td>
       </tr>
                   <tr>
@@ -4545,7 +4548,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://serialver.sourceforge.net/">http://serialver.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -4555,7 +4558,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="https://lists.sourceforge.net/lists/listinfo/serialver-development">developer mailing list</a>
       </td>
       </tr>
                   <tr>
@@ -4593,7 +4596,8 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.redhillconsulting.com.au/products/simian/">
+            http://www.redhillconsulting.com.au/products/simian/</a>
       </td>
       </tr>
                   <tr>
@@ -4603,7 +4607,9 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:simian-user-subscribe@redhillconsulting.com.au">
+            simian-user-subscribe@redhillconsulting.com.au (User Mailinglist)
+            </a>
       </td>
       </tr>
                   <tr>
@@ -4642,7 +4648,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://smartanalyzer.sourceforge.net/">http://smartanalyzer.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -4652,7 +4658,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/projects/smartanalyzer">support at sourceforge project page</a>
       </td>
       </tr>
                   <tr>
@@ -4694,7 +4700,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.martiansoftware.com/lab/index.html#snip">http://www.martiansoftware.com/lab/index.html#snip</a>
       </td>
       </tr>
                   <tr>
@@ -4704,7 +4710,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.martiansoftware.com/contact.html">Marty Lamb</a>
       </td>
       </tr>
                   <tr>
@@ -4745,7 +4751,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.pavelvlasov.com/pv/content/Products/Speech4j/index.html">http://www.pavelvlasov.com/pv/content/Products/Speech4j/index.html</a>
       </td>
       </tr>
                   <tr>
@@ -4755,7 +4761,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.pavelvlasov.com/pv/content/contact.html">Pavel Vlasov</a>
       </td>
       </tr>
                   <tr>
@@ -4800,7 +4806,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.pavelvlasov.com/pv/content/Products/Common/doc/AntDoc/com/pavelvlasov/sql/java/ant/StatementCompilerTask.html">http://www.pavelvlasov.com/pv/content/Products/Common/doc/AntDoc/com/pavelvlasov/sql/java/ant/StatementCompilerTask.html</a>
       </td>
       </tr>
                   <tr>
@@ -4810,7 +4816,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.pavelvlasov.com/pv/content/contact.html">Pavel Vlasov</a>
       </td>
       </tr>
                   <tr>
@@ -4853,7 +4859,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sqlunit.sourceforge.net">http://sqlunit.sourceforge.net</a>
       </td>
       </tr>
                   <tr>
@@ -4863,7 +4869,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/forum/?group_id=77832">Project forums</a>
       </td>
       </tr>
                   <tr>
@@ -4912,7 +4918,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.langdale.com.au/styler/">http://www.langdale.com.au/styler/</a>
       </td>
       </tr>
                   <tr>
@@ -4922,7 +4928,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:adv@langdale.com.au">Arnold deVos</a>
       </td>
       </tr>
                   <tr>
@@ -4964,7 +4970,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://ostermiller.org/syntax/ant.html">http://ostermiller.org/syntax/ant.html</a>
       </td>
       </tr>
                   <tr>
@@ -4974,7 +4980,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://ostermiller.org/contact.pl?regarding=Syntax+Highlighting">Stephen Ostermiller</a>
       </td>
       </tr>
                   <tr>
@@ -5015,7 +5021,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://anttestsetgen.sourceforge.net/">http://anttestsetgen.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -5025,7 +5031,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:m.c.jansen@planet.nl">m.c.jansen@planet.nl</a>
       </td>
       </tr>
                   <tr>
@@ -5066,7 +5072,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.chive.com/tim.htm">http://www.chive.com/tim.htm</a>
       </td>
       </tr>
                   <tr>
@@ -5076,7 +5082,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:support@chive.com">support@chive.com</a>
       </td>
       </tr>
                   <tr>
@@ -5114,7 +5120,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://tiniant.sourceforge.net/">http://tiniant.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -5124,7 +5130,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:kelly@ad1440.net">Sean Kelly</a>
       </td>
       </tr>
                   <tr>
@@ -5162,7 +5168,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.pavelvlasov.com/pv/content/menu.show@id=products.transformica.html">http://www.pavelvlasov.com/pv/content/menu.show@id=products.transformica.html</a>
       </td>
       </tr>
                   <tr>
@@ -5172,7 +5178,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.pavelvlasov.com/pv/content/contact.html">Pavel Vlasov</a>
       </td>
       </tr>
                   <tr>
@@ -5214,7 +5220,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.geocities.com/vamp201/ant.html">http://www.geocities.com/vamp201/ant.html</a>
       </td>
       </tr>
                   <tr>
@@ -5224,7 +5230,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:vamp201@yahoo.com">Gerald Bauer</a>
       </td>
       </tr>
                   <tr>
@@ -5261,7 +5267,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://ant.ryangrier.com/">http://ant.ryangrier.com/</a>
       </td>
       </tr>
                   <tr>
@@ -5271,7 +5277,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:version_tool@ryangrier.com">version_tool@ryangrier.com</a>
       </td>
       </tr>
                   <tr>
@@ -5312,7 +5318,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://vpp.sourceforge.net/">http://vpp.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -5322,7 +5328,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:vpp-user@lists.sourceforge.net">vpp-user@lists.sourceforge.net</a>
       </td>
       </tr>
                   <tr>
@@ -5365,7 +5371,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://objectstyle.org/woproject/">http://objectstyle.org/woproject/</a>
       </td>
       </tr>
                   <tr>
@@ -5375,7 +5381,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:andrus@objectstyle.org">Andrus Adamchik</a>
       </td>
       </tr>
                   <tr>
@@ -5418,7 +5424,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.eclipse.org/wsvt">http://www.eclipse.org/wsvt</a>
       </td>
       </tr>
                   <tr>
@@ -5428,7 +5434,8 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.eclipse.org/wsvt">Project newsgroup and
+            mailing list</a>
       </td>
       </tr>
                   <tr>
@@ -5438,7 +5445,8 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www-124.ibm.com/developerworks/oss/CPLv1.0.htm">Common Public
+            License (CPL)</a>
       </td>
       </tr>
           </table>
@@ -5473,7 +5481,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/projects/xcluder">http://sourceforge.net/projects/xcluder</a>
       </td>
       </tr>
                   <tr>
@@ -5483,7 +5491,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:mbatsis@users.sf.net">mbatsis@users.sf.net</a>
       </td>
       </tr>
                   <tr>
@@ -5527,7 +5535,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/projects/xdoclet/">http://sourceforge.net/projects/xdoclet/</a>
       </td>
       </tr>
                   <tr>
@@ -5579,7 +5587,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:mario@jeckle.de">mario@jeckle.de</a>
       </td>
       </tr>
                   <tr>
@@ -5619,7 +5627,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://xmlreleasenotes.free.fr/">http://xmlreleasenotes.free.fr/</a>
       </td>
       </tr>
                   <tr>
@@ -5671,7 +5679,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.oopsconsultancy.com/software/xmltask.html">http://www.oopsconsultancy.com/software/xmltask.html</a>
       </td>
       </tr>
                   <tr>
@@ -5681,7 +5689,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:xmltask@oopsconsultancy.com">xmltask@oopsconsultancy.com</a>
       </td>
       </tr>
                   <tr>
@@ -5725,7 +5733,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.yworks.com/en/products_yguard_about.htm">http://www.yworks.com/en/products_yguard_about.htm</a>
       </td>
       </tr>
                   <tr>
@@ -5735,7 +5743,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:yguard@yworks.com">yGuard@yWorks.com</a>
       </td>
       </tr>
                   <tr>
@@ -5772,7 +5780,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.zelix.com/klassmaster/docs/buildToolApi.html">http://www.zelix.com/klassmaster/docs/buildToolApi.html</a>
       </td>
       </tr>
                   <tr>
@@ -5816,7 +5824,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.madbean.com/blog/3/">http://www.madbean.com/blog/3/</a>
       </td>
       </tr>
                   <tr>
@@ -5866,7 +5874,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://dione.zcu.cz/~toman40/miniRMI/">http://dione.zcu.cz/~toman40/miniRMI/</a>
       </td>
       </tr>
                   <tr>
@@ -5876,7 +5884,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:Petr.Toman@pinknet.cz">Petr Toman</a>
       </td>
       </tr>
                   <tr>
@@ -5917,7 +5925,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://plugins.jedit.org/plugins/?AntFarm">http://plugins.jedit.org/plugins/?AntFarm</a>
       </td>
       </tr>
                   <tr>
@@ -5927,7 +5935,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:jedit-devel@lists.sourceforge.net">jEdit developers mailinglist</a>
       </td>
       </tr>
                   <tr>
@@ -5964,7 +5972,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.erudra.com/antman/index.html">http://www.erudra.com/antman/index.html</a>
       </td>
       </tr>
                   <tr>
@@ -5974,7 +5982,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:ashok@erudra.com">Ashok Sridhar</a>
       </td>
       </tr>
                   <tr>
@@ -6012,7 +6020,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antrunner.sourceforge.net/">http://antrunner.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -6022,7 +6030,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:dirk.schnelle@web.de">Dirk Schnelle</a>
       </td>
       </tr>
                   <tr>
@@ -6059,7 +6067,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip">ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip</a>
       </td>
       </tr>
                   <tr>
@@ -6069,7 +6077,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:KHartlage@t-online.de">Klaus Hartlage</a>
       </td>
       </tr>
                   <tr>
@@ -6125,7 +6133,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="news://news.eclipse.org/eclipse.platform">news://news.eclipse.org/eclipse.platform</a>
       </td>
       </tr>
                   <tr>
@@ -6163,7 +6171,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.gexperts.com/gel.html">http://www.gexperts.com/gel.html</a>
       </td>
       </tr>
                   <tr>
@@ -6173,7 +6181,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://groups.yahoo.com/group/gelide/">Project Mailing List</a>
       </td>
       </tr>
                   <tr>
@@ -6212,7 +6220,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.intellij.com/idea/">http://www.intellij.com/idea/</a>
       </td>
       </tr>
                   <tr>
@@ -6222,7 +6230,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:support@intellij.com">support@intellij.com</a>
       </td>
       </tr>
                   <tr>
@@ -6261,7 +6269,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.borland.com/jbuilder/index.html">http://www.borland.com/jbuilder/index.html</a>
       </td>
       </tr>
                   <tr>
@@ -6271,7 +6279,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:customer_service@borland.com">customer_service@borland.com</a>
       </td>
       </tr>
                   <tr>
@@ -6310,7 +6318,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jdee.sunsite.dk/">http://jdee.sunsite.dk/</a>
       </td>
       </tr>
                   <tr>
@@ -6320,7 +6328,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:jde-subscribe@sunsite.auc.dk">JDEE Mailing list.</a>
       </td>
       </tr>
                   <tr>
@@ -6360,7 +6368,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://ant.netbeans.org/">http://ant.netbeans.org/</a>
       </td>
       </tr>
                   <tr>
@@ -6370,7 +6378,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:nbdev@netbeans.org">nbdev@netbeans.org</a>
       </td>
       </tr>
                   <tr>
@@ -6407,7 +6415,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://otn.oracle.com/products/jdev/">http://otn.oracle.com/products/jdev/</a>
       </td>
       </tr>
                   <tr>
@@ -6417,7 +6425,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:jdeveloperbeta_us@oracle.com">jdeveloperbeta_us@oracle.com</a>
       </td>
       </tr>
                   <tr>
@@ -6454,7 +6462,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www7b.software.ibm.com/wsdd/library/techarticles/0203_searle/searle1.html">Ant Integration Part1</a>
       </td>
       </tr>
                   <tr>
@@ -6499,7 +6507,8 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.seapine.com/scmresources.php#integration">
+            Surround SCM Resource Center</a>
       </td>
       </tr>
                   <tr>
@@ -6509,7 +6518,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:support@seapine.com">Seapine Support</a>
       </td>
       </tr>
                   <tr>
diff --git a/docs/faq.html b/docs/faq.html
index 526265e6a..dfa4938d4 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/index.html b/docs/index.html
index bbc55c745..028e424d4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -78,9 +78,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/legal.html b/docs/legal.html
index 80e0b472a..bf27738eb 100644
--- a/docs/legal.html
+++ b/docs/legal.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/license.html b/docs/license.html
index f3cc0d10b..91ed4eccb 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/mail.html b/docs/mail.html
index 42dc33250..7f3f4eaa7 100644
--- a/docs/mail.html
+++ b/docs/mail.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/manual/CoreTypes/mapper.html b/docs/manual/CoreTypes/mapper.html
index 1209ae088..e691e1732 100644
--- a/docs/manual/CoreTypes/mapper.html
+++ b/docs/manual/CoreTypes/mapper.html
@@ -347,7 +347,7 @@ in a nested <code>&lt;classpath&gt;</code>.</p>
 following algorithm:</p>
 <ul>
 <li>If the system property
-<code>ant.regexp.regexpimpl</code> has been set, it is taken as the
+<code>ant.regexp.matcherimpl</code> has been set, it is taken as the
 name of the class implementing
 <code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that
 should be used.</li>
diff --git a/docs/mission.html b/docs/mission.html
index 0f02092ce..286eeddb1 100644
--- a/docs/mission.html
+++ b/docs/mission.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/problems.html b/docs/problems.html
index f63db9dee..8fffcb5df 100644
--- a/docs/problems.html
+++ b/docs/problems.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/projects.html b/docs/projects.html
index 4bfe82f00..45ad60e61 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
@@ -209,7 +209,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.andromda.org/">http://www.AndroMDA.org/</a>
       </td>
       </tr>
                   <tr>
@@ -219,7 +219,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/mail/?group_id=73047">project mailing lists</a>
       </td>
       </tr>
                   <tr>
@@ -259,7 +259,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://ant-contrib.sourceforge.net/">http://ant-contrib.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -269,7 +269,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/mail/?group_id=36177">project mailing list</a>
       </td>
       </tr>
                   <tr>
@@ -313,7 +313,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antelope.tigris.org/">http://antelope.tigris.org/</a>
       </td>
       </tr>
                   <tr>
@@ -323,7 +323,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:daleanson@users.sourceforge.net">Dale Anson</a>
       </td>
       </tr>
                   <tr>
@@ -366,7 +366,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.urbancode.com/projects/anthill/">http://www.urbancode.com/projects/anthill/</a>
       </td>
       </tr>
                   <tr>
@@ -376,7 +376,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:mbz@urbancode.com">Maciej Zawadzki</a>
       </td>
       </tr>
                   <tr>
@@ -414,7 +414,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antigen.sourceforge.net/">http://antigen.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -424,7 +424,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:johndavidtaylor@users.sourceforge.net">Jon Tayler</a>
       </td>
       </tr>
                   <tr>
@@ -464,7 +464,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antinstaller.sf.net/">http://antinstaller.sf.net/</a>
       </td>
       </tr>
                   <tr>
@@ -474,7 +474,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:teknopaul@users.sourceforge.net">teknopaul@users.sourceforge.net</a>
       </td>
       </tr>
                   <tr>
@@ -519,7 +519,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antlion.sourceforge.net/">http://antlion.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -529,7 +529,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="https://sourceforge.net/mail/?group_id=93410">Project mailing list</a>
       </td>
       </tr>
                   <tr>
@@ -579,7 +579,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://antworks.sourceforge.net/">http://antworks.sourceforge.net/index.html</a>
       </td>
       </tr>
                   <tr>
@@ -589,7 +589,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://lists.sourceforge.net/lists/listinfo/antworks-developers">Antworks Developers mailing lists</a>
       </td>
       </tr>
                   <tr>
@@ -629,7 +629,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.buildmonkey.com/">http://www.buildmonkey.com/</a>
       </td>
       </tr>
                   <tr>
@@ -639,7 +639,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:jb@buildmonkey.com">jb@buildmonkey.com</a>
       </td>
       </tr>
                   <tr>
@@ -680,7 +680,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://cruisecontrol.sourceforge.net/">http://cruisecontrol.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -690,7 +690,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://cruisecontrol.sourceforge.net/contact.html">Project Mailing Lists and Administrators</a>
       </td>
       </tr>
                   <tr>
@@ -732,7 +732,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://invicta.sf.net/">http://invicta.sf.net/</a>
       </td>
       </tr>
                   <tr>
@@ -742,7 +742,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://invicta.sf.net/contact.html">Project Mailing Lists and Administrators</a>
       </td>
       </tr>
                   <tr>
@@ -782,7 +782,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.javagen.com/jam.jsp">http://www.javagen.com/jam.jsp</a>
       </td>
       </tr>
                   <tr>
@@ -843,7 +843,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.sourceforge.net/projects/luntbuild/">http://www.sourceforge.net/projects/luntbuild/</a>
       </td>
       </tr>
                   <tr>
@@ -853,7 +853,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/projects/luntbuild/">luntbuild project page</a>
       </td>
       </tr>
                   <tr>
@@ -892,7 +892,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://nant.sourceforge.net/">http://nant.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -902,7 +902,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/mail/?group_id=31650">project mailing list</a>
       </td>
       </tr>
                   <tr>
@@ -942,7 +942,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.viewtier.com/products/parabuild.htm">http://www.viewtier.com/products/parabuild.htm</a>
       </td>
       </tr>
                   <tr>
@@ -952,7 +952,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.viewtier.com/about_us.htm">http://www.viewtier.com/about_us.htm</a>
       </td>
       </tr>
                   <tr>
@@ -991,7 +991,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://sourceforge.net/projects/remoteant/">http://sourceforge.net/projects/remoteant/</a>
       </td>
       </tr>
                   <tr>
@@ -1001,7 +1001,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:cnelson@einnovation.com">Chris Nelson</a>
       </td>
       </tr>
                   <tr>
@@ -1046,7 +1046,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.inversoft.com/">http://www.inversoft.com/</a>
       </td>
       </tr>
                   <tr>
@@ -1056,7 +1056,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.inversoft.com/contact.html">http://www.inversoft.com/contact.html</a>
       </td>
       </tr>
                   <tr>
@@ -1095,7 +1095,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://XMLpublication.org/">http://XMLpublication.org/</a>
       </td>
       </tr>
                   <tr>
@@ -1105,7 +1105,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:jmvanel@free.fr">Jean-Marc Vanel</a>
       </td>
       </tr>
                   <tr>
@@ -1147,7 +1147,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.yworks.com/products/yed/">http://www.yworks.com/products/yed/</a>
       </td>
       </tr>
                   <tr>
@@ -1157,7 +1157,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.yworks.com/en/company_contact.htm">yWorks Support</a>
       </td>
       </tr>
                   <tr>
diff --git a/docs/projects/index.html b/docs/projects/index.html
index 72805e1e8..0ed4a25d9 100644
--- a/docs/projects/index.html
+++ b/docs/projects/index.html
@@ -76,9 +76,9 @@
                                                               
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/resources.html b/docs/resources.html
index 60e7b6a90..8ede6dae8 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
@@ -194,7 +194,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="faq.html">http://ant.apache.org/faq.html</a>
       </td>
       </tr>
           </table>
@@ -211,7 +211,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.jguru.com/forums/home.jsp?topic=Ant">http://www.jguru.com/forums/home.jsp?topic=Ant</a>
       </td>
       </tr>
                   <tr>
@@ -221,7 +221,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.jguru.com/faq/home.jsp?topic=Ant">http://www.jguru.com/faq/home.jsp?topic=Ant</a>
       </td>
       </tr>
           </table>
@@ -240,7 +240,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.moussaud.org/ejbjar.html">http://www.moussaud.org/ejbjar.html</a>
       </td>
       </tr>
           </table>
@@ -261,7 +261,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://wiki.apache.org/general">Apache Wiki Farm</a>
       </td>
       </tr>
                   <tr>
@@ -271,7 +271,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://wiki.apache.org/ant/">Ant Wiki</a>
       </td>
       </tr>
           </table>
@@ -405,7 +405,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.sams.com/catalog/product.asp?product_id=%7BFB825A48-BC04-4C55-BD8C-DF93C6BBF920%7D">http://www.sams.com/catalog/product.asp?product_id=%7BFB825A48-BC04-4C55-BD8C-DF93C6BBF920%7D</a>
       </td>
       </tr>
             <tr><th>ISBN:</th><td>0672325624</td></tr>
@@ -453,7 +453,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.addison-wesley.de/main/main.asp?page=home/bookdetails&amp;ProductID=13459">http://www.addison-wesley.de/main/main.asp?page=home/bookdetails&amp;ProductID=13459</a>
       </td>
       </tr>
             <tr><th>ISBN:</th><td>3827320666</td></tr>
@@ -507,7 +507,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.manning.com/antbook/">http://www.manning.com/antbook/</a>
       </td>
       </tr>
             <tr><th>ISBN:</th><td>1930110588</td></tr>
@@ -541,7 +541,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.oreilly.com/catalog/anttdg/">http://www.oreilly.com/catalog/anttdg/</a>
       </td>
       </tr>
             <tr><th>ISBN:</th><td>0596001843</td></tr>
@@ -583,7 +583,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.amazon.de/exec/obidos/ASIN/3897212412/">http://www.amazon.de/exec/obidos/ASIN/3897212412/</a>
       </td>
       </tr>
             <tr><th>ISBN:</th><td>3897212412</td></tr>
@@ -624,7 +624,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.wiley.com/cda/product/0,,047120708X,00.html">http://www.wiley.com/cda/product/0,,047120708X,00.html</a>
       </td>
       </tr>
             <tr><th>ISBN:</th><td>047120708X</td></tr>
@@ -677,7 +677,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="https://sourceforge.net/project/showfiles.php?group_id=103509">https://sourceforge.net/project/showfiles.php?group_id=103509 (Download ZIP+PDF from Sourceforge)</a>
       </td>
       </tr>
           </table>
@@ -704,7 +704,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.ftponline.com/javapro/2004_06/magazine/features/kgauthier/">http://www.ftponline.com/javapro/2004_06/magazine/features/kgauthier/</a>
       </td>
       </tr>
           </table>
@@ -732,7 +732,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://otn.oracle.com/pub/articles/bodewig_taskwriters.html">http://otn.oracle.com/pub/articles/bodewig_taskwriters.html</a>
       </td>
       </tr>
           </table>
@@ -763,7 +763,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.sys-con.com/story/?storyid=45078&amp;DE=1">http://www.sys-con.com/story/?storyid=45078&amp;DE=1</a>
       </td>
       </tr>
           </table>
@@ -792,7 +792,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://otn.oracle.com/pub/articles/bodewig_ant1.6.html">http://otn.oracle.com/pub/articles/bodewig_ant1.6.html</a>
       </td>
       </tr>
           </table>
@@ -823,7 +823,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.sigs-datacom.de/sd/news/document?PID=216">http://www.sigs-datacom.de/sd/news/document?PID=216</a>
       </td>
       </tr>
           </table>
@@ -851,7 +851,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="ant_in_anger.html">http://ant.apache.org/ant_in_anger.html</a>
       </td>
       </tr>
           </table>
@@ -879,7 +879,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="ant_task_guidelines.html">http://ant.apache.org/ant_task_guidelines.html</a>
       </td>
       </tr>
           </table>
@@ -907,7 +907,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.fawcette.com/javapro/2003_02/magazine/features/ehatcher/">http://www.fawcette.com/javapro/2003_02/magazine/features/ehatcher/l</a>
       </td>
       </tr>
           </table>
@@ -924,7 +924,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:ehatcher@apache.org">Erik Hatcher</a>
       </td>
       </tr>
                   <tr>
@@ -934,7 +934,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.ibm.com/developerworks/java/library/j-junitmail/">http://www.ibm.com/developerworks/java/library/j-junitmail/</a>
       </td>
       </tr>
           </table>
@@ -953,7 +953,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:malcolm@nuearth.com">Malcolm Davis</a>
       </td>
       </tr>
                   <tr>
@@ -963,7 +963,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www-106.ibm.com/developerworks/library/j-ant/?dwzone=java">http://www-106.ibm.com/developerworks/library/j-ant/?dwzone=java</a>
       </td>
       </tr>
           </table>
@@ -981,7 +981,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:michael.cymerman@javaworld.com">Michael Cymerman</a>
       </td>
       </tr>
                   <tr>
@@ -991,7 +991,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.javaworld.com/javaworld/jw-10-2000/jw-1020-ant.html">http://www.javaworld.com/javaworld/jw-10-2000/jw-1020-ant.html</a>
       </td>
       </tr>
           </table>
@@ -1020,7 +1020,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://jakarta.apache.org/cactus/howto_ant_primer.html">http://jakarta.apache.org/cactus/howto_ant_primer.html</a>
       </td>
       </tr>
           </table>
@@ -1039,7 +1039,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:glenn@somanetworks.com">Glenn McAllister</a>
       </td>
       </tr>
                   <tr>
@@ -1049,7 +1049,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www7.software.ibm.com/vad.nsf/data/document2366?OpenDocument&amp;p=1&amp;BCT=1&amp;Footer=1">http://www7.software.ibm.com/vad.nsf/data/document2366?OpenDocument&amp;p=1&amp;BCT=1&amp;Footer=1</a>
       </td>
       </tr>
           </table>
@@ -1067,7 +1067,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:glenn@somanetworks.com">Glenn McAllister</a>
       </td>
       </tr>
                   <tr>
@@ -1077,7 +1077,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www7.software.ibm.com/vad.nsf/Data/Document4366?OpenDocument&amp;p=1&amp;BCT=3&amp;Footer=1">http://www7.software.ibm.com/vad.nsf/Data/Document4366?OpenDocument&amp;p=1&amp;BCT=3&amp;Footer=1</a>
       </td>
       </tr>
           </table>
@@ -1105,7 +1105,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://dcb.sun.com/practices/profiles/ant.jsp">http://dcb.sun.com/practices/profiles/ant.jsp</a>
       </td>
       </tr>
           </table>
@@ -1134,7 +1134,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.sys-con.com/java/archivesa.cfm?volume=06&amp;issue=06">http://www.sys-con.com/java/archivesa.cfm?volume=06&amp;issue=06</a>
       </td>
       </tr>
           </table>
@@ -1162,7 +1162,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.onjava.com/pub/a/onjava/2001/06/25/antejb.html">http://www.onjava.com/pub/a/onjava/2001/06/25/antejb.html</a>
       </td>
       </tr>
           </table>
@@ -1189,7 +1189,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.sitepen.com/ant/javascript.html">http://www.sitepen.com/ant/javascript.html</a>
       </td>
       </tr>
           </table>
@@ -1207,7 +1207,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:alexc@purpletech.com">Alex Chaffee</a>
       </td>
       </tr>
                   <tr>
@@ -1270,7 +1270,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="mailto:chanezon@netscape.com">Patrick Chanezon</a>
       </td>
       </tr>
                   <tr>
@@ -1280,7 +1280,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://people.netscape.com/chanezon/tech/ant/ant_preso.ppt">http://people.netscape.com/chanezon/tech/ant/ant_preso.ppt</a>
       </td>
       </tr>
           </table>
@@ -1310,7 +1310,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.ociweb.com/jnb/files/Ant.pdf">http://www.ociweb.com/jnb/files/Ant.pdf</a>
       </td>
       </tr>
           </table>
@@ -1339,7 +1339,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.iseran.com/Steve/modern_development_processes.html">http://www.iseran.com/Steve/modern_development_processes.html</a>
       </td>
       </tr>
           </table>
@@ -1367,7 +1367,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          &nbsp;
+          <a href="http://www.iseran.com/Steve/papers/when_web_services_go_bad.html">http://www.iseran.com/Steve/papers/when_web_services_go_bad.html</a>
       </td>
       </tr>
           </table>
diff --git a/docs/srcdownload.html b/docs/srcdownload.html
index f5616cc82..86f59349d 100644
--- a/docs/srcdownload.html
+++ b/docs/srcdownload.html
@@ -74,9 +74,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">
diff --git a/docs/svn.html b/docs/svn.html
index e08068861..ca97e6f47 100644
--- a/docs/svn.html
+++ b/docs/svn.html
@@ -76,9 +76,9 @@
                     
   <div class="menucontainer">
     <div align="center">
-      <a href="http://ApacheCon.Com/"><img width="150" height="50"
+      <a href="http://ApacheCon.Com/"><img width="135" height="50"
              border="0" style="background-color: white"
-             src="http://www.apache.org/images/ac2005us_150x50.gif"
+             src="http://apache.org/images/ac2005eu_135x50.gif"
              alt="ApacheCon!" title="Come to ApacheCon!"/></a>
     </div>
     <div class="menu">