From 5fc48a4bf92cd63ce993a0bef6738a5ac9d17f96 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 28 Feb 2014 16:14:30 +0000 Subject: [PATCH] assorted spelling fixes by Lajos Veres - closes #4 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1572981 13f79535-47bb-0310-9956-ffa450edef68 --- CONTRIBUTORS | 1 + WHATSNEW | 24 +++++++++---------- contributors.xml | 4 ++++ manual/Tasks/conditions.html | 10 ++++---- manual/Tasks/local.html | 2 +- manual/Tasks/style.html | 2 +- manual/Types/patternset.html | 2 +- manual/install.html | 2 +- manual/targets.html | 2 +- .../tutorial-tasks-filesets-properties.html | 4 ++-- src/etc/printFailingTests.xsl | 2 +- src/etc/testcases/filters/tokenfilter.xml | 6 ++--- src/etc/testcases/taskdefs/concat.xml | 2 +- .../taskdefs/optional/antlr/antlr.xml | 2 +- .../apache/tools/ant/DirectoryScanner.java | 2 +- .../apache/tools/ant/taskdefs/Available.java | 2 +- .../org/apache/tools/ant/taskdefs/Concat.java | 4 ++-- .../org/apache/tools/ant/taskdefs/Jar.java | 2 +- .../tools/ant/taskdefs/optional/NetRexxC.java | 2 +- .../ant/taskdefs/optional/TraXLiaison.java | 2 +- .../taskdefs/optional/XMLValidateTask.java | 2 +- .../optional/extension/Compatability.java | 12 +++++----- .../optional/extension/Compatibility.java | 2 +- .../optional/extension/Extension.java | 6 ++--- .../extension/JarLibManifestTask.java | 2 +- .../tools/ant/taskdefs/optional/jsp/JspC.java | 2 +- .../ant/taskdefs/optional/jsp/WLJspc.java | 2 +- .../ant/taskdefs/optional/net/RExecTask.java | 2 +- .../ant/taskdefs/optional/net/TelnetTask.java | 2 +- .../ant/taskdefs/optional/pvcs/Pvcs.java | 2 +- .../ant/taskdefs/optional/vss/MSVSS.java | 4 ++-- .../taskdefs/optional/vss/MSVSSHISTORY.java | 2 +- .../apache/tools/ant/types/Environment.java | 2 +- .../ant/types/optional/image/ColorMapper.java | 2 +- .../modifiedselector/ModifiedSelector.java | 10 ++++---- .../apache/tools/ant/util/ResourceUtils.java | 4 ++-- .../apache/tools/bzip2/CBZip2InputStream.java | 2 +- .../apache/tools/zip/ZipEncodingHelper.java | 2 +- .../antunit/taskdefs/defaultexcludes-test.xml | 6 ++--- .../ant/ProjectHelperRepositoryTest.java | 2 +- .../taskdefs/optional/PropertyFileTest.java | 4 ++-- 41 files changed, 79 insertions(+), 74 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a78940d1d..47a79636a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -203,6 +203,7 @@ Kevin Z Grey Kim Hansen Kirk Wylie Kyle Adams +Lajos Veres Larry Shatzer Larry Streepy Les Hughes diff --git a/WHATSNEW b/WHATSNEW index 1add234ec..4246cc32e 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -1224,7 +1224,7 @@ Changes that could break older environments: Bugzilla Report 46506. * silently ignored missing resources even with - failOnError="true". If your build tries to copy non-existant + failOnError="true". If your build tries to copy non-existent resources and you relied on this behavior you must now explicitly set failOnError to false. Bugzilla Report 47362. @@ -1377,7 +1377,7 @@ Fixed bugs: Bugzilla Report 45607. * only s that logged to a file were notified if forked VM - crashed or a timeout occured in . + crashed or a timeout occurred in . Bugzilla Report 37312. * ant -v -version would print the version information twice. @@ -1475,7 +1475,7 @@ Fixed bugs: of the file system). Bugzilla Report 43665. - * didn't store the ouput in outputproperty if the remote + * didn't store the output in outputproperty if the remote command failed. Bugzilla Report 46340. @@ -1748,7 +1748,7 @@ Other changes: * A new listener for has been added that tries to invoke the tearDown method of a TestCase if that TestCase was run in a forked - VM and the VM crashed or a timeout occured. See the task's + VM and the VM crashed or a timeout occurred. See the task's manual page for details. Bugzilla Report 37241. @@ -1879,7 +1879,7 @@ Other changes: * now fails early if a specified stylesheet doesn't exist. Bugzilla Report 34525. - * now has an option to supress transformer warnings. This + * now has an option to suppress transformer warnings. This option only has an effect for processors that support this feature; the "trax" processor included with Ant does support it. Bugzilla Report 18897. @@ -2790,7 +2790,7 @@ Other changes: * Upgraded XML API and parser to Xerces 2.8.1 * A code review of some threaded logic has tightened up the synchronization - of Watchdog, ExecuteWatchdog and ExecuteJava, which could reduce the occurence + of Watchdog, ExecuteWatchdog and ExecuteJava, which could reduce the occurrence of race conditions here, especially on Java1.5+. * Allow broken reference build files. The defer reference processing would @@ -3368,7 +3368,7 @@ Fixed bugs: * FTP task, getTimeDiff method was returning wrong value. Bugzilla 30595. -* make sure that Zip and its derivates call the createEmptyZip method when +* make sure that Zip and its derivatives call the createEmptyZip method when there are no resources to zip/jar/... * Zip task was not zipping when only empty directories were found. @@ -3946,7 +3946,7 @@ Fixed bugs: than seven characters. Bugzilla Report 18105. * and 's failonerror didn't apply to filesets pointing to - non-existant directories. Bugzilla Report 18414. + non-existent directories. Bugzilla Report 18414. * The filter sometimes removed parts of string constants. Bugzilla Report 17441. @@ -4061,7 +4061,7 @@ Fixed bugs: * ftp put with chmod failed when the remote system was UNIX and local system Windows. Bugzilla Report 23143. -* ftp did not set the ascii mode explicity, causing problems with ftp servers +* ftp did not set the ascii mode explicitly, causing problems with ftp servers having binary as default * ftp was not able to download files when they were pointed to by symbolic @@ -5204,7 +5204,7 @@ Other changes: or a file. * New tasks and to pack and unpack files using the - BZip2 alogrithm. + BZip2 algorithm. * New tasks , , , , , , , , , , , @@ -5504,7 +5504,7 @@ Changes that could break older environments: other tasks. This can break customer listeners which do not expect messages from a task before the previous task has finished. -* Ant now installs its own ouput stream into System.out to route output to the +* Ant now installs its own output stream into System.out to route output to the task currently executing on the current thread. This also means that all output is now routed as Ant message events. Customer listeners and loggers should not call System.out at any time. This has always been true but such @@ -5622,7 +5622,7 @@ Other changes: * added vmlauncher attribute to exec tasks. This defaults to true. If it is set to false, the VM's ability to launch commands in bypassed - and the OS shell, either directly or through the auxillary antRun + and the OS shell, either directly or through the auxiliary antRun scripts is used. * regexp mapper now supports the java.util.regex package of JDK 1.4. diff --git a/contributors.xml b/contributors.xml index f37dc7af9..965ac0c05 100644 --- a/contributors.xml +++ b/contributors.xml @@ -839,6 +839,10 @@ Kyle Adams + + Lajos + Veres + Larry Shatzer diff --git a/manual/Tasks/conditions.html b/manual/Tasks/conditions.html index 410c3789a..814072ecb 100644 --- a/manual/Tasks/conditions.html +++ b/manual/Tasks/conditions.html @@ -255,7 +255,7 @@ TCP/IP listener at the specified host and port.

