diff --git a/manual/Integration/jext-plugin.html b/manual/Integration/jext-plugin.html
index 84e88c087..effb033bd 100644
--- a/manual/Integration/jext-plugin.html
+++ b/manual/Integration/jext-plugin.html
@@ -14,20 +14,18 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta http-equiv="Content-Language" content="en-us">
   <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
 <title>Apache AntWork Plugin for the Jext Java Text Editor</title>
 </head>
 <body>
 
-<h1>AntWork Plugin for the Jext Java Text Editor</h1>
- <a name="authors"></a>by<ul>
-  <li>Klaus Hartlage
-      (<a href="mailto:KHartlage@t-online.de">KHartlage@t-online.de</a>)</li>
+<h1 id="authors">AntWork Plugin for the Jext Java Text Editor</h1>
+by
+<ul>
+  <li>Klaus Hartlage (<a href="mailto:KHartlage@t-online.de">KHartlage@t-online.de</a>)</li>
 </ul>
 <hr>
 
@@ -52,5 +50,5 @@ compile.</p>
 Jext. With a double-click on the error-message you jump to the error
 in the specified java text file.</p>
 
-
-</body></html>
+</body>
+</html>
diff --git a/manual/Tasks/BorlandEJBTasks.html b/manual/Tasks/BorlandEJBTasks.html
index 3ee56c6c9..e473d65b1 100644
--- a/manual/Tasks/BorlandEJBTasks.html
+++ b/manual/Tasks/BorlandEJBTasks.html
@@ -42,79 +42,79 @@ his homepage.</p>
 <h3>Borland element</h3>
 <table>
   <tr>
-    <td valign="top" width="63"><b>Attribute</b></td>
-    <td valign="top" width="915"><b>Description</b></td>
-    <td align="center" valign="top" width="62"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
   </tr>
   <tr>
-    <td valign="top" width="63">destdir</td>
-    <td valign="top" width="915">The base directory into which the generated borland
+    <td valign="top">destdir</td>
+    <td valign="top">The base directory into which the generated borland
       ready jar files are deposited</td>
-    <td align="center" valign="middle" width="62">yes</td>
+    <td align="center" valign="middle">yes</td>
   </tr>
   <tr>
-    <td valign="top" width="63">debug</td>
-    <td valign="top" width="915">If true, turn on the debug mode for each borland
+    <td valign="top">debug</td>
+    <td valign="top">If true, turn on the debug mode for each borland
       tools (java2iiop, iastool ...) default = false</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td align="center" valign="middle">no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">verify</td>
-    <td valign="top" width="915">If true, turn on the verification at the end
+    <td valign="top">verify</td>
+    <td valign="top">If true, turn on the verification at the end
       of the jar production (default = false)</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td align="center" valign="middle">no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">verifyargs</td>
-    <td valign="top" width="915">extra parameter for verify command</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td valign="top">verifyargs</td>
+    <td valign="top">extra parameter for verify command</td>
+    <td align="center" valign="middle">no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">suffix</td>
-    <td valign="top" width="915">String value appended to the basename of the
+    <td valign="top">suffix</td>
+    <td valign="top">String value appended to the basename of the
       deployment descriptor to create the filename of the Borland EJB jar file.</td>
-    <td align="center" valign="middle" width="62">No, defaults to '-ejb.jar'.</td>
+    <td align="center" valign="middle">No, defaults to '-ejb.jar'.</td>
   </tr>
   <tr>
-    <td valign="top" width="63">basdtd</td>
-    <td valign="top" width="915"><b>Deprecated</b>. Defines the location of the
+    <td valign="top">basdtd</td>
+    <td valign="top"><b>Deprecated</b>. Defines the location of the
       DTD which covers the Borland specific deployment descriptors.
       This should not be necessary if you have borland in your classpath. If you
       do not, you should use a nested
       <a href="ejb.html#ejbjar-dtd"><code>&lt;dtd&gt;</code></a> element, described
       in the ejbjar task documentation.</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td align="center" valign="middle">no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">ejbdtd</td>
-    <td valign="top" width="915"><b>Deprecated</b>. Defines the location of the
+    <td valign="top">ejbdtd</td>
+    <td valign="top"><b>Deprecated</b>. Defines the location of the
       ejb-jar DTD in the class hierarchy. This should not be necessary
       if you have borland in your classpath. If you do not, you should use a
       nested <a href="ejb.html#ejbjar-dtd"><code>&lt;dtd&gt;</code></a> element,
       described in the ejbjar task
       documentation.</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td align="center" valign="middle">no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">generateclient</td>
-    <td valign="top" width="915">If true, turn on the generation of the corresponding
+    <td valign="top">generateclient</td>
+    <td valign="top">If true, turn on the generation of the corresponding
       ejbjar (default = false)</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td align="center" valign="middle">no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">version</td>
-    <td valign="top" width="915">set the Borland Application Version.
+    <td valign="top">version</td>
+    <td valign="top">set the Borland Application Version.
             <ul>
               <li>4 means B.A.S (Borland Application Server) 4.x, target will add ejb-inprise.xml file</li>
               <li>5 means B.E.S (Borland Application Server) 5.x, target will add ejb-borland.xml file</li>
             </ul>
           </td>
-    <td align="center" valign="middle" width="62">No, defaults to 4</td>
+    <td align="center" valign="middle">No, defaults to 4</td>
   </tr>
   <tr>
-    <td valign="top" width="63">java2iiopParams</td>
-    <td valign="top" width="915">If filled, the params are added to the java2iiop command (ex: -no_warn_missing_define)</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td valign="top">java2iiopParams</td>
+    <td valign="top">If filled, the params are added to the java2iiop command (ex: -no_warn_missing_define)</td>
+    <td align="center" valign="middle">no</td>
   </tr>
 
 </table>
diff --git a/manual/Tasks/BorlandGenerateClient.html b/manual/Tasks/BorlandGenerateClient.html
index 9454444a9..fe5021fb1 100644
--- a/manual/Tasks/BorlandGenerateClient.html
+++ b/manual/Tasks/BorlandGenerateClient.html
@@ -33,43 +33,43 @@
 <h3>Parameters</h3>
 <table>
   <tr>
-    <td valign="top" width="63"><b>Attribute</b></td>
-    <td valign="top" width="915"><b>Description</b></td>
-    <td align="center" valign="top" width="62"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
   </tr>
   <tr>
-    <td valign="top" width="63">ejbjar</td>
-    <td valign="top" width="915">ejb jar file</td>
-    <td align="center" valign="middle" width="62">yes</td>
+    <td valign="top">ejbjar</td>
+    <td valign="top">ejb jar file</td>
+    <td align="center" valign="middle">yes</td>
   </tr>
   <tr>
-    <td valign="top" width="63">debug</td>
-    <td valign="top" width="915">If true, turn on the debug mode for each borland
+    <td valign="top">debug</td>
+    <td valign="top">If true, turn on the debug mode for each borland
       tools (java2iiop, iastool ...) default = false</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td align="center" valign="middle">no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">clientjar</td>
-    <td valign="top" width="915">client jar file name. If missing the client jar
+    <td valign="top">clientjar</td>
+    <td valign="top">client jar file name. If missing the client jar
       file name is build using the ejbjar file name: ejbjar = hellobean-ejb.jar
       =&gt; hellobean-ejbclient.jar</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td align="center" valign="middle">no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">mode</td>
-    <td valign="top" width="915">choose the command launching mode. Two values:
+    <td valign="top">mode</td>
+    <td valign="top">choose the command launching mode. Two values:
       java or fork. default = fork. java is not supported for version=5.Possibility to specify a classpath.</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td align="center" valign="middle">no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">version</td>
-    <td valign="top" width="915">set the Borland Application Version.
+    <td valign="top">version</td>
+    <td valign="top">set the Borland Application Version.
             <ul>
               <li>4 means B.A.S (Borland Application Server 4.x)</li>
               <li>5 means B.E.S (Borland Application Server 5.x)</li>
             </ul>
           </td>
-    <td align="center" valign="middle" width="62">No, defaults to 4</td>
+    <td align="center" valign="middle">No, defaults to 4</td>
   </tr>
 </table>
 
diff --git a/manual/Tasks/apply.html b/manual/Tasks/apply.html
index 540be75a6..dd42fe953 100644
--- a/manual/Tasks/apply.html
+++ b/manual/Tasks/apply.html
@@ -37,9 +37,9 @@ href="../Types/resources.html#collection">Resource Collection</a>s
 &ndash; including but not restricted to
  <a href="../Types/fileset.html">FileSet</a>s,
  <a href="../Types/dirset.html">DirSet</a>s
