From 6b7bc9e53500d2347a555dea2988788a922f3101 Mon Sep 17 00:00:00 2001
From: Jacobus Martinus Kruithof <jkf@apache.org>
Date: Sat, 26 May 2012 13:33:54 +0000
Subject: [PATCH] Bug 53291 - Several spell checker findings in apache ant
 1.8.3 documentation -- api --

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1342897 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                           |  2 +-
 .../org/apache/tools/ant/AntTypeDefinition.java    |  6 +++---
 src/main/org/apache/tools/ant/ComponentHelper.java |  4 ++--
 src/main/org/apache/tools/ant/ProjectHelper.java   |  4 ++--
 .../apache/tools/ant/filters/FixCrLfFilter.java    |  2 +-
 .../org/apache/tools/ant/filters/SortFilter.java   |  2 +-
 .../org/apache/tools/ant/filters/TabsToSpaces.java |  2 +-
 .../apache/tools/ant/helper/ProjectHelper2.java    |  2 +-
 .../org/apache/tools/ant/listener/MailLogger.java  |  4 ++--
 .../apache/tools/ant/property/LocalProperties.java |  2 +-
 .../tools/ant/property/LocalPropertyStack.java     |  2 +-
 src/main/org/apache/tools/ant/taskdefs/Ant.java    |  2 +-
 .../tools/ant/taskdefs/AntlibDefinition.java       |  2 +-
 src/main/org/apache/tools/ant/taskdefs/Apt.java    |  2 +-
 .../org/apache/tools/ant/taskdefs/Available.java   |  2 +-
 .../org/apache/tools/ant/taskdefs/CallTarget.java  |  2 +-
 .../apache/tools/ant/taskdefs/Componentdef.java    |  4 ++--
 .../org/apache/tools/ant/taskdefs/CopyPath.java    |  2 +-
 .../org/apache/tools/ant/taskdefs/Definer.java     |  2 +-
 src/main/org/apache/tools/ant/taskdefs/Get.java    |  2 +-
 .../org/apache/tools/ant/taskdefs/HostInfo.java    |  2 +-
 .../org/apache/tools/ant/taskdefs/JDBCTask.java    |  4 ++--
 src/main/org/apache/tools/ant/taskdefs/Java.java   |  2 +-
 src/main/org/apache/tools/ant/taskdefs/Javac.java  |  2 +-
 .../org/apache/tools/ant/taskdefs/Javadoc.java     |  8 ++++----
 .../apache/tools/ant/taskdefs/MatchingTask.java    |  2 +-
 .../org/apache/tools/ant/taskdefs/Recorder.java    |  2 +-
 src/main/org/apache/tools/ant/taskdefs/Retry.java  |  2 +-
 src/main/org/apache/tools/ant/taskdefs/Rmic.java   |  2 +-
 .../org/apache/tools/ant/taskdefs/SQLExec.java     | 12 ++++++------
 src/main/org/apache/tools/ant/taskdefs/SubAnt.java |  2 +-
 .../org/apache/tools/ant/taskdefs/WaitFor.java     |  4 ++--
 .../apache/tools/ant/taskdefs/XSLTLiaison2.java    |  2 +-
 .../org/apache/tools/ant/taskdefs/XSLTProcess.java | 12 ++++++------
 .../org/apache/tools/ant/taskdefs/XmlProperty.java |  2 +-
 src/main/org/apache/tools/ant/taskdefs/Zip.java    |  8 ++++----
 .../tools/ant/taskdefs/condition/AntVersion.java   |  2 +-
 .../tools/ant/taskdefs/condition/Matches.java      |  2 +-
 .../apache/tools/ant/taskdefs/optional/Javah.java  |  2 +-
 .../tools/ant/taskdefs/optional/Native2Ascii.java  |  2 +-
 .../tools/ant/taskdefs/optional/NetRexxC.java      |  2 +-
 .../tools/ant/taskdefs/optional/ReplaceRegExp.java |  2 +-
 .../ant/taskdefs/optional/SchemaValidate.java      |  2 +-
 .../taskdefs/optional/ejb/DescriptorHandler.java   |  2 +-
 .../tools/ant/taskdefs/optional/ejb/EjbJar.java    |  2 +-
 .../optional/ejb/GenericDeploymentTool.java        |  2 +-
 .../optional/ejb/WebsphereDeploymentTool.java      |  4 ++--
 .../ant/taskdefs/optional/extension/Extension.java |  6 +++---
 .../optional/extension/JarLibAvailableTask.java    |  2 +-
 .../taskdefs/optional/extension/Specification.java |  8 ++++----
 .../optional/extension/resolvers/URLResolver.java  |  2 +-
 .../ant/taskdefs/optional/i18n/Translate.java      |  2 +-
 .../optional/j2ee/GenericHotDeploymentTool.java    |  4 ++--
 .../optional/j2ee/JonasHotDeploymentTool.java      |  4 ++--
 .../optional/j2ee/WebLogicHotDeploymentTool.java   |  4 ++--
 .../tools/ant/taskdefs/optional/jsp/JspC.java      |  2 +-
 .../tools/ant/taskdefs/optional/jsp/WLJspc.java    |  2 +-
 .../optional/jsp/compilers/JspCompilerAdapter.java |  2 +-
 .../ant/taskdefs/optional/junit/JUnitTask.java     | 14 +++++++-------
 .../taskdefs/optional/junit/JUnitTaskMirror.java   |  4 ++--
 .../taskdefs/optional/junit/JUnitTestRunner.java   |  2 +-
 .../optional/junit/XMLResultAggregator.java        |  4 ++--
 .../tools/ant/taskdefs/optional/net/FTP.java       |  4 ++--
 .../taskdefs/optional/net/FTPTaskMirrorImpl.java   |  2 +-
 .../tools/ant/taskdefs/optional/net/RExecTask.java |  2 +-
 .../ant/taskdefs/optional/perforce/P4Resolve.java  |  2 +-
 .../tools/ant/taskdefs/optional/sos/SOS.java       |  2 +-
 .../ant/taskdefs/optional/sound/SoundTask.java     |  2 +-
 .../ant/taskdefs/optional/splash/SplashTask.java   |  2 +-
 .../tools/ant/taskdefs/optional/ssh/Directory.java |  2 +-
 .../ant/taskdefs/optional/ssh/LogListener.java     |  2 +-
 .../tools/ant/taskdefs/optional/ssh/SSHBase.java   |  2 +-
 .../tools/ant/taskdefs/optional/ssh/Scp.java       |  2 +-
 .../ant/taskdefs/optional/testing/Funtest.java     |  2 +-
 .../taskdefs/optional/unix/AbstractAccessTask.java |  2 +-
 .../tools/ant/taskdefs/optional/unix/Chgrp.java    |  4 ++--
 .../tools/ant/taskdefs/optional/unix/Chown.java    |  4 ++--
 .../ant/taskdefs/optional/vss/MSVSSConstants.java  |  2 +-
 .../ant/taskdefs/optional/windows/Attrib.java      |  2 +-
 .../ant/taskdefs/rmic/DefaultRmicAdapter.java      |  2 +-
 .../tools/ant/taskdefs/rmic/RmicAdapter.java       |  2 +-
 .../org/apache/tools/ant/taskdefs/rmic/WLRmic.java |  2 +-
 .../apache/tools/ant/types/AbstractFileSet.java    |  4 ++--
 .../org/apache/tools/ant/types/ArchiveFileSet.java |  6 +++---
 .../org/apache/tools/ant/types/ArchiveScanner.java |  2 +-
 .../apache/tools/ant/types/CommandlineJava.java    |  2 +-
 .../org/apache/tools/ant/types/Environment.java    |  2 +-
 src/main/org/apache/tools/ant/types/FilterSet.java |  2 +-
 .../apache/tools/ant/types/Parameterizable.java    |  2 +-
 src/main/org/apache/tools/ant/types/Path.java      |  2 +-
 .../org/apache/tools/ant/types/PropertySet.java    |  2 +-
 .../org/apache/tools/ant/types/TarFileSet.java     |  4 ++--
 .../org/apache/tools/ant/types/ZipFileSet.java     |  4 ++--
 .../tools/ant/types/optional/ScriptCondition.java  |  2 +-
 .../tools/ant/types/optional/image/Ellipse.java    |  2 +-
 .../types/resources/AbstractClasspathResource.java |  2 +-
 .../tools/ant/types/resources/BZip2Resource.java   |  2 +-
 .../tools/ant/types/resources/selectors/Name.java  |  2 +-
 .../types/selectors/AbstractSelectorContainer.java |  2 +-
 .../ant/types/selectors/BaseSelectorContainer.java |  2 +-
 .../types/selectors/ContainsRegexpSelector.java    |  2 +-
 .../ant/types/selectors/DifferentSelector.java     |  2 +-
 .../ant/types/selectors/ReadableSelector.java      |  2 +-
 .../ant/types/selectors/SelectorContainer.java     |  2 +-
 .../tools/ant/types/selectors/SelectorScanner.java |  2 +-
 .../tools/ant/types/selectors/SelectorUtils.java   |  2 +-
 .../modifiedselector/ModifiedSelector.java         |  6 +++---
 .../org/apache/tools/ant/util/ContainerMapper.java |  2 +-
 .../org/apache/tools/ant/util/JavaEnvUtils.java    |  4 ++--
 .../tools/ant/util/KeepAliveInputStream.java       |  2 +-
 .../tools/ant/util/KeepAliveOutputStream.java      |  4 ++--
 .../tools/ant/util/LazyFileOutputStream.java       |  2 +-
 .../org/apache/tools/ant/util/LineTokenizer.java   |  2 +-
 .../apache/tools/ant/util/PackageNameMapper.java   |  2 +-
 .../apache/tools/ant/util/RegexpPatternMapper.java |  4 ++--
 .../org/apache/tools/ant/util/ResourceUtils.java   |  2 +-
 .../org/apache/tools/ant/util/ScriptRunner.java    |  2 +-
 .../apache/tools/ant/util/SymbolicLinkUtils.java   |  2 +-
 src/main/org/apache/tools/ant/util/UUEncoder.java  |  2 +-
 .../org/apache/tools/ant/util/XmlConstants.java    |  2 +-
 .../ant/util/depend/bcel/AncestorAnalyzer.java     |  2 +-
 .../ant/util/depend/bcel/DependencyVisitor.java    |  2 +-
 .../tools/ant/util/depend/bcel/FullAnalyzer.java   |  2 +-
 .../tools/ant/util/facade/FacadeTaskHelper.java    |  2 +-
 .../facade/ImplementationSpecificArgument.java     |  4 ++--
 .../tools/ant/util/optional/JavaxScriptRunner.java |  2 +-
 .../tools/ant/util/regexp/RegexpMatcher.java       |  2 +-
 .../org/apache/tools/bzip2/CBZip2OutputStream.java |  2 +-
 .../apache/tools/mail/ErrorInQuitException.java    |  2 +-
 src/main/org/apache/tools/mail/MailMessage.java    |  2 +-
 src/main/org/apache/tools/tar/TarEntry.java        |  2 +-
 src/main/org/apache/tools/tar/TarInputStream.java  |  2 +-
 .../tools/zip/AbstractUnicodeExtraField.java       |  4 ++--
 src/main/org/apache/tools/zip/ExtraFieldUtils.java |  6 +++---
 src/main/org/apache/tools/zip/ZipEntry.java        |  2 +-
 src/main/org/apache/tools/zip/ZipFile.java         |  2 +-
 136 files changed, 194 insertions(+), 194 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 11f20da08..7ef320266 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -15,7 +15,7 @@ Fixed bugs:
    Bugzilla Reports 52738, 52740, 52742, 52743.
 
  * Updated documentation to fix spelling errors / broken links.
