diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java b/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java
index 9867905d0..a06011e5b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@ import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Compares two files for bitwise equality based on size and
- * content. Timestamps are not looked at at all.
+ * content. Timestamps are not at all looked at.
  *
  * @author Steve Loughran
  * @version $Revision$
@@ -99,7 +99,7 @@ public class FilesMatch implements Condition {
     }
 
     /**
-     * comparision method of the interface
+     * comparison method of the interface
      *
      * @return true if the files are equal
      * @exception BuildException if it all went pear-shaped
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
index c4a690e4f..d30a9f2c6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
@@ -97,9 +97,9 @@ class ChangeLogParser {
     private final Hashtable m_entries = new Hashtable();
 
     /**
-     * Get a list of rcs entrys as an array.
+     * Get a list of rcs entries as an array.
      *
-     * @return a list of rcs entrys as an array
+     * @return a list of rcs entries as an array
      */
     CVSEntry[] getEntrySetAsArray() {
         final CVSEntry[] array = new CVSEntry[ m_entries.size() ];
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
index fbf188e45..2d8038707 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
@@ -117,14 +117,14 @@ public class ChangeLogTask extends Task {
     /** Output file */
     private File m_destfile;
 
-    /** The earliest date at which to start processing entrys.  */
+    /** The earliest date at which to start processing entries.  */
     private Date m_start;
 
-    /** The latest date at which to stop processing entrys.  */
+    /** The latest date at which to stop processing entries.  */
     private Date m_stop;
 
     /**
-     * Filesets containting list of files against which the cvs log will be
+     * Filesets containing list of files against which the cvs log will be
      * performed. If empty then all files will in the working directory will
      * be checked.
      */
@@ -359,7 +359,7 @@ public class ChangeLogTask extends Task {
     }
 
     /**
-     * Filter the specified entrys accoridn to an appropriate rule.
+     * Filter the specified entries according to an appropriate rule.
      *
      * @param entrySet the entry set to filter
      * @return the filtered entry set
@@ -406,7 +406,7 @@ public class ChangeLogTask extends Task {
      * Print changelog to file specified in task.
      *
      * @param entrySet the entry set to write.
-     * @throws BuildException if theres an error writing changelog.
+     * @throws BuildException if there is an error writing changelog.
      */
     private void writeChangeLog(final CVSEntry[] entrySet)
          throws BuildException {
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java
index 9b49ffc2e..ca7035b3f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,10 +65,10 @@ import java.util.TimeZone;
  * @version $Revision$ $Date$
  */
 class ChangeLogWriter {
-    /** output format for dates writtn to xml file */
+    /** output format for dates written to xml file */
     private static final SimpleDateFormat c_outputDate
         = new SimpleDateFormat("yyyy-MM-dd");
-    /** output format for times writtn to xml file */
+    /** output format for times written to xml file */
     private static final SimpleDateFormat c_outputTime
         = new SimpleDateFormat("HH:mm");
 
@@ -79,7 +79,7 @@ class ChangeLogWriter {
     }
 
     /**
-     * Print out the specifed entrys.
+     * Print out the specified entries.
      *
      * @param output writer to which to send output.
      * @param entries the entries to be written.
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java
index 2f5744cb8..20e5cb768 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -102,7 +102,7 @@ public class CvsUser {
     /**
      * Get the user's full name
      *
-     * @return the usre's full name
+     * @return the user's full name
      */
     String getDisplayname() {
         return m_displayName;
@@ -110,7 +110,7 @@ public class CvsUser {
 
 
     /**
-     * validate that this objetc is configured.
+     * validate that this object is configured.
      *
      * @exception BuildException if the instance has not be correctly
      *            configured.
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java
index 60445d81d..20139e71c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
 package org.apache.tools.ant.taskdefs.cvslib;
 
 /**
- * Represents a RCS File cheange.
+ * Represents a RCS File change.
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @author <a href="mailto:jeff.martin@synamic.co.uk">Jeff Martin</a>
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
index 7d33888d7..8f1a8e28d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
@@ -254,7 +254,7 @@ public class EmailTask
 
 
     /**
-     * Add a message elemnt
+     * Add a message element
      *
      * @param message The message object
      * @throws BuildException if a message has already been added
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
index a735dbffa..5ff62332c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
@@ -98,7 +98,7 @@ public class MimeMailer extends Mailer {
     private static final String DEFAULT_CHARSET
         = System.getProperty("file.encoding");
 
-    // To work poperly with national charsets we have to use
+    // To work properly with national charsets we have to use
     // implementation of interface javax.activation.DataSource
     /**
      * @since Ant 1.6
@@ -160,8 +160,8 @@ public class MimeMailer extends Mailer {
             props.put("mail.smtp.host", host);
             props.put("mail.smtp.port", String.valueOf(port));
 
-            // Aside, the JDK is clearly unaware of the scottish
-            // 'session', which //involves excessive quantities of
+            // Aside, the JDK is clearly unaware of the Scottish
+            // 'session', which involves excessive quantities of
             // alcohol :-)
             Session sesh;
             Authenticator auth;
@@ -214,7 +214,7 @@ public class MimeMailer extends Mailer {
                 // Assign/reassign message charset from MimeType
                 message.setCharset(charset);
             } else {
-                // Next: looking if charset having explict definition
+                // Next: looking if charset having explicit definition
                 charset = message.getCharset();
                 if (charset == null) {
                     // Using default
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
index d5315e899..5a75590f8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -252,7 +252,7 @@ public class IContract extends MatchingTask {
     private File targets = null;
 
     /**
-     * will be set to true if any of the sourca files are newer than the
+     * will be set to true if any of the source files are newer than the
      * instrumented files
      */
     private boolean dirty = false;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
index 520ad8d17..822a5f285 100755
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
@@ -326,7 +326,7 @@ public class Javah extends Task {
     // we need a way to not use the current classpath.
 
     /**
-     * Peforms a compile using the classic compiler that shipped with
+     * Performs a compile using the classic compiler that shipped with
      * JDK 1.1 and 1.2.
      */
 
@@ -431,7 +431,7 @@ public class Javah extends Task {
 
     /**
      * Logs the compilation parameters, adds the files to compile and logs the
-     * &qout;niceSourceList&quot;
+     * &quot;niceSourceList&quot;
      */
     protected void logAndAddFilesToCompile(Commandline cmd) {
         int n = 0;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
index 8f213e0d3..cbeade6e8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000,2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -240,7 +240,7 @@ public class Native2Ascii extends MatchingTask {
         }
 
         // Make intermediate directories if needed
-        // XXX JDK 1.1 dosen't have File.getParentFile,
+        // XXX JDK 1.1 doesn't have File.getParentFile,
         String parentName = destFile.getParent();
         if (parentName != null) {
             File parentFile = new File(parentName);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
index dfd82aa2b..3a3fb6d54 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -720,7 +720,7 @@ public class NetRexxC extends MatchingTask {
     }
 
 
-    /** Peforms a copmile using the NetRexx 1.1.x compiler  */
+    /** Performs a compile using the NetRexx 1.1.x compiler  */
     private void doNetRexxCompile() throws BuildException {
         log("Using NetRexx compiler", Project.MSG_VERBOSE);
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
index 2fafb09e1..dbd328e27 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -511,7 +511,7 @@ public class PropertyFile extends Task {
         private void checkParameters() throws BuildException {
             if (type == Type.STRING_TYPE
                 && operation == Operation.DECREMENT_OPER) {
-                throw new BuildException("- is not suported for string "
+                throw new BuildException("- is not supported for string "
                     + "properties (key:" + key + ")");
             }
             if (value == null && defaultValue == null) {
@@ -522,7 +522,7 @@ public class PropertyFile extends Task {
                 throw new BuildException("key is mandatory");
             }
             if (type == Type.STRING_TYPE && pattern != null) {
-                throw new BuildException("pattern is not suported for string "
+                throw new BuildException("pattern is not supported for string "
                     + "properties (key:" + key + ")");
             }
         }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
index 57ae9c480..708c6b315 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
@@ -79,7 +79,7 @@ import org.apache.tools.ant.util.regexp.Regexp;
  * file.  The input file(s) must be able to be properly processed by
  * a Reader instance.  That is, they must be text only, no binary.
  *
- * The syntax of the regular expression depends on the implemtation that
+ * The syntax of the regular expression depends on the implementation that
  * you choose to use. The system property <code>ant.regexp.regexpimpl</code>
  * will be the classname of the implementation that will be used (the default
  * is <code>org.apache.tools.ant.util.regexp.JakartaOroRegexp</code> and
@@ -218,7 +218,7 @@ public class ReplaceRegExp extends Task {
      * The flags to use when matching the regular expression.  For more
      * information, consult the Perl5 syntax.
      * <ul>
-     *  <li>g : Global replacement.  Replace all occurences found
+     *  <li>g : Global replacement.  Replace all occurrences found
      *  <li>i : Case Insensitive.  Do not consider case in the match
      *  <li>m : Multiline.  Treat the string as multiple lines of input,
      *         using "^" and "$" as the start or end of any line, respectively,
@@ -236,7 +236,7 @@ public class ReplaceRegExp extends Task {
     /**
      * Process the file(s) one line at a time, executing the replacement
      * on one line at a time.  This is useful if you
-     * want to only replace the first occurence of a regular expression on
+     * want to only replace the first occurrence of a regular expression on
      * each line, which is not easy to do when processing the file as a whole.
      * Defaults to <i>false</i>.</td>
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
index 63a856287..a79571ab3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
@@ -269,7 +269,7 @@ public class Rpm extends Task {
     /**
      * Flag (optional, default=false)
      * to remove the sources after the build.
-     * See the the <tt>--rmsource</tt>  option of rpmbuild.
+     * See the <tt>--rmsource</tt>  option of rpmbuild.
      */
     public void setRemoveSource(boolean rs) {
         removeSource = rs;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
index 3fdd4de09..847220fd4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
@@ -71,7 +71,7 @@ public class Script extends Task {
     /**
      * Do the work.
      *
-     * @exception BuildException if someting goes wrong with the build
+     * @exception BuildException if something goes wrong with the build
      */
     public void execute() throws BuildException {
         runner.addBeans(getProject().getProperties());
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index c213eec93..4d5feb7ad 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -223,7 +223,7 @@ public class TraXLiaison implements XSLTLiaison2, ErrorListener, XSLTLoggerAware
     }
 
     /**
-     * Read in templates from the stylsheet
+     * Read in templates from the stylesheet
      */
     private void readTemplates()
         throws IOException, TransformerConfigurationException {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
index 47de8d5cc..aa1df4623 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
@@ -435,7 +435,7 @@ public class XMLValidateTask extends Task {
      * ValidatorErrorHandler role :
      * <ul>
      * <li> log SAX parse exceptions,
-     * <li> remember if an error occured
+     * <li> remember if an error occurred
      * </ul>
      */
     protected class ValidatorErrorHandler implements ErrorHandler {
@@ -467,7 +467,7 @@ public class XMLValidateTask extends Task {
 
         public void warning(SAXParseException exception) {
             // depending on implementation, XMLReader can yield hips of warning,
-            // only output then if user explicitely asked for it
+            // only output then if user explicitly asked for it
             if (warn) {
                 doLog(exception, Project.MSG_WARN);
             }
@@ -538,7 +538,7 @@ public class XMLValidateTask extends Task {
 
         /**
          * Gets the attribute value.
-         * @return the featuree value
+         * @return the feature value
          */
         public boolean getValue() {
             return attributeValue;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
index b101c5e96..c92bc00fc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
@@ -230,7 +230,7 @@ public class CCMCheck extends Continuus {
     public static final String FLAG_COMMENT = "/comment";
 
     /**
-     *  -task flag -- associate checckout task with task
+     *  -task flag -- associate checkout task with task
      */
     public static final String FLAG_TASK = "/task";
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
index 85ab21075..8421a24b5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
@@ -294,7 +294,7 @@ public class CCMCreateTask extends Continuus implements ExecuteStreamHandler {
     public static final String FLAG_SUBSYSTEM = "/subsystem";
 
     /**
-     *  -task flag -- associate checckout task with task
+     *  -task flag -- associate checkout task with task
      */
     public static final String FLAG_TASK = "/task";
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
index 99d889dd7..2a6403fd1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
@@ -61,7 +61,7 @@ import org.apache.tools.ant.types.Commandline;
 
 
 /**
- * Task allows to reconfigure a project, recurcively or not
+ * Task allows to reconfigure a project, recursively or not
  * @author Benoit Moussaud benoit.moussaud@criltelecom.com
  */
 public class CCMReconfigure extends Continuus {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
index 92d58598c..bf322dce1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000,2002-2003 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@ import org.apache.tools.ant.types.Commandline;
  * Performs ClearCase checkout.
  *
  * <p>
- * The following attributes are interpretted:
+ * The following attributes are interpreted:
  * <table border="1">
  *   <tr>
  *     <th>Attribute</th>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java
index e570b5ffc..b2d768766 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java
@@ -71,7 +71,7 @@ import org.apache.tools.ant.types.Commandline;
  * Performs a ClearCase Lock command.
  *
  * <p>
- * The following attributes are interpretted:
+ * The following attributes are interpreted:
  * <table border="1">
  *   <tr>
  *     <th>Attribute</th>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
index 310a09417..b5061a9d0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000,2002-2003 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@ import org.apache.tools.ant.types.Commandline;
  * Performs ClearCase UnCheckout command.
  *
  * <p>
- * The following attributes are interpretted:
+ * The following attributes are interpreted:
  * <table border="1">
  *   <tr>
  *     <th>Attribute</th>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java
index 80d0bf94c..dad5d87d5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java
@@ -69,7 +69,7 @@ import org.apache.tools.ant.types.Commandline;
  * Performs a ClearCase Unlock command.
  *
  * <p>
- * The following attributes are interpretted:
+ * The following attributes are interpreted:
  * <table border="1">
  *   <tr>
  *     <th>Attribute</th>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
index d92fc1a49..61dee3842 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
@@ -63,7 +63,7 @@ import org.apache.tools.ant.types.Commandline;
  * Performs a ClearCase Update command.
  *
  * <p>
- * The following attributes are interpretted:
+ * The following attributes are interpreted:
  * <table border="1">
  *   <tr>
  *     <th>Attribute</th>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index f7b60bef3..e8ba5acad 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000,2002-2003 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -76,7 +76,7 @@ import org.apache.tools.ant.types.Commandline;
  * cleartool.
  * </p>
  *
- * @author Curtis White (Exteneded by Sean P. Kane)
+ * @author Curtis White (Extended by Sean P. Kane)
  */
 public abstract class ClearCase extends Task {
     private String m_ClearToolDir = "";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
index b4d92cbe9..e0958a426 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
@@ -83,7 +83,7 @@ public class AntAnalyzer extends AbstractAnalyzer {
      * @param files a vector to be populated with the files which contain
      *      the dependency classes
      * @param classes a vector to be populated with the names of the
-     *      depencency classes.
+     *      dependency classes.
      */
     protected void determineDependencies(Vector files, Vector classes) {
         // we get the root classes and build up a set of
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
index 96883d5d0..65bf9446b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@ public interface ClassFileIterator {
     /**
      * Get the next class file in the iteration
      *
-     * @return the next class file in the iterationr
+     * @return the next class file in the iteration
      */
     ClassFile getNextClassFile();
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
index 635111b67..8268aae7e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
@@ -130,7 +130,7 @@ public class Depend extends MatchingTask {
     /**
      * indicates that the dependency relationships should be extended beyond
      * direct dependencies to include all classes. So if A directly affects
-     * B abd B directly affects C, then A indirectly affects C.
+     * B and B directly affects C, then A indirectly affects C.
      */
     private boolean closure = false;
 
@@ -197,7 +197,7 @@ public class Depend extends MatchingTask {
      * Read the dependencies from cache file
      *
      * @return a collection of class dependencies
-     * @exception IOException if the dependnecy file cannot be read
+     * @exception IOException if the dependency file cannot be read
      */
     private Hashtable readCachedDependencies(File depFile) throws IOException {
         Hashtable dependencyMap = new Hashtable();
@@ -472,7 +472,7 @@ public class Depend extends MatchingTask {
     /**
      * Delete all the class files of classes which depend on the given class
      *
-     * @param className the name of the class whose dependent classes willbe
+     * @param className the name of the class whose dependent classes will be
      *      deleted
      * @return the number of class files removed
      */
@@ -761,11 +761,11 @@ public class Depend extends MatchingTask {
      * file vector, including any subdirectories.
      *
      * @param classFileList a list of ClassFileInfo objects for all the
-     *      files in the diretcort tree
-     * @param dir tyhe directory tree to be searched, recursivley, for class
+     *      files in the directory tree
+     * @param dir the directory tree to be searched, recursively, for class
      *      files
      * @param root the root of the source tree. This is used to determine
-     *      the absoluate class name from the relative position in the
+     *      the absolute class name from the relative position in the
      *      source tree
      */
     private void addClassFiles(Vector classFileList, File dir, File root) {