- (<em>since&nbsp;Ant&nbsp;1.6</em>) or
+ (<em>since Ant 1.6</em>) or
  <a href="../Types/filelist.html">FileList</a>s
- (<em>since&nbsp;Ant&nbsp;1.6</em>)
+ (<em>since Ant 1.6</em>)
 &ndash; are passed as arguments to the system command.</p>
 <p>If you specify a nested <a href="../Types/mapper.html">mapper</a>,
 the timestamp of each source file is compared to the timestamp of a
@@ -86,7 +86,7 @@ to send input to it is via the input and inputstring attributes.</p>
     <td valign="top">whether or not you want the commands to be spawned.<br>
     If you spawn a command, its output will not be logged by Ant.<br>
     The input, output, error, and result property settings are not active when spawning a process.<br>
-    <em>since&nbsp;Ant&nbsp;1.6</em>
+    <em>since Ant 1.6</em>
     </td>
     <td align="center" valign="top">No, default is <i>false</i></td>
   </tr>
@@ -139,7 +139,7 @@ to send input to it is via the input and inputstring attributes.</p>
   <tr>
     <td valign="top">error</td>
     <td valign="top">The file to which the standard error of the
-    command should be redirected.  <em>since&nbsp;Ant&nbsp;1.6</em></td>
+    command should be redirected.  <em>since Ant 1.6</em></td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
@@ -149,7 +149,7 @@ to send input to it is via the input and inputstring attributes.</p>
     file/property. The error output will not be included in the output
     file/property. If you redirect error with the &quot;error&quot; or
     &quot;errorProperty&quot; attributes, this will have no effect.
-    <em>since&nbsp;Ant&nbsp;1.6</em></td>
+    <em>since Ant 1.6</em></td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
@@ -170,21 +170,21 @@ to send input to it is via the input and inputstring attributes.</p>
   <tr>
     <td valign="top">errorproperty</td>
     <td valign="top">The name of a property in which the standard error of the
-      command should be stored.  <em>since&nbsp;Ant&nbsp;1.6</em></td>
+      command should be stored.  <em>since Ant 1.6</em></td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
     <td valign="top">input</td>
     <td valign="top">A file from which the executed command's standard
     input is taken. This attribute is mutually exclusive with the
-    inputstring attribute.  <em>since&nbsp;Ant&nbsp;1.6</em></td>
+    inputstring attribute.  <em>since Ant 1.6</em></td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
     <td valign="top">inputstring</td>
     <td valign="top">A string which serves as the input stream for the
     executed command. This attribute is mutually exclusive with the
-    input attribute.  <em>since&nbsp;Ant&nbsp;1.6</em></td>
+    input attribute.  <em>since Ant 1.6</em></td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
@@ -265,38 +265,38 @@ to send input to it is via the input and inputstring attributes.</p>
     that does not exist, against the execution directory if
     specified. On Unix systems, if you only want to allow execution of
     commands in the user's path, set this to false.
-    <em>since&nbsp;Ant&nbsp;1.6</em></td>
+    <em>since Ant 1.6</em></td>
     <td align="center" valign="top">No, default is <i>false</i></td>
   </tr>
   <tr>
     <td valign="top">maxparallel</td>
     <td valign="top">Limit the amount of parallelism by passing at
       most this many sourcefiles at once.  Set it to &lt;= 0 for
-      unlimited. <em>Since&nbsp;Ant&nbsp;1.6</em>.</td>
+      unlimited. <em>Since Ant 1.6</em>.</td>
     <td align="center" valign="top">No, unlimited by default</td>
   </tr>
   <tr>
     <td valign="top">addsourcefile</td>
     <td valign="top">Whether source file names should be added to the
-      command automatically. <em>Since&nbsp;Ant&nbsp;1.6</em>.</td>
+      command automatically. <em>Since Ant 1.6</em>.</td>
     <td align="center" valign="top">No, default is <i>true</i></td>
   </tr>
   <tr>
     <td valign="top">verbose</td>
     <td valign="top">Whether to print a summary after execution or not.
-      <em>Since&nbsp;Ant&nbsp;1.6</em>.</td>
+      <em>Since Ant 1.6</em>.</td>
     <td align="center" valign="top">No, default <i>false</i></td>
   </tr>
   <tr>
     <td valign="top">ignoremissing</td>
     <td valign="top">Whether to ignore nonexistent files specified
-      via filelists.  <em>Since&nbsp;Ant&nbsp;1.6.2</em>.</td>
+      via filelists.  <em>Since Ant 1.6.2</em>.</td>
     <td align="center" valign="top">No, default is <i>true</i></td>
   </tr>
   <tr>
     <td valign="top">force</td>
     <td valign="top">Whether to bypass timestamp comparisons
-      for target files.  <em>Since&nbsp;Ant&nbsp;1.6.3</em>.</td>
+      for target files.  <em>Since Ant 1.6.3</em>.</td>
     <td align="center" valign="top">No, default is <i>false</i></td>
   </tr>
 </table>
@@ -306,12 +306,12 @@ to send input to it is via the input and inputstring attributes.</p>
 elements to define the files for this task and refer to
 <code>&lt;fileset&gt;</code>s defined elsewhere.</p>
 <h4>filelist</h4>
-<p><em>Since&nbsp;Ant&nbsp;1.6</em></p>
+<p><em>Since Ant 1.6</em></p>
 <p>You can use any number of nested <code>&lt;filelist&gt;</code>
 elements to define the files for this task and refer to
 <code>&lt;filelist&gt;</code>s defined elsewhere.</p>
 <h4>dirset</h4>
-<p><em>Since&nbsp;Ant&nbsp;1.6</em></p>
+<p><em>Since Ant 1.6</em></p>
 <p>You can use any number of nested <code>&lt;dirset&gt;</code>
 elements to define the directories for this task and refer to
 <code>&lt;dirset&gt;</code>s defined elsewhere.</p>
@@ -386,7 +386,7 @@ specified if you also define a nested mapper.</p>
 system command via nested <code>&lt;env&gt;</code> elements. See the
 description in the section about <a href="exec.html#env">exec</a></p>
 <h4>redirector</h4>
-<em>Since&nbsp;Ant&nbsp;1.6.2</em>
+<em>Since Ant 1.6.2</em>
 <p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
 can be specified.  &lt;apply&gt;'s behavior is like that of
 <a href="exec.html#redirector">exec</a> with regard to
diff --git a/manual/Tasks/available.html b/manual/Tasks/available.html
index bda0f5854..3b0a9c751 100644
--- a/manual/Tasks/available.html
+++ b/manual/Tasks/available.html
@@ -147,7 +147,7 @@ if the class <code>javax.xml.transform.Transformer</code> is found in the classp
 &lt;available property=&quot;have.extras&quot; resource=&quot;extratasks.properties&quot;&gt;
   &lt;classpath&gt;
     &lt;pathelement location=&quot;/usr/local/ant/extra.jar&quot; /&gt;
-&nbsp;&nbsp;&lt;/classpath&gt;
+  &lt;/classpath&gt;
 &lt;/available&gt;
 </pre></blockquote>
 <p>sets the <code>have.extras</code> property to the value &quot;true&quot;
diff --git a/manual/Tasks/conditions.html b/manual/Tasks/conditions.html
index 312437ea6..c3976855d 100644
--- a/manual/Tasks/conditions.html
+++ b/manual/Tasks/conditions.html
@@ -205,9 +205,9 @@ web server of the specified url. By default, HTTP responses errors
 of 400 or greater are viewed as invalid.</p>
 <table>
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">url</td>
@@ -244,9 +244,9 @@ of 400 or greater are viewed as invalid.</p>
 TCP/IP listener at the specified host and port.</p>
 <table>
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">server</td>
@@ -270,9 +270,9 @@ or the filenames match the answer is so obvious the detailed test is omitted.
 </p>
 <table>
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">file1</td>
@@ -771,9 +771,9 @@ must match. <em>Since Ant 1.7</em>
 </p>
 <table>
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">astext</td>
@@ -792,9 +792,9 @@ must match. <em>Since Ant 1.7</em>
 </p>
 <table>
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">resource</td>
@@ -830,9 +830,9 @@ must match. <em>Since Ant 1.7</em>
 
 <table>
     <tr>
-        <td width="12%" valign="top"><b>Attribute</b></td>
-        <td width="78%" valign="top"><b>Description</b></td>
-        <td width="10%" valign="top"><b>Required</b></td>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td valign="top"><b>Required</b></td>
     </tr>
     <tr>
         <td valign="top">classname</td>
