diff --git a/src/main/org/apache/tools/ant/DemuxInputStream.java b/src/main/org/apache/tools/ant/DemuxInputStream.java
index 42d5dd406..07503427f 100644
--- a/src/main/org/apache/tools/ant/DemuxInputStream.java
+++ b/src/main/org/apache/tools/ant/DemuxInputStream.java
@@ -43,9 +43,6 @@ public class DemuxInputStream extends InputStream {
         this.project = project;
     }
 
-    /**
-     * @see InputStream.read()
-     */
     public int read() throws IOException {
         byte[] buffer = new byte[1];
         if (project.demuxInput(buffer, 0, 1) == -1) {
@@ -55,10 +52,8 @@ public class DemuxInputStream extends InputStream {
     }
 
 
-    /**
-     * @see InputStream.read(byte[], int, int)
-     */
     public int read(byte[] buffer, int offset, int length) throws IOException {
         return project.demuxInput(buffer, offset, length);
     }
+
 }
diff --git a/src/main/org/apache/tools/ant/filters/TokenFilter.java b/src/main/org/apache/tools/ant/filters/TokenFilter.java
index fa4b00ad8..bc3498934 100644
--- a/src/main/org/apache/tools/ant/filters/TokenFilter.java
+++ b/src/main/org/apache/tools/ant/filters/TokenFilter.java
@@ -37,7 +37,7 @@ import org.apache.tools.ant.util.regexp.Regexp;
  * @since Ant 1.6
  * @see BaseFilterReader
  * @see ChainableReader
- * @see DynamicConfigurator
+ * @see org.apache.tools.ant.DynamicConfigurator
  */
 public class TokenFilter extends BaseFilterReader
     implements ChainableReader {
diff --git a/src/main/org/apache/tools/ant/types/DataType.java b/src/main/org/apache/tools/ant/types/DataType.java
index a5d9c79e6..c64206f7d 100644
--- a/src/main/org/apache/tools/ant/types/DataType.java
+++ b/src/main/org/apache/tools/ant/types/DataType.java
@@ -205,7 +205,7 @@ public abstract class DataType extends ProjectComponent {
     /**
      * check that it is ok to set attributes, i.e that no reference is defined
      * @since Ant 1.6
-     * @throw BuildException if not allowed
+     * @throws BuildException if not allowed
      */
     protected void checkAttributesAllowed() {
         if (isReference()) {
@@ -216,7 +216,7 @@ public abstract class DataType extends ProjectComponent {
     /**
      * check that it is ok to add children, i.e that no reference is defined
      * @since Ant 1.6
-     * @throw BuildException if not allowed
+     * @throws BuildException if not allowed
      */
     protected void checkChildrenAllowed() {
         if (isReference()) {
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index e958decef..f7c95764b 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -1327,7 +1327,7 @@ public class FileUtils {
      * implicitly not up do date.
      * @param source source file (should be the older)
      * @param dest dest file (should be the newer)
-     * @param granularity: an offset added to the source time.
+     * @param granularity an offset added to the source time.
      * @return true if the source is older than the dest, taking the
      *  granularity into account
      * @since Ant1.7
diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java
index 4f025e247..6afa720dd 100644
--- a/src/main/org/apache/tools/zip/ZipFile.java
+++ b/src/main/org/apache/tools/zip/ZipFile.java
@@ -161,9 +161,8 @@ public class ZipFile {
     }
 
     /**
-     * Returns all entries as {@link org.apache.tools.ant.ZipEntry
-     * ZipEntry} instances.
-     * @return all entries as ZipEntry instances.
+     * Returns all entries.
+     * @return all entries as {@link ZipEntry} instances
      */
     public Enumeration getEntries() {
         return entries.keys();
diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java
index f35ecd096..3cf01bd53 100644
--- a/src/main/org/apache/tools/zip/ZipOutputStream.java
+++ b/src/main/org/apache/tools/zip/ZipOutputStream.java
@@ -256,8 +256,8 @@ public class ZipOutputStream extends FilterOutputStream {
      * access file).
      *
      * <p>For seekable streams, you don't need to calculate the CRC or
-     * uncompressed size for {@link #STORED STORED} entries before
-     * invoking {@link #putEntry putEntry}.
+     * uncompressed size for {@link #STORED} entries before
+     * invoking {@link #putNextEntry}.
      *
      * @since 1.17
      */