diff --git a/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
index 5071824ec..c63460792 100644
--- a/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
@@ -264,7 +264,7 @@ public class PumpStreamHandler implements ExecuteStreamHandler {
      * @param is the input stream to copy from.
      * @param os the output stream to copy to.
      * @param closeWhenExhausted if true close the inputstream.
-     * @param useAvailable set it to <code>true</code> to use simulated non
+     * @param nonBlockingIO set it to <code>true</code> to use simulated non
      *                     blocking IO.
      * @return a thread object that does the pumping, subclasses
      * should return an instance of {@link ThreadWithPumper
diff --git a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
index fef495601..4f3c9cbff 100644
--- a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
+++ b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
@@ -28,7 +28,8 @@ import org.apache.tools.ant.util.FileNameMapper;
  * <p>This mapper was inspired by a user-list thread that mentioned
  * wget's --cut-dirs option.</p>
  *
- * @see http://mail-archives.apache.org/mod_mbox/ant-user/201009.mbox/%3C51772743BEA5D44A9EA5BF52AADDD6FB010E96F6@hammai008.delphi.local%3E
+ * @see <a href="http://mail-archives.apache.org/mod_mbox/ant-user/201009.mbox/%3C51772743BEA5D44A9EA5BF52AADDD6FB010E96F6@hammai008.delphi.local%3E">
+ * simplify copy with regexpmapper</a>
  */
 public class CutDirsMapper implements FileNameMapper {
     private int dirs = 0;
diff --git a/src/main/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.java b/src/main/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.java
index 443c323d4..ecd3d1b20 100644
--- a/src/main/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.java
+++ b/src/main/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.java
@@ -119,7 +119,7 @@ public abstract class AbstractResourceCollectionWrapper
      * Do compute the size of the resource collection. The implementation of
      * this function is allowed to be not thread safe.
      * 
-     * @return
+     * @return size of resource collection.
      */
     protected abstract int getSize();
 
diff --git a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java
index c30386628..b78cdeb32 100644
--- a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java
+++ b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java
@@ -50,8 +50,8 @@ public class LazyResourceCollectionWrapper extends
      * Specify if the resource should be filtered or not. This function should
      * be overrided in order to define the filtering algorithm
      * 
-     * @param r
-     * @return
+     * @param r resource considered for filtration
+     * @return whether the resource should be filtered or not
      */
     protected boolean filterResource(Resource r) {
         return false;
diff --git a/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java b/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
index ab46f8b4b..f9381a503 100644
--- a/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
+++ b/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
@@ -22,9 +22,11 @@ package org.apache.tools.zip;
  * Wrapper for extra field data that doesn't conform to the recommended format of header-tag + size + data.
  *
  * <p>The header-id is artificial (and not listed as a know ID in
- * {@link http://www.pkware.com/documents/casestudies/APPNOTE.TXT
- * APPNOTE.TXT}.  Since it isn't used anywhere except to satisfy the
+ * the .ZIP File Format Specification).  
+ * Since it isn't used anywhere except to satisfy the
  * ZipExtraField contract it shouldn't matter anyway.</p>
+ * @see <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+ * APPNOTE.TXT">.ZIP File Format Specification</a>
  * @since Ant 1.8.1
  */
 public final class UnparseableExtraFieldData