diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java
index 8eb550452..f1878208f 100644
--- a/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -223,7 +223,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
     private ClassLoader parent = null;
 
     /**
-     * A hashtable of zip files opened by the classloader
+     * A hashtable of zip files opened by the classloader (File to ZipFile)
      */
     private Hashtable zipFiles = new Hashtable();
 
@@ -561,8 +561,8 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      *
      * @return the required Class object
      *
-     * @throws ClassNotFoundException if the requested class does not exist on
-     * this loader's classpath.
+     * @exception ClassNotFoundException if the requested class does not exist
+     * on this loader's classpath.
      */
     public Class forceLoadClass(String classname) throws ClassNotFoundException {
         log("force loading " + classname, Project.MSG_DEBUG);
@@ -589,8 +589,8 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      *
      * @return the required Class object
      *
-     * @throws ClassNotFoundException if the requested class does not exist on
-     * this loader's classpath.
+     * @exception ClassNotFoundException if the requested class does not exist
+     * on this loader's classpath.
      */
     public Class forceLoadSystemClass(String classname) throws ClassNotFoundException {
         log("force system loading " + classname, Project.MSG_DEBUG);
@@ -841,7 +841,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      * @param name the resource name to search for. Must not be 
      *             <code>null</code>.
      * @return an enumeration of URLs for the resources.
-     * @throws IOException if I/O errors occurs (can't happen)
+     * @exception IOException if I/O errors occurs (can't happen)
      */
     protected Enumeration findResources(String name) throws IOException {
         return new ResourceEnumeration(name);
@@ -916,8 +916,8 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      *
      * @return the required Class object
      *
-     * @throws ClassNotFoundException if the requested class does not exist on
-     * the system classpath (when not in isolated mode) or this loader's 
+     * @exception ClassNotFoundException if the requested class does not exist
+     * on the system classpath (when not in isolated mode) or this loader's 
      * classpath.
      */
     protected Class loadClass(String classname, boolean resolve) throws ClassNotFoundException {
@@ -981,7 +981,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      *
      * @return the Class object read from the stream.
      *
-     * @throws IOException if there is a problem reading the class from the
+     * @exception IOException if there is a problem reading the class from the
      * stream.
      */
     private Class getClassFromStream(InputStream stream, String classname)
@@ -1034,8 +1034,8 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      *
      * @return the required Class object
      *
-     * @throws ClassNotFoundException if the requested class does not exist on
-     * this loader's classpath.
+     * @exception ClassNotFoundException if the requested class does not exist
+     * on this loader's classpath.
      */
     public Class findClass(String name) throws ClassNotFoundException {
         log("Finding class " + name, Project.MSG_DEBUG);
@@ -1052,8 +1052,8 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      * 
      * @return the required Class object
      *
-     * @throws ClassNotFoundException if the requested class does not exist on
-     * this loader's classpath.
+     * @exception ClassNotFoundException if the requested class does not exist
+     * on this loader's classpath.
      */
     private Class findClassInComponents(String name) throws ClassNotFoundException {
         // we need to search the components of the path to see if we can find the
@@ -1099,8 +1099,8 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
      * 
      * @return the required Class object
      *
-     * @throws ClassNotFoundException if the requested class does not exist on
-     * this loader's classpath.
+     * @exception ClassNotFoundException if the requested class does not exist
+     * on this loader's classpath.
      */
     private Class findBaseClass(String name) throws ClassNotFoundException {
         if (parent == null) {
diff --git a/src/main/org/apache/tools/ant/DemuxOutputStream.java b/src/main/org/apache/tools/ant/DemuxOutputStream.java
index f2deaa466..63878b9a3 100644
--- a/src/main/org/apache/tools/ant/DemuxOutputStream.java
+++ b/src/main/org/apache/tools/ant/DemuxOutputStream.java
@@ -70,7 +70,7 @@ public class DemuxOutputStream extends OutputStream {
 
     /** Maximum buffer size */
     private final static int MAX_SIZE = 1024;
-    /** Mapping from thread to buffer (Thread->ByteOutputStream) */
+    /** Mapping from thread to buffer (Thread to ByteOutputStream) */
     private Hashtable buffers = new Hashtable();
 //    private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
     /** 
diff --git a/src/main/org/apache/tools/ant/ExitException.java b/src/main/org/apache/tools/ant/ExitException.java
index 063681376..053baa6af 100644
--- a/src/main/org/apache/tools/ant/ExitException.java
+++ b/src/main/org/apache/tools/ant/ExitException.java
@@ -54,7 +54,7 @@
 package org.apache.tools.ant;
 
 /**
- * Used to report exit status of classes which call System.exit()
+ * Used to report exit status of classes which call System.exit().
  *
  * @see org.apache.tools.ant.util.optional.NoExitSecurityManager
  *
diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java
index 76d81260b..6c634cdf4 100644
--- a/src/main/org/apache/tools/ant/IntrospectionHelper.java
+++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java
@@ -422,9 +422,9 @@ public class IntrospectionHelper implements BuildListener {
      * @param text    The text to add.
      *                Must not be <code>null</code>.
      * 
-     * @throws BuildException if non-whitespace text is provided and no
-     *                        method is available to handle it, or if
-     *                        the handling method fails.
+     * @exception BuildException if non-whitespace text is provided and no
+     *                           method is available to handle it, or if
+     *                           the handling method fails.
      */
     public void addText(Project project, Object element, String text) {
         if (addText == null) {
@@ -471,9 +471,9 @@ public class IntrospectionHelper implements BuildListener {
      * 
      * @return an instance of the specified element type
      * 
-     * @throws BuildException if no method is available to create the 
-     *                        element instance, or if the creating method
-     *                        fails.
+     * @exception BuildException if no method is available to create the
+     *                           element instance, or if the creating method
+     *                           fails.
      */
     public Object createElement(Project project, Object parent, String elementName)
         throws BuildException {
@@ -522,7 +522,7 @@ public class IntrospectionHelper implements BuildListener {
      *                     May be <code>null</code>, in which case
      *                     this method returns immediately.
      * 
-     * @throws BuildException if the storage method fails.
+     * @exception BuildException if the storage method fails.
      */
     public void storeElement(Project project, Object parent, Object child, String elementName)
         throws BuildException {
@@ -559,8 +559,8 @@ public class IntrospectionHelper implements BuildListener {
      * @return the type of the nested element with the specified name.
      *         This will never be <code>null</code>.
      * 
-     * @throws BuildException if the introspected class does not
-     *                        support the named nested element.
+     * @exception BuildException if the introspected class does not
+     *                           support the named nested element.
      */
     public Class getElementType(String elementName)
         throws BuildException {
@@ -582,8 +582,8 @@ public class IntrospectionHelper implements BuildListener {
      * @return the type of the attribute with the specified name.
      *         This will never be <code>null</code>.
      * 
-     * @throws BuildException if the introspected class does not
-     *                        support the named attribute.
+     * @exception BuildException if the introspected class does not
+     *                           support the named attribute.
      */
     public Class getAttributeType(String attributeName)
         throws BuildException {