filesmatch

Test two files for matching. Nonexistence of one file results in "false", although if neither exists they are considered equal in terms of content. -This test does a byte for byte comparision, so test time scales with +This test does a byte for byte comparison, so test time scales with byte size. NB: if the files are different sizes, one of them is missing or the filenames match the answer is so obvious the detailed test is omitted. @@ -306,7 +306,7 @@ or the filenames match the answer is so obvious the detailed test is omitted. casesensitive - Perform a case sensitive comparision. Default is + Perform a case sensitive comparison. Default is true. No @@ -753,7 +753,7 @@ Probe for the maven repository being reachable using the hostname, ten second ti

resourcesmatch

Test resources for matching. Nonexistence of one or more resources results in "false", although if none exists they are considered equal in terms of content. -By default this test does a byte for byte comparision, so test time scales with +By default this test does a byte for byte comparison, so test time scales with byte size. NB: if the files are different sizes, one of them is missing or the filenames match the answer is so obvious the detailed test is omitted. The resources to check are specified as nested @@ -805,7 +805,7 @@ must match. Since Ant 1.7 casesensitive - Perform a case sensitive comparision. Default is + Perform a case sensitive comparison. Default is true. No @@ -1071,7 +1071,7 @@ is redundant and will be ignored.

resourceexists