@@ -1033,9 +1033,9 @@ is redundant and will be ignored.</p>
 
 <table>
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">millis</td>
@@ -1098,9 +1098,9 @@ is redundant and will be ignored.</p>
 
 <table>
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">atleast</td>
diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html
index c08d940dc..f8de104de 100644
--- a/manual/Tasks/ejb.html
+++ b/manual/Tasks/ejb.html
@@ -1735,7 +1735,7 @@ nested elements.</p>
 JOnAS EJB container. This example requires the naming standard to be used for
 the deployment descriptors. Using this format will create a EJB JAR file for
 each variation of &nbsp;'*-jar.xml' that is found in the deployment descriptor
-directory.&nbsp;</p>
+directory.</p>
 
 <pre>
       &lt;ejbjar srcdir="${build.classes}"
diff --git a/manual/Tasks/ftp.html b/manual/Tasks/ftp.html
index 1961e8caa..1d60d68f0 100644
--- a/manual/Tasks/ftp.html
+++ b/manual/Tasks/ftp.html
@@ -64,9 +64,9 @@ try to set up a new connection.</p>
 <h3>Parameters</h3>
 <table>
   <tr>
-    <td valign="top" width="15%"><b>Attribute</b></td>
-    <td valign="top" width="65%"><b>Description</b></td>
-    <td align="center" valign="top" width="20%"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">server</td>
@@ -386,36 +386,36 @@ try to set up a new connection.</p>
 <table>
   <tbody>
     <tr>
-      <td style="vertical-align: top;" width="20%">Action</td>
-      <td style="vertical-align: top;" width="40%">meaning of <code>remotedir</code></td>
+      <td style="vertical-align: top;">Action</td>
+      <td style="vertical-align: top;">meaning of <code>remotedir</code></td>
       <td style="vertical-align: top;">use of nested <code>fileset</code>(s)</td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">send/put</td>
-      <td style="vertical-align: top;" width="40%">base directory to
+      <td style="vertical-align: top;">send/put</td>
+      <td style="vertical-align: top;">base directory to
 which the files are sent</td>
       <td style="vertical-align: top;">they are used normally and
 evaluated on the local machine</td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">recv/get</td>
-      <td style="vertical-align: top;" width="40%">base directory from
+      <td style="vertical-align: top;">recv/get</td>
+      <td style="vertical-align: top;">base directory from
 which the files are retrieved</td>
       <td style="vertical-align: top;">the remote files located under
 the <code>remotedir</code> matching the include/exclude patterns of
 the <code>fileset</code></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">del/delete</td>
-      <td style="vertical-align: top;" width="40%">base directory from
+      <td style="vertical-align: top;">del/delete</td>
+      <td style="vertical-align: top;">base directory from
 which files get deleted</td>
       <td style="vertical-align: top;">the remote files located under
 the <code>remotedir</code> matching the include/exclude patterns of
 the <code>fileset</code></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">list</td>
-      <td style="vertical-align: top;" width="40%">base directory from
+      <td style="vertical-align: top;">list</td>
+      <td style="vertical-align: top;">base directory from
 which files are listed<br>
       </td>
       <td style="vertical-align: top;">the remote files located under
@@ -423,21 +423,21 @@ the <code>remotedir</code> matching the include/exclude patterns of
 the <code>fileset</code></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">mkdir</td>
-      <td style="vertical-align: top;" width="40%">directory to create</td>
+      <td style="vertical-align: top;">mkdir</td>
+      <td style="vertical-align: top;">directory to create</td>
       <td style="vertical-align: top;">not used</td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">chmod</td>
-      <td style="vertical-align: top;" width="40%">base directory from
+      <td style="vertical-align: top;">chmod</td>
+      <td style="vertical-align: top;">base directory from
 which the mode of files get changed</td>
       <td style="vertical-align: top;">the remote files located under
 the <code>remotedir</code> matching the include/exclude patterns of
 the <code>fileset</code></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">rmdir</td>
-      <td style="vertical-align: top;" width="40%">base directory from
+      <td style="vertical-align: top;">rmdir</td>
+      <td style="vertical-align: top;">base directory from
 which directories get removed</td>
       <td style="vertical-align: top;">the remote directories located
 under the <code>remotedir</code> matching the include/exclude
diff --git a/manual/Tasks/image.html b/manual/Tasks/image.html
index 20459d046..d1a06e202 100644
--- a/manual/Tasks/image.html
+++ b/manual/Tasks/image.html
@@ -220,12 +220,12 @@ nested inside the Draw object.</p>
 <h3>Examples</h3>
 
 <blockquote><pre>
-&nbsp;&lt;image destdir="samples/low" overwrite="yes"&gt;
-&nbsp;&nbsp;&nbsp;&nbsp; &lt;fileset dir="samples/full"&gt;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;include name="**/*.jpg"/&gt;
-&nbsp;&nbsp;&nbsp;&nbsp; &lt;/fileset&gt;
-&nbsp;&nbsp;&nbsp;&nbsp; &lt;scale width="160" height="160" proportions="fit"/&gt;
-&nbsp;&lt;/image&gt;
+ &lt;image destdir="samples/low" overwrite="yes"&gt;
+     &lt;fileset dir="samples/full"&gt;
+         &lt;include name="**/*.jpg"/&gt;
+     &lt;/fileset&gt;
+     &lt;scale width="160" height="160" proportions="fit"/&gt;
+ &lt;/image&gt;
 </pre></blockquote>
 <p>Create thumbnails of my images and make sure they all fit within the 160x160 size whether the
 image is portrait or landscape.</p>
diff --git a/manual/Tasks/import.html b/manual/Tasks/import.html
index 5744bf613..d588a3111 100644
--- a/manual/Tasks/import.html
+++ b/manual/Tasks/import.html
@@ -118,12 +118,12 @@ properties from <code>imported.properties</code>:</p>
 
 <pre>&lt;!-- importing.xml --&gt;
 &lt;project name="importing" basedir="." default="..."&gt;
-&nbsp; &lt;import file="${path_to_imported}/imported.xml"/&gt;
+  &lt;import file="${path_to_imported}/imported.xml"/&gt;
 &lt;/project&gt;
 
 &lt;!-- imported.xml --&gt;
 &lt;project name="imported" basedir="." default="..."&gt;
-&nbsp; &lt;property file="imported.properties"/&gt;
+  &lt;property file="imported.properties"/&gt;
 &lt;/project&gt;
 </pre>
 
@@ -135,8 +135,8 @@ of <code>imported.xml</code> is ignored by Ant. The right way to use
 <pre>
 &lt;!-- imported.xml --&gt;
 &lt;project name="imported" basedir="." default="..."&gt;
-&nbsp; &lt;dirname property="imported.basedir" file="${ant.file.imported}"/&gt;
-&nbsp; &lt;property file="${imported.basedir}/imported.properties"/&gt;
+  &lt;dirname property="imported.basedir" file="${ant.file.imported}"/&gt;
+  &lt;property file="${imported.basedir}/imported.properties"/&gt;
 &lt;/project&gt;
 </pre>
 
@@ -224,14 +224,12 @@ collection</h4>
     1.8.0</em></p>
 
 <h3>Examples</h3>
-<pre>&nbsp; &lt;import file=&quot;../common-targets.xml&quot;/&gt;
-</pre>
+<pre>  &lt;import file=&quot;../common-targets.xml&quot;/&gt;</pre>
 
 <p>Imports targets from the common-targets.xml file that is in a parent
 directory.</p>
 
-<pre>&nbsp; &lt;import file=&quot;${deploy-platform}.xml&quot;/&gt;
-</pre>
+<pre>  &lt;import file=&quot;${deploy-platform}.xml&quot;/&gt;</pre>
 
 <p>Imports the project defined by the property deploy-platform</p>
 
diff --git a/manual/Tasks/include.html b/manual/Tasks/include.html
index 3b9cdb7e7..1c9ab3255 100644
--- a/manual/Tasks/include.html
+++ b/manual/Tasks/include.html
@@ -113,12 +113,12 @@ properties from <code>included.properties</code>:</p>
 
 <pre>&lt;!-- including.xml --&gt;
 &lt;project name="including" basedir="." default="..."&gt;
-&nbsp; &lt;include file="${path_to_included}/included.xml"/&gt;
+  &lt;include file="${path_to_included}/included.xml"/&gt;
 &lt;/project&gt;
 
 &lt;!-- included.xml --&gt;
 &lt;project name="included" basedir="." default="..."&gt;
