diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
index 047f5289d..dc99744bb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
@@ -49,7 +49,6 @@ import java.net.UnknownHostException;
  * Requires Java1.5+ to work properly. On Java1.4 and earlier, if a hostname
  * can be resolved, the destination is assumed to be reachable.
  *
- * @ant.condition name="isreachable"
  * @since Ant 1.7
  */
 public class IsReachable extends ProjectComponent implements Condition {
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java b/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
index 75e2ef2a0..808a66c26 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
@@ -64,7 +64,8 @@ public class Matches extends ProjectComponent implements Condition {
      * A regular expression.
      * You can use this element to refer to a previously
      * defined regular expression datatype instance
-     * @return the regular expression object to be configured as an element
+     * @param regularExpression the regular expression object
+     *                          to be configured as an element
      */
     public void addRegexp(RegularExpression regularExpression) {
         if (this.regularExpression != null) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java
index 57f9f3ba6..47db6ef3c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java
@@ -25,7 +25,7 @@ import org.apache.tools.ant.types.Reference;
  * Simple class that represents an Extension and conforms to Ants
  * patterns.
  *
- * @ant.data-type name="extension"
+ * @ant.datatype name="extension"
  */
 public class ExtensionAdapter extends DataType {
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
index ff021dde2..b178ceb41 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
@@ -29,7 +29,7 @@ import org.apache.tools.ant.types.Reference;
  * The Extension set lists a set of "Optional Packages" /
  * "Extensions".
  *
- * @ant.data-type name="extension-set"
+ * @ant.datatype name="extension-set"
  */
 public class ExtensionSet
     extends DataType {
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java
index 18a8afd8c..7e187d1ba 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java
@@ -77,7 +77,7 @@ public class ForkingSunRmic extends DefaultRmicAdapter {
 
     /**
      * Override point.
-     * @return
+     * @return the executable name.
      */
     protected String getExecutableName() {
         return SunRmic.RMIC_EXECUTABLE;
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
index a050cdd41..b3017e7aa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
@@ -5,8 +5,9 @@ import org.apache.tools.ant.types.Commandline;
 /**
  * Run rmic in a new process with -Xnew set.
  * This switches rmic to use a new compiler, one that doesnt work in-process
- * on ant on java1.6 
- * @see: http://issues.apache.org/bugzilla/show_bug.cgi?id=38732
+ * on ant on java1.6.
+ * see: <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38732">
+ * http://issues.apache.org/bugzilla/show_bug.cgi?id=38732</a>
  */
 public class XNewRmic extends ForkingSunRmic {
 
diff --git a/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java b/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
index ec782bd69..9ba565d38 100644
--- a/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
+++ b/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
@@ -61,7 +61,8 @@ public abstract class EnumeratedAttribute {
      * @return                  Configured EA
      * @throws BuildException   If the class could not be found or the value
      *                          is not valid for the given EA-class.
-     * @see Bug-14831                          
+     * @see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14831">
+     * http://issues.apache.org/bugzilla/show_bug.cgi?id=14831</a>
      */
     public static EnumeratedAttribute getInstance(
     		Class/*<? extends EnumeratedAttribute>*/ clazz, 
@@ -146,4 +147,4 @@ public abstract class EnumeratedAttribute {
         return getValue();
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/org/apache/tools/ant/types/spi/Provider.java b/src/main/org/apache/tools/ant/types/spi/Provider.java
index 8f52fdad8..221f255ca 100644
--- a/src/main/org/apache/tools/ant/types/spi/Provider.java
+++ b/src/main/org/apache/tools/ant/types/spi/Provider.java
@@ -25,7 +25,8 @@ import org.apache.tools.ant.BuildException;
  * This class corresponds to the nested element
  * &lt;provider type="type"&gt; in the &lt;service type=""&gt;
  * nested element of the jar task.
- * @see http://issues.apache.org/bugzilla/show_bug.cgi?id=31520
+ * @see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=31520">
+ * http://issues.apache.org/bugzilla/show_bug.cgi?id=31520</a>
  */
 public class Provider extends ProjectComponent {
     private String type;
diff --git a/src/main/org/apache/tools/ant/types/spi/Service.java b/src/main/org/apache/tools/ant/types/spi/Service.java
index 4d5e4bb56..d7c24b0f7 100644
--- a/src/main/org/apache/tools/ant/types/spi/Service.java
+++ b/src/main/org/apache/tools/ant/types/spi/Service.java
@@ -33,7 +33,8 @@ import org.apache.tools.ant.BuildException;
 /**
  * ANT Jar-Task SPI extension
  * 
- * @see http://issues.apache.org/bugzilla/show_bug.cgi?id=31520
+ * @see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=31520">
+ * http://issues.apache.org/bugzilla/show_bug.cgi?id=31520</a>
  */
 public class Service extends ProjectComponent {
     private List providerList = new ArrayList();