-

Tests a resource for existance. since Ant 1.8.0

+

Tests a resource for existence. since Ant 1.8.0

The actual resource to test is specified as a nested element.

diff --git a/manual/Tasks/local.html b/manual/Tasks/local.html index f8519903e..c7ed8fc4b 100644 --- a/manual/Tasks/local.html +++ b/manual/Tasks/local.html @@ -37,7 +37,7 @@ top-level operations are carried out; it will not be defined for other targets in the buildfile. Since Ant 1.8

A property is made local if the <local> task - preceedes its definition. See the examples section.

+ precedes its definition. See the examples section.

Parameters

diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html index e97e88ea5..6e2a2a523 100644 --- a/manual/Tasks/style.html +++ b/manual/Tasks/style.html @@ -225,7 +225,7 @@ element which is used to perform Entity and URI resolution.

- +
No
supressWarningssuppressWarnings Whether processor warnings shall be suppressed. This option requires support by the processor, it is supported by the trax processor bundled with Ant. diff --git a/manual/Types/patternset.html b/manual/Types/patternset.html index 3ece3ec5c..d060d04d9 100644 --- a/manual/Types/patternset.html +++ b/manual/Types/patternset.html @@ -98,7 +98,7 @@ your build file, you should use the includesfile/excludesfile attributes or elements. Using the attribute, you can only specify a single file of each type, while the nested elements can be specified more than once - the nested elements also support if/unless attributes -you can use to test the existance of a property.

+you can use to test the existence of a property.

diff --git a/manual/install.html b/manual/install.html index 507b2c809..cf027ebbe 100644 --- a/manual/install.html +++ b/manual/install.html @@ -105,7 +105,7 @@ Choose the format that is best supported for your platform. runtime. Such distributions are usually unsupported by everyone. Particularly troublesome are those products that not only ship with their own Ant release, they add their own version of ANT.BAT or ant.sh to the PATH. If Ant starts - behaving wierdly after installing something, try the + behaving weirdly after installing something, try the diagnostics advice.

diff --git a/manual/targets.html b/manual/targets.html index 8453fd724..a778c950f 100644 --- a/manual/targets.html +++ b/manual/targets.html @@ -94,7 +94,7 @@

Only one propertyname can be specified in the if/unless clause. If you want to check multiple conditions, you can use a - dependend target for computing the result for the check:

+ dependent target for computing the result for the check:

 <target name="myTarget" depends="myTarget.check" if="myTarget.run">
diff --git a/manual/tutorial-tasks-filesets-properties.html b/manual/tutorial-tasks-filesets-properties.html
index 1caa74bbf..5ba08f6ef 100644
--- a/manual/tutorial-tasks-filesets-properties.html
+++ b/manual/tutorial-tasks-filesets-properties.html
@@ -301,9 +301,9 @@ can implement our task, so that these test cases will pass.

 is a common way, because we separate the prerequisites from the real work. On //2 we iterate
 over all nested filesets. If we don't want to handle multiple filesets, the addFileset()
 method has to reject the further calls. We can get the result of a fileset via its DirectoryScanner