-   Bugzilla Reports 53215, 53291 (excluding api)
+   Bugzilla Reports 53215, 53291
    
 Other changes:
 --------------
diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java
index 9755041e7..1abd47a72 100644
--- a/src/main/org/apache/tools/ant/AntTypeDefinition.java
+++ b/src/main/org/apache/tools/ant/AntTypeDefinition.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Constructor;
 /**
  * This class contains all the information
  * on a particular ant type,
- * the classname, adaptor and the class
+ * the classname, adapter and the class
  * it should be assignable from.
  * This type replaces the task/datatype split
  * of pre ant 1.6.
@@ -239,7 +239,7 @@ public class AntTypeDefinition {
      * <dl>
      *   <li>if the class can be created.</li>
      *   <li>if an adapter class can be created</li>
-     *   <li>if the type is assignable from adapto</li>
+     *   <li>if the type is assignable from adapter</li>
      *   <li>if the type can be used with the adapter class</li>
      * </dl>
      * @param project the current project.
@@ -302,7 +302,7 @@ public class AntTypeDefinition {
      * @param newclass class to create
      * @param project the project to use
      * @return a newly constructed and bound instance.
-     * @throws NoSuchMethodException  no good construtor.
+     * @throws NoSuchMethodException  no good constructor.
      * @throws InstantiationException cannot initialize the object.
      * @throws IllegalAccessException cannot access the object.
      * @throws InvocationTargetException error in invocation.
diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java
index ad32faf63..f6001ffda 100644
--- a/src/main/org/apache/tools/ant/ComponentHelper.java
+++ b/src/main/org/apache/tools/ant/ComponentHelper.java
@@ -389,7 +389,7 @@ public class ComponentHelper  {
     /**
      * Returns the current task definition hashtable. The returned hashtable is
      * "live" and so should not be modified.  Also, the returned table may be 
-     * modifed asynchronously.
+     * modified asynchronously.
      *
      * @return a map of from task name to implementing class
      *         (String to Class).
@@ -448,7 +448,7 @@ public class ComponentHelper  {
     /**
      * This returns a list of restricted definitions for a name.
      * The returned List is "live" and so should not be modified.  
-     * Also, the returned list may be modifed asynchronously.  
+     * Also, the returned list may be modified asynchronously.  
      * Any access must be guarded with a lock on the list itself.
      * 
      * @param componentName the name to use.
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 599aa0b62..7b61160ba 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -207,7 +207,7 @@ public class ProjectHelper {
     /**
      * The separator between the prefix and the target name.
      *
-     * <p>May be set by &lt;import&gt;'s prefixSeperator attribute.</p>
+     * <p>May be set by &lt;import&gt;'s prefixSeparator attribute.</p>
      *
      * @since Ant 1.8.0
      */