-&nbsp; &lt;property file="included.properties"/&gt;
+  &lt;property file="included.properties"/&gt;
 &lt;/project&gt;
 </pre>
 
@@ -130,8 +130,8 @@ of <code>included.xml</code> is ignored by Ant. The right way to use
 <pre>
 &lt;!-- included.xml --&gt;
 &lt;project name="included" basedir="." default="..."&gt;
-&nbsp; &lt;dirname property="included.basedir" file="${ant.file.included}"/&gt;
-&nbsp; &lt;property file="${included.basedir}/included.properties"/&gt;
+  &lt;dirname property="included.basedir" file="${ant.file.included}"/&gt;
+  &lt;property file="${included.basedir}/included.properties"/&gt;
 &lt;/project&gt;
 </pre>
 
@@ -219,14 +219,12 @@ collection</h4>
 <p>The specified resources will be included.</p>
 
 <h3>Examples</h3>
-<pre>&nbsp; &lt;include file=&quot;../common-targets.xml&quot;/&gt;
-</pre>
+<pre>  &lt;include file=&quot;../common-targets.xml&quot;/&gt;</pre>
 
 <p>Includes targets from the common-targets.xml file that is in a parent
 directory.</p>
 
-<pre>&nbsp; &lt;include file=&quot;${deploy-platform}.xml&quot;/&gt;
-</pre>
+<pre>  &lt;include file=&quot;${deploy-platform}.xml&quot;/&gt;</pre>
 
 <p>Includes the project defined by the property deploy-platform</p>
 
diff --git a/manual/Tasks/jar.html b/manual/Tasks/jar.html
index 321a5862a..ea3eecce8 100644
--- a/manual/Tasks/jar.html
+++ b/manual/Tasks/jar.html
@@ -543,7 +543,7 @@ program (Implementation-Version). Note that the Built-By attribute will take the
 property ${user.name}. The manifest produced by the above would look like this:
 </p>
 
-<blockquote><pre><code>Manifest-Version: 1.0
+<blockquote><pre>Manifest-Version: 1.0
 Permissions: sandbox
 Codebase: example.com
 Built-By: conor
@@ -553,7 +553,7 @@ Implementation-Version: 1.0.0beta2
 Created-By: Apache Ant 1.9.2
 
 Name: common/MyClass.class
-Sealed: false</code></pre></blockquote>
+Sealed: false</pre></blockquote>
 
 <h4>Service Provider</h4>
 
diff --git a/manual/Tasks/java.html b/manual/Tasks/java.html
index ee49be129..305ea9a74 100644
--- a/manual/Tasks/java.html
+++ b/manual/Tasks/java.html
@@ -32,7 +32,7 @@ specified.</p>
 If odd things go wrong when you run this task, set fork="true" to use a new
 JVM.
 
-<p>As of Ant 1.6.3, you can interact with a forked VM, as well as
+<p><em>Since Ant 1.6.3</em>, you can interact with a forked VM, as well as
 sending input to it via the <code>input</code> and <code>inputstring</code>
 attributes.</p>
 
diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html
index 70f693290..a0656bb19 100644
--- a/manual/Tasks/javac.html
+++ b/manual/Tasks/javac.html
@@ -571,9 +571,9 @@ enable arguments only if a given compiler implementation will be
 used.</p>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">value</td>
diff --git a/manual/Tasks/javah.html b/manual/Tasks/javah.html
index ac6ee3e7b..cbfd67e85 100644
--- a/manual/Tasks/javah.html
+++ b/manual/Tasks/javah.html
@@ -38,9 +38,8 @@ systems are used.</p>
   attribute instead which allows you to compile the classes and
   generate the native header files with a single step.</p>
 
-<p><strong>Note</strong>: <code>javah</code> has been deprecated as of Java 9
-  and removed as of Java 10. Trying to use it with Java 10 will
-  fail.</p>
+<p><strong>Note</strong>: <code>javah</code> has been deprecated in Java 9
+  and removed in Java 10. Attempts to use it with Java 10 will fail.</p>
 
 <p id="implementationvalues">It is possible to use different
 compilers. This can be selected with the <code>implementation</code>
@@ -132,7 +131,7 @@ attribute:</p>
     <td align="center" valign="top">No</td>
   </tr>
 </table>
-<p>Either outputFile or destdir must be supplied, but not both.&nbsp;</p>
+<p>Either outputFile or destdir must be supplied, but not both.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
@@ -146,9 +145,9 @@ only if a given compiler implementation will be used.</p>
 
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">value</td>
diff --git a/manual/Tasks/jdepend.html b/manual/Tasks/jdepend.html
index 27f60b05d..6fd5486d1 100644
--- a/manual/Tasks/jdepend.html
+++ b/manual/Tasks/jdepend.html
@@ -120,9 +120,9 @@ to ignore (requires JDepend 2.5 or above).</p>
 <blockquote>
 <pre>
 &lt;jdepend classpathref="base.path"&gt;
-&nbsp;&nbsp;&nbsp; &lt;classespath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="build"/&gt;
-&nbsp;&nbsp;&nbsp; &lt;/classespath&gt;
+    &lt;classespath&gt;
+        &lt;pathelement location="build"/&gt;
+    &lt;/classespath&gt;
 &lt;/jdepend&gt;
 </pre>
 </blockquote>
@@ -134,13 +134,13 @@ classpath reference.</p>
 <blockquote>
 <pre>
 &lt;jdepend outputfile="docs/jdepend.xml" fork="yes" format="xml"&gt;
-&nbsp;&nbsp;&nbsp; &lt;sourcespath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="src"/&gt;
-&nbsp;&nbsp;&nbsp; &lt;/sourcespath&gt;
-&nbsp;&nbsp;&nbsp; &lt;classpath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="classes"/&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="lib/jdepend.jar"/&gt;
-&nbsp;&nbsp;&nbsp; &lt;/classpath&gt;
+    &lt;sourcespath&gt;
+        &lt;pathelement location="src"/&gt;
+    &lt;/sourcespath&gt;
+    &lt;classpath&gt;
+        &lt;pathelement location="classes"/&gt;
+        &lt;pathelement location="lib/jdepend.jar"/&gt;
+    &lt;/classpath&gt;
 &lt;/jdepend&gt;
 </pre>
 </blockquote>
@@ -153,11 +153,11 @@ classpath is defined using nested elements.</p>
 <blockquote>
 <pre>
 &lt;jdepend classpathref="base.path"&gt;
-&nbsp;&nbsp;&nbsp; &lt;exclude name="java.*&gt;
-&nbsp;&nbsp;&nbsp; &lt;exclude name="javax.*&gt;
-&nbsp;&nbsp;&nbsp; &lt;classespath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="build"/&gt;
-&nbsp;&nbsp;&nbsp; &lt;/classespath&gt;
+    &lt;exclude name="java.*&gt;
+    &lt;exclude name="javax.*&gt;
+    &lt;classespath&gt;
+        &lt;pathelement location="build"/&gt;
+    &lt;/classespath&gt;
 &lt;/jdepend&gt;
 </pre>
 </blockquote>
diff --git a/manual/Tasks/jjdoc.html b/manual/Tasks/jjdoc.html
index f3721b5b2..caf718a6f 100644
--- a/manual/Tasks/jjdoc.html
+++ b/manual/Tasks/jjdoc.html
@@ -71,7 +71,7 @@ generated BNF documentation file.</p>
 <td valign="top">outputfile</td>
 
 <td valign="top">The file to write the generated BNF documentation file to. If not set,
-the file is written with the same name as the JavaCC grammar file but with a the suffix .html or .txt.&nbsp;</td>
+the file is written with the same name as the JavaCC grammar file but with a the suffix .html or .txt</td>
 
 <td align="center" valign="top">No</td>
 </tr>
@@ -106,9 +106,9 @@ Example</h3>
 
 <blockquote>
 <pre>&lt;jjdoc
-&nbsp;&nbsp;&nbsp; target="src/Parser.jj"
-&nbsp;&nbsp;&nbsp; outputfile="doc/ParserBNF.html"
-&nbsp;&nbsp;&nbsp; javacchome="c:/program files/JavaCC"/&gt;</pre>
+    target="src/Parser.jj"
+    outputfile="doc/ParserBNF.html"
+    javacchome="c:/program files/JavaCC"/&gt;</pre>
 </blockquote>
 This invokes JJDoc on grammar file src/Parser.jj, writing the generated
 BNF documentation file, ParserBNF.html, file to doc.