-like done in //3. After that we create a platform independend String representation of
+like done in //3. After that we create a platform independent String representation of
 the file path (//4, can be done in other ways of course). We have to do the replace(),
-because we work with a simple string comparison. Ant itself is platform independant and can
+because we work with a simple string comparison. Ant itself is platform independent and can
 therefore run on filesystems with slash (/, e.g. Linux) or backslash (\, e.g. Windows) as
 path separator. Therefore we have to unify that. If we found our file we create an absolute
 path representation on //5, so that we can use that information without knowing the basedir.
diff --git a/src/etc/printFailingTests.xsl b/src/etc/printFailingTests.xsl
index c083bd84b..7d323404f 100644
--- a/src/etc/printFailingTests.xsl
+++ b/src/etc/printFailingTests.xsl
@@ -37,7 +37,7 @@
 | .() : 
 
 
-
+
 
 
 
diff --git a/src/etc/testcases/filters/tokenfilter.xml b/src/etc/testcases/filters/tokenfilter.xml
index e7b0b8b2c..a23bc82e9 100644
--- a/src/etc/testcases/filters/tokenfilter.xml
+++ b/src/etc/testcases/filters/tokenfilter.xml
@@ -184,7 +184,7 @@
     
   
 
-  
+  
   
     
       hello Hello HELLO hello
@@ -226,7 +226,7 @@
     
   
 
-  
+  
   
     
       hello world
@@ -256,7 +256,7 @@
   
 
 
-  
+  
   
     
       SUITE(TestSuite, bits);
diff --git a/src/etc/testcases/taskdefs/concat.xml b/src/etc/testcases/taskdefs/concat.xml
index 2a3d151db..235b15289 100644
--- a/src/etc/testcases/taskdefs/concat.xml
+++ b/src/etc/testcases/taskdefs/concat.xml
@@ -63,7 +63,7 @@
       
     
     
-    
   
 
diff --git a/src/etc/testcases/taskdefs/optional/antlr/antlr.xml b/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
index 907a18ea8..21d3f14c7 100644
--- a/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
+++ b/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
@@ -74,7 +74,7 @@
   
 
   
-    
+    
   
 
   
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index 9049cc6c5..1c67f3f6f 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -1851,7 +1851,7 @@ public class DirectoryScanner
      *
      * 
Can only happen if the given directory has been seen at
      * least more often than allowed during the current scan and it is
-     * a symbolic link and enough other occurences of the same name
+     * a symbolic link and enough other occurrences of the same name
      * higher up are symbolic links that point to the same place.

      *
      * @since Ant 1.8.0
diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index 8e13eafbd..2fcb2967a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -245,7 +245,7 @@ public class Available extends Task implements Condition {
                         Project.MSG_WARN);
                 }
                 // NB: this makes use of Project#setProperty rather than Project#setNewProperty
