diff --git a/docs/ant15_todo.html b/docs/ant15_todo.html
index dafdf5ef1..ecd48cce9 100644
--- a/docs/ant15_todo.html
+++ b/docs/ant15_todo.html
@@ -7,10 +7,10 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
-                      <meta name="author" value="Erik Hatcher">
-  <meta name="email" value="ehatcher@apache.org">
+                      <meta name="author" content="Erik Hatcher">
+  <meta name="email" content="ehatcher@apache.org">
         
       
       <title>Apache Ant - Ant 1.5 Release To-Do List</title>
@@ -21,7 +21,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -30,12 +30,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -64,7 +64,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -85,9 +85,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/docs/antnews.html b/docs/antnews.html
index 6377c2277..8f266b04f 100644
--- a/docs/antnews.html
+++ b/docs/antnews.html
@@ -7,14 +7,14 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
-                      <meta name="author" value="Conor MacNeill">
-  <meta name="email" value="">
-                <meta name="author" value="Stefan Bodewig">
-  <meta name="email" value="stefan.bodewig@epost.de">
-                <meta name="author" value="Magesh Umasankar">
-  <meta name="email" value="">
+                      <meta name="author" content="Conor MacNeill">
+  <meta name="email" content="">
+                <meta name="author" content="Stefan Bodewig">
+  <meta name="email" content="stefan.bodewig@epost.de">
+                <meta name="author" content="Magesh Umasankar">
+  <meta name="email" content="">
         
       
       <title>Apache Ant - Ant News</title>
@@ -25,7 +25,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -34,12 +34,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -68,7 +68,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -89,9 +89,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/docs/bindownload.html b/docs/bindownload.html
index 223265bb8..33b5e6c13 100644
--- a/docs/bindownload.html
+++ b/docs/bindownload.html
@@ -7,7 +7,7 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
               
                         <base href="http://jakarta.apache.org/ant/."/>
@@ -20,7 +20,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -29,12 +29,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -63,7 +63,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -84,9 +84,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/docs/external.html b/docs/external.html
index a5fd570af..bf54fee09 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -7,10 +7,10 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
-                      <meta name="author" value="Stefan Bodewig">
-  <meta name="email" value="bodewig@apache.org">
+                      <meta name="author" content="Stefan Bodewig">
+  <meta name="email" content="bodewig@apache.org">
         
       
       <title>Apache Ant - External Tools and Tasks</title>
@@ -21,7 +21,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -30,12 +30,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -64,7 +64,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -85,9 +85,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/docs/faq.html b/docs/faq.html
index 6bf584662..faeb43986 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -7,10 +7,10 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
-                      <meta name="author" value="Stefan Bodewig">
-  <meta name="email" value="bodewig@apache.org">
+                      <meta name="author" content="Stefan Bodewig">
+  <meta name="email" content="bodewig@apache.org">
         
       
       <title>Apache Ant - Frequently Asked Questions</title>
@@ -21,7 +21,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -30,12 +30,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -64,7 +64,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -85,9 +85,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/docs/index.html b/docs/index.html
index 364b64470..1c242cb4b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -7,12 +7,12 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
-                      <meta name="author" value="Conor MacNeill">
-  <meta name="email" value="">
-                <meta name="author" value="Stefan Bodewig">
-  <meta name="email" value="stefan.bodewig@epost.de">
+                      <meta name="author" content="Conor MacNeill">
+  <meta name="email" content="">
+                <meta name="author" content="Stefan Bodewig">
+  <meta name="email" content="stefan.bodewig@epost.de">
         
       
       <title>Apache Ant - Ant</title>
@@ -23,7 +23,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -32,12 +32,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -66,7 +66,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -87,9 +87,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/docs/problems.html b/docs/problems.html
index dea99a059..8891f05ab 100644
--- a/docs/problems.html
+++ b/docs/problems.html
@@ -7,10 +7,10 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
-                      <meta name="author" value="Conor MacNeill">
-  <meta name="email" value="">
+                      <meta name="author" content="Conor MacNeill">
+  <meta name="email" content="">
         
       
       <title>Apache Ant - Having Problems?</title>
@@ -21,7 +21,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -30,12 +30,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -64,7 +64,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -85,9 +85,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/docs/projects.html b/docs/projects.html
index c26c525f5..2e40b53a8 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -7,10 +7,10 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
-                      <meta name="author" value="Stefan Bodewig">
-  <meta name="email" value="bodewig@apache.org">
+                      <meta name="author" content="Stefan Bodewig">
+  <meta name="email" content="bodewig@apache.org">
         
       
       <title>Apache Ant - Related Projects</title>
@@ -21,7 +21,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -30,12 +30,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -64,7 +64,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -85,9 +85,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/docs/resources.html b/docs/resources.html
index 39642defe..9518b5b97 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -7,10 +7,10 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
-                      <meta name="author" value="Stefan Bodewig">
-  <meta name="email" value="bodewig@apache.org">
+                      <meta name="author" content="Stefan Bodewig">
+  <meta name="email" content="bodewig@apache.org">
         
       
       <title>Apache Ant - Resources</title>
@@ -21,7 +21,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -30,12 +30,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -64,7 +64,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -85,9 +85,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/docs/srcdownload.html b/docs/srcdownload.html
index b07f2fbbd..74f719681 100644
--- a/docs/srcdownload.html
+++ b/docs/srcdownload.html
@@ -7,7 +7,7 @@
     <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
               
                         <base href="http://jakarta.apache.org/ant/."/>