@@ -484,7 +484,7 @@ public class ProjectHelper {
      * For BC purposes the names from the ant core uri will be
      * mapped to "name", other names will be mapped to
      * uri + ":" + name.
-     * @param uri   The namepace URI
+     * @param uri   The namespace URI
      * @param name  The localname
      * @return      The stringified form of the ns name
      */
diff --git a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
index 1b88d5f0d..e1920d1d1 100644
--- a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
+++ b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
@@ -200,7 +200,7 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
      * Get whether the stream is to be treated as though it contains Java
      * source.
      * <P>
-     * This attribute is only used in assocation with the &quot;<i><b>tab</b></i>&quot;
+     * This attribute is only used in association with the &quot;<i><b>tab</b></i>&quot;
      * attribute. Tabs found in Java literals are protected from changes by this
      * filter.
      *
diff --git a/src/main/org/apache/tools/ant/filters/SortFilter.java b/src/main/org/apache/tools/ant/filters/SortFilter.java
index 8c3261fd9..7c5099190 100644
--- a/src/main/org/apache/tools/ant/filters/SortFilter.java
+++ b/src/main/org/apache/tools/ant/filters/SortFilter.java
@@ -84,7 +84,7 @@ import org.apache.tools.ant.types.Parameter;
  * Sort all files <code>*.txt</code> from <i>src</i> location using as
  * sorting criterium <code>EvenFirstCmp</code> class, that sorts the file
  * lines putting even lines first then odd lines for example. The modified files
- * are copied into <i>build</i> location. The <code>EventFirstCmp</code>,
+ * are copied into <i>build</i> location. The <code>EvenFirstCmp</code>,
  * has to an instanciable class via <code>Class.newInstance()</code>,
  * therefore in case of inner class has to be <em>static</em>. It also has to
  * implement <code>java.util.Comparator</code> interface, for example:
diff --git a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
index 453899c90..ea6125136 100644
--- a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
+++ b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
@@ -26,7 +26,7 @@ import org.apache.tools.ant.types.Parameter;
  *
  * Example:
  *
- * <pre>&lt;tabtospaces tablength=&quot;8&quot;/&gt;</pre>
+ * <pre>&lt;tabstospaces tablength=&quot;8&quot;/&gt;</pre>
  *
  * Or:
  *
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index fc204c5af..bda99346e 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -652,7 +652,7 @@ public class ProjectHelper2 extends ProjectHelper {
         }
 
         /**
-         * End a namepace prefix to uri mapping
+         * End a namespace prefix to uri mapping
          *
          * @param prefix the prefix that is not mapped anymore
          */
diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java
index a31152a54..1be1a2288 100644
--- a/src/main/org/apache/tools/ant/listener/MailLogger.java
+++ b/src/main/org/apache/tools/ant/listener/MailLogger.java
@@ -46,9 +46,9 @@ import org.apache.tools.mail.MailMessage;
  *  <ul>
  *    <li> MailLogger.mailhost [default: localhost] - Mail server to use</li>
  *    <li> MailLogger.port [default: 25] - Default port for SMTP </li>
- *    <li> Maillogger.user [no default] - user name for SMPT auth
+ *    <li> Maillogger.user [no default] - user name for SMTP auth
  *    (requires JavaMail)</li>
- *    <li> Maillogger.password [no default] - password for SMPT auth
+ *    <li> Maillogger.password [no default] - password for SMTP auth
  *    (requires JavaMail)</li>
  *    <li> Maillogger.ssl [default: false] - on or true if ssl is
  *    needed (requires JavaMail)</li>
diff --git a/src/main/org/apache/tools/ant/property/LocalProperties.java b/src/main/org/apache/tools/ant/property/LocalProperties.java
index 367261637..e36a1dff0 100644
--- a/src/main/org/apache/tools/ant/property/LocalProperties.java
+++ b/src/main/org/apache/tools/ant/property/LocalProperties.java
@@ -32,7 +32,7 @@ public class LocalProperties
 
     /**
      * Get a localproperties for the given project.
-     * @param project the project to retieve the localproperties for.
+     * @param project the project to retrieve the localproperties for.
      * @return the localproperties.
      */
     public static synchronized LocalProperties get(Project project) {
diff --git a/src/main/org/apache/tools/ant/property/LocalPropertyStack.java b/src/main/org/apache/tools/ant/property/LocalPropertyStack.java
index dd6f97adc..1cba3f519 100644
--- a/src/main/org/apache/tools/ant/property/LocalPropertyStack.java
+++ b/src/main/org/apache/tools/ant/property/LocalPropertyStack.java
@@ -41,7 +41,7 @@ public class LocalPropertyStack {
 
     /**
      * Add a local property.
-     * @param property the name of the local proeprty.
+     * @param property the name of the local property.
      */
     public void addLocal(String property) {
         if (!stack.isEmpty()) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java
index 463453347..0ea9e2b89 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Ant.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java
@@ -257,7 +257,7 @@ public class Ant extends Task {
 
     /**
      * Handles input.
-     * Deleate to the created project, if present, otherwise
+     * Delegate to the created project, if present, otherwise
      * call the super class.
      * @param buffer the buffer into which data is to be read.
      * @param offset the offset into the buffer at which data is stored.
diff --git a/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java b/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java
index 3ef31e36e..eef333459 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java
@@ -55,7 +55,7 @@ public class AntlibDefinition extends Task {
 
     /**
      * The URI for this definition.
-     * @return The URI for this defintion.
+     * @return The URI for this definition.
      */
     public String getURI() {
         return uri;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Apt.java b/src/main/org/apache/tools/ant/taskdefs/Apt.java
index 241594e2a..6827a6abb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Apt.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Apt.java
@@ -104,7 +104,7 @@ public class Apt
     }
 
     /**
-     * Construtor for Apt task.
+     * Constructor for Apt task.
      * This sets the apt compiler adapter as the compiler in the super class.
      */
     public Apt() {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index 2061e5f17..8e13eafbd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -60,7 +60,7 @@ public class Available extends Task implements Condition {
      * Set the searchParents attribute.
      * This controls the behaviour of the the "file" type.
      * If true, the path, parent path and grandparent path are
-     * searched for the file. If false, only the path is seached.
+     * searched for the file. If false, only the path is searched.
      * The default value is false.
      * @param searchParents the value to set.
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
index a6b3f673e..524855525 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
@@ -184,7 +184,7 @@ public class CallTarget extends Task {
 
     /**
      * Handles input.
-     * Deleate to the created project, if present, otherwise
+     * Delegate to the created project, if present, otherwise
      * call the super class.
      * @param buffer the buffer into which data is to be read.
      * @param offset the offset into the buffer at which data is stored.
diff --git a/src/main/org/apache/tools/ant/taskdefs/Componentdef.java b/src/main/org/apache/tools/ant/taskdefs/Componentdef.java
index 9352462a0..275c9f0d7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Componentdef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Componentdef.java
@@ -19,9 +19,9 @@
 package org.apache.tools.ant.taskdefs;
 
 /**
- * Adds a compenent definition to the current project.
+ * Adds a component definition to the current project.
  * used in the current project. Two attributes are needed, the name that identifies
- * this compenent uniquely, and the full name of the class (
+ * this component uniquely, and the full name of the class (
  * including the packages) that
  * implements this component.</p>
  * @since Ant 1.8
diff --git a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
index 1e4ce9fee..5670215dc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
@@ -159,7 +159,7 @@ public class CopyPath extends Task {
     }
 
     /**
-     * This is a very minimal derivative of the nomal copy logic.
+     * This is a very minimal derivative of the normal copy logic.
      *
      * @throws BuildException
      *             if something goes wrong with the build.
diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java
index e5ba9f85c..09bd5ea1f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Definer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Definer.java
@@ -568,7 +568,7 @@ public abstract class Definer extends DefBase {
      * used by derived classes, used instead of
      * the adaptTo attribute.
      *
-     * @param adaptToClass the class for adapto.
+     * @param adaptToClass the class for adaptor.
      */
     protected void setAdaptToClass(Class adaptToClass) {
         this.adaptToClass = adaptToClass;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java
index 858cb073f..dcd7cfb2b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -442,7 +442,7 @@ public class Get extends Task {
 
     /**
      * Interface implemented for reporting
-     * progess of downloading.
+     * progress of downloading.
      */
     public interface DownloadProgress {
         /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/HostInfo.java b/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
index 0a15de749..52476879f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
@@ -93,7 +93,7 @@ public class HostInfo extends Task {
      * 
      * @param aHost
      *            the name or the address of the host, data for the local host
-     *            will be retrieved if ommited.
+     *            will be retrieved if omitted.
      * @since Ant 1.8
      */
     public void setHost(String aHost) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
index c0275a7cc..e60dc2559 100644
--- a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
@@ -72,10 +72,10 @@ public class SQLExampleTask extends JDBCTask {
 
         } finally {
             if (stmt != null) {
-                try {stmt.close();}catch (SQLException ingore) {}
+                try {stmt.close();}catch (SQLException ignore) {}
             }
             if (conn != null) {
-                try {conn.close();}catch (SQLException ingore) {}
+                try {conn.close();}catch (SQLException ignore) {}
             }
         }
     }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java
index e1553e8b0..9533d1b42 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -354,7 +354,7 @@ public class Java extends Task {
     /**
      * If set, system properties will be copied to the cloned VM--as
      * well as the bootclasspath unless you have explicitly specified
-     * a bootclaspath.
+     * a bootclasspath.
      *
      * <p>Doesn't have any effect unless fork is true.</p>
      * @param cloneVm if true copy system properties.
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index fb2fcbbad..b92f9faca 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -863,7 +863,7 @@ public class Javac extends MatchingTask {
     /**
      * Get the result of the javac task (success or failure).
      * @return true if compilation succeeded, or
-     *         was not neccessary, false if the compilation failed.
+     *         was not necessary, false if the compilation failed.
      */
     public boolean getTaskSuccess() {
         return taskSuccess;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index b91a06a66..93f93063e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1061,7 +1061,7 @@ public class Javadoc extends Task {
     }
 
     /**
-     * Control deprecation infromation
+     * Control deprecation information
      *
      * @param b If true, do not include deprecated information.
      */
@@ -1184,7 +1184,7 @@ public class Javadoc extends Task {
         private URL packagelistURL;
         private boolean resolveLink = false;
 
-        /** Constructor for LinkArguement */
+        /** Constructor for LinkArgument */
         public LinkArgument() {
             //empty
         }
@@ -1497,14 +1497,14 @@ public class Javadoc extends Task {
         }
         /**
          * Add a package nested element.
-         * @param pn a nested element specifing the package.
+         * @param pn a nested element specifying the package.
          */
         public void addPackage(PackageName pn) {
             packages.addElement(pn);
         }
 
         /**
-         * Get the packages as a collon separated list.
+         * Get the packages as a colon separated list.
          * @return the packages as a string
          */
         public String getPackages() {
diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
index ec4fa6a07..51d9d2601 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
@@ -426,7 +426,7 @@ public abstract class MatchingTask extends Task implements SelectorContainer {
     }
 
     /**
-     * add an arbitary selector
+     * add an arbitrary selector
      * @param selector the selector to add
      * @since Ant 1.6
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
index 44d5543ad..c2237ec7d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
@@ -198,7 +198,7 @@ public class Recorder extends Task implements SubBuildListener {
     /**
      * Gets the recorder that's associated with the passed in name. If the
      * recorder doesn't exist, then a new one is created.
-     * @param name the name of the recoder
+     * @param name the name of the recorder
      * @param proj the current project
      * @return a recorder
      * @throws BuildException on error
diff --git a/src/main/org/apache/tools/ant/taskdefs/Retry.java b/src/main/org/apache/tools/ant/taskdefs/Retry.java
index 89ca6ebd2..5f9c812c8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Retry.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Retry.java
@@ -66,7 +66,7 @@ public class Retry extends Task implements TaskContainer {
     }
 
     /**
-     * set the delay between retries (in miliseconds)
+     * set the delay between retries (in milliseconds)
      * @param n the time between retries.
      * @since Ant 1.8.3
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index 13a6d3bf1..7b5b200d9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -486,7 +486,7 @@ public class Rmic extends MatchingTask {
      * Sets the compiler implementation to use; optional,
      * defaults to the value of the <code>build.rmic</code> property,
      * or failing that, default compiler for the current VM
-     * @param compiler the compiler implemention to use
+     * @param compiler the compiler implementation to use
      * @since Ant 1.5
      */
     public void setCompiler(String compiler) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index 4515f501b..576ececc7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -204,7 +204,7 @@ public class SQLExec extends JDBCTask {
     private boolean rawBlobs;
 
     /**
-     * delimers must match in case and whitespace is significant.
+     * delimiters must match in case and whitespace is significant.
      * @since Ant 1.8.0
      */
     private boolean strictDelimiterMatching = true;
@@ -245,7 +245,7 @@ public class SQLExec extends JDBCTask {
     private String csvQuoteChar = null;
 
     /**
-     * Whether a warning is an error - in which case onError aplies.
+     * Whether a warning is an error - in which case onError applies.
      * @since Ant 1.8.0
      */
     private boolean treatWarningsAsErrors = false;
@@ -478,9 +478,9 @@ public class SQLExec extends JDBCTask {
     }
 
     /**
-     * If false, delimiters will be searched for in a case-insesitive
-     * manner (i.e. delimer="go" matches "GO") and surrounding
-     * whitespace will be ignored (delimter="go" matches "GO ").
+     * If false, delimiters will be searched for in a case-insensitive
+     * manner (i.e. delimiter="go" matches "GO") and surrounding
+     * whitespace will be ignored (delimiter="go" matches "GO ").
      * @since Ant 1.8.0
      */
     public void setStrictDelimiterMatching(boolean b) {
@@ -496,7 +496,7 @@ public class SQLExec extends JDBCTask {
     }
 
     /**
-     * Whether a warning is an error - in which case onError aplies.
+     * Whether a warning is an error - in which case onError applies.
      * @since Ant 1.8.0
      */
     public void setTreatWarningsAsErrors(boolean b) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
index b8c5b1660..1cf79323e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
@@ -454,7 +454,7 @@ public class SubAnt extends Task {
     /**
      * Corresponds to <code>&lt;ant&gt;</code>'s
      * nested <code>&lt;propertyset&gt;</code> element.
-     * @param ps the propertset
+     * @param ps the propertyset
      */
     public void addPropertyset(PropertySet ps) {
         propertySets.addElement(ps);
diff --git a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
index a5818a7c7..ef64f6786 100644
--- a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
+++ b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
@@ -46,7 +46,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
  * The maxwaitunit and checkeveryunit are allowed to have the following values:
  * millisecond, second, minute, hour, day and week. The default is millisecond.
  *
- * For programmatic use/subclassing, there are two methods that may be overrridden,
+ * For programmatic use/subclassing, there are two methods that may be overridden,
  * <code>processSuccess</code> and <code>processTimeout</code>
  * @since Ant 1.5
  *
@@ -188,7 +188,7 @@ public class WaitFor extends ConditionBase {
     }
 
     /**
-     * Get the maxiumum wait time, in milliseconds.
+     * Get the maximum wait time, in milliseconds.
      * @since Ant 1.8
      * @return how long to wait before timing out
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison2.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison2.java
index 831aff5f9..f41f91511 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison2.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison2.java
@@ -26,7 +26,7 @@ package org.apache.tools.ant.taskdefs;
  */
 public interface XSLTLiaison2 extends XSLTLiaison {
     /**
-     * Configure the liasion from the XSLTProcess task
+     * Configure the liaision from the XSLTProcess task
      * @param xsltTask the XSLTProcess task
      */
     void configure(XSLTProcess xsltTask);
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 28167b5c1..bde1c55dc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -90,7 +90,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
     /** Classpath to use when trying to load the XSL processor */
     private Path classpath = null;
 
-    /** The Liason implementation to use to communicate with the XSL
+    /** The Liaison implementation to use to communicate with the XSL
      *  processor */
     private XSLTLiaison liaison;
 
@@ -905,9 +905,9 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
     }
 
     /**
-     * Get the Liason implementation to use in processing.
+     * Get the Liaison implementation to use in processing.
      *
-     * @return an instance of the XSLTLiason interface.
+     * @return an instance of the XSLTLiaison interface.
      */
     protected XSLTLiaison getLiaison() {
         // if processor wasn't specified, use TraX.
@@ -1010,7 +1010,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
 
         /**
          * Set whether this param should be used.  It will be used if
-         * the expression evalutes to true or the name of a property
+         * the expression evaluates to true or the name of a property
          * which has been set, otherwise it won't.
          * @param ifCond evaluated expression
          * @since Ant 1.8.0
@@ -1021,7 +1021,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
 
         /**
          * Set whether this param should be used.  It will be used if
-         * the expression evalutes to true or the name of a property
+         * the expression evaluates to true or the name of a property
          * which has been set, otherwise it won't.
          * @param ifProperty evaluated expression
          */
@@ -1156,7 +1156,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
 
         try {
             log("Loading stylesheet " + stylesheet, Project.MSG_INFO);
-            // We call liason.configure() and then liaison.setStylesheet()
+            // We call liaison.configure() and then liaison.setStylesheet()
             // so that the internal variables of liaison can be set up
             if (liaison instanceof XSLTLiaison2) {
                 ((XSLTLiaison2) liaison).configure(this);
diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
index 4e37a31aa..d85f86e10 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
@@ -649,7 +649,7 @@ public class XmlProperty extends org.apache.tools.ant.Task {
     /**
      * Include the semantic attribute name as part of the property name.
      * Ignored if semanticAttributes is not set to true.
-     * @param includeSemanticAttribute if true include the sematic attribute
+     * @param includeSemanticAttribute if true include the semantic attribute
      *                                 name.
      */
     public void setIncludeSemanticAttribute(boolean includeSemanticAttribute) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index 2b0d66db5..f5cdde0bb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -214,7 +214,7 @@ public class Zip extends MatchingTask {
         UnicodeExtraField.NEVER;
 
     /**
-     * Whether to fall back to UTF-8 if a name cannot be enoded using
+     * Whether to fall back to UTF-8 if a name cannot be encoded using
      * the specified encoding.
      *
      * @since Ant 1.8.0
@@ -532,7 +532,7 @@ public class Zip extends MatchingTask {
     }
 
     /**
-     * Whether to fall back to UTF-8 if a name cannot be enoded using
+     * Whether to fall back to UTF-8 if a name cannot be encoded using
      * the specified encoding.
      *
      * <p>Defaults to false.</p>
@@ -544,7 +544,7 @@ public class Zip extends MatchingTask {
     }
 
     /**
-     * Whether to fall back to UTF-8 if a name cannot be enoded using
+     * Whether to fall back to UTF-8 if a name cannot be encoded using
      * the specified encoding.
      *
      * @since Ant 1.8.0
@@ -1183,7 +1183,7 @@ public class Zip extends MatchingTask {
      * third arg if they already know that the archive is
      * out-of-date.</p>
      *
-     * <p>This method first delegates to getNonFileSetResourceToAdd
+     * <p>This method first delegates to getNonFileSetResourcesToAdd
      * and then invokes the FileSet-arg version.  All this to keep
      * backwards compatibility for subclasses that don't know how to
      * deal with non-FileSet ResourceCollections.</p>
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java b/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java
index b220d94a3..aadf5a7e5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java
@@ -52,7 +52,7 @@ public class AntVersion extends Task implements Condition {
     }
 
     /**
-     * Evalute the condition.
+     * Evaluate the condition.
      * @return true if the condition is true.
      * @throws BuildException if an error occurs.
      */
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 7b4725130..ac37f8fed 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
@@ -93,7 +93,7 @@ public class Matches extends ProjectComponent implements Condition {
 
     /**
      * Whether to treat input as singleline ('.' matches newline).
-     * Corresponsds to java.util.regex.Pattern.DOTALL.
+     * Corresponds to java.util.regex.Pattern.DOTALL.
      * @param b the value to set.
      */
     public void setSingleLine(boolean b) {
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 1908682c6..06e1d110d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
@@ -373,7 +373,7 @@ public class Javah extends Task {
 
     /**
      * Choose the implementation for this particular task.
-     * @param impl the name of the implemenation.
+     * @param impl the name of the implementation.
      * @since Ant 1.6.3
      */
     public void setImplementation(String impl) {
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 a40e6a331..291d444d7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
@@ -126,7 +126,7 @@ public class Native2Ascii extends MatchingTask {
 
     /**
      * Choose the implementation for this particular task.
-     * @param impl the name of the implemenation
+     * @param impl the name of the implementation
      * @since Ant 1.6.3
      */
     public void setImplementation(String impl) {
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 5bd74870c..83ae93001 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -561,7 +561,7 @@ public class NetRexxC extends MatchingTask {
 
 
     /**
-     * Tells wether the trailing .keep in nocompile-mode should be removed
+     * Tells whether the trailing .keep in nocompile-mode should be removed
      * so that the resulting java source really ends on .java.
      * This facilitates the use of the javadoc tool lateron.
      */
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 b31d1d87a..0751ec541 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
@@ -344,7 +344,7 @@ public class ReplaceRegExp extends Task {
     /**
      *  Perform the replacement on a file
      *
-     * @param f the file to perform the relacement on
+     * @param f the file to perform the replacement on
      * @param options the regular expressions options
      * @exception IOException if an error occurs
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
index 91b1700f5..2e08ff5bb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
@@ -37,7 +37,7 @@ import java.net.MalformedURLException;
 /**
  * Validate XML Schema documents.
  * This task validates XML schema documents. It requires an XML parser
- * that handles the relevant SAx, Xerces or JAXP options.
+ * that handles the relevant SAX, Xerces or JAXP options.
  *
  * To resolve remote referencies, Ant may need its proxy set up, using the
  * setproxy task.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
index e8392605b..202b7718c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
@@ -118,7 +118,7 @@ public class DescriptorHandler extends org.xml.sax.HandlerBase {
 
     /**
      * Constructor for DescriptorHandler.
-     * @param task the task that owns this desciptor
+     * @param task the task that owns this descriptor
      * @param srcDir the source directory
      */
     public DescriptorHandler(Task task, File srcDir) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
index f161ca078..cac1db92a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
@@ -133,7 +133,7 @@ public class EjbJar extends MatchingTask {
     public static class NamingScheme extends EnumeratedAttribute {
         /**
          * Naming scheme where generated jar is determined from the ejb-name in
-         * the deployment descripor
+         * the deployment descriptor
          */
         public static final String EJB_NAME = "ejb-name";
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index 2cb67e36f..069bdfcf9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -726,7 +726,7 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
     }
 
     /**
-     * Get the manifets file to use for building the generic jar.
+     * Get the manifest file to use for building the generic jar.
      *
      * If the file does not exist the global manifest from the config is used
      * otherwise the default Ant manifest will be used.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
index ec721b556..23208810d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
@@ -251,7 +251,7 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
     /**
      * Flag to enable internal tracing when set, optional, default false.
      *
-     * @param trace a <code>boolean</code> vaule.
+     * @param trace a <code>boolean</code> value.
      */
     public void setTrace(boolean trace) {
         this.trace = trace;
@@ -308,7 +308,7 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
 
 
     /**
-     * Decide, wether ejbdeploy should be called or not;
+     * Decide, whether ejbdeploy should be called or not;
      * optional, default true.
      *
      * @param ejbdeploy a <code>boolean</code> value.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
index 71de84a70..c1c92f432 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
@@ -52,7 +52,7 @@ public final class Extension {
      * are not required for the library to operate but if present will be used.
      * It is NOT part of the official "Optional Package" specification.
      *
-     * @see <a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/spec.html#dependnecy">
+     * @see <a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/spec.html#dependency">
      *      Installed extension dependency</a>
      */
     public static final Attributes.Name OPTIONAL_EXTENSION_LIST
@@ -221,7 +221,7 @@ public final class Extension {
      * are no such optional packages, a zero-length list is returned.
      *
      * @param manifest Manifest to be parsed
-     * @return the dependencies that are specified in manifes
+     * @return the dependencies that are specified in manifest
      */
     public static Extension[] getRequired(final Manifest manifest) {
         return getListed(manifest, Attributes.Name.EXTENSION_LIST);
@@ -430,7 +430,7 @@ public final class Extension {
      *
      * @param required Description of the required optional package
      * @return the enum indicating the compatibility (or lack thereof)
-     *         of specifed extension
+     *         of specified extension
      */
     public Compatibility getCompatibilityWith(final Extension required) {
         // Extension Name must match
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java
index 9787be333..a8fd9ea41 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java
@@ -95,7 +95,7 @@ public class JarLibAvailableTask extends Task {
     /**
      * Execute the task.
      *
-     * @throws BuildException if somethign goes wrong.
+     * @throws BuildException if something goes wrong.
      */
     public void execute() throws BuildException {
         validate();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
index b2755b443..1e4bb7b30 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
@@ -265,7 +265,7 @@ public final class Specification {
     /**
      * Get the title of the specification.
      *
-     * @return the title of speciication
+     * @return the title of specification
      */
     public String getSpecificationTitle() {
         return specificationTitle;
@@ -318,10 +318,10 @@ public final class Specification {
 
     /**
      * Return an array containing sections to which specification applies
-     * or null if relevent to no sections.
+     * or null if relevant to no sections.
      *
      * @return an array containing sections to which specification applies
-     *         or null if relevent to no sections.
+     *         or null if relevant to no sections.
      */
     public String[] getSections() {
         if (null == sections) {
@@ -339,7 +339,7 @@ public final class Specification {
      *
      * @param other the other specification
      * @return the enum indicating the compatibility (or lack thereof)
-     *         of specifed Package Specification
+     *         of specified Package Specification
      */
     public Compatibility getCompatibilityWith(final Specification other) {
         // Specification Name must match
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java
index 714f692fb..cfdd39852 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java
@@ -60,7 +60,7 @@ public class URLResolver implements ExtensionResolver {
 
     /**
      * Returns the file resolved from URL and directory
-     * @param extension the extention
+     * @param extension the extension
      * @param project the project
      * @return file the file resolved
      * @throws BuildException if the URL is invalid
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
index 34f7a37a9..2cc690bd9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
@@ -178,7 +178,7 @@ public class Translate extends MatchingTask {
 
     /**
      * Sets locale specific language of resource bundle; optional.
-     * @param bundleLanguage langage of the bundle
+     * @param bundleLanguage language of the bundle
      */
     public void setBundleLanguage(String bundleLanguage) {
         this.bundleLanguage = bundleLanguage;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java
index 3a25e6162..5a5abbab6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java
@@ -52,7 +52,7 @@ public class GenericHotDeploymentTool extends AbstractHotDeploymentTool {
     }
 
     /**
-     *  Add a nested argment element to hand to the JVM running the
+     *  Add a nested argument element to hand to the JVM running the
      *  deployment tool.
      *  Creates a nested arg element.
      *  @return A Commandline.Argument object representing the
@@ -112,7 +112,7 @@ public class GenericHotDeploymentTool extends AbstractHotDeploymentTool {
     }
 
     /**
-     *  The name of the class to execute to perfom
+     *  The name of the class to execute to perform
      *  deployment; required.
      *  Example: "com.foobar.tools.deploy.DeployTool"
      *  @param className The fully qualified class name of the class
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
index caed6a5ac..a2b265c58 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
@@ -30,8 +30,8 @@ import org.apache.tools.ant.types.Path;
  *  has been assembled and is supplied as the "source" attribute.
  *  <p>
  *
- *  In the end, this task assembles the commadline parameters and
- *  runs the weblogic.deploy tool in a seperate JVM.
+ *  In the end, this task assembles the commandline parameters and
+ *  runs the weblogic.deploy tool in a separate JVM.
  *
  *@see org.apache.tools.ant.taskdefs.optional.j2ee.HotDeploymentTool
  *@see org.apache.tools.ant.taskdefs.optional.j2ee.AbstractHotDeploymentTool
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java
index 6fbbad22e..da8750927 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java
@@ -27,8 +27,8 @@ import org.apache.tools.ant.taskdefs.Java;
  *  This is <b>not</b> the same as creating the application archive.
  *  This task assumes the archive (EAR, JAR, or WAR) file has been
  *  assembled and is supplied as the "source" attribute.
- *  <p>In the end, this task assembles the commadline parameters
- *  and runs the weblogic.deploy tool in a seperate JVM.
+ *  <p>In the end, this task assembles the commandline parameters
+ *  and runs the weblogic.deploy tool in a separate JVM.
  *
  *  @see org.apache.tools.ant.taskdefs.optional.j2ee.HotDeploymentTool
  *  @see org.apache.tools.ant.taskdefs.optional.j2ee.AbstractHotDeploymentTool
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
index ee5e5af61..9c2882fa8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
@@ -640,7 +640,7 @@ public class JspC extends MatchingTask {
 
     /**
      * get a filename from our jsp file.
-     * @param mangler the jsp filename managler.
+     * @param mangler the jsp filename manager.
      * @param srcFile the source file.
      * @param srcDir  the source directory.
      * @param dest    the destination directory.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
index e0faf8ca3..48b2623e3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
@@ -251,7 +251,7 @@ public class WLJspc extends MatchingTask {
     /**
      * Set the package under which the compiled classes go
      *
-     * @param packageName the package name for the clases
+     * @param packageName the package name for the classes
      */
     public void setPackage(String packageName) {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
index 56d2e0613..34897d5bf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
@@ -25,7 +25,7 @@ import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
  * The interface that all jsp compiler adapters must adher to.
  *
  * <p>A compiler adapter is an adapter that interprets the jspc's
- * parameters in preperation to be passed off to the compier this
+ * parameters in preperation to be passed off to the compiler this
  * adapter represents.  As all the necessary values are stored in the
  * Jspc task itself, the only thing all adapters need is the jsp
  * task, the execute command and a parameterless constructor (for
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index b30eb61d4..88d35c740 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -238,7 +238,7 @@ public class JUnitTask extends Task {
      * Property to set to "true" if there is a error in a test.
      *
      * <p>This property is applied on all BatchTest (batchtest) and
-     * JUnitTest (test), however, it can possibly be overriden by
+     * JUnitTest (test), however, it can possibly be overridden by
      * their own properties.</p>
      * @param propertyName the name of the property to set in the
      * event of an error.
@@ -268,7 +268,7 @@ public class JUnitTask extends Task {
      * Property to set to "true" if there is a failure in a test.
      *
      * <p>This property is applied on all BatchTest (batchtest) and
-     * JUnitTest (test), however, it can possibly be overriden by
+     * JUnitTest (test), however, it can possibly be overridden by
      * their own properties.</p>
      * @param propertyName the name of the property to set in the
      * event of an failure.
@@ -311,7 +311,7 @@ public class JUnitTask extends Task {
      * <p>Only tests with the same configuration of haltonerror,
      * haltonfailure, errorproperty, failureproperty and filtertrace
      * can share a forked Java VM, so even if you set the value to
-     * "once", Ant may need to fork mutliple VMs.</p>
+     * "once", Ant may need to fork multiple VMs.</p>
      * @param mode the mode to use.
      * @since Ant 1.6.2
      */
@@ -428,7 +428,7 @@ public class JUnitTask extends Task {
 
     /**
      * Adds a system property that tests can access.
-     * This might be useful to tranfer Ant properties to the
+     * This might be useful to transfer Ant properties to the
      * testcases when JVM forking is not enabled.
      *
      * @since Ant 1.3
@@ -442,7 +442,7 @@ public class JUnitTask extends Task {
 
     /**
      * Adds a system property that tests can access.
-     * This might be useful to tranfer Ant properties to the
+     * This might be useful to transfer Ant properties to the
      * testcases when JVM forking is not enabled.
      * @param sysp new environment variable to add
      * @since Ant 1.6
@@ -459,7 +459,7 @@ public class JUnitTask extends Task {
      * Adds a set of properties that will be used as system properties
      * that tests can access.
      *
-     * This might be useful to tranfer Ant properties to the
+     * This might be useful to transfer Ant properties to the
      * testcases when JVM forking is not enabled.
      *
      * @param sysp set of properties to be added
@@ -644,7 +644,7 @@ public class JUnitTask extends Task {
     /**
      * If set, system properties will be copied to the cloned VM - as
      * well as the bootclasspath unless you have explicitly specified
-     * a bootclaspath.
+     * a bootclasspath.
      *
      * <p>Doesn't have any effect unless fork is true.</p>
      * @param cloneVm a <code>boolean</code> value.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java
index 67451f8d4..84c62c96a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java
@@ -42,9 +42,9 @@ public interface JUnitTaskMirror {
 
     /**
      * Add the formatter to be called when the jvm exits before
-     * the test suite finishs.
+     * the test suite finishes.
      * @param test the test.
-     * @param formatter the fomatter to use.
+     * @param formatter the formatter to use.
      * @param out the output stream to use.
      * @param message the message to write out.
      * @param testCase the name of the test.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index ce48fa432..05320b11f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -762,7 +762,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
      * failures?</td><td>false</td></tr>
      *
      * <tr><td>formatter</td><td>A JUnitResultFormatter given as
-     * classname,filename. If filename is ommitted, System.out is
+     * classname,filename. If filename is omitted, System.out is
      * assumed.</td><td>none</td></tr>
      *
      * <tr><td>showoutput</td><td>send output to System.err/.out as
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
index fd41e08c3..c9c07f62b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
@@ -44,7 +44,7 @@ import org.xml.sax.SAXException;
 /**
  * Aggregates all &lt;junit&gt; XML formatter testsuite data under
  * a specific directory and transforms the results via XSLT.
- * It is not particulary clean but
+ * It is not particularly clean but
  * should be helpful while I am thinking about another technique.
  *
  * <p> The main problem is due to the fact that a JVM can be forked for a testcase
@@ -207,7 +207,7 @@ public class XMLResultAggregator extends Task implements XMLConstants {
     /**
      * Write the DOM tree to a file.
      * @param doc the XML document to dump to disk.
-     * @param file the filename to write the document to. Should obviouslly be a .xml file.
+     * @param file the filename to write the document to. Should obviously be a .xml file.
      * @throws IOException thrown if there is an error while writing the content.
      */
     protected void writeDOMTree(Document doc, File file) throws IOException {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index ef20aa089..0b4bff001 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -1702,7 +1702,7 @@ public class FTP extends Task implements FTPTaskConfig {
 
     /**
      * Executable a retryable object.
-     * @param h the retry hander.
+     * @param h the retry handler.
      * @param r the object that should be retried until it succeeds
      *          or the number of retrys is reached.
      * @param descr a description of the command that is being run.
@@ -2245,7 +2245,7 @@ public class FTP extends Task implements FTPTaskConfig {
      * Retrieve a single file from the remote host. <code>filename</code> may
      * contain a relative path specification. <p>
      *
-     * The file will then be retreived using the entire relative path spec -
+     * The file will then be retrieved using the entire relative path spec -
      * no attempt is made to change directories. It is anticipated that this
      * may eventually cause problems with some FTP servers, but it simplifies
      * the coding.</p>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
index dd5daf63d..c8fd88975 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
@@ -1088,7 +1088,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
 
     /**
      * Executable a retryable object.
-     * @param h the retry hander.
+     * @param h the retry handler.
      * @param r the object that should be retried until it succeeds
      *          or the number of retrys is reached.
      * @param descr a description of the command that is being run.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
index b6e4b9515..71e97ac9e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
@@ -399,7 +399,7 @@ public class RExecTask extends Task {
         rexec.sendString(password, false);
     }
     /**
-     * Set the the comand to execute on the server;
+     * Set the the command to execute on the server;
      * @param c a <code>String</code> value
      */
     public void setCommand(String c) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java
index 39cc81e18..3fd7f4725 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java
@@ -101,7 +101,7 @@ public class P4Resolve extends P4Base {
     /**
      * read the simulation mode flag
      * @return flag indicating whether one wants just to simulate
-     * the p4 resolve operation whithout actually doing it
+     * the p4 resolve operation without actually doing it
      */
     public boolean isSimulationmode() {
         return simulationmode;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java
index d7805b0a5..8c1992a59 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java
@@ -219,7 +219,7 @@ public abstract class SOS extends Task implements SOSCmd {
     }
 
     /**
-     * Get the executable to run. Add the path if it was specifed in the build file
+     * Get the executable to run. Add the path if it was specified in the build file
      *
      * @return the executable to run.
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
index b55470a72..f2ebae83e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
@@ -112,7 +112,7 @@ public class SoundTask extends Task {
 
         /**
          * Sets the duration in milliseconds the file should be played; optional.
-         * @param duration the duration in millisconds
+         * @param duration the duration in milliseconds
          */
         public void setDuration(Long duration) {
             this.duration = duration;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
index 10c53c358..2a87854e5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
@@ -116,7 +116,7 @@ public class SplashTask extends Task {
     /**
      * how long to show the splash screen in milliseconds,
      * optional; default 5000 ms.
-     * @param duration the spash duration in milliseconds
+     * @param duration the splash duration in milliseconds
      */
     public void setShowduration(int duration) {
         this.showDuration = duration;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
index 439cb40e5..f25ec7d95 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
@@ -167,7 +167,7 @@ public class Directory {
 
     /**
      * Convert a file path to an array of path components.
-     * This uses File.sepatator to split the file path string.
+     * This uses File.separator to split the file path string.
      * @param thePath the file path string to convert
      * @return an array of path components
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.java
index 824e257ec..41209ceb9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.java
@@ -23,7 +23,7 @@ package org.apache.tools.ant.taskdefs.optional.ssh;
  */
 public interface LogListener {
     /**
-     * Method for the loglistener to implement to recieve log messages.
+     * Method for the loglistener to implement to receive log messages.
      * @param message the message to log
      */
     void log(String message);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
index 1c56bb2d5..9250be93a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
@@ -191,7 +191,7 @@ public abstract class SSHBase extends Task implements LogListener {
     }
 
     /**
-     * Open an ssh seession.
+     * Open an ssh session.
      * @return the opened session
      * @throws JSchException on error
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
index 67421d964..a67dc56dc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -182,7 +182,7 @@ public class Scp extends SSHBase {
     }
 
     /**
-     * Adds a FileSet tranfer to remote host.  NOTE: Either
+     * Adds a FileSet transfer to remote host.  NOTE: Either
      * addFileSet() or setFile() are required.  But, not both.
      *
      * @param set FileSet to send to remote host.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java b/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java
index 910ded4a6..7560cd4f5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java
@@ -30,7 +30,7 @@ import org.apache.tools.ant.taskdefs.Sequential;
 import org.apache.tools.ant.taskdefs.WaitFor;
 
 /**
- * Task to provide functional testing under Ant, with a fairly complex worflow of:
+ * Task to provide functional testing under Ant, with a fairly complex workflow of:
  *
  * <ul>
  * <li>Conditional execution</li>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
index 40b8e8a2f..d3385e6cc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
@@ -88,7 +88,7 @@ public abstract class AbstractAccessTask
     }
 
     /**
-     * Prevent the use of the addsourcefile atribute.
+     * Prevent the use of the addsourcefile attribute.
      *
      * @ant.attribute ignore="true"
      * @param b A user supplied boolean we won't accept.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java
index 403fc2d8d..1279a2c82 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java
@@ -50,7 +50,7 @@ public class Chgrp extends AbstractAccessTask {
     }
 
     /**
-     * Set the group atribute.
+     * Set the group attribute.
      *
      * @param group    The new group for the file(s) or directory(ies)
      */
@@ -72,7 +72,7 @@ public class Chgrp extends AbstractAccessTask {
     }
 
     /**
-     * We don't want to expose the executable atribute, so overide it.
+     * We don't want to expose the executable attribute, so override it.
      *
      * @param e User supplied executable that we won't accept.
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java
index ba1028b64..53f72536b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java
@@ -50,7 +50,7 @@ public class Chown extends AbstractAccessTask {
     }
 
     /**
-     * Set the owner atribute.
+     * Set the owner attribute.
      *
      * @param owner    The new owner for the file(s) or directory(ies)
      */
@@ -72,7 +72,7 @@ public class Chown extends AbstractAccessTask {
     }
 
     /**
-     * We don't want to expose the executable atribute, so overide it.
+     * We don't want to expose the executable attribute, so override it.
      *
      * @param e User supplied executable that we won't accept.
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java
index 4144d4492..9e5ec6060 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java
@@ -63,7 +63,7 @@ public interface MSVSSConstants {
 
     /**  The text for replacing writable files   */
     String WRITABLE_REPLACE = "replace";
-    /**  The text for skiping writable files  */
+    /**  The text for skipping writable files  */
     String WRITABLE_SKIP = "skip";
     /**  The text for failing on writable files  */
     String WRITABLE_FAIL = "fail";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
index fc729e777..68a0d35d3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
@@ -172,7 +172,7 @@ public class Attrib extends ExecuteOn {
 
     /**
      * Check if the os is valid.
-     * Defauls is to allow windows
+     * Default is to allow windows
      * @return true if the os is valid.
      */
     protected boolean isValidOs() {
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
index 575868223..07139f48b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
@@ -34,7 +34,7 @@ import org.apache.tools.ant.util.StringUtils;
 /**
  * This is the default implementation for the RmicAdapter interface.
  * Currently, this is a cut-and-paste of the original rmic task and
- * DefaultCopmpilerAdapter.
+ * DefaultCompilerAdapter.
  *
  * @since Ant 1.4
  */
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
index 8493d4eaa..851f3d5a5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
@@ -61,7 +61,7 @@ public interface RmicAdapter {
 
     /**
      * The CLASSPATH this rmic process will use.
-     * @return the classpaht this rmic process will use
+     * @return the classpath this rmic process will use
      */
     Path getClasspath();
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
index 613de52ea..3b1f2a19e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
@@ -49,7 +49,7 @@ public class WLRmic extends DefaultRmicAdapter {
     public static final String WL_RMI_STUB_SUFFIX = "_WLStub";
     /** The skeleton suffix */
     public static final String WL_RMI_SKEL_SUFFIX = "_WLSkel";
-    /** upsupported error message */
+    /** unsupported error message */
     public static final String UNSUPPORTED_STUB_OPTION = "Unsupported stub option: ";
 
     /**
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 247a71284..60e0b900a 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -444,7 +444,7 @@ public abstract class AbstractFileSet extends DataType
      }
 
     /**
-     * Gets whether an error is/shold be thrown if the base directory
+     * Gets whether an error is/should be thrown if the base directory
      * does not exist.
      * @since Ant 1.8.2
      */
@@ -799,7 +799,7 @@ public abstract class AbstractFileSet extends DataType
     }
 
     /**
-     * Add an arbitary selector.
+     * Add an arbitrary selector.
      * @param selector the <code>FileSelector</code> to add.
      * @since Ant 1.6
      */
diff --git a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java
index a5890a048..4f77bc737 100644
--- a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java
+++ b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java
@@ -77,7 +77,7 @@ public abstract class ArchiveFileSet extends FileSet {
     }
 
     /**
-     * Constructor using a fileset arguement.
+     * Constructor using a fileset argument.
      * @param fileset the fileset to use
      */
     protected ArchiveFileSet(FileSet fileset) {
@@ -85,7 +85,7 @@ public abstract class ArchiveFileSet extends FileSet {
     }
 
     /**
-     * Constructor using a archive fileset arguement.
+     * Constructor using a archive fileset argument.
      * @param fileset the archivefileset to use
      */
     protected ArchiveFileSet(ArchiveFileSet fileset) {
@@ -200,7 +200,7 @@ public abstract class ArchiveFileSet extends FileSet {
      * Performs the check for circular references and returns the
      * referenced object.
      * This is an override which does not delegate to the superclass; instead it invokes
-     * {@link #getRef(Project)}, because that conains the special support for fileset
+     * {@link #getRef(Project)}, because that contains the special support for fileset
      * references, which can be handled by all ArchiveFileSets.
      * @param p the Ant Project instance against which to resolve references.
      * @return the dereferenced object.
diff --git a/src/main/org/apache/tools/ant/types/ArchiveScanner.java b/src/main/org/apache/tools/ant/types/ArchiveScanner.java
index da5a97d02..4d2f3ad81 100644
--- a/src/main/org/apache/tools/ant/types/ArchiveScanner.java
+++ b/src/main/org/apache/tools/ant/types/ArchiveScanner.java
@@ -351,7 +351,7 @@ public abstract class ArchiveScanner extends DirectoryScanner {
     /**
      * Remove trailing slash if present.
      * @param s the file name to trim.
-     * @return the trimed file name.
+     * @return the trimmed file name.
      */
     protected static final String trimSeparator(String s) {
         return s.endsWith("/") ? s.substring(0, s.length() - 1) : s;
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index db3bfd894..94461fc62 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -458,7 +458,7 @@ public class CommandlineJava implements Cloneable {
     /**
      * Specify max memory of the JVM.
      * -mx or -Xmx depending on VM version.
-     * @param max the string to pass to the jvm to specifiy the max memory.
+     * @param max the string to pass to the jvm to specify the max memory.
      */
     public void setMaxmemory(String max) {
         this.maxMemory = max;
diff --git a/src/main/org/apache/tools/ant/types/Environment.java b/src/main/org/apache/tools/ant/types/Environment.java
index 05695b919..326a9956b 100644
--- a/src/main/org/apache/tools/ant/types/Environment.java
+++ b/src/main/org/apache/tools/ant/types/Environment.java
@@ -29,7 +29,7 @@ public class Environment {
     // CheckStyle:VisibilityModifier OFF - bc
 
     /**
-     * a vector of type Enviromment.Variable
+     * a vector of type Environment.Variable
      * @see Variable
      */
     protected Vector variables;
diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index a90a4a600..6faa7e94e 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -62,7 +62,7 @@ public class FilterSet extends DataType implements Cloneable {
         }
 
         /**
-         * No-argument conmstructor.
+         * No-argument constructor.
          */
         public Filter() {
         }
diff --git a/src/main/org/apache/tools/ant/types/Parameterizable.java b/src/main/org/apache/tools/ant/types/Parameterizable.java
index ed9ce1fab..7945a9a6c 100644
--- a/src/main/org/apache/tools/ant/types/Parameterizable.java
+++ b/src/main/org/apache/tools/ant/types/Parameterizable.java
@@ -18,7 +18,7 @@
 package org.apache.tools.ant.types;
 
 /**
- * Parameterizable objects take genric key value pairs.
+ * Parameterizable objects take generic key value pairs.
  *
  */
 public interface Parameterizable {
diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java
index f124ed63b..1e753f809 100644
--- a/src/main/org/apache/tools/ant/types/Path.java
+++ b/src/main/org/apache/tools/ant/types/Path.java
@@ -53,7 +53,7 @@ import org.apache.tools.ant.util.JavaEnvUtils;
  * &lt;/sometask&gt;<br>
  * </code>
  * <p>
- * The object implemention <code>sometask</code> must provide a method called
+ * The object implementation <code>sometask</code> must provide a method called
  * <code>createSomepath</code> which returns an instance of <code>Path</code>.
  * Nested path definitions are handled by the Path object and must be labeled
  * <code>pathelement</code>.<p>
diff --git a/src/main/org/apache/tools/ant/types/PropertySet.java b/src/main/org/apache/tools/ant/types/PropertySet.java
index 2267e0d12..bed52a240 100644
--- a/src/main/org/apache/tools/ant/types/PropertySet.java
+++ b/src/main/org/apache/tools/ant/types/PropertySet.java
@@ -247,7 +247,7 @@ public class PropertySet extends DataType implements ResourceCollection {
 
     /**
      * Get the dynamic attribute.
-     * @return true if the property set is to be evalulated each time it is used.
+     * @return true if the property set is to be evaluated each time it is used.
      */
     public boolean getDynamic() {
         if (isReference()) {
diff --git a/src/main/org/apache/tools/ant/types/TarFileSet.java b/src/main/org/apache/tools/ant/types/TarFileSet.java
index 7d61ae119..eec1dfa0c 100644
--- a/src/main/org/apache/tools/ant/types/TarFileSet.java
+++ b/src/main/org/apache/tools/ant/types/TarFileSet.java
@@ -47,7 +47,7 @@ public class TarFileSet extends ArchiveFileSet {
     }
 
     /**
-     * Constructor using a fileset arguement.
+     * Constructor using a fileset argument.
      * @param fileset the fileset to use
      */
     protected TarFileSet(FileSet fileset) {
@@ -55,7 +55,7 @@ public class TarFileSet extends ArchiveFileSet {
     }
 
     /**
-     * Constructor using a tarfileset arguement.
+     * Constructor using a tarfileset argument.
      * @param fileset the tarfileset to use
      */
     protected TarFileSet(TarFileSet fileset) {
diff --git a/src/main/org/apache/tools/ant/types/ZipFileSet.java b/src/main/org/apache/tools/ant/types/ZipFileSet.java
index 6fcc66560..eb6a694dc 100644
--- a/src/main/org/apache/tools/ant/types/ZipFileSet.java
+++ b/src/main/org/apache/tools/ant/types/ZipFileSet.java
@@ -41,7 +41,7 @@ public class ZipFileSet extends ArchiveFileSet {
     }
 
     /**
-     * Constructor using a fileset arguement.
+     * Constructor using a fileset argument.
      * @param fileset the fileset to use
      */
     protected ZipFileSet(FileSet fileset) {
@@ -49,7 +49,7 @@ public class ZipFileSet extends ArchiveFileSet {
     }
 
     /**
-     * Constructor using a zipfileset arguement.
+     * Constructor using a zipfileset argument.
      * @param fileset the zipfileset to use
      */
     protected ZipFileSet(ZipFileSet fileset) {
diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java b/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java
index a034246f7..fac02bfa4 100644
--- a/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java
+++ b/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java
@@ -48,7 +48,7 @@ public class ScriptCondition extends AbstractScriptComponent implements Conditio
     }
 
     /**
-     * get the current value of the conditon
+     * get the current value of the condition
      * @return true if the condition
      */
     public boolean getValue() {
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
index 9fc5e29f9..23623d0f4 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
@@ -43,7 +43,7 @@ public class Ellipse extends BasicShape implements DrawOperation {
 
     /**
      * Set the height.
-     * @param height the height of the elipse.
+     * @param height the height of the ellipse.
      */
     public void setHeight(int height) {
         this.height = height;
diff --git a/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java b/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java
index b70b5a785..336b3d6c8 100644
--- a/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java
@@ -225,7 +225,7 @@ public abstract class AbstractClasspathResource extends Resource {
     }
 
     /**
-     * open the inpout stream from a specific classloader
+     * open the input stream from a specific classloader
      * @param cl the classloader to use. Will be null if the system classloader is used
      * @return an open input stream for the resource
      * @throws IOException if an error occurs.
diff --git a/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java b/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java
index 2b8cf7c8a..a00d696c3 100644
--- a/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java
+++ b/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java
@@ -27,7 +27,7 @@ import org.apache.tools.bzip2.CBZip2OutputStream;
 /**
  * A Bzip2 compressed resource.
  *
- * <p>Wraps around another resource, delegates all quries to that
+ * <p>Wraps around another resource, delegates all queries to that
  * other resource but uncompresses/compresses streams on the fly.</p>
  *
  * @since Ant 1.7
diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
index 590e3ac36..50c242a20 100644
--- a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
+++ b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
@@ -96,7 +96,7 @@ public class Name implements ResourceSelector {
     }
 
     /**
-     * Attribute specifing whether to ignore the difference
+     * Attribute specifying whether to ignore the difference
      * between / and \ (the two common directory characters).
      * @param handleDirSep a boolean, default is false.
      * @since Ant 1.8.0
diff --git a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
index 481312e86..999adf301 100644
--- a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
@@ -314,7 +314,7 @@ public abstract class AbstractSelectorContainer extends DataType
     }
 
     /**
-     * add an arbitary selector
+     * add an arbitrary selector
      * @param selector the selector to add
      * @since Ant 1.6
      */
diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
index a49455256..6d9d2696b 100644
--- a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
@@ -320,7 +320,7 @@ public abstract class BaseSelectorContainer extends BaseSelector
     }
 
     /**
-     * add an arbitary selector
+     * add an arbitrary selector
      * @param selector the selector to add
      * @since Ant 1.6
      */
diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
index 2d84306b6..987fa4d25 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
@@ -102,7 +102,7 @@ public class ContainsRegexpSelector extends BaseExtendSelector
 
     /**
      * Whether to treat input as singleline ('.' matches newline).
-     * Corresponsds to java.util.regex.Pattern.DOTALL.
+     * Corresponds to java.util.regex.Pattern.DOTALL.
      * @param b the value to set.
      * @since Ant 1.8.2
      */
diff --git a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java
index c11259dc6..9b979e918 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java
@@ -44,7 +44,7 @@ import java.io.IOException;
  * Clearly, however, bulk file comparisons is inefficient; anything that can
  * use timestamps is to be preferred. If this selector must be used, use it
  * over as few files as possible, perhaps following it with an &lt;uptodate;&gt
- * to keep the descendent routines conditional.
+ * to keep the descendant routines conditional.
  *
  */
 public class DifferentSelector extends MappingSelector {
diff --git a/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java b/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java
index 5332b12dc..f4ee5bae0 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java
@@ -26,7 +26,7 @@ import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
 /**
  * A selector that selects readable files.
  *
- * <p>Readable is definied in terms of java.io.File#canRead, this
+ * <p>Readable is defined in terms of java.io.File#canRead, this
  * means the selector will accept any file that exists and is readable
  * by the application.</p>
  *
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
index 432a36475..1d11cf5bc 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
@@ -178,7 +178,7 @@ public interface SelectorContainer {
     void addModified(ModifiedSelector selector);
 
     /**
-     * add an arbitary selector
+     * add an arbitrary selector
      * @param selector the selector to add
      * @since Ant 1.6
      */
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorScanner.java b/src/main/org/apache/tools/ant/types/selectors/SelectorScanner.java
index 718dbc2d4..df9f8a40d 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorScanner.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorScanner.java
@@ -19,7 +19,7 @@ package org.apache.tools.ant.types.selectors;
 
 /**
  * An interface used to describe the actions required by any type of
- * directory scanner that supports Selecters.
+ * directory scanner that supports Selectors.
  *
  * @since 1.5
  */
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
index 5f2917efe..34e23ed1f 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
@@ -658,7 +658,7 @@ public final class SelectorUtils {
     /**
      * "Flattens" a string by removing all whitespace (space, tab, linefeed,
      * carriage return, and formfeed). This uses StringTokenizer and the
-     * default set of tokens as documented in the single arguement constructor.
+     * default set of tokens as documented in the single argument constructor.
      *
      * @param input a String to remove all whitespace.
      * @return a String that has had all whitespace removed.
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
index c4d230760..0002786a3 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
@@ -51,7 +51,7 @@ import org.apache.tools.ant.util.ResourceUtils;
  * in a persistent manner.</p>
  *
  * <p>The ModifiedSelector is implemented as a <b>CoreSelector</b> and uses default
- * values for all its attributes therefore the simpliest example is <pre>
+ * values for all its attributes therefore the simplest example is <pre>
  *   &lt;copy todir="dest"&gt;
  *       &lt;filelist dir="src"&gt;
  *           &lt;modified/&gt;
@@ -95,7 +95,7 @@ import org.apache.tools.ant.util.ResourceUtils;
  * element, so that the selector can find the classes. <pre>
  *   &lt;modified cacheclassname="com.mycompany.MyCache"&gt;
  *       &lt;classpath&gt;
- *           &lt;pathelement location="lib/mycompony-antutil.jar"/&gt;
+ *           &lt;pathelement location="lib/mycompany-antutil.jar"/&gt;
  *       &lt;/classpath&gt;
  *   &lt;/modified&gt;
  * </pre></p>
@@ -808,7 +808,7 @@ public class ModifiedSelector extends BaseExtendSelector
 
     /**
      * Signals that the last target has finished.
-     * @param event recieved BuildEvent
+     * @param event received BuildEvent
     */
     public void buildFinished(BuildEvent event) {
         if (getDelayUpdate()) {
diff --git a/src/main/org/apache/tools/ant/util/ContainerMapper.java b/src/main/org/apache/tools/ant/util/ContainerMapper.java
index f47f42783..c3bf08c89 100644
--- a/src/main/org/apache/tools/ant/util/ContainerMapper.java
+++ b/src/main/org/apache/tools/ant/util/ContainerMapper.java
@@ -46,7 +46,7 @@ public abstract class ContainerMapper implements FileNameMapper {
      * This class used to contain an add method and an
      * addConfiguredMapper method. Dur to ordering,
      * the add method was always called first. This
-     * addConfigued method has been added to allow
+     * addConfigured method has been added to allow
      * chaining to work correctly.
      * @param fileNameMapper a <code>FileNameMapper</code>.
      */
diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
index 3f3b7d2ac..08cc22cc4 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -26,7 +26,7 @@ import org.apache.tools.ant.taskdefs.condition.Os;
 
 /**
  * A set of helper methods related to locating executables or checking
- * conditons of a given Java installation.
+ * conditions of a given Java installation.
  *
  * @since Ant 1.5
  */
@@ -186,7 +186,7 @@ public final class JavaEnvUtils {
 
     /**
      * Returns the version of Java this class is running under.
-     * This number can be used for comparisions; it will always be
+     * This number can be used for comparisons; it will always be
      * @return the version of Java as a number 10x the major/minor,
      * e.g Java1.5 has a value of 15
      */
diff --git a/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java b/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
index ac5919710..fe5e32fd7 100644
--- a/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
+++ b/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
@@ -49,7 +49,7 @@ public class KeepAliveInputStream extends FilterInputStream {
 
     /**
      * This method does nothing.
-     * @throws IOException as we are overridding FilterInputStream.
+     * @throws IOException as we are overriding FilterInputStream.
      */
     public void close() throws IOException {
         // do not close the stream
diff --git a/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java b/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
index 4e437e906..9f5c06b96 100644
--- a/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
+++ b/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
@@ -41,7 +41,7 @@ public class KeepAliveOutputStream extends FilterOutputStream {
     /**
      * Constructor of KeepAliveOutputStream.
      *
-     * @param out an OutputStream value, it shoudl be standard output.
+     * @param out an OutputStream value, it should be standard output.
      */
     public KeepAliveOutputStream(OutputStream out) {
         super(out);
@@ -49,7 +49,7 @@ public class KeepAliveOutputStream extends FilterOutputStream {
 
     /**
      * This method does nothing.
-     * @throws IOException as we are overridding FilterOutputStream.
+     * @throws IOException as we are overriding FilterOutputStream.
      */
     public void close() throws IOException {
         // do not close the stream
diff --git a/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java b/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java
index 7d289b9c1..7e5bf7863 100644
--- a/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java
+++ b/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java
@@ -131,7 +131,7 @@ public class LazyFileOutputStream extends OutputStream {
      * @param b the byte array.
      * @param offset write from this index.
      * @param len    the number of bytes to write.
-     * @throws IOException if there is a probem.
+     * @throws IOException if there is a problem.
      */
     public synchronized void write(byte[] b, int offset, int len)
         throws IOException {
diff --git a/src/main/org/apache/tools/ant/util/LineTokenizer.java b/src/main/org/apache/tools/ant/util/LineTokenizer.java
index 21bfb021a..11e7ebce4 100644
--- a/src/main/org/apache/tools/ant/util/LineTokenizer.java
+++ b/src/main/org/apache/tools/ant/util/LineTokenizer.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import org.apache.tools.ant.ProjectComponent;
 
 /**
- * class to tokenize the input as lines seperated
+ * class to tokenize the input as lines separated
  * by \r (mac style), \r\n (dos/windows style) or \n (unix style)
  * @since Ant 1.6
  */
diff --git a/src/main/org/apache/tools/ant/util/PackageNameMapper.java b/src/main/org/apache/tools/ant/util/PackageNameMapper.java
index 2ccde5d14..87477c3d9 100644
--- a/src/main/org/apache/tools/ant/util/PackageNameMapper.java
+++ b/src/main/org/apache/tools/ant/util/PackageNameMapper.java
@@ -21,7 +21,7 @@ import java.io.File;
 
 /**
  * Maps directory name matches into a dotted package name. This is
- * useful for matching JUnit test cases againt their XML formatter
+ * useful for matching JUnit test cases against their XML formatter
  * results.
  * <pre>
  * &lt;mapper classname="org.apache.tools.ant.util.PackageNameMapper"
diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
index 5d8d0f5e5..9265207d6 100644
--- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
@@ -51,7 +51,7 @@ public class RegexpPatternMapper implements FileNameMapper {
     private int     regexpOptions = 0;
 
     /**
-     * Attribute specifing whether to ignore the difference
+     * Attribute specifying whether to ignore the difference
      * between / and \ (the two common directory characters).
      * @param handleDirSep a boolean, default is false.
      * @since Ant 1.6.3
@@ -61,7 +61,7 @@ public class RegexpPatternMapper implements FileNameMapper {
     }
 
     /**
-     * Attribute specifing whether to ignore the case difference
+     * Attribute specifying whether to ignore the case difference
      * in the names.
      *
      * @param caseSensitive a boolean, default is false.
diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java
index d1f4876a2..e572a553c 100644
--- a/src/main/org/apache/tools/ant/util/ResourceUtils.java
+++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java
@@ -372,7 +372,7 @@ public class ResourceUtils {
      * @param inputEncoding the encoding used to read the files.
      * @param outputEncoding the encoding used to write the files.
      * @param project the project instance.
-     * @param force whether read-only taret files will be overwritten
+     * @param force whether read-only target files will be overwritten
      *
      * @throws IOException if the copying fails.
      *
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunner.java b/src/main/org/apache/tools/ant/util/ScriptRunner.java
index 1bc2adc2b..735e55557 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunner.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunner.java
@@ -18,7 +18,7 @@
 package org.apache.tools.ant.util;
 
 /**
- * This class is here for backwards compatiblity.
+ * This class is here for backwards compatibility.
  * @deprecated Implementation moved to another location. Use
  *             that org.apache.tools.ant.types.optional.ScriptRunner instead.
  */
diff --git a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
index bac58c46a..f52ea0d03 100644
--- a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
+++ b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
@@ -192,7 +192,7 @@ public class SymbolicLinkUtils {
      * accidentally invoked on a real file, the real file will not be
      * harmed, but silently ignored.</p>
      *
-     * <p>Normaly this method works by
+     * <p>Normally this method works by
      * getting the canonical path of the link, using the canonical path to
      * rename the resource (breaking the link) and then deleting the link.
      * The resource is then returned to its original name inside a finally
diff --git a/src/main/org/apache/tools/ant/util/UUEncoder.java b/src/main/org/apache/tools/ant/util/UUEncoder.java
index 666b42220..1c17c6270 100644
--- a/src/main/org/apache/tools/ant/util/UUEncoder.java
+++ b/src/main/org/apache/tools/ant/util/UUEncoder.java
@@ -38,7 +38,7 @@ public class UUEncoder {
     private String name;
 
     /**
-     * Constructor specifing a name for the encoded buffer, begin
+     * Constructor specifying a name for the encoded buffer, begin
      * line will be:
      * <pre>
      *   begin 644 [NAME]
diff --git a/src/main/org/apache/tools/ant/util/XmlConstants.java b/src/main/org/apache/tools/ant/util/XmlConstants.java
index fdf0343cf..3fae4d3c2 100644
--- a/src/main/org/apache/tools/ant/util/XmlConstants.java
+++ b/src/main/org/apache/tools/ant/util/XmlConstants.java
@@ -55,7 +55,7 @@ public class XmlConstants {
     /** the sax external entities feature */
     public static final String FEATURE_EXTERNAL_ENTITIES =
             "http://xml.org/sax/features/external-general-entities";
-    /** the apache.org/xml disalllow doctype decl feature */
+    /** the apache.org/xml disallow doctype decl feature */
     public static final String FEATURE_DISALLOW_DTD =
             "http://apache.org/xml/features/disallow-doctype-decl";
 }
diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
index a1724f55f..664f3b0b7 100644
--- a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
+++ b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
@@ -59,7 +59,7 @@ public class AncestorAnalyzer 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/util/depend/bcel/DependencyVisitor.java b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
index 07bd388d4..5fd59a6ab 100644
--- a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
+++ b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
@@ -51,7 +51,7 @@ public class DependencyVisitor extends EmptyVisitor {
         return dependencies.keys();
     }
 
-    /** Clear the curretn set of collected dependencies. */
+    /** Clear the current set of collected dependencies. */
     public void clearDependencies() {
         dependencies.clear();
     }
diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
index 865ca4426..5e964c842 100644
--- a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
+++ b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
@@ -58,7 +58,7 @@ public class FullAnalyzer 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/util/facade/FacadeTaskHelper.java b/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java
index 55a3f18a3..ba77de2c1 100644
--- a/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java
+++ b/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java
@@ -123,7 +123,7 @@ public class FacadeTaskHelper {
     /**
      * Retrieves the command line arguments enabled for the current
      * facade implementation.
-     * @return an array of command line arguements.
+     * @return an array of command line arguments.
      */
     public String[] getArgs() {
         List tmp = new ArrayList(args.size());
diff --git a/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java b/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java
index 2b2b838ca..ba7f14a01 100644
--- a/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java
+++ b/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java
@@ -21,7 +21,7 @@ package org.apache.tools.ant.util.facade;
 import org.apache.tools.ant.types.Commandline;
 
 /**
- * Extension of Commandline.Argument with a new attribute that choses
+ * Extension of Commandline.Argument with a new attribute that chooses
  * a specific implementation of the facade.
  *
  *
@@ -48,7 +48,7 @@ public class ImplementationSpecificArgument extends Commandline.Argument {
      * implementation matches the chosen implementation.
      * @see org.apache.tools.ant.types.Commandline.Argument#getParts()
      * @param chosenImpl the implementation to check against.
-     * @return the parts if the implemention matches or an zero length
+     * @return the parts if the implementation matches or an zero length
      *         array if not.
      */
     public final String[] getParts(String chosenImpl) {
diff --git a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
index 82377ccf4..e5ba85995 100644
--- a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
+++ b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
@@ -61,7 +61,7 @@ public class JavaxScriptRunner extends ScriptRunnerBase {
      * @param execName the name that will be passed to the
      *                 scripting engine for this script execution.
      *
-     * @exception BuildException if someting goes wrong exectuing the script.
+     * @exception BuildException if something goes wrong executing the script.
      */
     public void executeScript(String execName) throws BuildException {
         evaluateScript(execName);
diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
index 5c36d9b74..edd1cfe83 100644
--- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
+++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
@@ -34,7 +34,7 @@ public interface RegexpMatcher {
     int MATCH_DEFAULT          = 0x00000000;
 
     /***
-     * Perform a case insenstive match
+     * Perform a case insensitive match
      */
     int MATCH_CASE_INSENSITIVE = 0x00000100;
 
diff --git a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
index cfee7fcfd..965b7a2a6 100644
--- a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
+++ b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
@@ -719,7 +719,7 @@ public class CBZip2OutputStream extends OutputStream
     }
 
     /**
-     * Overriden to close the stream.
+     * Overridden to close the stream.
      */
     @Override
     protected void finalize() throws Throwable {
diff --git a/src/main/org/apache/tools/mail/ErrorInQuitException.java b/src/main/org/apache/tools/mail/ErrorInQuitException.java
index 2c9b85f3f..6f78a1428 100644
--- a/src/main/org/apache/tools/mail/ErrorInQuitException.java
+++ b/src/main/org/apache/tools/mail/ErrorInQuitException.java
@@ -21,7 +21,7 @@ package org.apache.tools.mail;
 import java.io.IOException;
 
 /**
- * Specialized IOException that get thrown if SMPT's QUIT command fails.
+ * Specialized IOException that get thrown if SMTP's QUIT command fails.
  *
  * <p>This seems to happen with some version of MS Exchange that
  * doesn't respond with a 221 code immediately.  See <a
diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java
index 882ca4779..a4c8bfef7 100644
--- a/src/main/org/apache/tools/mail/MailMessage.java
+++ b/src/main/org/apache/tools/mail/MailMessage.java
@@ -72,7 +72,7 @@ import java.util.Enumeration;
  * msg.sendAndClose();
  * </pre></blockquote>
  * <p>
- * Be sure to set the from address, then set the recepient
+ * Be sure to set the from address, then set the recipient
  * addresses, then set the subject and other headers, then get the
  * PrintStream, then write the message, and finally send and close.
  * The class does minimal error checking internally; it counts on the mail
diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java
index 726957221..bca54861d 100644
--- a/src/main/org/apache/tools/tar/TarEntry.java
+++ b/src/main/org/apache/tools/tar/TarEntry.java
@@ -292,7 +292,7 @@ public class TarEntry implements TarConstants {
      * Descendancy is determined by the name of the descendant
      * starting with this entry's name.
      *
-     * @param desc Entry to be checked as a descendent of this.
+     * @param desc Entry to be checked as a descendant of this.
      * @return True if entry is a descendant of this.
      */
     public boolean isDescendent(TarEntry desc) {
diff --git a/src/main/org/apache/tools/tar/TarInputStream.java b/src/main/org/apache/tools/tar/TarInputStream.java
index f6c126ce4..00f96746b 100644
--- a/src/main/org/apache/tools/tar/TarInputStream.java
+++ b/src/main/org/apache/tools/tar/TarInputStream.java
@@ -125,7 +125,7 @@ public class TarInputStream extends FilterInputStream {
      * is left in the entire archive, only in the current entry.
      * This value is determined from the entry's size header field
      * and the amount of data already read from the current entry.
-     * Integer.MAX_VALUE is returen in case more than Integer.MAX_VALUE
+     * Integer.MAX_VALUE is returned in case more than Integer.MAX_VALUE
      * bytes are left in the current entry in the archive.
      *
      * @return The number of available bytes for the current entry.
diff --git a/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java b/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
index 3ba2e0ea5..02e6e1e70 100644
--- a/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
+++ b/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
@@ -35,7 +35,7 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField {
 
     /**
      * Assemble as unicode extension from the name/comment and
-     * encoding of the orginal zip entry.
+     * encoding of the original zip entry.
      * 
      * @param text The file name or comment.
      * @param bytes The encoded of the filename or comment in the zip
@@ -61,7 +61,7 @@ public abstract class AbstractUnicodeExtraField implements ZipExtraField {
 
     /**
      * Assemble as unicode extension from the name/comment and
-     * encoding of the orginal zip entry.
+     * encoding of the original zip entry.
      * 
      * @param text The file name or comment.
      * @param bytes The encoded of the filename or comment in the zip
diff --git a/src/main/org/apache/tools/zip/ExtraFieldUtils.java b/src/main/org/apache/tools/zip/ExtraFieldUtils.java
index 7f6460ebb..ffa03b6c0 100644
--- a/src/main/org/apache/tools/zip/ExtraFieldUtils.java
+++ b/src/main/org/apache/tools/zip/ExtraFieldUtils.java
@@ -71,12 +71,12 @@ public class ExtraFieldUtils {
     }
 
     /**
-     * Create an instance of the approriate ExtraField, falls back to
+     * Create an instance of the appropriate ExtraField, falls back to
      * {@link UnrecognizedExtraField UnrecognizedExtraField}.
      * @param headerId the header identifier
-     * @return an instance of the appropiate ExtraField
+     * @return an instance of the appropriate ExtraField
      * @exception InstantiationException if unable to instantiate the class
-     * @exception IllegalAccessException if not allowed to instatiate the class
+     * @exception IllegalAccessException if not allowed to instantiate the class
      * @since 1.1
      */
     public static ZipExtraField createExtraField(ZipShort headerId)
diff --git a/src/main/org/apache/tools/zip/ZipEntry.java b/src/main/org/apache/tools/zip/ZipEntry.java
index a14abccfb..834ba8ba9 100644
--- a/src/main/org/apache/tools/zip/ZipEntry.java
+++ b/src/main/org/apache/tools/zip/ZipEntry.java
@@ -190,7 +190,7 @@ public class ZipEntry extends java.util.zip.ZipEntry implements Cloneable {
      * by&quot; part of the central file header.
      *
      * @return PLATFORM_FAT unless {@link #setUnixMode setUnixMode}
-     * has been called, in which case PLATORM_UNIX will be returned.
+     * has been called, in which case PLATFORM_UNIX will be returned.
      *
      * @since Ant 1.5.2
      */
diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java
index 6614fe4c9..2336916fc 100644
--- a/src/main/org/apache/tools/zip/ZipFile.java
+++ b/src/main/org/apache/tools/zip/ZipFile.java
@@ -252,7 +252,7 @@ public class ZipFile {
      * Returns an InputStream for reading the contents of the given entry.
      * @param ze the entry to get the stream for.
      * @return a stream to read the entry from.
-     * @throws IOException if unable to create an input stream from the zipenty
+     * @throws IOException if unable to create an input stream from the zipentry
      * @throws ZipException if the zipentry has an unsupported
      * compression method
      */