diff --git a/manual/Tasks/jjtree.html b/manual/Tasks/jjtree.html
index 70529bb8b..4bfd484ab 100644
--- a/manual/Tasks/jjtree.html
+++ b/manual/Tasks/jjtree.html
@@ -74,7 +74,7 @@ generated JavaCC file.</p>
 <td valign="top">outputdirectory</td>
 
 <td valign="top">The directory to write the generated JavaCC grammar and node files to.
-If not set, the files are written to the directory containing the grammar file.&nbsp;</td>
+If not set, the files are written to the directory containing the grammar file.</td>
 
 <td align="center" valign="top">No</td>
 </tr>
@@ -195,11 +195,11 @@ option.</td>
 <h3>Example</h3>
 
 <blockquote>
-<pre>&lt;jjtree&nbsp;
-&nbsp;&nbsp;&nbsp; target="src/Parser.jjt"
-&nbsp;&nbsp;&nbsp; outputdirectory="build/src"
-&nbsp;&nbsp;&nbsp; javacchome="c:/program files/JavaCC"
-&nbsp;&nbsp;&nbsp; nodeusesparser="true"/&gt;</pre>
+<pre>&lt;jjtree
+    target="src/Parser.jjt"
+    outputdirectory="build/src"
+    javacchome="c:/program files/JavaCC"
+    nodeusesparser="true"/&gt;</pre>
 </blockquote>
 This invokes JJTree on grammar file src/Parser.jjt, writing the generated
 grammar file, Parser.jj, file to build/src. The grammar option NODE_USES_PARSER
@@ -211,7 +211,7 @@ is set to true when invoking JJTree.
 <table>
 <tr>
   <td><b>Command Line JJTree options</b>
-    <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>and Generated Files</i> (working directory: <code>/tmp</code>)</td>
+    <i>and Generated Files</i> (working directory: <code>/tmp</code>)</td>
   <td><b>Ant 1.5.3</b> versus command line</td>
   <td><b>Ant 1.6</b> versus command line</td>
 </tr>
diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html
index e53ace722..2d65b8bf9 100644
--- a/manual/Tasks/junit.html
+++ b/manual/Tasks/junit.html
@@ -73,9 +73,9 @@ elements</a>).</p>
 <h3>Parameters</h3>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">printsummary</td>
@@ -289,7 +289,7 @@ supports a nested <code>&lt;classpath&gt;</code>
 element that represents a <a href="../using.html#path">PATH like
 structure</a>.</p>
 
-<p>As of Ant 1.7, this classpath may be used to refer to <code>junit.jar</code>
+<p><em>Since Ant 1.7</em>, this classpath may be used to refer to <code>junit.jar</code>
 as well as your tests and the tested code.
 
 <h4>jvmarg</h4>
@@ -416,9 +416,9 @@ the name of the resulting class (without suffix). It defaults to <i>java-tmp-dir
 
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">type</td>
@@ -459,9 +459,9 @@ the name of the resulting class (without suffix). It defaults to <i>java-tmp-dir
 
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">name</td>
@@ -583,9 +583,9 @@ supported.</p>
 
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">fork</td>
diff --git a/manual/Tasks/junitreport.html b/manual/Tasks/junitreport.html
index 8ce88d1d4..2b0e72c1d 100644
--- a/manual/Tasks/junitreport.html
+++ b/manual/Tasks/junitreport.html
@@ -58,9 +58,9 @@ available anymore for quite some time.</p>
 <h3>Parameters</h3>
 <table>
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">tofile</td>
@@ -85,9 +85,9 @@ element.</p>
 <h3>Parameters</h3>
 <table>
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Required</b></td>
   </tr>
   <tr>
     <td valign="top">format</td>
diff --git a/manual/Tasks/mail.html b/manual/Tasks/mail.html
index 0edc15a09..2ada002c3 100644
--- a/manual/Tasks/mail.html
+++ b/manual/Tasks/mail.html
@@ -336,7 +336,7 @@ the <code>&lt;message&gt;</code> element.</p>
 
 <p>Sends an eMail from <i>config@myisp.com</i> to <i>all@xyz.com</i> with a subject of
 <i>Test Build</i>. Replies to this email will go to <i>me@myisp.com</i>.
-Any zip files from the dist directory are attached.&nbsp; The
+Any zip files from the dist directory are attached. The
 task will attempt to use JavaMail and fall back to UU encoding or no encoding in
 that order depending on what support classes are available. <code>${buildname}</code>
 will be replaced with the <code>buildname</code> property's value.</p>
diff --git a/manual/Tasks/manifest.html b/manual/Tasks/manifest.html
index 208503b9a..f020c92f4 100644
--- a/manual/Tasks/manifest.html
+++ b/manual/Tasks/manifest.html
@@ -172,7 +172,7 @@ version identification</a> for the package <code>common</code>.</p>
 
 <p>The manifest produced by the above would look like this:</p>
 
-<pre><code>Manifest-Version: 1.0
+<pre>Manifest-Version: 1.0
 Built-By: bodewig
 Created-By: Apache Ant 1.9
 
@@ -187,7 +187,7 @@ Implementation-Title: common
 Name: common/class1.class
 Sealed: false
 
-</code></pre>
+</pre>
 
 </body>
 </html>
diff --git a/manual/Tasks/native2ascii.html b/manual/Tasks/native2ascii.html
index 8a43e0813..b23820018 100644
--- a/manual/Tasks/native2ascii.html
+++ b/manual/Tasks/native2ascii.html
@@ -162,9 +162,9 @@ only if a given converter implementation will be used.</p>
 
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">value</td>
diff --git a/manual/Tasks/propertyfile.html b/manual/Tasks/propertyfile.html
index a77f91f8f..f698301ea 100644
--- a/manual/Tasks/propertyfile.html
+++ b/manual/Tasks/propertyfile.html
@@ -44,26 +44,26 @@ file are preserved.</p>
 <h3>Parameters</h3>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
 <tr>
-  <td width="12%" valign="top">file</td>
-  <td width="78%" valign="top">Location of the property file to be edited</td>
-  <td width="10%" valign="top">Yes</td>
+  <td valign="top">file</td>
+  <td valign="top">Location of the property file to be edited</td>
+  <td valign="top">Yes</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">comment</td>
-  <td width="78%" valign="top">Header for the file itself</td>
-  <td width="10%" valign="top">no</td>
+  <td valign="top">comment</td>
+  <td valign="top">Header for the file itself</td>
+  <td valign="top">no</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">jdkproperties</td>
-  <td width="78%" valign="top">Use java.lang.Properties, which will
+  <td valign="top">jdkproperties</td>
+  <td valign="top">Use java.lang.Properties, which will
     lose comments and layout of file (default is 'false').  <em>since
     Ant 1.8.0</em></td>
-  <td width="10%" valign="top">no</td>
+  <td valign="top">no</td>
 </tr>
 </table>
 
@@ -140,7 +140,7 @@ elements to specify actual modifications to the property file itself.</p>
     <td align="center" valign="top">No</td>
   </tr>
 </table>
-<p>The rules used when setting a property value are shown below.&nbsp; The
+<p>The rules used when setting a property value are shown below. The
 operation occurs <b>after</b> these rules are considered.</p>
 
 <ul>
diff --git a/manual/Tasks/pvcstask.html b/manual/Tasks/pvcstask.html
index 91c85c4b0..f08b5a1cd 100644
--- a/manual/Tasks/pvcstask.html
+++ b/manual/Tasks/pvcstask.html
@@ -68,101 +68,101 @@ version of the files contained by the repository.
 
 <table>
 <tr>
-<td valign="top" width="12%"><b>Attribute</b></td>
+<td valign="top"><b>Attribute</b></td>
 
-<td valign="top" width="78%"><b>Description</b></td>
+<td valign="top"><b>Description</b></td>
 
-<td valign="top" width="10%"><b>Required</b></td>
+<td valign="top"><b>Required</b></td>
 </tr>
 
 <tr>
-<td valign="top" width="12%">repository</td>
+<td valign="top">repository</td>
 
