diff --git a/docs/manual/CoreTypes/selectors.html b/docs/manual/CoreTypes/selectors.html
index eae12ae63..5f3efa12c 100644
--- a/docs/manual/CoreTypes/selectors.html
+++ b/docs/manual/CoreTypes/selectors.html
@@ -326,8 +326,8 @@
     <p>Selects all files in the base directory and one directory below
     that.</p>
 
-    <a name="differentselect">
-    <h4>Different Selector</h4>
+    
+    <h4><a name="differentselect">Different Selector</a></h4>
 
     <p>The <code>&lt;different&gt;</code> selector will select a file
     if it is deemed to be 'different' from an equivalent file in
@@ -690,7 +690,7 @@
         <li> update the cache if needed and requested </li>
         <li> do the selection according to the comparison result </li>
         </ol>
-    The comparison, computing of the hashvalue and the store is done by implementation
+    <p>The comparison, computing of the hashvalue and the store is done by implementation
     of special interfaces. Therefore they may provide additional parameters.</p>
 
     <p>The <code>&lt;modified&gt;</code> selector can be used as a
@@ -807,7 +807,7 @@
                                    <i>set</i>XX-methods </li>
         <li> <b> comparator.* </b>: Value is transfered to the comparator via its
                                    <i>set</i>XX-methods </li>
-    </ul></p>
+    </ul>
 
     <table border="1" cellpadding="2" cellspacing="0">
       <tr><td colspan="2"><font size="+1"><b> Algorithm options</b></font></td></tr>
@@ -1005,7 +1005,7 @@
         <a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
         or
         <a href="https://scripting.dev.java.net">JSR 223</a>
-        supported language.</p>
+        supported language.
         See the <a href="../OptionalTasks/script.html">Script</a> task for
         an explanation of scripts and dependencies.
       </p>
@@ -1190,7 +1190,7 @@ Select files whose filename length is even.
     <p>All selector containers can contain any other selector, including
     other containers, as an element. Using containers, the selector tags
     can be arbitrarily deep. Here is a complete list of allowable
-    selector elements within a container:</P>
+    selector elements within a container:</p>
 
     <ul>
       <li><code>&lt;and&gt;</code></li>
diff --git a/docs/manual/OptionalTasks/junit.html b/docs/manual/OptionalTasks/junit.html
index bb1181f32..ec648ebab 100644
--- a/docs/manual/OptionalTasks/junit.html
+++ b/docs/manual/OptionalTasks/junit.html
@@ -260,7 +260,7 @@ that begin with the following string patterns:<pre>
    "sun.reflect."
    "org.apache.tools.ant."
    "org.junit."
-   "junit.framework.JUnit4TestAdapter"</pre></p>
+   "junit.framework.JUnit4TestAdapter"</pre>
 
 <h3><a name="nested">Nested Elements</a></h3>
 
diff --git a/docs/manual/using.html b/docs/manual/using.html
index 77687b4ac..0ce59a5c4 100644
--- a/docs/manual/using.html
+++ b/docs/manual/using.html
@@ -154,10 +154,10 @@ In fact, they do not even get evaluated until the target is about to be executed
 and all its predecessors have already run.
 
 <p>The optional <code>description</code> attribute can be used to provide a one-line description of this target, which is printed by the
-<nobr><code>-projecthelp</code></nobr> command-line option. Targets
+<code>-projecthelp</code> command-line option. Targets
 without such a description are deemed internal and will not be listed,
-unless either the <nobr><code>-verbose</code></nobr> or
-<nobr><code>-debug</code></nobr> option is used.
+unless either the <code>-verbose</code> or
+<code>-debug</code> option is used.
 </p>
 <p>It is a good practice to place your <a
 href="CoreTasks/tstamp.html">tstamp</a> tasks in a so-called
@@ -203,7 +203,6 @@ executed first.</p>
     <td align="center" valign="top">No</td>
   </tr>
 </table>
-</p>
 
 <p>A target name can be any alphanumeric string valid in the encoding of the XML
 file. The empty string &quot;&quot; is in this set, as is
@@ -289,7 +288,7 @@ task instances at all, only proxies.
   found <a href="properties.html">in the concepts section</a> of this
   manual.</p>
 
-<a name="example"><h3>Example Buildfile</h3></a>
+<h3><a name="example">Example Buildfile</a></h3>
 <pre>
 &lt;project name=&quot;MyProject&quot; default=&quot;dist&quot; basedir=&quot;.&quot;&gt;
     &lt;description&gt;
@@ -348,7 +347,7 @@ Finally, for this target to work the source in the <tt>src</tt> subdirectory
 should be stored in a directory tree which matches the package names. Check the
 <tt>&lt;javac&gt;</tt> task for details.
 
-<a name="filters"><h3>Token Filters</h3></a>
+<h3><a name="filters">Token Filters</a></h3>
 <p>A project can have a set of tokens that might be automatically expanded if
 found when a file is copied, when the filtering-copy behavior is selected in the
 tasks that support this. These might be set in the buildfile