diff --git a/docs/manual/CoreTasks/concat.html b/docs/manual/CoreTasks/concat.html
index e3572e025..d51df0dd3 100644
--- a/docs/manual/CoreTasks/concat.html
+++ b/docs/manual/CoreTasks/concat.html
@@ -18,7 +18,7 @@
       </p>
 
       <p>
-          <a href="../CoreTypes/path.html">Path</a>s and/or
+          <a href="../using.html#path">Path</a>s and/or
 	<a href="../CoreTypes/fileset.html">FileSet</a>s and/or <a
 	href="../CoreTypes/filelist.html">FileList</a>s are used to
 	select which files are to be concatenated. There is no
diff --git a/docs/manual/CoreTasks/java.html b/docs/manual/CoreTasks/java.html
index fb9c2650c..af36918a3 100644
--- a/docs/manual/CoreTasks/java.html
+++ b/docs/manual/CoreTasks/java.html
@@ -94,7 +94,7 @@ EOF (-1). This is a change from Ant 1.5, where such an attempt would block.</p>
   <tr>
     <td valign="top">failonerror</td>
     <td valign="top">Stop the buildprocess if the command exits with a
-      returncode other than 0. Default is "false" (see <a href="#failonerror">note)</a></td>
+      returncode other than 0. Default is "false" (see <a href="#failonerror">note</a>)</td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
@@ -235,10 +235,10 @@ see <a href="../CoreTypes/permissions.html">permissions</a></p>
 <p>When the permission RuntimePermission exitVM has not been granted (or has
 been revoked) the System.exit() call will be intercepted
 and treated like indicated in <i>failonerror</i>.</p>
-<p><a name="failonerror"/>
-If you specify <code>failonerror=&quot;true&quot;</code> and you do not specify permissions,
-a set of default permissions will be added to your java invocation making sure that
-a non zero return code will lead to a <code>BuildException</code>.
+<p><a name="failonerror">Note:</a>
+if you specify <code>failonerror=&quot;true&quot;</code> and you do not specify permissions,
+a set of default permissions will be added to your Java invocation to make sure that
+a non-zero return code will lead to a <code>BuildException</code>.
 </p>
 <p>Settings will be ignored if fork is enabled.</p>
 
diff --git a/docs/manual/CoreTypes/xmlcatalog.html b/docs/manual/CoreTypes/xmlcatalog.html
index 291ca3110..2394ab70a 100644
--- a/docs/manual/CoreTypes/xmlcatalog.html
+++ b/docs/manual/CoreTypes/xmlcatalog.html
@@ -211,7 +211,7 @@ resolution</a>.  The nested <code>&lt;classpath&gt;</code> is a
 <h4>catalogpath</h4>
 <p>
 The nested <code>catalogpath</code> element is a <a
-href="using.html#path">path</a>-like structure listing catalog files to
+href="../using.html#path">path</a>-like structure listing catalog files to
 search.  All files in this path are assumed to be OASIS catalog files, in
 either
 <a href="http://oasis-open.org/committees/entity/background/9401.html">
diff --git a/docs/manual/OptionalTasks/ccm.html b/docs/manual/OptionalTasks/ccm.html
index 1bae5b47b..25d97b5bb 100644
--- a/docs/manual/OptionalTasks/ccm.html
+++ b/docs/manual/OptionalTasks/ccm.html
@@ -61,7 +61,7 @@ Task to checkin a file
   Comment attribute <i>mycomment</i> is added as a task comment. The task 
   used is the one set as the default.</p>
 <hr>
-<h2><a name="ccmheckout">CCMCheckout</a></h2>
+<h2><a name="ccmcheckout">CCMCheckout</a></h2>
 <h3>Description</h3>
 Task to perform a Checkout command to Continuus 
 <h3>Parameters</h3>
diff --git a/docs/manual/OptionalTasks/dotnet.html b/docs/manual/OptionalTasks/dotnet.html
index 995b61fff..66070accb 100644
--- a/docs/manual/OptionalTasks/dotnet.html
+++ b/docs/manual/OptionalTasks/dotnet.html
@@ -94,7 +94,7 @@ can, however, be done if absolutely necessary.
 </tr>
 
 <tr>
-  <td><a href="ImportTypelib.html">ImportTypelib .html</a></td>
+  <td><a href="importtypelib.html">ImportTypelib</a></td>
   <td>Imports a COM type library into .NET</td>
 </tr>
 
diff --git a/docs/manual/OptionalTasks/replaceregexp.html b/docs/manual/OptionalTasks/replaceregexp.html
index cbb409163..2060e9762 100644
--- a/docs/manual/OptionalTasks/replaceregexp.html
+++ b/docs/manual/OptionalTasks/replaceregexp.html
@@ -20,7 +20,7 @@ have been regenerated by this task.</p>
 type mappers</a> this task needs a supporting regular expression
 library and an implementation of
 <code>org.apache.tools.ant.util.regexp.Regexp</code>.
-See details in the documentation of the <a href=../CoreTypes/regexp.html#implementation">Regexp Type</a>. </p>
+See details in the documentation of the <a href="../CoreTypes/regexp.html#implementation">Regexp Type</a>. </p>
 
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
diff --git a/docs/manual/dirtasks.html b/docs/manual/dirtasks.html
index 193a29e3f..960d15b7e 100644
--- a/docs/manual/dirtasks.html
+++ b/docs/manual/dirtasks.html
@@ -188,7 +188,7 @@ tasks that can act as an implicit fileset:</p>
   <li><a href="CoreTasks/tar.html">&lt;tar&gt;</a></li>
   <li><a href="CoreTasks/zip.html">&lt;zip&gt;</a></li>
   <li><a href="OptionalTasks/ejb.html#ddcreator">&lt;ddcreator&gt;</a></li>
-  <li><a href="OptionalTasks/ejb.html#ejbjar.html">&lt;ejbjar&gt;</a></li>
+  <li><a href="OptionalTasks/ejb.html#ejbjar">&lt;ejbjar&gt;</a></li>
   <li><a href="OptionalTasks/ejb.html#ejbc">&lt;ejbc&gt;</a></li>
   <li><a href="OptionalTasks/cab.html">&lt;cab&gt;</a></li>
   <li><a href="OptionalTasks/icontract.html">&lt;icontract&gt;</a></li>
diff --git a/src/etc/tagdiff.xsl b/src/etc/tagdiff.xsl
index 72f7e5e17..12a1e6f75 100644
--- a/src/etc/tagdiff.xsl
+++ b/src/etc/tagdiff.xsl
@@ -64,7 +64,7 @@
           </h1>
           Tagdiff between <xsl:value-of select="@startTag"/> <xsl:value-of select="@startDate"/> and
 			<xsl:value-of select="@endTag"/> <xsl:value-of select="@endDate"/>
-          <p align="right">Designed for use with <a href="http://jakarta.apache.org">Ant</a>.</p>
+          <p align="right">Designed for use with <a href="http://ant.apache.org/">Ant</a>.</p>
           <hr size="2"/>
 	<a name="TOP"/>
 	<table width="100%">