-<td valign="top" width="78%">The location of the repository (see your PVCS
+<td valign="top">The location of the repository (see your PVCS
 manuals)</td>
 
-<td valign="top" width="10%">Yes</td>
+<td valign="top">Yes</td>
 </tr>
 
 <tr>
-<td valign="top" width="12%">pvcsproject</td>
+<td valign="top">pvcsproject</td>
 
-<td valign="top" width="78%">The project within the PVCS repository to extract
+<td valign="top">The project within the PVCS repository to extract
 files from (&quot;/&quot; is root project and that is default if this attribute isn't
 specified)</td>
 
-<td valign="top" width="10%">No</td>
+<td valign="top">No</td>
 </tr>
 
 <tr>
-<td valign="top" width="12%">label</td>
+<td valign="top">label</td>
 
-<td valign="top" width="78%">Only files marked with this label are extracted.</td>
+<td valign="top">Only files marked with this label are extracted.</td>
 
-<td valign="top" width="10%">No</td>
+<td valign="top">No</td>
 </tr>
 
 <tr>
-<td valign="top" width="12%">promotiongroup</td>
+<td valign="top">promotiongroup</td>
 
-<td valign="top" width="78%">Only files within this promotion group are extracted. Using
+<td valign="top">Only files within this promotion group are extracted. Using
 both the <i>label</i> and the <i>promotiongroup</i> tag will cause the files in the
 promotion group and with that label to be extracted.
 </td>
 
-<td valign="top" width="10%">No</td>
+<td valign="top">No</td>
 </tr>
 
 <tr>
-<td valign="top" width="12%">config</td>
+<td valign="top">config</td>
 
-<td valign="top" width="78%">path of a non default .cfg file.
+<td valign="top">path of a non default .cfg file.
 Can be given absolute or relative to Ant's base directory.
 </td>
 
-<td valign="top" width="10%">No</td>
+<td valign="top">No</td>
 </tr>
 
 <tr>
-<td valign="top" width="12%">force</td>
+<td valign="top">force</td>
 
-<td valign="top" width="78%">If set to <i>yes</i> all files that exists and are writable are overwritten. Default <i>no</i> causes the files that are writable to be ignored. This stops the PVCS command <i>get</i> to stop asking questions!</td>
+<td valign="top">If set to <i>yes</i> all files that exists and are writable are overwritten. Default <i>no</i> causes the files that are writable to be ignored. This stops the PVCS command <i>get</i> to stop asking questions!</td>
 
-<td valign="top" width="10%">No</td>
+<td valign="top">No</td>
 </tr>
 
 <tr>
-<td valign="top" width="12%">workspace</td>
+<td valign="top">workspace</td>
 
-<td valign="top" width="78%">By specifying a workspace, the files are extracted to that location. A PVCS workspace is a
+<td valign="top">By specifying a workspace, the files are extracted to that location. A PVCS workspace is a
 name for a location of the workfiles and isn't as such the location itself. You define the location for a workspace
 using the PVCS GUI clients. If this isn't specified the default workspace for the current user is used.</td>
 
-<td valign="top" width="10%">No</td>
+<td valign="top">No</td>
 </tr>
 
 <tr>
-<td valign="top" width="12%">pvcsbin</td>
+<td valign="top">pvcsbin</td>
 
-<td valign="top" width="78%">On some systems the PVCS executables <i>pcli</i>
+<td valign="top">On some systems the PVCS executables <i>pcli</i>
 and <i>get</i> are not found in the PATH. In such cases this attribute
 should be set to the bin directory of the PVCS installation containing
 the executables mentioned before. If this attribute isn't specified the
 tag expects the executables to be found using the PATH environment variable.</td>
 
-<td valign="top" width="10%">No</td>
+<td valign="top">No</td>
 </tr>
     <tr>
-      <td valign="top" width="12%">ignorereturncode</td>
-      <td valign="top" width="78%">If set to <i>true</i> the return value from executing
+      <td valign="top">ignorereturncode</td>
+      <td valign="top">If set to <i>true</i> the return value from executing
         the pvcs commands are ignored.</td>
-      <td valign="top" width="10%">No</td>
+      <td valign="top">No</td>
     </tr>
     <tr>
-      <td valign="top" width="12%">updateonly</td>
-      <td valign="top" width="78%">If set to <i>true</i> files are gotten only if
+      <td valign="top">updateonly</td>
+      <td valign="top">If set to <i>true</i> files are gotten only if
         newer than existing local files.</td>
-      <td valign="top" width="10%">No</td>
+      <td valign="top">No</td>
     </tr>
     <tr>
       <td valign="top">filenameformat</td>
@@ -207,19 +207,19 @@ specified.</p>
 
 <table>
 <tr>
-<td valign="top" width="12%"><b>Attribute</b></td>
+<td valign="top"><b>Attribute</b></td>
 
-<td valign="top" width="78%"><b>Description</b></td>
+<td valign="top"><b>Description</b></td>
 
-<td valign="top" width="10%"><b>Required</b></td>
+<td valign="top"><b>Required</b></td>
 </tr>
 
 <tr>
-<td valign="top" width="12%">name</td>
+<td valign="top">name</td>
 
-<td valign="top" width="78%">The name of the pvcs project</td>
+<td valign="top">The name of the pvcs project</td>
 
-<td valign="top" width="10%">Yes</td>
+<td valign="top">Yes</td>
 </tr>
 </table>
 
diff --git a/manual/Tasks/rmic.html b/manual/Tasks/rmic.html
index 92bd28d6b..8ac52d5be 100644
--- a/manual/Tasks/rmic.html
+++ b/manual/Tasks/rmic.html
@@ -262,9 +262,9 @@ enable arguments only if a given compiler implementation will be
 used.</p>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">value</td>
diff --git a/manual/Tasks/schemavalidate.html b/manual/Tasks/schemavalidate.html
index 40b3c21f5..6a6f1e9fc 100644
--- a/manual/Tasks/schemavalidate.html
+++ b/manual/Tasks/schemavalidate.html
@@ -143,9 +143,9 @@ the document(s).
 </p>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">namespace</td>
@@ -169,9 +169,9 @@ the document(s).
 </p>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">publicId</td>
@@ -198,9 +198,9 @@ SAX features are defined here:
  </p>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">name</td>
@@ -222,9 +222,9 @@ Properties can be used to set the schema used to validate the XML file.
 </p>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">name</td>
diff --git a/manual/Tasks/sos.html b/manual/Tasks/sos.html
index 990829024..f590f69a8 100644
--- a/manual/Tasks/sos.html
+++ b/manual/Tasks/sos.html
@@ -77,7 +77,7 @@ have been tested with Linux, Solaris &amp; Windows2000.</p>
          <tr>
            <td><a href="#SOSCheckOut">soscheckout</a></td>
            <td>Retrieves a read-write copy of the specified project
-           or file, locking the&nbsp;VSS master copy</td>
+           or file, locking the VSS master copy</td>
          </tr>
 
   </tbody>
diff --git a/manual/Tasks/sql.html b/manual/Tasks/sql.html
index cf94ac87e..4e52ae4e8 100644
--- a/manual/Tasks/sql.html
+++ b/manual/Tasks/sql.html
@@ -56,34 +56,34 @@ and <b>abort</b> execution and transaction and fail task.</p>
 <h3>Parameters</h3>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
 <tr>
-  <td width="12%" valign="top">driver</td>
-  <td width="78%" valign="top">Class name of the jdbc driver</td>
-  <td width="10%" valign="top">Yes</td>
+  <td valign="top">driver</td>
+  <td valign="top">Class name of the jdbc driver</td>
+  <td valign="top">Yes</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">url</td>
-  <td width="78%" valign="top">Database connection url</td>
-  <td width="10%" valign="top">Yes</td>
+  <td valign="top">url</td>
+  <td valign="top">Database connection url</td>
+  <td valign="top">Yes</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">userid</td>
-  <td width="78%" valign="top">Database user name</td>
-  <td width="10%" valign="top">Yes</td>
+  <td valign="top">userid</td>
+  <td valign="top">Database user name</td>
+  <td valign="top">Yes</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">password</td>
-  <td width="78%" valign="top">Database password</td>
-  <td width="10%" valign="top">Yes</td>
+  <td valign="top">password</td>
+  <td valign="top">Database password</td>
+  <td valign="top">Yes</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">src</td>
-  <td width="78%" valign="top">File containing SQL statements</td>
-  <td width="10%" valign="top">Yes, unless statements enclosed within tags</td>
+  <td valign="top">src</td>
+  <td valign="top">File containing SQL statements</td>
+  <td valign="top">Yes, unless statements enclosed within tags</td>
 </tr>
 <tr>
   <td valign="top">encoding</td>
@@ -97,37 +97,37 @@ and <b>abort</b> execution and transaction and fail task.</p>
   <td align="center">No - defaults to default JVM encoding</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">delimiter</td>
-  <td width="78%" valign="top">String that separates SQL statements</td>
-  <td width="10%" valign="top">No, default &quot;;&quot;</td>
+  <td valign="top">delimiter</td>
+  <td valign="top">String that separates SQL statements</td>
+  <td valign="top">No, default &quot;;&quot;</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">autocommit</td>
-  <td width="78%" valign="top">Auto commit flag for database connection (default false)</td>
-  <td width="10%" valign="top">No, default &quot;false&quot;</td>
+  <td valign="top">autocommit</td>
+  <td valign="top">Auto commit flag for database connection (default false)</td>
+  <td valign="top">No, default &quot;false&quot;</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">print</td>
-  <td width="78%" valign="top">Print result sets from the statements (default false)</td>
-  <td width="10%" valign="top">No, default &quot;false&quot;</td>
+  <td valign="top">print</td>
+  <td valign="top">Print result sets from the statements (default false)</td>
+  <td valign="top">No, default &quot;false&quot;</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">showheaders</td>
-  <td width="78%" valign="top">Print headers for result sets from the statements (default true)</td>
-  <td width="10%" valign="top">No, default &quot;true&quot;</td>
+  <td valign="top">showheaders</td>
+  <td valign="top">Print headers for result sets from the statements (default true)</td>
+  <td valign="top">No, default &quot;true&quot;</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">showtrailers</td>
-  <td width="78%" valign="top">Print trailer for number of rows affected (default true)</td>
-  <td width="10%" valign="top">No, default &quot;true&quot;</td>
+  <td valign="top">showtrailers</td>
+  <td valign="top">Print trailer for number of rows affected (default true)</td>
+  <td valign="top">No, default &quot;true&quot;</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">output</td>
-  <td width="78%" valign="top">Output file for result sets (defaults to System.out).
+  <td valign="top">output</td>
+  <td valign="top">Output file for result sets (defaults to System.out).
     <em>Since Ant 1.8</em> can specify any Resource that supports output (see
     <a href="../develop.html#set-magic">note</a>).
   </td>
-  <td width="10%" valign="top">No (print to System.out by default)</td>
+  <td valign="top">No (print to System.out by default)</td>
 </tr>
   <tr>
     <td valign="top">append</td>
@@ -137,120 +137,120 @@ and <b>abort</b> execution and transaction and fail task.</p>
       specify a filesystem destination.</td>
   </tr>
 <tr>
-  <td width="12%" valign="top">classpath</td>
-  <td width="78%" valign="top">Classpath used to load driver</td>
-  <td width="10%" valign="top">No (use system classpath)</td>
+  <td valign="top">classpath</td>
+  <td valign="top">Classpath used to load driver</td>
+  <td valign="top">No (use system classpath)</td>
 </tr>
   <tr>
-    <td width="12%" valign="top">classpathref</td>
-    <td width="78%" valign="top">The classpath to use, given as a <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
-  <td width="10%" valign="top">No (use system classpath)</td>
+    <td valign="top">classpathref</td>
+    <td valign="top">The classpath to use, given as a <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
+  <td valign="top">No (use system classpath)</td>
   </tr>
 <tr>
-  <td width="12%" valign="top">onerror</td>
-  <td width="78%" valign="top">Action to perform when statement fails: continue, stop, abort</td>
-  <td width="10%" valign="top">No, default &quot;abort&quot;</td>
+  <td valign="top">onerror</td>
+  <td valign="top">Action to perform when statement fails: continue, stop, abort</td>
+  <td valign="top">No, default &quot;abort&quot;</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">rdbms</td>
-  <td width="78%" valign="top">Execute task only if this rdbms</td>
-  <td width="10%" valign="top">No (no restriction)</td>
+  <td valign="top">rdbms</td>
+  <td valign="top">Execute task only if this rdbms</td>
+  <td valign="top">No (no restriction)</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">version</td>
-  <td width="78%" valign="top">Execute task only if rdbms version match</td>
-  <td width="10%" valign="top">No (no restriction)</td>
+  <td valign="top">version</td>
+  <td valign="top">Execute task only if rdbms version match</td>
+  <td valign="top">No (no restriction)</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">caching</td>
-  <td width="78%" valign="top">Should the task cache loaders and the driver?</td>
-  <td width="10%" valign="top">No (default=true)</td>
+  <td valign="top">caching</td>
+  <td valign="top">Should the task cache loaders and the driver?</td>
+  <td valign="top">No (default=true)</td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">delimitertype</td>
-  <td width="78%" valign="top">Control whether the delimiter will only be recognized on a line by itself.<br>
+  <td valign="top">delimitertype</td>
+  <td valign="top">Control whether the delimiter will only be recognized on a line by itself.<br>
     Can be "normal" -anywhere on the line, or "row", meaning it must be on a line by itself</td>
-  <td width="10%" valign="top">No (default:normal)</td>
+  <td valign="top">No (default:normal)</td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">keepformat</td>
-  <td width="78%" valign="top">Control whether the format of the sql will be preserved.<br>
+  <td valign="top">keepformat</td>
+  <td valign="top">Control whether the format of the sql will be preserved.<br>
     Useful when loading packages and procedures.
-  <td width="10%" valign="top">No (default=false)</td>
+  <td valign="top">No (default=false)</td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">escapeprocessing</td>
-  <td width="78%" valign="top">Control whether the Java statement
+  <td valign="top">escapeprocessing</td>
+  <td valign="top">Control whether the Java statement
     object will perform escape substitution.<br>
     See <a
     href="http://docs.oracle.com/javase/7/docs/api/java/sql/Statement.html#setEscapeProcessing%28boolean%29">Statement's
     API docs</a> for details.  <em>Since Ant 1.6</em>.
-  <td width="10%" valign="top">No (default=true)</td>
+  <td valign="top">No (default=true)</td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">expandproperties</td>
-  <td width="78%" valign="top">Set to true to turn on property expansion in
+  <td valign="top">expandproperties</td>
+  <td valign="top">Set to true to turn on property expansion in
   nested SQL, inline in the task or nested transactions. <em>Since Ant 1.7</em>.
-  <td width="10%" valign="top">No (default=true)</td>
+  <td valign="top">No (default=true)</td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">rawblobs</td>
-  <td width="78%" valign="top">If true, will write raw streams rather than hex encoding when
+  <td valign="top">rawblobs</td>
+  <td valign="top">If true, will write raw streams rather than hex encoding when
     printing BLOB results. <em>Since Ant 1.7.1</em>.</td>
-  <td width="10%" valign="top">No, default <em>false</em></td>
+  <td valign="top">No, default <em>false</em></td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">failOnConnectionError</td>
-  <td width="78%" valign="top">If false, will only print a warning
+  <td valign="top">failOnConnectionError</td>
+  <td valign="top">If false, will only print a warning
     message and not execute any statement if the task fails to connect
     to the database.  <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default <em>true</em></td>
+  <td valign="top">No, default <em>true</em></td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">strictDelimiterMatching</td>
-  <td width="78%" valign="top">If false, delimiters will be searched
+  <td valign="top">strictDelimiterMatching</td>
+  <td valign="top">If false, delimiters will be searched
     for in a case-insensitive manner (i.e. delimiter="go" matches "GO")
     and surrounding whitespace will be ignored (delimiter="go" matches
     "GO ").  <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default <em>true</em></td>
+  <td valign="top">No, default <em>true</em></td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">showWarnings</td>
-  <td width="78%" valign="top">If true, SQLWarnings will be logged at
+  <td valign="top">showWarnings</td>
+  <td valign="top">If true, SQLWarnings will be logged at
     the WARN level.  <em>Since Ant 1.8.0</em>.<br/>
     <strong>Note</strong>: even if the attribute is set to false, warnings that
     apply to the connection will be logged at the verbose level.</td>
-  <td width="10%" valign="top">No, default <em>false</em></td>
+  <td valign="top">No, default <em>false</em></td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">treatWarningsAsErrors</td>
-  <td width="78%" valign="top">If true, SQLWarnings will be treated
+  <td valign="top">treatWarningsAsErrors</td>
+  <td valign="top">If true, SQLWarnings will be treated
     like errors - and the logic selected via the onError attribute
     applies.
     <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default <em>false</em></td>
+  <td valign="top">No, default <em>false</em></td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">csvColumnSeparator</td>
-  <td width="78%" valign="top">The column separator used when printing
+  <td valign="top">csvColumnSeparator</td>
+  <td valign="top">The column separator used when printing
     the results.
     <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default <em>','</em></td>
+  <td valign="top">No, default <em>','</em></td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">csvQuoteCharacter</td>
-  <td width="78%" valign="top">The character used to quote column
+  <td valign="top">csvQuoteCharacter</td>
+  <td valign="top">The character used to quote column
     values.<br/>
     If set, columns that contain either the column separator or the
     quote character itself will be surrounded by the quote character.
@@ -258,14 +258,14 @@ and <b>abort</b> execution and transaction and fail task.</p>
     the column's value.<br/>
     <strong>Note</strong>: BLOB values will never be quoted.
     <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default is not set (i.e. no quoting
+  <td valign="top">No, default is not set (i.e. no quoting
     ever occurs)</td>
 </tr>
 
 <tr>
-  <td width="12%" valign="top">forceCsvQuoteChar</td>
-  <td width="78%" valign="top">If true, quoting always occurs</td>
-  <td width="10%" valign="top">No, default is not set (i.e. quoting
+  <td valign="top">forceCsvQuoteChar</td>
+  <td valign="top">If true, quoting always occurs</td>
+  <td valign="top">No, default is not set (i.e. quoting
     occurs only where needed)</td>
 </tr>
 
diff --git a/manual/Tasks/xmlvalidate.html b/manual/Tasks/xmlvalidate.html
index 5981f2933..8ae19257e 100644
--- a/manual/Tasks/xmlvalidate.html
+++ b/manual/Tasks/xmlvalidate.html
@@ -107,9 +107,9 @@ may not apply.</p>
 </p>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">publicId</td>
@@ -136,9 +136,9 @@ SAX features are defined here:
  </p>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">name</td>
@@ -160,9 +160,9 @@ Properties can be used to set the schema used to validate the XML file.
 </p>
 <table>
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td valign="top"><b>Required</b></td>
 </tr>
   <tr>
     <td valign="top">name</td>
diff --git a/manual/Types/filterchain.html b/manual/Types/filterchain.html
index 7159185b7..ced1f3079 100644
--- a/manual/Types/filterchain.html
+++ b/manual/Types/filterchain.html
@@ -272,7 +272,7 @@ Convenience method:
 &lt;/loadfile&gt;
 </pre></blockquote>
 
-<p>As of Ant <strong>1.8.3</strong>, a nested
+<p><em>Since Ant 1.8.3</em>, a nested
  <a href="propertyset.html">PropertySet</a> can be specified:
 
 <blockquote><pre>
@@ -421,10 +421,10 @@ regular expression matching strings.
   <tr>
     <td valign="top">regexp</td>
     <td valign="top" align="center">Regular expression to be searched for.<br>
-      <em>Starting with 1.10.2 this also works as an attribute
-        on <code>linecontainsregexp</code>, in earlier versions of Ant
+      <em>Since Ant 1.10.2</em>, this also works as an attribute
+        on <code>linecontainsregexp</code>. In earlier versions of Ant
         you must use a nested element when using the convenience
-        method.</em>
+        method.
     </td>
     <td valign="top" align="center">Yes</td>
   </tr>
diff --git a/manual/Types/mapper.html b/manual/Types/mapper.html
index 38c3824d4..01ccc904c 100644
--- a/manual/Types/mapper.html
+++ b/manual/Types/mapper.html
@@ -636,7 +636,7 @@ with <code>&lt;uptodate&gt;</code> and <code>&lt;junit&gt;</code> output.</p>
     File mapping is performed by passing the source filename to each nested
     <code>&lt;mapper&gt;</code> in turn, returning all results.
     The <i>to</i> and <i>from</i> attributes are ignored.</p>
-  <p>Starting with Ant 1.8.0 the order of the mapped results is the
+  <p><em>Since Ant 1.8.0</em>, the order of the mapped results is the
     same as the order of the nested mappers; prior to Ant 1.8.0 the
     order has been undefined.</p>
 <b>Examples:</b>
diff --git a/manual/Types/namespace.html b/manual/Types/namespace.html
index 5488022e5..51dccc999 100644
--- a/manual/Types/namespace.html
+++ b/manual/Types/namespace.html
@@ -129,7 +129,7 @@
           &lt;/task&gt;
         </pre>
     <p>
-      From Ant 1.6.2, elements nested inside a namespaced element may also be
+        <em>Since Ant 1.6.2</em>, elements nested inside a namespaced element may also be
       in Ant's default namespace. This means that the following is now allowed:
     </p>
     <pre> &lt;typedef resource="org/example/tasks.properties"
diff --git a/manual/Types/resources.html b/manual/Types/resources.html
index d16650a9d..7c0040c58 100644
--- a/manual/Types/resources.html
+++ b/manual/Types/resources.html
@@ -190,20 +190,20 @@ supported. A constant must be specified as <tt>public static</tt> otherwise it c
 This loads the value of the constant <tt>VERSION</tt> of the <tt>org.acme.Main</tt> class
 into the <tt>version</tt>-property. The classpath for finding that class is provided via
 nested classpath element.
-<pre><code>&lt;loadresource property=&quot;version&quot;&gt;
+<pre>&lt;loadresource property=&quot;version&quot;&gt;
    &lt;javaconstant name=&quot;org.acme.Main.VERSION&quot;&gt;
      &lt;classpath&gt;
        &lt;pathelement location=&quot;${acme.lib.dir}&quot;/&gt;
      &lt;/classpath&gt;
    &lt;/javaconstant&gt;
  &lt;/loadresource&gt;
-</code></pre>
+</pre>
 
 Create a new file <tt>c:/temp/org.apache.tools.ant.Main.DEFAULT_BUILD_FILENAME</tt> with the content
 of that constant (<tt>build.xml</tt>).
-<pre><code>&lt;copy todir=&quot;c:/temp&quot;&gt;
+<pre>&lt;copy todir=&quot;c:/temp&quot;&gt;
   &lt;javaconstant name=&quot;org.apache.tools.ant.Main.DEFAULT_BUILD_FILENAME&quot;/&gt;
-&lt;/copy&gt;</code></pre>
+&lt;/copy&gt;</pre>
 
 <h4 id="zipentry">zipentry</h4>
 
@@ -791,9 +791,9 @@ platforms.
     <a href="#resources">resources</a> collection.</p>
   <h6>Examples</h6>
   <p>Assuming the namespace settings</p>
-<pre><code>  rsel="antlib:org.apache.tools.ant.types.resources.selectors"
+<pre>  rsel="antlib:org.apache.tools.ant.types.resources.selectors"
   rcmp="antlib:org.apache.tools.ant.types.resources.comparators"
-</code></pre>
+</pre>
   <pre>
 &lt;restrict&gt;
   &lt;fileset dir="src" includes="a,b,c,d,e,f,g" /&gt;

Attribute	Description	Required	Attribute	Description	Required
destdir	The base directory into which the generated borland +	destdir	The base directory into which the generated borland ready jar files are deposited	yes	yes
debug	If true, turn on the debug mode for each borland +	debug	If true, turn on the debug mode for each borland tools (java2iiop, iastool ...) default = false	no	no
verify	If true, turn on the verification at the end +	verify	If true, turn on the verification at the end of the jar production (default = false)	no	no
verifyargs	extra parameter for verify command	no	verifyargs	extra parameter for verify command	no
suffix	String value appended to the basename of the +	suffix	String value appended to the basename of the deployment descriptor to create the filename of the Borland EJB jar file.	No, defaults to '-ejb.jar'.	No, defaults to '-ejb.jar'.
basdtd	Deprecated. Defines the location of the +	basdtd	Deprecated. Defines the location of the DTD which covers the Borland specific deployment descriptors. This should not be necessary if you have borland in your classpath. If you do not, you should use a nested `<dtd>` element, described in the ejbjar task documentation.	no	no
ejbdtd	Deprecated. Defines the location of the +	ejbdtd	Deprecated. Defines the location of the ejb-jar DTD in the class hierarchy. This should not be necessary if you have borland in your classpath. If you do not, you should use a nested `<dtd>` element, described in the ejbjar task documentation.	no	no
generateclient	If true, turn on the generation of the corresponding +	generateclient	If true, turn on the generation of the corresponding ejbjar (default = false)	no	no
version	set the Borland Application Version. +	version	set the Borland Application Version. 4 means B.A.S (Borland Application Server) 4.x, target will add ejb-inprise.xml file 5 means B.E.S (Borland Application Server) 5.x, target will add ejb-borland.xml file	No, defaults to 4	No, defaults to 4
java2iiopParams	If filled, the params are added to the java2iiop command (ex: -no_warn_missing_define)	no	java2iiopParams	If filled, the params are added to the java2iiop command (ex: -no_warn_missing_define)	no