@@ -20,7 +20,7 @@
         <!-- TOP IMAGE -->
         <tr>
                 <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -29,12 +29,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
                 <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
@@ -63,7 +63,7 @@
         </ul>
       <p><strong>Jakarta</strong></p>
     <ul>
-          <li>      <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
+          <li>      <a href="http://jakarta.apache.org/site/news.html">News &amp; Status</a>
   </li>
           <li>      <a href="http://jakarta.apache.org/site/mission.html">Mission</a>
   </li>
@@ -84,9 +84,9 @@
   </li>
           <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&bug_severity=Enhancement">Enhancement Requests</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement">Enhancement Requests</a>
   </li>
-          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Ant&short_desc=%5BPATCH%5D&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Patch Queue</a>
+          <li>      <a href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time">Patch Queue</a>
   </li>
         </ul>
             </td>
diff --git a/xdocs/stylesheets/project.xml b/xdocs/stylesheets/project.xml
index 42c31ac34..60db26758 100644
--- a/xdocs/stylesheets/project.xml
+++ b/xdocs/stylesheets/project.xml
@@ -31,7 +31,7 @@
     </menu>
 
     <menu name="Jakarta">
-        <item name="News &amp; Status"     href="/site/news.html"/>
+        <item name="News &amp;amp; Status"     href="/site/news.html"/>
         <item name="Mission"               href="/site/mission.html"/>
         <item name="Guidelines Notes"      href="/site/guidelines.html"/>
         <item name="FAQs"                  href="/site/faqs.html"/>
@@ -43,7 +43,7 @@
         <item name="Mailing Lists"         href="/site/mail.html"/>
         <item name="Reference Library"     href="/site/library.html"/>
         <item name="Bug Database"          href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant"/>
-        <item name="Enhancement Requests"  href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=Enhancement"/>
-        <item name="Patch Queue"           href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;email1=&amp;emailtype1=substring&amp;emailassigned_to1=1&amp;email2=&amp;emailtype2=substring&amp;emailreporter2=1&amp;bugidtype=include&amp;bug_id=&amp;changedin=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;product=Ant&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr&amp;long_desc=&amp;long_desc_type=allwordssubstr&amp;bug_file_loc=&amp;bug_file_loc_type=allwordssubstr&amp;keywords=&amp;keywords_type=anywords&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time"/>    </menu>
+        <item name="Enhancement Requests"  href="http://nagoya.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;amp;bug_severity=Enhancement"/>
+        <item name="Patch Queue"           href="http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&amp;amp;bug_status=ASSIGNED&amp;amp;bug_status=REOPENED&amp;amp;email1=&amp;amp;emailtype1=substring&amp;amp;emailassigned_to1=1&amp;amp;email2=&amp;amp;emailtype2=substring&amp;amp;emailreporter2=1&amp;amp;bugidtype=include&amp;amp;bug_id=&amp;amp;changedin=&amp;amp;votes=&amp;amp;chfieldfrom=&amp;amp;chfieldto=Now&amp;amp;chfieldvalue=&amp;amp;product=Ant&amp;amp;short_desc=%5BPATCH%5D&amp;amp;short_desc_type=allwordssubstr&amp;amp;long_desc=&amp;amp;long_desc_type=allwordssubstr&amp;amp;bug_file_loc=&amp;amp;bug_file_loc_type=allwordssubstr&amp;amp;keywords=&amp;amp;keywords_type=anywords&amp;amp;field0-0-0=noop&amp;amp;type0-0-0=noop&amp;amp;value0-0-0=&amp;amp;cmdtype=doit&amp;amp;order=Reuse+same+sort+as+last+time"/>    </menu>
     </body>
 </project>
diff --git a/xdocs/stylesheets/templates.vm b/xdocs/stylesheets/templates.vm
index 8f1f255bf..8fdfbbcc5 100644
--- a/xdocs/stylesheets/templates.vm
+++ b/xdocs/stylesheets/templates.vm
@@ -71,8 +71,8 @@
 #end
 
 #macro ( metaauthor $author $email )
-  <meta name="author" value="$author">
-  <meta name="email" value="$email">
+  <meta name="author" content="$author">
+  <meta name="email" content="$email">
 #end
 
 #macro ( image $value )
@@ -127,7 +127,7 @@
 #macro (getProjectImage)
   #if ($project.getChild("logo"))
     <td align="left">
-    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"/></a>
+    <a href="http://jakarta.apache.org"><img src="images/jakarta-logo.gif" border="0"></a>
     </td>
     <td align="right">
     #set ( $logoString = $project.getChild("logo").getAttributeValue("href") )
@@ -148,7 +148,7 @@
   <html>
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   
       #set ($authors = $root.getChild("properties").getChildren("author"))
       #foreach ( $au in $authors )
@@ -176,12 +176,12 @@
       </table>
       <table border="0" width="100%" cellspacing="4">
         <tr><td colspan="2">
-          <hr noshade="" size="1"/>
+          <hr noshade size="1"/>
         </td></tr>
         
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
-          <td valign="top" nowrap="true">
+          <td valign="top" nowrap>
           #makeProject()
           </td>
           <td align="left" valign="top">