-                //     due to backwards compatiblity reasons
+                //     due to backwards compatibility reasons
                 ph.setProperty(property, value, true);
             }
         } finally {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java
index 45716f306..930ce27b6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Concat.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java
@@ -475,9 +475,9 @@ public class Concat extends Task implements ResourceCollection {
     private boolean forceOverwrite = true;
     /** overwrite read-only files */
     private boolean force = false;
-    /** String to place at the start of the concatented stream */
+    /** String to place at the start of the concatenated stream */
     private TextElement footer;
-    /** String to place at the end of the concatented stream */
+    /** String to place at the end of the concatenated stream */
     private TextElement header;
     /** add missing line.separator to files **/
     private boolean fixLastLine = false;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index d351627b2..865715319 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -825,7 +825,7 @@ public class Jar extends Zip {
             // this pass is only there to construct the merged
             // manifest this means we claim an update was needed and
             // only include the manifests, skipping any uptodate
-            // checks here defering them for the second run
+            // checks here deferring them for the second run
             Resource[][] manifests = grabManifests(rcs);
             int count = 0;
             for (int i = 0; i < manifests.length; i++) {
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 83ae93001..ed22d72b6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -991,7 +991,7 @@ public class NetRexxC extends MatchingTask {
      * Takes a classpath-like string, and adds each element of this string to
      * a new classpath, if the components exist. Components that don't exist,
      * aren't added. We do this, because jikes issues warnings for
-     * non-existant files/dirs in his classpath, and these warnings are pretty
+     * non-existent files/dirs in his classpath, and these warnings are pretty
      * annoying.
      *
      * @param target - target classpath
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index 01f80c21d..edd1e9409 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -363,7 +363,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
     }
 
     /**
-     * Sets the paramters for the transformer.
+     * Sets the parameters for the transformer.
      */
     private void setTransformationParameters() {
         for (final Enumeration enumeration = params.keys();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
index 24798f4a5..c777feb72 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
@@ -99,7 +99,7 @@ public class XMLValidateTask extends Task {
     private final Vector propertyList = new Vector();
 
     private XMLCatalog xmlCatalog = new XMLCatalog();
-    /** Message for sucessfull validation */
+    /** Message for successfull validation */
     public static final String MESSAGE_FILES_VALIDATED
         = " file(s) have been successfully validated.";
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java
index fc2e2566c..2c06daf17 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java
@@ -18,7 +18,7 @@
 package org.apache.tools.ant.taskdefs.optional.extension;
 
 /**
- * Enum used in (@link Extension) to indicate the compatability
+ * Enum used in (@link Extension) to indicate the compatibility
  * of one extension to another. See (@link Extension) for instances
  * of object.
  *
@@ -33,23 +33,23 @@ package org.apache.tools.ant.taskdefs.optional.extension;
  */
 public final class Compatability {
     /**
-     * A string representaiton of compatability level.
+     * A string representation of compatibility level.
      */
     private final String name;
 
     /**
-     * Create a compatability enum with specified name.
+     * Create a compatibility enum with specified name.
      *
-     * @param name the name of compatability level
+     * @param name the name of compatibility level
      */
     Compatability(final String name) {
         this.name = name;
     }
 
     /**
-     * Return name of compatability level.
+     * Return name of compatibility level.
      *
-     * @return the name of compatability level
+     * @return the name of compatibility level
      */
     public String toString() {
         return name;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java
index 0f91c66b2..bb28cd6b4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java
@@ -33,7 +33,7 @@ package org.apache.tools.ant.taskdefs.optional.extension;
  */
 public final class Compatibility {
     /**
-     * A string representaiton of compatibility level.
+     * A string representation of compatibility level.
      */
     private final String name;
 
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 c1c92f432..d13d2f4e3 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
@@ -602,9 +602,9 @@ public final class Extension {
             return;
         }
 
-        final String[] extentions = split(names, " ");
-        for (int i = 0; i < extentions.length; i++) {
-            final String prefix = extentions[ i ] + "-";
+        final String[] extensions = split(names, " ");
+        for (int i = 0; i < extensions.length; i++) {
+            final String prefix = extensions[ i ] + "-";
             final Extension extension = getExtension(prefix, attributes);
 
             if (null != extension) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java
index 37b24a39e..a2e9b6b5c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java
@@ -253,7 +253,7 @@ public final class JarLibManifestTask extends Task {
      * Append an attribute such as "Extension-List: lib0 lib1 lib2"
      * using specified prefix and counting up to specified size.
      * Also use specified extensionKey so that can generate list of
-     * optional dependencies aswell.
+     * optional dependencies as well.
      *
      * @param size the number of librarys to list
      * @param listPrefix the prefix for all librarys
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 9c2882fa8..b227d7d2d 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
@@ -608,7 +608,7 @@ public class JspC extends MatchingTask {
      * 
      * @param srcFile JSP source file
      * @param javaFile JSP dest file
-     * @return true if a compile is definately needed.
+     * @return true if a compile is definitely needed.
      *
      */
     private boolean isCompileNeeded(File srcFile, File javaFile) {
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 0bb28ce4f..50b6ed140 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
@@ -311,7 +311,7 @@ public class WLJspc extends MatchingTask {
 
 
     /**
-     * Replace occurances of a string with a replacement string.
+     * Replace occurrences of a string with a replacement string.
      * @param inpString the string to convert.
      * @param escapeChars the string to replace.
      * @param replaceChars the string to place.
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 71e97ac9e..3b3277417 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
@@ -387,7 +387,7 @@ public class RExecTask extends Task {
     }
     /**
      *  Process a 'typical' login.  If it differs, use the read
-     *  and write tasks explicitely
+     *  and write tasks explicitly
      */
     private void login(AntRExecClient rexec) {
         if (addCarriageReturn) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
index 14357ea05..f296b8410 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
@@ -131,7 +131,7 @@ public class TelnetTask extends Task {
 
     /**
      *  Process a 'typical' login.  If it differs, use the read
-     *  and write tasks explicitely
+     *  and write tasks explicitly
      */
     private void login(AntTelnetClient telnet) {
        if (addCarriageReturn) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
index 3e105639c..c128fd632 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
@@ -54,7 +54,7 @@ import org.apache.tools.ant.util.FileUtils;
 
  *
  * 19-04-2001 
The task now has a more robust
- * parser. It allows for platform independant file paths
+ * parser. It allows for platform independent file paths
  * and supports file names with (). Thanks to Erik Husby for
  * bringing the bug to my attention.
  *
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
index 40d469296..592c33aa8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
@@ -757,7 +757,7 @@ public abstract class MSVSS extends Task implements MSVSSConstants {
     }
 
     /**
-     * Extention of EnumeratedAttribute to hold the values for file time stamp.
+     * Extension of EnumeratedAttribute to hold the values for file time stamp.
      */
     public static class CurrentModUpdated extends EnumeratedAttribute {
         /**
@@ -770,7 +770,7 @@ public abstract class MSVSS extends Task implements MSVSSConstants {
     }
 
     /**
-     * Extention of EnumeratedAttribute to hold the values for writable filess.
+     * Extension of EnumeratedAttribute to hold the values for writable filess.
      */
     public static class WritableFiles extends EnumeratedAttribute {
         /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
index 8f3b8ec37..05ec91c2c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
@@ -185,7 +185,7 @@ public class MSVSSHISTORY extends MSVSS {
     }
 
     /**
-     * Extention of EnumeratedAttribute to hold the values for style.
+     * Extension of EnumeratedAttribute to hold the values for style.
      */
     public static class BriefCodediffNofile extends EnumeratedAttribute {
         /**
diff --git a/src/main/org/apache/tools/ant/types/Environment.java b/src/main/org/apache/tools/ant/types/Environment.java
index cc47b3f6f..ac231e2f0 100644
--- a/src/main/org/apache/tools/ant/types/Environment.java
+++ b/src/main/org/apache/tools/ant/types/Environment.java
@@ -106,7 +106,7 @@ public class Environment {
         }
 
         /**
-         * get the assigment string
+         * get the assignment string
          * This is not ready for insertion into a property file without following
          * the escaping rules of the properties class.
          * @return a string of the form key=value.
diff --git a/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java b/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java
index b2e2d2c21..88e2871a2 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java
@@ -40,7 +40,7 @@ public final class ColorMapper {
     public static final String COLOR_GRAY = "gray";
     /** lightgray string */
     public static final String COLOR_LIGHTGRAY = "lightgray";
-    // Gotta atleast put in the proper spelling :-P
+    // Gotta at least put in the proper spelling :-P
     /** darkgrey string */
     public static final String COLOR_DARKGREY = "darkgrey";
     /** grey string */
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 3015ba3ba..8dcd017bf 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
@@ -817,7 +817,7 @@ public class ModifiedSelector extends BaseExtendSelector
 
     /**
      * Signals that a target has finished.
-     * @param event recieved BuildEvent
+     * @param event received BuildEvent
     */
     public void targetFinished(BuildEvent event) {
         if (getDelayUpdate()) {
@@ -828,7 +828,7 @@ public class ModifiedSelector extends BaseExtendSelector
 
     /**
      * Signals that a task has finished.
-     * @param event recieved BuildEvent
+     * @param event received BuildEvent
     */
     public void taskFinished(BuildEvent event) {
         if (getDelayUpdate()) {
@@ -839,7 +839,7 @@ public class ModifiedSelector extends BaseExtendSelector
 
     /**
      * Signals that a build has started.
-     * @param event recieved BuildEvent
+     * @param event received BuildEvent
     */
     public void buildStarted(BuildEvent event) {
         // no-op
@@ -858,7 +858,7 @@ public class ModifiedSelector extends BaseExtendSelector
 
     /**
      * Signals that a task is starting.
-     * @param event recieved BuildEvent
+     * @param event received BuildEvent
     */
     public void taskStarted(BuildEvent event) {
         // no-op
@@ -867,7 +867,7 @@ public class ModifiedSelector extends BaseExtendSelector
 
     /**
      * Signals a message logging event.
-     * @param event recieved BuildEvent
+     * @param event received BuildEvent
     */
     public void messageLogged(BuildEvent event) {
         // no-op
diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java
index 2b1e7cbfd..16a139a7d 100644
--- a/src/main/org/apache/tools/ant/util/ResourceUtils.java
+++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java
@@ -567,9 +567,9 @@ public class ResourceUtils {
     /**
      * Binary compares the contents of two Resources.
      * 

-     * simple but sub-optimal comparision algorithm. written for working
+     * simple but sub-optimal comparison algorithm. written for working
      * rather than fast. Better would be a block read into buffers followed
-     * by long comparisions apart from the final 1-7 bytes.
+     * by long comparisons apart from the final 1-7 bytes.
      * 

      *
      * @param r1 the Resource whose content is to be compared.
diff --git a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
index 1ce0ce0a4..62315d122 100644
--- a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
+++ b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
@@ -1031,7 +1031,7 @@ public class CBZip2InputStream extends InputStream implements BZip2Constants {
          *
          * This method is called when the required length of the array
          * is known.  I don't initialize it at construction time to
-         * avoid unneccessary memory allocation when compressing small
+         * avoid unnecessary memory allocation when compressing small
          * files.
          */
         final int[] initTT(int length) {
diff --git a/src/main/org/apache/tools/zip/ZipEncodingHelper.java b/src/main/org/apache/tools/zip/ZipEncodingHelper.java
index f4ca79d19..b32f902b3 100644
--- a/src/main/org/apache/tools/zip/ZipEncodingHelper.java
+++ b/src/main/org/apache/tools/zip/ZipEncodingHelper.java
@@ -194,7 +194,7 @@ public abstract class ZipEncodingHelper {
     static final String UTF8 = "UTF8";
 
     /**
-     * variant name of the encoding UTF-8 used for comparisions.
+     * variant name of the encoding UTF-8 used for comparisons.
      */
     private static final String UTF_DASH_8 = "utf-8";
 
diff --git a/src/tests/antunit/taskdefs/defaultexcludes-test.xml b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
index a2f80342a..cbea93c20 100644
--- a/src/tests/antunit/taskdefs/defaultexcludes-test.xml
+++ b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
@@ -23,7 +23,7 @@
     
   
 
-  
     
       
@@ -32,7 +32,7 @@
     
   
 
-  
     
       
@@ -41,7 +41,7 @@
     
   
 
-  
     
       
diff --git a/src/tests/junit/org/apache/tools/ant/ProjectHelperRepositoryTest.java b/src/tests/junit/org/apache/tools/ant/ProjectHelperRepositoryTest.java
index ab3c1bb80..9afecd8cb 100644
--- a/src/tests/junit/org/apache/tools/ant/ProjectHelperRepositoryTest.java
+++ b/src/tests/junit/org/apache/tools/ant/ProjectHelperRepositoryTest.java
@@ -71,7 +71,7 @@ public class ProjectHelperRepositoryTest extends TestCase {
         assertTrue(helper instanceof ProjectHelper2);
     }
 
-    public void testNoDefaultContructor() throws Exception {
+    public void testNoDefaultConstructor() throws Exception {
         class IncrrectHelper extends ProjectHelper {
             // the default constructor is not visible to ant here 
         }
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
index 012294bc8..9996389f8 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
@@ -25,7 +25,7 @@ import java.util.Properties;
 import org.apache.tools.ant.BuildFileTest;
 
 /**
- *  JUnit testcase that excercises the optional PropertyFile task in ant.
+ *  JUnit testcase that exercises the optional PropertyFile task in ant.
  *  (this is really more of a functional test so far.., but it's enough to let
  *   me start refactoring...)
  *
@@ -70,7 +70,7 @@ public class PropertyFileTest extends BuildFileTest {
     }
 
     /**
-     *  A unit test for JUnit- Excercises the propertyfile tasks ability to
+     *  A unit test for JUnit- Exercises the propertyfile tasks ability to
      *  update properties that are already defined-
      */
     public void testUpdatesExistingProperties() throws Exception {
Attribute