Fix spelling mistakes. Thanks to Josh Soref. This fixes #1 from GitHub.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jelly/trunk@1797644 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
index ec6ddb0..7ec0ab3 100644
--- a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
+++ b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
@@ -163,7 +163,7 @@
                 // now lets set any attributes of this tag...
                 setBeanProperties();
 
-                // now lets set the addText() of the body content, if its applicaable
+                // now lets set the addText() of the body content, if its applicable
                 Method method = MethodUtils.getAccessibleMethod( task.getClass(),
                                                                  "addText",
                                                                  addTaskParamTypes );
@@ -314,7 +314,7 @@
         return project;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
index 99c58c3..0a1bdd6 100644
--- a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
+++ b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
@@ -46,7 +46,7 @@
     /** A history of the properties marked as user properties. */
     protected Map userProperties = new HashMap();
 
-    /** A history of the properties makred as inherited properties. */
+    /** A history of the properties marked as inherited properties. */
     protected Map inheritedProperties = new HashMap();
     
     /** Initializes hte object with a blank set of properties.
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java
index a7172ce..34a995d 100644
--- a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java
+++ b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileIterator.java
@@ -26,7 +26,7 @@
 
 /**
  * <p><code>FileIterator</code> is an iterator over a
- * over a number of files from a colleciton of FileSet instances.
+ * over a number of files from a collection of FileSet instances.
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @version $Revision$
@@ -101,7 +101,7 @@
         throw new UnsupportedOperationException();
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java
index ed8d65d..83a6db3 100644
--- a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java
+++ b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/FileScanner.java
@@ -25,7 +25,7 @@
 
 /**
  * <p><code>FileScanner</code> is a bean which allows the iteration
- * over a number of files from a colleciton of FileSet instances.
+ * over a number of files from a collection of FileSet instances.
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @version $Revision$
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java
index 8089b6a..5092d4e 100644
--- a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java
+++ b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java
@@ -55,7 +55,7 @@
      *  Immediately after initialization, a <code>GrantProject</code>
      *  delegates <b>all</b> calls to the normal ant <code>Project</code>
      *  super class.   Only after installing delegators will custom
-     *  behavious be acheived.
+     *  behaviour be achieved.
      *  </p>
      */
     public GrantProject() {
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
index 0f21b8f..5db7a95 100644
--- a/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
+++ b/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
@@ -23,7 +23,7 @@
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.expression.Expression;
 
-/** Implementation of a Commons Grant <code>propsHandler</code>
+/** Implementstion of a Commons Grant <code>propsHandler</code>
  *  to resolve through Jelly's context.
  *
  *  @author <a href="mailto:bob@eng.werken.com">Bob McWhirter</a>
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java b/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
index 7d42e3d..c5d047a 100644
--- a/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
+++ b/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
@@ -122,7 +122,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java b/jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java
index d158794..2a9eb65 100644
--- a/jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java
+++ b/jelly-tags/ant/src/java/org/apache/commons/jelly/task/JellyTask.java
@@ -69,7 +69,7 @@
     //-------------------------------------------------------------------------
 
     /**
-     * Excutes the Jelly script
+     * Executes the Jelly script
      */
     public void execute() throws BuildException {
         try {
@@ -174,7 +174,7 @@
         return context;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly b/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly
index 4e056e4..4a07575 100644
--- a/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly
+++ b/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly
@@ -38,9 +38,9 @@
           <attribute name="Specification-Title" value="Some Title"/>
           <attribute name="Specification-Version" value="1.1"/>
           <attribute name="Specification-Vendor" value="Apache"/>
-          <attribute name="Implementation-Title" value="Some implementation title"/>
-          <attribute name="Implementation-Version" value="1.1"/>
-          <attribute name="Implementation-Vendor" value="Apache"/>
+          <attribute name="Implementstion-Title" value="Some implementation title"/>
+          <attribute name="Implementstion-Version" value="1.1"/>
+          <attribute name="Implementstion-Vendor" value="Apache"/>
         </section>
       </manifest>
     </jar>
diff --git a/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java b/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
index 5baf089..c6e63e0 100644
--- a/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
+++ b/jelly-tags/avalon/src/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
@@ -150,7 +150,7 @@
      * &lt;/jelly&gt;<br />
      * </p>
      * <p>
-     *   Where each &lt;script&gt; element defines a seperate script. The validate attribute
+     *   Where each &lt;script&gt; element defines a separate script. The validate attribute
      *   on the url tag is optional and defaults to false.
      * </p>
      *
@@ -188,7 +188,7 @@
                     }
                 }
 
-                // All atempts failed...
+                // All attempts failed...
                 if( url == null )
                     throw new ConfigurationException( "Could not find script [" + scriptName + "]" );
 
@@ -208,7 +208,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/bean/src/java/org/apache/commons/jelly/tags/bean/BeanTagLibrary.java b/jelly-tags/bean/src/java/org/apache/commons/jelly/tags/bean/BeanTagLibrary.java
index 21c14fe..afe966b 100644
--- a/jelly-tags/bean/src/java/org/apache/commons/jelly/tags/bean/BeanTagLibrary.java
+++ b/jelly-tags/bean/src/java/org/apache/commons/jelly/tags/bean/BeanTagLibrary.java
@@ -99,7 +99,7 @@
         return new TagScript( createTagFactory(name, attributes) );
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/bean/src/java/org/apache/commons/jelly/tags/bean/BeandefTag.java b/jelly-tags/bean/src/java/org/apache/commons/jelly/tags/bean/BeandefTag.java
index 94057d7..4c63a28 100644
--- a/jelly-tags/bean/src/java/org/apache/commons/jelly/tags/bean/BeandefTag.java
+++ b/jelly-tags/bean/src/java/org/apache/commons/jelly/tags/bean/BeandefTag.java
@@ -146,7 +146,7 @@
         this.methodName = methodName;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected Method getInvokeMethod(Class theClass) {
         if (methodName != null) {
diff --git a/jelly-tags/bean/src/test/org/apache/commons/jelly/tags/bean/MyTagLibrary.java b/jelly-tags/bean/src/test/org/apache/commons/jelly/tags/bean/MyTagLibrary.java
index 0beee14..3104c50 100644
--- a/jelly-tags/bean/src/test/org/apache/commons/jelly/tags/bean/MyTagLibrary.java
+++ b/jelly-tags/bean/src/test/org/apache/commons/jelly/tags/bean/MyTagLibrary.java
@@ -50,7 +50,7 @@
         return new TagScript( factory );
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java b/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
index 1d844b5..b92df58 100644
--- a/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
+++ b/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
@@ -143,7 +143,7 @@
         this.var = var;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java b/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
index a250eaf..ab3183d 100644
--- a/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
+++ b/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
@@ -196,7 +196,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Channel.java b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Channel.java
index 549f6f8..a3b3a9c 100644
--- a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Channel.java
+++ b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Channel.java
@@ -28,7 +28,7 @@
 
 
 /**
- * <p>Implementation object representing a <strong>channel</strong> in the
+ * <p>Implementstion object representing a <strong>channel</strong> in the
  * <em>Rich Site Summary</em> DTD, version 0.91.  This class may be subclassed
  * to further specialize its behavior.</p>
  */
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Image.java b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Image.java
index c58f558..5002b3b 100644
--- a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Image.java
+++ b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Image.java
@@ -23,7 +23,7 @@
 
 
 /**
- * <p>Implementation object representing an <strong>image</strong> in the
+ * <p>Implementstion object representing an <strong>image</strong> in the
  * <em>Rich Site Summary</em> DTD, version 0.91.  This class may be subclassed
  * to further specialize its behavior.</p>
  */
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Item.java b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Item.java
index 073d2b9..051b39c 100644
--- a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Item.java
+++ b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Item.java
@@ -23,7 +23,7 @@
 
 
 /**
- * <p>Implementation object representing an <strong>item</strong> in the
+ * <p>Implementstion object representing an <strong>item</strong> in the
  * <em>Rich Site Summary</em> DTD, version 0.91.  This class may be subclassed
  * to further specialize its behavior.</p>
  */
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/RSSDigester.java b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/RSSDigester.java
index 459a95b..2c79b58 100644
--- a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/RSSDigester.java
+++ b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/RSSDigester.java
@@ -31,7 +31,7 @@
 
 
 /**
- * <p>Implementation of <strong>org.apache.commons.digester.Digester</strong>
+ * <p>Implementstion of <strong>org.apache.commons.digester.Digester</strong>
  * designed to process input streams that conform to the <em>Rich Site
  * Summary</em> DTD, version 0.91.  For more information about this format,
  * see the <a href="http://my.netscape.com/publish/">My Netscape</a> site.</p>
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/TextInput.java b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/TextInput.java
index 40846bf..96f53da 100644
--- a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/TextInput.java
+++ b/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/TextInput.java
@@ -23,7 +23,7 @@
 
 
 /**
- * <p>Implementation object representing a <strong>textinput</strong> in the
+ * <p>Implementstion object representing a <strong>textinput</strong> in the
  * <em>Rich Site Summary</em> DTD, version 0.91.  This class may be subclassed
  * to further specialize its behavior.</p>
  */
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java b/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
index fc7f536..7b1ecf0 100644
--- a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
+++ b/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
@@ -63,7 +63,7 @@
     }
 
     public Object evaluate(JellyContext context) {
-        // XXXX: unfortunately we must sychronize evaluations
+        // XXXX: unfortunately we must synchronize evaluations
         // so that we can swizzle in the context.
         // maybe we could create an expression from a context
         // (and so create a BSFManager for a context)
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java b/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
index 75658b4..8936bc7 100644
--- a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
+++ b/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
@@ -91,7 +91,7 @@
         }
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /** Factory method */
diff --git a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java b/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
index 4021eb3..88204e0 100644
--- a/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
+++ b/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
@@ -60,7 +60,7 @@
 
         log.debug(text);
 
-        // XXXX: unfortunately we must sychronize evaluations
+        // XXXX: unfortunately we must synchronize evaluations
         // so that we can swizzle in the context.
         // maybe we could create an expression from a context
         // (and so create a BSFManager for a context)
diff --git a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/BeanTag.java b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/BeanTag.java
index 650a05f..8cfd81b 100644
--- a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/BeanTag.java
+++ b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/BeanTag.java
@@ -162,7 +162,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
index 6d73ed8..598272f 100644
--- a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
+++ b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
@@ -78,7 +78,7 @@
         this.url = url;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
diff --git a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/DefineTagSupport.java b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/DefineTagSupport.java
index 5281913..f87c5b0 100644
--- a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/DefineTagSupport.java
+++ b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/DefineTagSupport.java
@@ -22,14 +22,14 @@
 import org.apache.commons.jelly.impl.DynamicTagLibrary;
 
 /**
- * An abstract base class useful for implementation inheritence.
+ * An abstract base class useful for implementation inheritance.
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @version $Revision$
  */
 public abstract class DefineTagSupport extends TagSupport {
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java
index 82c42c3..573764f 100644
--- a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java
+++ b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java
@@ -69,7 +69,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     protected Method getInvokeMethod( Class theClass ) {
diff --git a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/TaglibTag.java b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/TaglibTag.java
index 9b75956..9ca6d4a 100644
--- a/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/TaglibTag.java
+++ b/jelly-tags/define/src/java/org/apache/commons/jelly/tags/define/TaglibTag.java
@@ -40,7 +40,7 @@
     private String uri;
     /** The new tags being added */
     private DynamicTagLibrary tagLibrary;
-    /** Whether or not inheritence is enabled */
+    /** Whether or not inheritance is enabled */
     private boolean inherit = true;
 
     public TaglibTag() {
diff --git a/jelly-tags/define/src/test/org/apache/commons/jelly/tags/mock/suite.jelly b/jelly-tags/define/src/test/org/apache/commons/jelly/tags/mock/suite.jelly
index 4022652..b08b6c6 100644
--- a/jelly-tags/define/src/test/org/apache/commons/jelly/tags/mock/suite.jelly
+++ b/jelly-tags/define/src/test/org/apache/commons/jelly/tags/mock/suite.jelly
@@ -25,7 +25,7 @@
 
         <!-- lets create the Mock Tags to simulate the database and the web service -->
         
-    <!-- note that the mock library will only be in effiect in this JellyContext. 
+    <!-- note that the mock library will only be in efficient in this JellyContext. 
         || Each test:case has its own context
       -->
         <j:set var="foodKind" value="pizza"/>
diff --git a/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/SetTag.java b/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/SetTag.java
index 1d26537..b2ee586 100644
--- a/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/SetTag.java
+++ b/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/SetTag.java
@@ -139,7 +139,7 @@
         this.property = property;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected void setPropertyValue( Object target, String property, Object value ) {
         try {
diff --git a/jelly-tags/dynabean/src/test/org/apache/commons/jelly/tags/dynabean/suite.jelly b/jelly-tags/dynabean/src/test/org/apache/commons/jelly/tags/dynabean/suite.jelly
index 412a968..2f48447 100644
--- a/jelly-tags/dynabean/src/test/org/apache/commons/jelly/tags/dynabean/suite.jelly
+++ b/jelly-tags/dynabean/src/test/org/apache/commons/jelly/tags/dynabean/suite.jelly
@@ -68,7 +68,7 @@
     <test:assertEquals expected="London" actual="${customer.address.city}"/>
     <test:assertEquals expected="Downing Street" actual="${customer.address.street}"/>
     
-    <!-- #### JellyUnit needs to support type cooercion for this to work...
+    <!-- #### JellyUnit needs to support type coercion for this to work...
     <test:assertEquals expected="10" actual="${customer.address.housenumber}"/>
     -->
     
diff --git a/jelly-tags/email/src/java/org/apache/commons/jelly/tags/email/EmailTag.java b/jelly-tags/email/src/java/org/apache/commons/jelly/tags/email/EmailTag.java
index 6cb9077..ad9501f 100644
--- a/jelly-tags/email/src/java/org/apache/commons/jelly/tags/email/EmailTag.java
+++ b/jelly-tags/email/src/java/org/apache/commons/jelly/tags/email/EmailTag.java
@@ -94,14 +94,14 @@
     }
 
     /**
-     * ";" seperated list of people to send to
+     * ";" separated list of people to send to
      */
     public void setTo(Expression to) {
         this.to = to;
     }
 
     /**
-     * ";" seperated list of people to cc
+     * ";" separated list of people to cc
      */
     public void setCC(Expression cc) {
         this.cc = cc;
diff --git a/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java b/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java
index 1f94f5a..f8772b0 100644
--- a/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java
+++ b/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java
@@ -101,7 +101,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java b/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
index 24f9874..a261dab 100644
--- a/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
+++ b/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
@@ -48,7 +48,7 @@
     }
 
     /**
-     * @see TagLibarary#getTagClasses()
+     * @see TagLibrary#getTagClasses()
      *
      * @return a Map of tag name to tag class
      */
diff --git a/jelly-tags/http/src/test/org/apache/commons/jelly/http/http.jelly b/jelly-tags/http/src/test/org/apache/commons/jelly/http/http.jelly
index 78f70a1..6e048d1 100644
--- a/jelly-tags/http/src/test/org/apache/commons/jelly/http/http.jelly
+++ b/jelly-tags/http/src/test/org/apache/commons/jelly/http/http.jelly
@@ -124,7 +124,7 @@
             <parameter name="target" value="registration"/>
         </post>
         SC: ${ph.getResponseHeader("Set-Cookie")}
-        <!-- show how to dump cookie name/value pairse -->
+        <!-- show how to dump cookie name/value pairs -->
         <j:forEach items='${ph.getResponseHeader("Set-Cookie").values}'
             var="element" indexVar="i">
             element[${i}] = ${element}
diff --git a/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java b/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
index a01cd51..8576ec6 100644
--- a/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
+++ b/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
@@ -163,7 +163,7 @@
             if (consoleReader != null
                     && consoleReader.getTerminal().isSupported()) {
 
-                // resue the static history, so our commands are remeberered
+                // resue the static history, so our commands are remembered
                 consoleReader.setHistory(consoleHistory);
 
                 // hate the bell!
diff --git a/jelly-tags/interaction/xdocs/changes.xml b/jelly-tags/interaction/xdocs/changes.xml
index 448c21d..1dd0251 100644
--- a/jelly-tags/interaction/xdocs/changes.xml
+++ b/jelly-tags/interaction/xdocs/changes.xml
@@ -27,7 +27,7 @@
   </properties>
   <body>
     <release version="1.1" date="2006-06-22">
-      <action dev="polx" type="add" issue="JELLY-229" due-to="Lukas Theussl">Enhanced the usage of AskTag with a custom completion list, upgraded depdendency to JLine 0.9.5.</action>
+      <action dev="polx" type="add" issue="JELLY-229" due-to="Lukas Theussl">Enhanced the usage of AskTag with a custom completion list, upgraded dependency to JLine 0.9.5.</action>
       <action dev="polx" type="add" issue="JELLY-175" due-to="Ryan Christianson">AskTag now uses JLine which allows history, auto-completion, and edition of answers.</action>
     </release>
     <release version="1.0" date="2004-09-12"></release>
diff --git a/jelly-tags/jaxme/project.xml b/jelly-tags/jaxme/project.xml
index 89ce71f..abacf0a 100644
--- a/jelly-tags/jaxme/project.xml
+++ b/jelly-tags/jaxme/project.xml
@@ -26,7 +26,7 @@
   <inceptionYear>2004</inceptionYear>
   <package>org.apache.commons.jelly.tags.jaxme</package>
   <logo/>
-  <description>JaxMe Tag Library. Apache JaxMe is an open source generative xml-object binder. Tags are provided that generate java objects from schema using JaxMe and that will marshall and unmarshall any JAXB complient implementations.</description>
+  <description>JaxMe Tag Library. Apache JaxMe is an open source generative xml-object binder. Tags are provided that generate java objects from schema using JaxMe and that will marshall and unmarshall any JAXB compliant implementations.</description>
   <shortDescription>JaxMe Tag Library</shortDescription>
   <versions>
     <version>
diff --git a/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java b/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
index f43f56b..1db5267 100644
--- a/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
+++ b/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
@@ -53,7 +53,7 @@
     }
 
     /**
-     * @see TagLibarary#getTagClasses()
+     * @see TagLibrary#getTagClasses()
      *
      * @return a Map of tag name to tag class
      */
diff --git a/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/RealmTag.java b/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/RealmTag.java
index 5f1c940..a08221a 100644
--- a/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/RealmTag.java
+++ b/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/RealmTag.java
@@ -46,7 +46,7 @@
 
     /**
      * Perform the tag functionality. In this case, add a realm with the
-     * specified name using the specified config (preperties) file to the
+     * specified name using the specified config (properties) file to the
      * parent server,
      *
      * @param xmlOutput where to send output
diff --git a/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/package.html b/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/package.html
index 53216d1..f51ca2c 100644
--- a/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/package.html
+++ b/jelly-tags/jetty/src/java/org/apache/commons/jelly/tags/jetty/package.html
@@ -19,7 +19,7 @@
 </head>
 <body>
 
-  <p>Tags for starting Jetty HTTP servers and procesing HTTP requests using Jelly scripts
+  <p>Tags for starting Jetty HTTP servers and processing HTTP requests using Jelly scripts
   </p>
 
 </body>
diff --git a/jelly-tags/jetty/src/test/org/apache/commons/jelly/jetty/TestJettyHttpServerTags.java b/jelly-tags/jetty/src/test/org/apache/commons/jelly/jetty/TestJettyHttpServerTags.java
index 0adaf31..b4f2f49 100644
--- a/jelly-tags/jetty/src/test/org/apache/commons/jelly/jetty/TestJettyHttpServerTags.java
+++ b/jelly-tags/jetty/src/test/org/apache/commons/jelly/jetty/TestJettyHttpServerTags.java
@@ -52,7 +52,7 @@
     }
 
     public void testDefaultServer() throws Exception {
-        String text = evaluteScriptAsText(
+        String text = evaluateScriptAsText(
             "src/test/org/apache/commons/jelly/jetty/defaultServer.jelly"
         );
         assertEquals("Produces the correct output", "It works!", text);
@@ -64,7 +64,7 @@
             logFile.delete();
         }
         assertTrue("Logfile does not exist", !logFile.exists());
-        String text = evaluteScriptAsText(
+        String text = evaluateScriptAsText(
             "src/test/org/apache/commons/jelly/jetty/jettyLogFile.jelly"
         );
         assertEquals("Produces the correct output", "It works!", text);
@@ -72,45 +72,45 @@
     }
 
     public void testSocketListener() throws Exception {
-        String text = evaluteScriptAsText(
+        String text = evaluateScriptAsText(
             "src/test/org/apache/commons/jelly/jetty/socketListener.jelly"
         );
         assertEquals("Produces the correct output", "It works!", text);
     }
 
     public void testHttpContext() throws Exception {
-        String text = evaluteScriptAsText(
+        String text = evaluateScriptAsText(
             "src/test/org/apache/commons/jelly/jetty/httpContext.jelly"
         );
         assertEquals("Produces the correct output", "It works!", text);
     }
 
     public void testResourceHandler() throws Exception {
-        String text = evaluteScriptAsText(
+        String text = evaluateScriptAsText(
             "src/test/org/apache/commons/jelly/jetty/resourceHandler.jelly"
         );
         assertEquals("Produces the correct output", "It works!", text);
     }
 
     public void testSecurityHandler() throws Exception {
-        String text = evaluteScriptAsText(
+        String text = evaluateScriptAsText(
             "src/test/org/apache/commons/jelly/jetty/securityHandlerForbidden.jelly"
         );
         assertEquals("Forbidden test produces the correct output", "It works!", text);
 
-        text = evaluteScriptAsText(
+        text = evaluateScriptAsText(
             "src/test/org/apache/commons/jelly/jetty/securityHandlerUnauthorized.jelly"
         );
         assertEquals("Unauthorized produces the correct output", "It works!", text);
     }
 
     public void testJellyResourceHandler() throws Exception {
-        String text = evaluteScriptAsText(
+        String text = evaluateScriptAsText(
             "src/test/org/apache/commons/jelly/jetty/jellyResourceHandler.jelly"
         );
         assertEquals("jellyResourceHandler produces the correct output", "It works!", text);
 
-        text = evaluteScriptAsText(
+        text = evaluateScriptAsText(
             "src/test/org/apache/commons/jelly/jetty/jellyResourceHandlerRequestBody.jelly"
         );
         assertEquals("jellyResourceHandlerRequestBody produces the correct output", "It works!", text);
@@ -120,14 +120,14 @@
      * Evaluates the script by the given file name and
      * returns the whitespace trimmed output as text
      */
-    protected String evaluteScriptAsText(String fileName) throws Exception {
+    protected String evaluateScriptAsText(String fileName) throws Exception {
         JellyContext context = new JellyContext();
 
         // allow scripts to refer to any resource inside this project
         // using an absolute URI like /src/test/org/apache/foo.xml
         context.setRootURL(new File(".").toURL());
 
-        // cature the output
+        // capture the output
         StringWriter buffer = new StringWriter();
         XMLOutput output = XMLOutput.createXMLOutput(buffer);
 
diff --git a/jelly-tags/jetty/xdocs/index.xml b/jelly-tags/jetty/xdocs/index.xml
index a693c0e..9f52909 100644
--- a/jelly-tags/jetty/xdocs/index.xml
+++ b/jelly-tags/jetty/xdocs/index.xml
@@ -25,7 +25,7 @@
   <body>
     <section name="Overview">
       <p>
-        Tags for starting Jetty HTTP servers and procesing HTTP requests using Jelly scripts.
+        Tags for starting Jetty HTTP servers and processing HTTP requests using Jelly scripts.
           See the <a href="tags.html">tags</a> for more information.
       </p>
     </section>
diff --git a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceImageTag.java b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceImageTag.java
index 2043e3a..4f37cc5 100644
--- a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceImageTag.java
+++ b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceImageTag.java
@@ -26,7 +26,7 @@
 import org.eclipse.swt.widgets.Widget;
 
 /**
- * Implementation of SWT ImageTag
+ * Implementstion of SWT ImageTag
  *
  * @author <a href="mailto:ckl@dacelo.nl">Christiaan ten Klooster</a>
  */
diff --git a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceLayoutDataTag.java b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceLayoutDataTag.java
index dc10ff6..b9ecd41 100644
--- a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceLayoutDataTag.java
+++ b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceLayoutDataTag.java
@@ -25,7 +25,7 @@
 import org.eclipse.swt.widgets.Widget;
 
 /**
- * Implementation of SWT LayoutDataTag
+ * Implementstion of SWT LayoutDataTag
  *  
  * @author <a href="mailto:ckl@dacelo.nl">Christiaan ten Klooster</a> 
  */
diff --git a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceLayoutTag.java b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceLayoutTag.java
index c11f58c..f501a48 100644
--- a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceLayoutTag.java
+++ b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceLayoutTag.java
@@ -25,7 +25,7 @@
 import org.eclipse.swt.widgets.Widget;
 
 /**
- * Implementation of SWT LayoutTag
+ * Implementstion of SWT LayoutTag
  *
  * @author <a href="mailto:ckl@dacelo.nl">Christiaan ten Klooster</a>
  */
diff --git a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceWidgetTag.java b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceWidgetTag.java
index 3cd0866..bb6bdab 100644
--- a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceWidgetTag.java
+++ b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/JFaceWidgetTag.java
@@ -27,7 +27,7 @@
 import org.eclipse.swt.widgets.Widget;
 
 /**
- * Implementation of SWT WidgetTag
+ * Implementstion of SWT WidgetTag
  *
  * @author <a href="mailto:ckl@dacelo.nl">Christiaan ten Klooster</a>
  */
diff --git a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/package.html b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/package.html
index fe7a489..6e84620 100644
--- a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/package.html
+++ b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/package.html
@@ -22,7 +22,7 @@
   <p>
   	The JellyJFace Library is a Jelly Library for creating Rich User Interfaces 
   	using SWT and JFace via XML markup (a Jelly script).
-  	JellyJFace is an eextension of JellySWT to add support for the JFace framework.
+  	JellyJFace is an extension of JellySWT to add support for the JFace framework.
   </p>
   
 </body>
diff --git a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
index 14fe3b7..47de42a 100644
--- a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
+++ b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
@@ -42,7 +42,7 @@
 public class PreferencePageTag extends TagSupport {
 
     /**
-     * Implementation of a FieldEditorPreferencePage
+     * Implementstion of a FieldEditorPreferencePage
      * method createFieldEditors is called on Dialog.open()
      */
     public class PreferencePageImpl extends FieldEditorPreferencePage {
diff --git a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java
index c96aeb1..eae05c1 100644
--- a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java
+++ b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java
@@ -66,7 +66,7 @@
 
         super.doTag(output);
 
-        // set Title of aaplicationWindow
+        // set Title of applicationWindow
         Object title = attributes.remove("title");
         if (title != null) {
             getWindow().getShell().setText((String)title);
diff --git a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/wizard/WizardDialogTag.java b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/wizard/WizardDialogTag.java
index fe75b6e..4a6e4f9 100644
--- a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/wizard/WizardDialogTag.java
+++ b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/wizard/WizardDialogTag.java
@@ -118,7 +118,7 @@
             if (script instanceof Script) {
                 performCancel = (Script) getAttributes().get("performCancel");
             } else {
-                throw new JellyTagException("Attributevalue " + script + " must be a Script");
+                throw new JellyTagException("AttributeValue " + script + " must be a Script");
             }
         }
 
@@ -127,7 +127,7 @@
             if (script instanceof Script) {
                 performFinish = (Script) getAttributes().get("performFinish");
             } else {
-                throw new JellyTagException("Attributevalue " + script + " must be a Script");
+                throw new JellyTagException("AttributeValue " + script + " must be a Script");
             }
         }
 
diff --git a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/wizard/WizardPageTag.java b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/wizard/WizardPageTag.java
index 45272b9..091d21e 100644
--- a/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/wizard/WizardPageTag.java
+++ b/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/wizard/WizardPageTag.java
@@ -36,7 +36,7 @@
 public class WizardPageTag extends UseBeanTag {
 
     /**
-     * Implementation of a WizardPage
+     * Implementstion of a WizardPage
      * method createControl is called on Dialog.open()
      */
     public class WizardPageImpl extends WizardPage {
diff --git a/jelly-tags/jface/src/test/org/apache/commons/jelly/tags/jface/JFaceDemo.jelly b/jelly-tags/jface/src/test/org/apache/commons/jelly/tags/jface/JFaceDemo.jelly
index f0b4dc8..aaee1a2 100644
--- a/jelly-tags/jface/src/test/org/apache/commons/jelly/tags/jface/JFaceDemo.jelly
+++ b/jelly-tags/jface/src/test/org/apache/commons/jelly/tags/jface/JFaceDemo.jelly
@@ -39,7 +39,7 @@
         <fillLayout type="vertical"/>    
     
         <label text="A big red label 1" background="204, 0, 0"/>
-        <label text="I can barelly read this ;-(" foreground="#f2f2f2" />
+        <label text="I can barely read this ;-(" foreground="#f2f2f2" />
         <label text="It sure looks like the dutch flag ;-)" foreground="#ffffff" background="0, 0, 153" />        
     
   </applicationWindow>
diff --git a/jelly-tags/jface/xdocs/index.xml b/jelly-tags/jface/xdocs/index.xml
index 9f8c2db..c107215 100644
--- a/jelly-tags/jface/xdocs/index.xml
+++ b/jelly-tags/jface/xdocs/index.xml
@@ -27,7 +27,7 @@
       <p>
         The JellyJFace Library is a Jelly Library for creating Rich User Interfaces 
         using SWT and JFace via XML markup (a Jelly script).
-          JellyJFace is an eextension of JellySWT to add support for the JFace framework.
+          JellyJFace is an extension of JellySWT to add support for the JFace framework.
       </p>
       <p>
           See the <a href="tags.html">tags</a> for more information.
diff --git a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MapMessageTag.java b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MapMessageTag.java
index 204571d..21aec6f 100644
--- a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MapMessageTag.java
+++ b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MapMessageTag.java
@@ -67,7 +67,7 @@
         }
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected Message createMessage() throws JellyTagException {
         try {
diff --git a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java
index eb9d2c5..9e1f1c4 100644
--- a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java
+++ b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java
@@ -83,7 +83,7 @@
         this.subject = subject;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MessageTag.java b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MessageTag.java
index 1b0b782..ed2babc 100644
--- a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MessageTag.java
+++ b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/MessageTag.java
@@ -143,7 +143,7 @@
         }
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected Messenger findConnection() throws JellyTagException {
         ConnectionContext messengerTag = (ConnectionContext) findAncestorWithClass( ConnectionContext.class );
diff --git a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/ObjectMessageTag.java b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/ObjectMessageTag.java
index ffdb1f9..c6561a1 100644
--- a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/ObjectMessageTag.java
+++ b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/ObjectMessageTag.java
@@ -47,7 +47,7 @@
         this.object = object;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected Message createMessage() throws JellyTagException {
         Serializable value = (object != null) ? object : getBodyText();
diff --git a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/ReceiveTag.java b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/ReceiveTag.java
index d1c1f8b..889946a 100644
--- a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/ReceiveTag.java
+++ b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/ReceiveTag.java
@@ -108,7 +108,7 @@
         this.timeout = timeout;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/TextMessageTag.java b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/TextMessageTag.java
index 3f094a3..553ccef 100644
--- a/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/TextMessageTag.java
+++ b/jelly-tags/jms/src/java/org/apache/commons/jelly/tags/jms/TextMessageTag.java
@@ -45,7 +45,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected Message createMessage() throws JellyTagException {
         String value = (text != null) ? text : getBodyText();
diff --git a/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/OperationTag.java b/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/OperationTag.java
index 4384aec..a4fb095 100644
--- a/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/OperationTag.java
+++ b/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/OperationTag.java
@@ -139,7 +139,7 @@
         this.parameters = parameters;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/RegisterTag.java b/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/RegisterTag.java
index 4758e1c..41a586d 100644
--- a/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/RegisterTag.java
+++ b/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/RegisterTag.java
@@ -113,7 +113,7 @@
         this.server = server;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/ServerTag.java b/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/ServerTag.java
index bd515fb..5b9c023 100644
--- a/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/ServerTag.java
+++ b/jelly-tags/jmx/src/java/org/apache/commons/jelly/tags/jmx/ServerTag.java
@@ -78,7 +78,7 @@
 
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     /**
      * Factory method to lazily create an MBeanServer if none is supplied
diff --git a/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java b/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
index 99b0ddc..f7bf580 100644
--- a/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
+++ b/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
@@ -94,7 +94,7 @@
         this.select = select;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /** @return the source on which the stylesheet should run
diff --git a/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java b/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
index 22276fa..eb3d0f8 100644
--- a/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
+++ b/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
@@ -166,7 +166,7 @@
         this.select = select;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /** @return the source on which the stylesheet should run
diff --git a/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java b/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
index 75dc689..2b9a46f 100644
--- a/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
+++ b/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
@@ -134,7 +134,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected Rule createRule(StylesheetTag tag, XMLOutput output) {
         return new Rule( match, createAction(tag, output) );
diff --git a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
index bacaf51..61dfa22 100644
--- a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
+++ b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
@@ -20,7 +20,7 @@
 
 /**
  * The abstract base class of any assertion tag which is
- * useful for implementation inheritence.
+ * useful for implementation inheritance.
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @version $Revision$
@@ -33,7 +33,7 @@
     public AssertTagSupport() {
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
index bcd61c5..3150ef8 100644
--- a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
+++ b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
@@ -117,7 +117,7 @@
         return ClassLoaderUtils.getClassLoader(classLoader, getContext().getUseContextClassLoader(), getClass());
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/CaseTag.java b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/CaseTag.java
index 9434b86..a355461 100644
--- a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/CaseTag.java
+++ b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/CaseTag.java
@@ -52,7 +52,7 @@
                 // will have its own variable scopes
                 JellyContext newContext = new JellyContext( context );
 
-                // disable inheritence of variables and tag libraries
+                // disable inheritance of variables and tag libraries
                 newContext.setExportLibraries(false);
                 newContext.setExport(false);
 
@@ -86,11 +86,11 @@
         this.name = name;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
-     * Strategy method to find the corrent TestSuite to add a new Test case to
+     * Strategy method to find the current TestSuite to add a new Test case to
      */
     protected TestSuite getSuite() {
         SuiteTag tag = (SuiteTag) findAncestorWithClass( SuiteTag.class );
diff --git a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
index 6444454..78123d4 100644
--- a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
+++ b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
@@ -44,7 +44,7 @@
      * <code>
      * createTestSuite( Foo.class, "suite.jelly" );
      * </code>
-     * which would loaad the 'suite.jelly script from the same package as the Foo
+     * which would load the 'suite.jelly script from the same package as the Foo
      * class on the classpath.
      *
      * @param testClass is the test class used to load the script via the classpath
diff --git a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/RunTag.java b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/RunTag.java
index c7189e4..8d01496 100644
--- a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/RunTag.java
+++ b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/RunTag.java
@@ -125,7 +125,7 @@
 
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/SuiteTag.java b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
index 8c10cf1..13b1d35 100644
--- a/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
+++ b/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
@@ -98,7 +98,7 @@
         this.name = name;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/junit/src/test/org/apache/commons/jelly/tags/junit/suite.jelly b/jelly-tags/junit/src/test/org/apache/commons/jelly/tags/junit/suite.jelly
index 520d28b..a9fc097 100644
--- a/jelly-tags/junit/src/test/org/apache/commons/jelly/tags/junit/suite.jelly
+++ b/jelly-tags/junit/src/test/org/apache/commons/jelly/tags/junit/suite.jelly
@@ -72,7 +72,7 @@
 
     <!-- test using var attribute -->
     <test:assertThrows var="ex">
-      <test:fail message="This exeption should be exported"/>
+      <test:fail message="This exception should be exported"/>
     </test:assertThrows>
     <test:assert test="${ex != null}">No exception exported</test:assert>
 
diff --git a/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/JellyJob.java b/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
index 5371340..31aac19 100644
--- a/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
+++ b/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
@@ -27,7 +27,7 @@
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
-/** Implementation of a quart <code>Job</code> to execute jellyscript.
+/** Implementstion of a quart <code>Job</code> to execute jellyscript.
  *
  *  @author <a href="mailto:bob@eng.werken.com">bob mcwhirter</a>
  */
diff --git a/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java b/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
index 8874e9d..7ad312e 100644
--- a/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
+++ b/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
@@ -176,7 +176,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/ResultImpl.java b/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
index 772df9e..69e6667 100644
--- a/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
+++ b/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
@@ -23,7 +23,7 @@
 /**
  * <p>This class creates a cached version of a <tt>ResultSet</tt>.
  * It's represented as a <tt>Result</tt> implementation, capable of
- * returing an array of <tt>Row</tt> objects containing a <tt>Column</tt>
+ * returning an array of <tt>Row</tt> objects containing a <tt>Column</tt>
  * instance for each column in the row.   It is not part of the JSTL
  * API; it serves merely as a back-end to ResultSupport's static methods.
  * Thus, we scope its access to the package.
diff --git a/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java b/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
index 32b3588..e3f7e69 100644
--- a/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
+++ b/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
@@ -24,7 +24,7 @@
  * <p>This interface is implemented by both &lt;sql:query&gt; and
  * &lt;sql:update&gt;. Its <code>addSQLParameter()</code> method
  * is called by nested parameter actions (such as &lt;sql:param&gt;)
- * to substitue <code>PreparedStatement<code> parameter values for
+ * to substitute <code>PreparedStatement<code> parameter values for
  * "?" parameter markers in the SQL statement of the enclosing
  * <code>SQLExecutionTag</code> action.</p>
  *
@@ -36,7 +36,7 @@
  * is the responsibility of the tag handler implementing this
  * interface</p>
  *
- * <p>The <code>SQLExcecutionTag</code> interface is exposed in order
+ * <p>The <code>SQLExecutionTag</code> interface is exposed in order
  * to support custom parameter actions which may retrieve their
  * parameters from any source and process them before substituting
  * them for a parameter marker in the sQL statement of the
diff --git a/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ResultImpl.java b/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
index 4e45415..32bc4ff 100644
--- a/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
+++ b/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
@@ -24,7 +24,7 @@
 /**
  * <p>This class creates a cached version of a <tt>ResultSet</tt>.
  * It's represented as a <tt>Result</tt> implementation, capable of
- * returing an array of <tt>Row</tt> objects containing a <tt>Column</tt>
+ * returning an array of <tt>Row</tt> objects containing a <tt>Column</tt>
  * instance for each column in the row.</p>
  *
  * <p>Note -- this is a private copy for the RI to avoid making the
diff --git a/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/TransactionTag.java b/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
index 1c1bbef..3ee8b2e 100644
--- a/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
+++ b/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
@@ -170,7 +170,7 @@
     }
 
     //*********************************************************************
-    // Implementation methods methods
+    // Implementstion methods methods
 
     /**
      * Restores the <code>Connection</code> to its initial state and
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java
index 8b3cd19..484a80a 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java
@@ -60,7 +60,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
 
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java
index c736a3b..e76233c 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java
@@ -72,7 +72,7 @@
         this.align = align;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     protected Object getConstraints() {
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java
index 1cc51c1..5459a8e 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java
@@ -72,7 +72,7 @@
         this.vgap = vgap;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java
index 38dd89c..1a0c06a 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java
@@ -77,7 +77,7 @@
         this.var = var;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
index 8a17cc6..5a777c1 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
@@ -288,7 +288,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java
index b5d90e8..79449cf 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java
@@ -34,7 +34,7 @@
     *    with {@link #getConstraintObject}.
     *    Probably a shorter java-source is do-able.
     *    <p>
-    *    TODO: this class should probably be extended with special treatment for dimensios
+    *    TODO: this class should probably be extended with special treatment for dimensions
     *    using the converter package.
     */
 public class ConstraintTag extends DynaBeanTagSupport {
@@ -44,7 +44,7 @@
                         is cloned then attributes are set
                         This tag should also support the attributes such as fill=BOTH
                         and anchor=NORTHEAST...
-                        Wooops... need to define setters ?? let's see if BeanUtils does it on public vars
+                        Whoops... need to define setters ?? let's see if BeanUtils does it on public vars
                         And... have an insets?? A child ?
     */
 
@@ -66,7 +66,7 @@
             public Tag createTag(String name, Attributes attributes) throws JellyException {
                 return new ConstraintTag ( this );
             }
-        } // class ConstatnStringFactory
+        } // class ConstantStringFactory
 
         // we could be able to make factories that create their tags in parametrized
         // subclasses of the tag depending on the name and attributes
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/DialogTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/DialogTag.java
index 9c2caad..beeaa1b 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/DialogTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/DialogTag.java
@@ -45,7 +45,7 @@
         super(JDialog.class);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
index ea1add3..3e56a00 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
@@ -54,7 +54,7 @@
             throw new MissingAttributeException("highlight must be supplied when shadow is supplied");
         }
         if( etchType != EtchedBorder.LOWERED || etchType != EtchedBorder.RAISED ) {
-            if( log.isDebugEnabled() ) log.debug( "etchType set to [" + etchType + "], which is invalid. Reseting to -1" );
+            if( log.isDebugEnabled() ) log.debug( "etchType set to [" + etchType + "], which is invalid. Resetting to -1" );
         }
         super.doTag(output);
     }
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/FontTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/FontTag.java
index 29a26df..15c4f55 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/FontTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/FontTag.java
@@ -91,7 +91,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/GbcTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/GbcTag.java
index 618d445..4fb1b66 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/GbcTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/GbcTag.java
@@ -32,7 +32,7 @@
 /**
  * This class represents a {@link GridBagConstraints} constraints as passed in
  * the second argument of {@link Container#add(Component,Object)}.
- * It supports inheritence between such tags in the following fashion:
+ * It supports inheritance between such tags in the following fashion:
  * <ul>
  *     <li>either using a <code>basedOn</code> attribute which is
  *         supposed to provide a reference to another {@link GbcTag}.</li>
@@ -76,7 +76,7 @@
         tag.addLayoutComponent(component, getConstraints());
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java
index 249176b..f48d348 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java
@@ -36,7 +36,7 @@
     public GridBagLayoutTag() {
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java
index 2139110..a22be88 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java
@@ -79,7 +79,7 @@
         this.var = var;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/SwingTagLibrary.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/SwingTagLibrary.java
index e305e6f..5f5613c 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/SwingTagLibrary.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/SwingTagLibrary.java
@@ -201,7 +201,7 @@
         return (Factory) getFactoryMap().get(elementName);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java
index e5ede65..28c20d2 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java
@@ -63,7 +63,7 @@
         super.doTag(output);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
 
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java
index ec2813e..7fc9da5 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java
@@ -40,7 +40,7 @@
         return super.getAttributeType(name);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected void processBean(String var, Object bean) throws JellyTagException {
         super.processBean(var, bean);
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableModelTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableModelTag.java
index 176ccc3..922d34f 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableModelTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TableModelTag.java
@@ -35,7 +35,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected void processBean(String var, Object bean) throws JellyTagException {
         super.processBean(var, bean);
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TdTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TdTag.java
index 2b77f73..8ffc6bd 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TdTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TdTag.java
@@ -133,7 +133,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java
index 58c4a39..4b72379 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java
@@ -101,7 +101,7 @@
 
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java
index 898aa8f..ad70254 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java
@@ -153,7 +153,7 @@
 
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected void invokeScript(XMLOutput output, WindowEvent event, Script script) {
         if ( var != null ) {
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/package.html b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/package.html
index 81abceb..7cea185 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/package.html
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/package.html
@@ -4,7 +4,7 @@
 <body>
 
   <p>
-  	Implementation classes for the JellySwing library
+  	Implementstion classes for the JellySwing library
   </p>
   
 </body>
diff --git a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java
index 29d6a4d..668922f 100644
--- a/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java
+++ b/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java
@@ -146,7 +146,7 @@
         this.context = context;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected static class MyTableColumnModel extends DefaultTableColumnModel {
         public List getColumnList() {
diff --git a/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestConverters.java b/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestConverters.java
index 1a22de2..23e2ab8 100644
--- a/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestConverters.java
+++ b/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestConverters.java
@@ -75,7 +75,7 @@
         assertPoint(" 0  ,  200  ", new Point(0, 200));
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     protected void assertPoint(String expression, Point expected) throws Exception {
diff --git a/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly b/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly
index 0765330..44bf9f9 100644
--- a/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly
+++ b/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly
@@ -27,7 +27,7 @@
                 - an insets tag (CVS ?)
                 - some Font support (CVS ?)
                 - incorporate CollapsablePanel
-                - dragable Label with subclass ItemTitleLabel
+                - draggable Label with subclass ItemTitleLabel
                 - CollapsablePanel implementing DropTarget (or approacher at least)
                 - adding relations
                 - DC pane (later with inheritance)
diff --git a/jelly-tags/swing/xdocs/index.xml b/jelly-tags/swing/xdocs/index.xml
index d8c2838..9d9fbde 100644
--- a/jelly-tags/swing/xdocs/index.xml
+++ b/jelly-tags/swing/xdocs/index.xml
@@ -31,7 +31,7 @@
         of your front end and allowing you to bind to Java code for the business objects and models. 
       </p>
       <p>
-        This mechanism uses seperation of concerns and MVC ideas from web applications, allowing the rendering
+        This mechanism uses separation of concerns and MVC ideas from web applications, allowing the rendering
         of your Swing front end to be easily transformed (since its XML) into different styles while leaving your
         model and business objects untouched. It also allows different views to be constructed independently of your models.
       </p>
@@ -76,7 +76,7 @@
         for templating HTML.
       </p>
       <p>
-        The demo was orignally written in
+        The demo was originally written in
         <a href="http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/HomepageBuilder.java?view=markup">Java code</a>
          
         to implement a simple Swing UI
@@ -84,7 +84,7 @@
        <a href="http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/homepageBuilder.jelly?view=markup">as a JellyScript</a>
         as well.
         While this is a fairly simple Swing UI and not a particularly great example of the power of JellySwing,
-        it does highlight the main difference between the two appraches.
+        it does highlight the main difference between the two approaches.
       </p>
     </section>
     
diff --git a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/DialogTag.java b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/DialogTag.java
index a2ee162..e1fecab 100644
--- a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/DialogTag.java
+++ b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/DialogTag.java
@@ -47,7 +47,7 @@
         super(widgetClass);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java
index 264175b..d304e7c 100644
--- a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java
+++ b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java
@@ -43,7 +43,7 @@
         super(layoutDataClass);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutTag.java b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutTag.java
index 2939d4e..03c5779 100644
--- a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutTag.java
+++ b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutTag.java
@@ -54,7 +54,7 @@
         return null;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutTagSupport.java b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutTagSupport.java
index 65583f9..a920d5a 100644
--- a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutTagSupport.java
+++ b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/LayoutTagSupport.java
@@ -69,7 +69,7 @@
         this.var = var;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     /**
      * Either defines a variable or adds the current component to the parent
diff --git a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/MenuTag.java b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/MenuTag.java
index 7255d41..c693cae 100644
--- a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/MenuTag.java
+++ b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/MenuTag.java
@@ -45,7 +45,7 @@
         super(Menu.class, style);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/OnEventTag.java b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/OnEventTag.java
index c6956f1..ae6897e 100644
--- a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/OnEventTag.java
+++ b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/OnEventTag.java
@@ -129,7 +129,7 @@
         this.type = type;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/WidgetTag.java b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
index 39439c6..2ec3a19 100644
--- a/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
+++ b/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
@@ -113,7 +113,7 @@
         clearBean();
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/threads/src/java/org/apache/commons/jelly/tags/threads/JellyThread.java b/jelly-tags/threads/src/java/org/apache/commons/jelly/tags/threads/JellyThread.java
index bb940ee..35fa4be 100644
--- a/jelly-tags/threads/src/java/org/apache/commons/jelly/tags/threads/JellyThread.java
+++ b/jelly-tags/threads/src/java/org/apache/commons/jelly/tags/threads/JellyThread.java
@@ -38,7 +38,7 @@
     RunnableStatus status = new RunnableStatus();
 
     public JellyThread() {
-        // aquire my still running lock immediately
+        // acquire my still running lock immediately
         while (true) {
             try {
                 runningMutex.acquire();
@@ -104,7 +104,7 @@
             throw new RuntimeException("This method should be called from a different thread than itself");
         }
 
-        // wait until the calling thread can aquire the lock
+        // wait until the calling thread can acquire the lock
         while (true) {
             try {
                 if (howLong == -1) {
diff --git a/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java b/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
index 20758c4..57baf3a 100644
--- a/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
+++ b/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
@@ -169,7 +169,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java b/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java
index 77e5505..f60b87d 100644
--- a/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java
+++ b/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java
@@ -62,7 +62,7 @@
         super.doTag(output);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java b/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java
index 11333f7..48e14f4 100644
--- a/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java
+++ b/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/ValidateTag.java
@@ -154,7 +154,7 @@
         this.var = var;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java b/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
index cf83b20..da99ff9 100644
--- a/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
+++ b/jelly-tags/validate/src/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
@@ -182,7 +182,7 @@
         return factory;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
 
diff --git a/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java b/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
index 6a90433..9948f48 100644
--- a/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
+++ b/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
@@ -28,9 +28,9 @@
  * Adapts a JellyContext for use as a Velocity Context.  This context
  * can be used in either read-only or read-write mode.  When used as a
  * read-only adapter, items <tt>put</tt> or <tt>remove</tt>ed from the
- * Velocity context are not permitted to propogate to the JellyContext,
+ * Velocity context are not permitted to propagate to the JellyContext,
  * which is the default behavior.  The adapter can also be used in a
- * read-write mode.  This permits changes made by Velocity to propogate
+ * read-write mode.  This permits changes made by Velocity to propagate
  * to the JellyContext.
  *
  * @author <a href="mailto:pete-apache-dev@kazmier.com">Pete Kazmier</a>
@@ -44,7 +44,7 @@
     /** The JellyContext being adapted */
     private JellyContext jellyContext;
 
-    /** The store for Velocity in the event the adpater is read-only */
+    /** The store for Velocity in the event the adapter is read-only */
     private HashMap privateContext = new HashMap();
 
     /**
@@ -59,9 +59,9 @@
 
     /**
      * Sets the read-only flag for this adapter.  If the read-only flag
-     * is set, changes to the Velocity Context will not be propogated to
+     * is set, changes to the Velocity Context will not be propagated to
      * the JellyContext.  Turning the read-only flag off enables changes
-     * to propogate.
+     * to propagate.
      *
      * @param readOnly If this parameter is <tt>true</tt>, the adapter
      * becomes read-only.  Setting the parameter to <tt>false</tt> the
@@ -75,7 +75,7 @@
     /**
      * Tests if the adapter is read-only.
      *
-     * @return <tt>true</tt> if the adpater is read-only; otherwise
+     * @return <tt>true</tt> if the adapter is read-only; otherwise
      * returns <tt>false</tt>.
      */
     public boolean isReadOnly()
diff --git a/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/MergeTag.java b/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
index 8c0753f..c7e1d50 100644
--- a/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
+++ b/jelly-tags/velocity/src/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
@@ -135,11 +135,11 @@
 
     /**
      * Sets the read-only flag for this adapter which prevents
-     * modifications in the Velocity context from propogating to the
+     * modifications in the Velocity context from propagating to the
      * JellyContext.
      *
      * @param readOnly <tt>true</tt> prevents modifications from
-     * propogating (the default), or <tt>false</tt> which permits
+     * propagating (the default), or <tt>false</tt> which permits
      * modifications.
      */
     public void setReadOnly( boolean readOnly )
@@ -170,7 +170,7 @@
         this.inputEncoding = encoding;
     }
 
-    // -- Implementation ----------------------------------------------------
+    // -- Implementstion ----------------------------------------------------
 
     /**
      * Merges the Velocity template with the Jelly context.
diff --git a/jelly-tags/velocity/src/test/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java b/jelly-tags/velocity/src/test/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
index aee1400..5370f68 100644
--- a/jelly-tags/velocity/src/test/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
+++ b/jelly-tags/velocity/src/test/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
@@ -86,7 +86,7 @@
 
     /**
      * Test that items can be added and retrieved from a read-write
-     * adpater.  Also verify the key/value pair was actually inserted
+     * adapter.  Also verify the key/value pair was actually inserted
      * into the JellyContext.
      */
     public void testReadWritePut()
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/IfTag.java b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/IfTag.java
index fb4fcd7..1027713 100644
--- a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/IfTag.java
+++ b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/IfTag.java
@@ -63,7 +63,7 @@
         this.select = select;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected Object getXPathContext() {
         ForEachTag tag = (ForEachTag) findAncestorWithClass( ForEachTag.class );
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java
index 0186cdd..7975737 100644
--- a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java
+++ b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java
@@ -80,7 +80,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java
index 8bdf4ba..b5b9e5c 100644
--- a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java
+++ b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ParseTagSupport.java
@@ -103,7 +103,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java
index 13a3e99..72bdc57 100644
--- a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java
+++ b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java
@@ -27,7 +27,7 @@
 
 /**
  * Replace namespace is a filter to change the namespace of any
- * elemement attribute passing through it.
+ * element attribute passing through it.
  * 
  * @author Diogo Quintela <dquintela@gmail.com>
  */
diff --git a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/TransformTag.java b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/TransformTag.java
index 6065b8a..eab5ee1 100644
--- a/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/TransformTag.java
+++ b/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/TransformTag.java
@@ -82,7 +82,7 @@
     /** The Log to which logging calls will be made. */
     private static final Log log = LogFactory.getLog(TransformTag.class);
 
-    /** Propert name for lexical handler */
+    /** Property name for lexical handler */
     private static final String LEXICAL_HANDLER_PROPERTY =
         "http://xml.org/sax/properties/lexical-handler";
 
@@ -192,7 +192,7 @@
         this.transformerHandler.getTransformer().setParameter(name, value);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
@@ -487,7 +487,7 @@
         }
 
         /**
-         * Helper method to determin if nested body needs to be parsed by (an
+         * Helper method to determine if nested body needs to be parsed by (an
          * xml parser, i.e. its only text) to generate SAX events or not
          *
          * @return True if tag body should be parsed or false if invoked only
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestXMLTags.java b/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestXMLTags.java
index 7b016ab..fe7d381 100644
--- a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestXMLTags.java
+++ b/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/TestXMLTags.java
@@ -96,7 +96,7 @@
     }
 
     public void testElementWithNameSpace() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir + "/elementWithNameSpace.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/elementWithNameSpace.jelly");
         assertEquals("Should produce the correct output",
                 "<env:Envelope "+
                 "xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" "+
@@ -106,17 +106,17 @@
 
     public void testElementWithNameSpaceError() throws Exception {
         try {
-            evaluteScriptAsText(testBaseDir + "/elementWithNameSpaceError.jelly");
+            evaluateScriptAsText(testBaseDir + "/elementWithNameSpaceError.jelly");
             Assert.fail("We should have bailed out with an JellyException");
         } catch (JellyException jex) {
-            assertTrue(jex.getReason().startsWith("Cannot set same prefix to diferent URI in same node"));
+            assertTrue(jex.getReason().startsWith("Cannot set same prefix to different URI in same node"));
         }
     }
 
     public void testNamespaceReplace() throws Exception {
         // For this test when we not set "ns" var with expected namespace, it
         // is expected to repeat the same two times
-        String text = evaluteScriptAsText(testBaseDir + "/namespaceReplace.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/namespaceReplace.jelly");
         String repeatingText = "<test-subnode attr=\"test\"><test-anotherSubNode></test-anotherSubNode><test-anotherSubNodeAgain xmlns:other=\"\" other:abc=\"testValue\"></test-anotherSubNodeAgain></test-subnode>";
         assertEquals("Should produce the correct output",
                 "<test-node xmlns:test=\"http://apache/testNS\" test:abc=\"testValue\">"+
@@ -126,7 +126,7 @@
         Map ctxVars = new HashMap();
         ctxVars.put("ns", "http://java/ns");
 
-        text = evaluteScriptAsText(testBaseDir + "/namespaceReplace.jelly", ctxVars);
+        text = evaluateScriptAsText(testBaseDir + "/namespaceReplace.jelly", ctxVars);
 
         String firstTrunk =
         "<test-subnode xmlns=\"\" attr=\"test\">" +
@@ -153,15 +153,15 @@
 
     public void testAttributeNameSpaceDuplicatedNS() throws Exception {
         try {
-            evaluteScriptAsText(testBaseDir + "/attributeNameSpaceDuplicatedNS.jelly");
+            evaluateScriptAsText(testBaseDir + "/attributeNameSpaceDuplicatedNS.jelly");
             Assert.fail("We should have bailed out with an JellyException");
         } catch (JellyException jex) {
-            assertTrue(jex.getReason().startsWith("Cannot set same prefix to diferent URI in same node"));
+            assertTrue(jex.getReason().startsWith("Cannot set same prefix to different URI in same node"));
         }
     }
 
     public void testAttributeNameSpace() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir + "/attributeNameSpace.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/attributeNameSpace.jelly");
         System.out.println(text);
         assertEquals("Should produce the correct output",
                 "<top-node xmlns=\"abc\">"+
@@ -174,7 +174,7 @@
     }
 
     public void testAttributeNameSpaceDefaultNS() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir + "/attributeNameSpaceDefaultNS.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/attributeNameSpaceDefaultNS.jelly");
         System.out.println(text);
         assertEquals("Should produce the correct output",
                 "<top-node>"+
@@ -187,7 +187,7 @@
     }
 
     public void testAttributeNameSpaceWithInnerElements() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir + "/attributeNameSpaceWithInnerElements.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/attributeNameSpaceWithInnerElements.jelly");
         assertEquals("Should produce the correct output",
                 "<test-node xmlns:test=\"http://apache/testNS\" test:abc=\"testValue\" abc2=\"testValue\" abc3=\"testValue\">"+
                 "<test-sub-node xmlns:test2=\"http://apache/testNS\" xmlns:test3=\"http://apache/anotherNS\" test:abc=\"testValue\" test2:abc2=\"testValue\" test3:abc3=\"testValue\">"+
@@ -197,51 +197,51 @@
     }
 
     public void testTransform() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir + "/transformExample.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/transformExample.jelly");
         assertEquals("Should produce the correct output", "It works!", text);
     }
 
     public void testTransformAllInLine() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir + "/transformExampleAllInLine.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/transformExampleAllInLine.jelly");
         assertEquals("Should produce the correct output", "It works!", text);
     }
 
     public void testTransformParams() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir + "/transformParamExample.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/transformParamExample.jelly");
         assertEquals("Should produce the correct output", "It works!", text);
     }
 
     public void testTransformParamsInLine() throws Exception {
 
-        String text = evaluteScriptAsText(testBaseDir + "/transformParamExample2.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/transformParamExample2.jelly");
         assertEquals("Should produce the correct output", "It works!", text);
     }
 
     public void testTransformSAXOutput() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir + "/transformExampleSAXOutput.jelly");
+        String text = evaluateScriptAsText(testBaseDir + "/transformExampleSAXOutput.jelly");
         assertEquals("Should produce the correct output", "It works!", text);
     }
 
     public void testTransformSAXOutputNestedTransforms() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir +
+        String text = evaluateScriptAsText(testBaseDir +
             "/transformExampleSAXOutputNestedTransforms.jelly");
         assertEquals("Should produce the correct output", "It works!", text);
     }
 
     public void testTransformSchematron() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir +
+        String text = evaluateScriptAsText(testBaseDir +
             "/schematron/transformSchematronExample.jelly");
         assertEquals("Should produce the correct output", "Report count=1:assert count=2", text);
     }
 
     public void testTransformXmlVar() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir +
+        String text = evaluateScriptAsText(testBaseDir +
             "/transformExampleXmlVar.jelly");
         assertEquals("Should produce the correct output", "It works!", text);
     }
 
     public void testDoctype() throws Exception {
-        String text = evaluteScriptAsText(testBaseDir +
+        String text = evaluateScriptAsText(testBaseDir +
             "/testDoctype.jelly");
         assertEquals("Should produce the correct output", "<!DOCTYPE foo PUBLIC \"publicID\" \"foo.dtd\">\n<foo></foo>", text);
     }
@@ -280,15 +280,15 @@
      * Evaluates the script by the given file name and
      * returns the whitespace trimmed output as text
      */
-    protected String evaluteScriptAsText(String fileName) throws Exception {
-        return evaluteScriptAsText(fileName, null);
+    protected String evaluateScriptAsText(String fileName) throws Exception {
+        return evaluateScriptAsText(fileName, null);
     }
 
     /**
      * Evaluates the script by the given file name and
      * returns the whitespace trimmed output as text
      */
-    protected String evaluteScriptAsText(String fileName, Map ctxVars) throws Exception {
+    protected String evaluateScriptAsText(String fileName, Map ctxVars) throws Exception {
         JellyContext context = new JellyContext();
         if (ctxVars != null) {
             Set keys = ctxVars.keySet();
@@ -303,7 +303,7 @@
         // using an absolute URI like /src/test/org/apache/foo.xml
         context.setRootURL(new File(".").toURL());
 
-        // cature the output
+        // capture the output
         StringWriter buffer = new StringWriter();
         XMLOutput output = XMLOutput.createXMLOutput(buffer);
 
@@ -316,7 +316,7 @@
         return text;
     }
 
-    protected String evaluteScriptAsTextUsingSaxContentHandler(String fileName, Map ctxVars) throws Exception {
+    protected String evaluateScriptAsTextUsingSaxContentHandler(String fileName, Map ctxVars) throws Exception {
         org.dom4j.io.OutputFormat outputFormat = new org.dom4j.io.OutputFormat();
         outputFormat.setSuppressDeclaration(true);
         outputFormat.setNewlines(false);
diff --git a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/test-schematron.xml b/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/test-schematron.xml
index 3d491d6..feb64e5 100644
--- a/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/test-schematron.xml
+++ b/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/schematron/test-schematron.xml
@@ -61,7 +61,7 @@
 
              <sch:pattern name="Adminstration Checks" id="admin">
 
-                <sch:p>Adminstrative constraints which are <sch:emph>always</sch:emph> applied</sch:p>
+                <sch:p>Administrative constraints which are <sch:emph>always</sch:emph> applied</sch:p>
 
                 <sch:rule context="house">
                    <sch:assert test="address">A house must have an address</sch:assert>
diff --git a/pom.xml b/pom.xml
index 25e0b6a..eac5eee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -355,7 +355,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+              <Implementstion-Vendor-Id>org.apache</Implementstion-Vendor-Id>
               <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
               <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
             </manifestEntries>
diff --git a/project.properties b/project.properties
index 153e188..7219a51 100644
--- a/project.properties
+++ b/project.properties
@@ -31,8 +31,8 @@
 maven.compile.target=1.3
 
 # Jar Manifest Additional Attributes
-maven.jar.manifest.attributes.list=Implementation-Vendor-Id,X-Compile-Source-JDK,X-Compile-Target-JDK
-maven.jar.manifest.attribute.Implementation-Vendor-Id=org.apache
+maven.jar.manifest.attributes.list=Implementstion-Vendor-Id,X-Compile-Source-JDK,X-Compile-Target-JDK
+maven.jar.manifest.attribute.Implementstion-Vendor-Id=org.apache
 maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source}
 maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target}
 
diff --git a/project.xml b/project.xml
index 107ddd8..6d5cd01 100644
--- a/project.xml
+++ b/project.xml
@@ -50,7 +50,7 @@
       <packages>org.apache.commons.jelly.impl,org.apache.commons.jelly.tags,org.apache.commons.jelly.expression</packages>
     </packageGroup>
     <packageGroup>
-      <title>Tag Implementations</title>
+      <title>Tag Implementstions</title>
       <packages>org.apache.commons.jelly.tags.*</packages>
     </packageGroup>
   </packageGroups>
diff --git a/src/java/org/apache/commons/jelly/Jelly.java b/src/java/org/apache/commons/jelly/Jelly.java
index 9ce4188..788c569 100644
--- a/src/java/org/apache/commons/jelly/Jelly.java
+++ b/src/java/org/apache/commons/jelly/Jelly.java
@@ -249,7 +249,7 @@
         this.validateXML = validate;
     }
     
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------                
     /**
      * @return the URL for the relative file name or absolute URL 
diff --git a/src/java/org/apache/commons/jelly/JellyContext.java b/src/java/org/apache/commons/jelly/JellyContext.java
index 6c91e04..52b4d5a 100644
--- a/src/java/org/apache/commons/jelly/JellyContext.java
+++ b/src/java/org/apache/commons/jelly/JellyContext.java
@@ -91,14 +91,14 @@
     /** Should we export tag libraries to our parents context */
     private boolean exportLibraries = true;
 
-    /** Should we cache Tag instances, per thread, to reduce object contruction overhead? */
+    /** Should we cache Tag instances, per thread, to reduce object construction overhead? */
     private boolean cacheTags = false;
     
     /**
      * True if exceptions should be suppressed; introduced in 1.1 beta and immediately deprecated
      * because future versions will _never_ suppress exceptions (required here for backwards
      * compatibility)
-	 * @deprected after v1.1, exceptions will never be suppressed
+	 * @deprecated after v1.1, exceptions will never be suppressed
      */
     private boolean suppressExpressionExceptions;
 
@@ -929,7 +929,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     /**
      * @return a new relative URL from the given root and with the addition of the
@@ -1014,7 +1014,7 @@
 
 	/**
 	 * @return the suppressExpressionExceptions
-	 * @deprected after v1.1, exceptions will never be suppressed
+	 * @deprecated after v1.1, exceptions will never be suppressed
 	 */
 	public boolean isSuppressExpressionExceptions() {
 		return suppressExpressionExceptions;
@@ -1022,7 +1022,7 @@
 
 	/**
 	 * @param suppressExpressionExceptions the suppressExpressionExceptions to set
-	 * @deprected after v1.1, exceptions will never be suppressed
+	 * @deprecated after v1.1, exceptions will never be suppressed
 	 */
 	public void setSuppressExpressionExceptions(boolean suppressExpressionExceptions) {
 		this.suppressExpressionExceptions = suppressExpressionExceptions;
diff --git a/src/java/org/apache/commons/jelly/MapTagSupport.java b/src/java/org/apache/commons/jelly/MapTagSupport.java
index 1883cde..17bc748 100644
--- a/src/java/org/apache/commons/jelly/MapTagSupport.java
+++ b/src/java/org/apache/commons/jelly/MapTagSupport.java
@@ -25,7 +25,7 @@
  * <p><code>MapTag</code> is a DynaTag implementation which uses a Map
  * to store its attribute values in. Derived tags can then process this
  * Map, change values, add or remove attributes or perform some other form
- * of processsing pretty easily.
+ * of processing pretty easily.
  * </p>
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
diff --git a/src/java/org/apache/commons/jelly/MissingAttributeException.java b/src/java/org/apache/commons/jelly/MissingAttributeException.java
index 25a7441..9bdcead 100644
--- a/src/java/org/apache/commons/jelly/MissingAttributeException.java
+++ b/src/java/org/apache/commons/jelly/MissingAttributeException.java
@@ -27,7 +27,7 @@
 
     private String missingAttribute;
     
-    // ### we may wish to implement a localized messag for this error
+    // ### we may wish to implement a localized message for this error
         
     public MissingAttributeException(String missingAttribute) {
         super( "You must define an attribute called '" + missingAttribute + "' for this tag." );
diff --git a/src/java/org/apache/commons/jelly/TagLibrary.java b/src/java/org/apache/commons/jelly/TagLibrary.java
index f91e765..80f52bd 100644
--- a/src/java/org/apache/commons/jelly/TagLibrary.java
+++ b/src/java/org/apache/commons/jelly/TagLibrary.java
@@ -138,7 +138,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/java/org/apache/commons/jelly/TagSupport.java b/src/java/org/apache/commons/jelly/TagSupport.java
index 85ec7bd..cda94fa 100644
--- a/src/java/org/apache/commons/jelly/TagSupport.java
+++ b/src/java/org/apache/commons/jelly/TagSupport.java
@@ -206,7 +206,7 @@
         getBody().run(context, output);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     /**
      * Searches up the parent hierarchy for a Tag of the given type.
diff --git a/src/java/org/apache/commons/jelly/XMLOutput.java b/src/java/org/apache/commons/jelly/XMLOutput.java
index f2b8e43..871b4cb 100644
--- a/src/java/org/apache/commons/jelly/XMLOutput.java
+++ b/src/java/org/apache/commons/jelly/XMLOutput.java
@@ -69,7 +69,7 @@
     /** The SAX LexicalHandler that output goes to. */
     private LexicalHandler lexicalHandler;
 
-    /** Stack of kown namespaces. */
+    /** Stack of known namespaces. */
     private NamespaceStack namespaceStack = new NamespaceStack();
 
     public XMLOutput() {
@@ -837,7 +837,7 @@
         }
     }
     
-    /** Pass data through the pipline.
+    /** Pass data through the pipeline.
       * By default, this call is ignored.
       * Subclasses are invited to use this as a way for children tags to
       * pass data to their parent.
@@ -898,7 +898,7 @@
         this.lexicalHandler = lexicalHandler;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     /**
      * Factory method to create a new XMLOutput from an XMLWriter
@@ -957,7 +957,7 @@
                         isNew = false;
                     }
                     // We found it in stack
-                    // If it was exacly the same, we won't bother
+                    // If it was exactly the same, we won't bother
                     break;
                 }
             }
@@ -965,18 +965,18 @@
             if (isNew) {
                 // not declared sometime before
                 prefixUriMap = (Map) nsStack.get(0); // Current depth map
-                // Sanity check: Don't let two prefixes for diferent uris in
+                // Sanity check: Don't let two prefixes for different uris in
                 // same depth
                 if (prefixUriMap.containsKey(prefix)) {
                     if (!uri.equals(prefixUriMap.get(prefix))) {
-                        throw new SAXException("Cannot set same prefix to diferent URI in same node: trying to add prefix \""
+                        throw new SAXException("Cannot set same prefix to different URI in same node: trying to add prefix \""
                                 + prefix + "\" for uri \""+uri+"\" whereas the declared ones are " + prefixUriMap);
                     }
                 } else {
                     prefixUriMap.put(prefix, uri);
 
                     // To avoid setting xmlns="" for top node (not very nice :D)
-                    // We need to especificaly check this condition
+                    // We need to specifically check this condition
                     if (!isRootNodeDefaultNs(prefix, uri)) {
 //                        System.out.println(">>>"+XMLOutput.this.hashCode()+">NamespaceStack.pushNamespace() prefix="+prefix+",uri="+uri);
                         contentHandler.startPrefixMapping(prefix, uri);
diff --git a/src/java/org/apache/commons/jelly/expression/CompositeExpression.java b/src/java/org/apache/commons/jelly/expression/CompositeExpression.java
index 300660e..f91a469 100644
--- a/src/java/org/apache/commons/jelly/expression/CompositeExpression.java
+++ b/src/java/org/apache/commons/jelly/expression/CompositeExpression.java
@@ -52,15 +52,15 @@
     }
 
     /**
-     * Parses the given String to be either a ConstantExpresssion, an Expression denoted as
-     * "${foo}" or some String with embedded expresssions such as "abc${something}def${else}xyz"
+     * Parses the given String to be either a ConstantExpression, an Expression denoted as
+     * "${foo}" or some String with embedded expressions such as "abc${something}def${else}xyz"
      * which results in a CompositeExpression being returned.
      *
      * @param text is the String to parse into expressions
-     * @param factory is the Factory of Expression objects used to create expresssions for the contents
+     * @param factory is the Factory of Expression objects used to create expressions for the contents
      *  of the String "foo" inside expressions such as "${foo}"
      *
-     * @return the Expresssion for the given String.
+     * @return the Expression for the given String.
      * @throws JellyException if the text is invalid (such as missing '}' character).
      * @throws JellyException if there was some problem creating the underlying Expression object
      *  from the ExpressionFactory
diff --git a/src/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java b/src/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
index 2b7a014..f29de5b 100644
--- a/src/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
+++ b/src/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
@@ -38,7 +38,7 @@
 
 public class JexlExpressionFactory implements ExpressionFactory {
 
-    /** whether we should allow Ant-style expresssions, using dots as part of variable name */
+    /** whether we should allow Ant-style expressions, using dots as part of variable name */
     private boolean supportAntVariables = true;
 
     // ExpressionFactory interface
@@ -76,7 +76,7 @@
     //-------------------------------------------------------------------------
 
     /**
-     * @return whether we should allow Ant-style expresssions, using dots as
+     * @return whether we should allow Ant-style expressions, using dots as
      * part of variable name
      */
     public boolean isSupportAntVariables() {
@@ -84,14 +84,14 @@
     }
 
     /**
-     * Sets whether we should allow Ant-style expresssions, using dots as
+     * Sets whether we should allow Ant-style expressions, using dots as
      * part of variable name
      */
     public void setSupportAntVariables(boolean supportAntVariables) {
         this.supportAntVariables = supportAntVariables;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/java/org/apache/commons/jelly/expression/package.html b/src/java/org/apache/commons/jelly/expression/package.html
index 1f4da0a..873f641 100644
--- a/src/java/org/apache/commons/jelly/expression/package.html
+++ b/src/java/org/apache/commons/jelly/expression/package.html
@@ -20,7 +20,7 @@
 </head>
 <body>
 
-  <p>Implementations of the Expression classes using commons-jexl.
+  <p>Implementstions of the Expression classes using commons-jexl.
   </p>
 
 </body>
diff --git a/src/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java b/src/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
index b91ffc3..0186007 100644
--- a/src/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
+++ b/src/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
@@ -114,7 +114,7 @@
         return value;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java b/src/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
index 5a0789f..4849317 100644
--- a/src/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
+++ b/src/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
@@ -27,7 +27,7 @@
 
 
 /**
- * <p><code>DefaultTagLibraryResolver</code> is a default implemenation
+ * <p><code>DefaultTagLibraryResolver</code> is a default implementation
  * which attempts to interpret the URI as a String called 'jelly:className'
  * and class load the given Java class. Otherwise META-INF/services/jelly/uri
  * is searched for on the thread context's class path and, if found, that
@@ -181,7 +181,7 @@
         this.discovery = discovery;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java b/src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
index cb824e0..1c0cac3 100644
--- a/src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
+++ b/src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
@@ -200,7 +200,7 @@
     /**
      * Report the state of the bean when method invocation fails
      * so that the user can determine any problems that might
-     * be occuring while using dynamic jelly beans.
+     * be occurring while using dynamic jelly beans.
      *
      * @param bean Bean on which <code>method</code was invoked
      * @param method Method that was invoked
diff --git a/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java b/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
index e0c1414..98e5993 100644
--- a/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
+++ b/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
@@ -31,7 +31,7 @@
 /**
  * This tag is bound onto a {@link DynaClass} instance.
  * When the tag is invoked a {@link DynaBean will be created using the tags attributes.
- * So this class is like a {@link DynaBean} implemenation of {@link DynamicBeanTag}
+ * So this class is like a {@link DynaBean} implementation of {@link DynamicBeanTag}
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @version $Revision$
diff --git a/src/java/org/apache/commons/jelly/impl/ScriptBlock.java b/src/java/org/apache/commons/jelly/impl/ScriptBlock.java
index dcd058c..3276ad3 100644
--- a/src/java/org/apache/commons/jelly/impl/ScriptBlock.java
+++ b/src/java/org/apache/commons/jelly/impl/ScriptBlock.java
@@ -61,7 +61,7 @@
 
     /**
      * Gets the child scripts that make up this block. This list is live
-     * so that it can be modified if requried
+     * so that it can be modified if required
      */
     public List getScriptList() {
         return list;
diff --git a/src/java/org/apache/commons/jelly/impl/TagScript.java b/src/java/org/apache/commons/jelly/impl/TagScript.java
index 41cb017..67135b4 100644
--- a/src/java/org/apache/commons/jelly/impl/TagScript.java
+++ b/src/java/org/apache/commons/jelly/impl/TagScript.java
@@ -511,7 +511,7 @@
         return namespaceContext;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/java/org/apache/commons/jelly/parser/XMLParser.java b/src/java/org/apache/commons/jelly/parser/XMLParser.java
index 3ebf335..1832d46 100644
--- a/src/java/org/apache/commons/jelly/parser/XMLParser.java
+++ b/src/java/org/apache/commons/jelly/parser/XMLParser.java
@@ -202,7 +202,7 @@
      * allows XMLParser to be used in environments which are unfriendly to
      * JAXP1.1 (such as WebLogic 6.0).  Note that if you use this option you
      * have to configure namespace and validation support yourself, as these
-     * properties only affect the SAXParser and emtpy constructor.
+     * properties only affect the SAXParser and empty constructor.
      */
     public XMLParser(XMLReader reader) {
         this.reader = reader;
@@ -952,7 +952,7 @@
         }
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     /**
      * If this object has not been configured then register the default
@@ -1033,7 +1033,7 @@
             if (taglib == null) {
                 if (namespaceURI != null && namespaceURI.startsWith("jelly:")) {
                     String uri = namespaceURI.substring(6);
-                    // try to find the class on the claspath
+                    // try to find the class on the classpath
                     try {
                         Class taglibClass = getClassLoader().loadClass(uri);
                         taglib = (TagLibrary) taglibClass.newInstance();
diff --git a/src/java/org/apache/commons/jelly/tags/core/CatchTag.java b/src/java/org/apache/commons/jelly/tags/core/CatchTag.java
index d9be1c6..a44434a 100644
--- a/src/java/org/apache/commons/jelly/tags/core/CatchTag.java
+++ b/src/java/org/apache/commons/jelly/tags/core/CatchTag.java
@@ -136,7 +136,7 @@
 
 	
 	/**
-	 * Build exception classe set
+	 * Build exception classes set
 	 * @throws ClassNotFoundException
 	 * 
 	 */
diff --git a/src/java/org/apache/commons/jelly/tags/core/ImportTag.java b/src/java/org/apache/commons/jelly/tags/core/ImportTag.java
index 9959732..f28d1d5 100644
--- a/src/java/org/apache/commons/jelly/tags/core/ImportTag.java
+++ b/src/java/org/apache/commons/jelly/tags/core/ImportTag.java
@@ -93,14 +93,14 @@
     //-------------------------------------------------------------------------
 
     /**
-     * @return whether property inheritence is enabled
+     * @return whether property inheritance is enabled
      */
     public boolean isInherit() {
         return inherit;
     }
 
     /**
-     * Sets whether property inheritence is enabled or disabled
+     * Sets whether property inheritance is enabled or disabled
      */
     public void setInherit(boolean inherit) {
         this.inherit = inherit;
diff --git a/src/java/org/apache/commons/jelly/tags/core/InvokeTag.java b/src/java/org/apache/commons/jelly/tags/core/InvokeTag.java
index 857be78..176afb6 100644
--- a/src/java/org/apache/commons/jelly/tags/core/InvokeTag.java
+++ b/src/java/org/apache/commons/jelly/tags/core/InvokeTag.java
@@ -27,7 +27,7 @@
 import org.apache.commons.jelly.XMLOutput;
 
 /**
-  * A tag which calls a method in an object instantied by core:new
+  * A tag which calls a method in an object instantiated by core:new
   *
   *
   * @author Rodney Waldhoff
diff --git a/src/java/org/apache/commons/jelly/tags/core/ParseTag.java b/src/java/org/apache/commons/jelly/tags/core/ParseTag.java
index 387e1b1..42ecbdf 100644
--- a/src/java/org/apache/commons/jelly/tags/core/ParseTag.java
+++ b/src/java/org/apache/commons/jelly/tags/core/ParseTag.java
@@ -153,7 +153,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java b/src/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
index dbc6a75..0ceb7b7 100644
--- a/src/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
+++ b/src/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
@@ -72,7 +72,7 @@
         setBeanProperties(bean, attributes);
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/java/org/apache/commons/jelly/tags/core/SetTag.java b/src/java/org/apache/commons/jelly/tags/core/SetTag.java
index 4b3f3bb..8bfa579 100644
--- a/src/java/org/apache/commons/jelly/tags/core/SetTag.java
+++ b/src/java/org/apache/commons/jelly/tags/core/SetTag.java
@@ -129,7 +129,7 @@
     }
 
     /**
-     * Sets the default value to be used if the value exprsesion results
+     * Sets the default value to be used if the value expression results
      * in a null value or blank String
      */
     public void setDefaultValue(Expression defaultValue) {
@@ -164,7 +164,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected void setPropertyValue( Object target, String property, Object value ) {
         try {
diff --git a/src/java/org/apache/commons/jelly/tags/core/UseBeanTag.java b/src/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
index 78af461..aeee07d 100644
--- a/src/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
+++ b/src/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
@@ -116,11 +116,11 @@
         }
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
-     * Allow derived classes to programatically set the bean
+     * Allow derived classes to programmatically set the bean
      */
     protected void setBean(Object bean) {
         this.bean = bean;
@@ -153,7 +153,7 @@
     /**
      * Loads the given class using the default class loading mechanism
      * which is to try use the current Thread's context class loader first
-     * otherise use the class loader which loaded this class.
+     * otherwise use the class loader which loaded this class.
      */
     protected Class loadClass(String className) throws ClassNotFoundException {
         return ClassLoaderUtils.loadClass(className, getClass());
diff --git a/src/java/org/apache/commons/jelly/tags/core/UseListTag.java b/src/java/org/apache/commons/jelly/tags/core/UseListTag.java
index 5396209..6787cab 100644
--- a/src/java/org/apache/commons/jelly/tags/core/UseListTag.java
+++ b/src/java/org/apache/commons/jelly/tags/core/UseListTag.java
@@ -63,7 +63,7 @@
     }
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     protected void setBeanProperties(Object bean, Map attributes) throws JellyTagException {
diff --git a/src/java/org/apache/commons/jelly/xpath/XPathTagSupport.java b/src/java/org/apache/commons/jelly/xpath/XPathTagSupport.java
index e81569e..ad8785f 100644
--- a/src/java/org/apache/commons/jelly/xpath/XPathTagSupport.java
+++ b/src/java/org/apache/commons/jelly/xpath/XPathTagSupport.java
@@ -18,14 +18,14 @@
 
 import org.apache.commons.jelly.TagSupport;
 
-/** An abstract base class useful for implementation inheritence
+/** An abstract base class useful for implementation inheritance
   *
   * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
   * @version $Revision$
   */
 public abstract class XPathTagSupport extends TagSupport {
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
     protected Object getXPathContext() {
         XPathSource tag = (XPathSource) findAncestorWithClass( XPathSource.class );
diff --git a/src/test/org/apache/commons/jelly/TestXMLOutput.java b/src/test/org/apache/commons/jelly/TestXMLOutput.java
index 2844580..7db0216 100644
--- a/src/test/org/apache/commons/jelly/TestXMLOutput.java
+++ b/src/test/org/apache/commons/jelly/TestXMLOutput.java
@@ -61,10 +61,10 @@
         
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         
-        XMLOutput ouput = XMLOutput.createXMLOutput(bos);
+        XMLOutput output = XMLOutput.createXMLOutput(bos);
         
-        script.run(getJellyContext(),ouput);
-        ouput.flush();
+        script.run(getJellyContext(),output);
+        output.flush();
         assertEquals("<html></html>",bos.toString());
     }
     
@@ -73,10 +73,10 @@
         Script script = getJelly().compileScript();
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLOutput ouput = XMLOutput.createXMLOutput(bos);
+        XMLOutput output = XMLOutput.createXMLOutput(bos);
 
-        script.run(getJellyContext(),ouput);
-        ouput.flush();
+        script.run(getJellyContext(),output);
+        output.flush();
         assertEquals("[string]",bos.toString().trim());
 	}
 }
diff --git a/src/test/org/apache/commons/jelly/core/TestModularExceptionBean.java b/src/test/org/apache/commons/jelly/core/TestModularExceptionBean.java
index 5f928b5..6461209 100644
--- a/src/test/org/apache/commons/jelly/core/TestModularExceptionBean.java
+++ b/src/test/org/apache/commons/jelly/core/TestModularExceptionBean.java
@@ -45,7 +45,7 @@
         bean.setException(NullPointerException.class.getName());
         try {
             bean.throwIt("myTest");
-            fail("Exception must be cacthed");
+            fail("Exception must be caught");
         } catch ( NullPointerException e) {
             
         } catch (Throwable e) {
diff --git a/src/test/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java b/src/test/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
index 0842308..2434c0b 100644
--- a/src/test/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
+++ b/src/test/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
@@ -35,7 +35,7 @@
 
 /**
  * This test illustrates pre-1.0 Jelly behavior that did not cache tags by default. Many user tag implementations
- * will assume that they are at an initalized state when doTag() is called, rather than still being "dirty" from a
+ * will assume that they are at an initialized state when doTag() is called, rather than still being "dirty" from a
  * prior run.
  *
  * @author <a href="mailto:proyal@apache.org">peter royal</a>
diff --git a/src/test/org/apache/commons/jelly/expression/TestExpressions.java b/src/test/org/apache/commons/jelly/expression/TestExpressions.java
index 69e4b9d..862c262 100644
--- a/src/test/org/apache/commons/jelly/expression/TestExpressions.java
+++ b/src/test/org/apache/commons/jelly/expression/TestExpressions.java
@@ -52,7 +52,7 @@
         super(testName);
     }
 
-    public void testExpresssions() throws Exception {
+    public void testExpressions() throws Exception {
         context.setVariable("topping", "cheese");
         context.setVariable("type", "deepPan");
 
@@ -87,7 +87,7 @@
         }
     }
 
-    public void testAntExpresssions() throws Exception {
+    public void testAntExpressions() throws Exception {
         context.setVariable("maven.home.foo", "cheese");
 
         assertExpression("${maven.home.foo}", "cheese");
diff --git a/src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java b/src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java
index 4afc61f..ccbc626 100644
--- a/src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java
+++ b/src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java
@@ -42,7 +42,7 @@
 
     public void testResolver() throws Exception {
         /**
-         * @todo temporary disbled test case until I can figure out how to get
+         * @todo temporary disabled test case until I can figure out how to get
          * it to work with commons-discovery
          */
 /*
diff --git a/src/test/org/apache/commons/jelly/tags/junit/AssertTagSupport.java b/src/test/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
index dc4ef86..00603a2 100644
--- a/src/test/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
+++ b/src/test/org/apache/commons/jelly/tags/junit/AssertTagSupport.java
@@ -20,7 +20,7 @@
 
 /**
  * The abstract base class of any assertion tag which is
- * useful for implementation inheritence.
+ * useful for implementation inheritance.
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @version $Revision$
@@ -30,7 +30,7 @@
     public AssertTagSupport() {
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/test/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java b/src/test/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
index 5515c58..5e75354 100644
--- a/src/test/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
+++ b/src/test/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
@@ -112,7 +112,7 @@
         return ClassLoaderUtils.getClassLoader(classLoader, getClass());
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/test/org/apache/commons/jelly/tags/junit/CaseTag.java b/src/test/org/apache/commons/jelly/tags/junit/CaseTag.java
index 9434b86..a355461 100644
--- a/src/test/org/apache/commons/jelly/tags/junit/CaseTag.java
+++ b/src/test/org/apache/commons/jelly/tags/junit/CaseTag.java
@@ -52,7 +52,7 @@
                 // will have its own variable scopes
                 JellyContext newContext = new JellyContext( context );
 
-                // disable inheritence of variables and tag libraries
+                // disable inheritance of variables and tag libraries
                 newContext.setExportLibraries(false);
                 newContext.setExport(false);
 
@@ -86,11 +86,11 @@
         this.name = name;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
-     * Strategy method to find the corrent TestSuite to add a new Test case to
+     * Strategy method to find the current TestSuite to add a new Test case to
      */
     protected TestSuite getSuite() {
         SuiteTag tag = (SuiteTag) findAncestorWithClass( SuiteTag.class );
diff --git a/src/test/org/apache/commons/jelly/tags/junit/JellyTestSuite.java b/src/test/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
index 6444454..78123d4 100644
--- a/src/test/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
+++ b/src/test/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
@@ -44,7 +44,7 @@
      * <code>
      * createTestSuite( Foo.class, "suite.jelly" );
      * </code>
-     * which would loaad the 'suite.jelly script from the same package as the Foo
+     * which would load the 'suite.jelly script from the same package as the Foo
      * class on the classpath.
      *
      * @param testClass is the test class used to load the script via the classpath
diff --git a/src/test/org/apache/commons/jelly/tags/junit/RunTag.java b/src/test/org/apache/commons/jelly/tags/junit/RunTag.java
index 91932eb..823fe6e 100644
--- a/src/test/org/apache/commons/jelly/tags/junit/RunTag.java
+++ b/src/test/org/apache/commons/jelly/tags/junit/RunTag.java
@@ -125,7 +125,7 @@
 
 
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/test/org/apache/commons/jelly/tags/junit/SuiteTag.java b/src/test/org/apache/commons/jelly/tags/junit/SuiteTag.java
index 6995b72..e629fd1 100644
--- a/src/test/org/apache/commons/jelly/tags/junit/SuiteTag.java
+++ b/src/test/org/apache/commons/jelly/tags/junit/SuiteTag.java
@@ -98,7 +98,7 @@
         this.name = name;
     }
 
-    // Implementation methods
+    // Implementstion methods
     //-------------------------------------------------------------------------
 
     /**
diff --git a/src/test/org/apache/commons/jelly/test/impl/TestEmbedded.java b/src/test/org/apache/commons/jelly/test/impl/TestEmbedded.java
index 0814a85..f7b1167 100644
--- a/src/test/org/apache/commons/jelly/test/impl/TestEmbedded.java
+++ b/src/test/org/apache/commons/jelly/test/impl/TestEmbedded.java
@@ -69,8 +69,8 @@
         embedded.setOutputStream(baos);
         boolean status = embedded.execute();
         //executed properly without script errors
-        assertTrue("Emebedded execution failed", status);
-        //check that the output  confirms the exepected
+        assertTrue("Embedded execution failed", status);
+        //check that the output  confirms the expected
         assertEquals("jelly-test-case", new String(baos.toByteArray()));
         //test generation of error
         embedded.setScript(jellyScript + "obnoxious-part");
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e0eca79..71bf22a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -38,7 +38,7 @@
     </release>
     <release version="1.0-RC1" date="2004-11-22">
       <action dev="dion" type="fix" issue="JELLY-148" due-to="Hans Gilde">Huge memory leak resulting from the use of ThreadLocal.</action>
-      <action dev="dion" type="fix" issue="JELLY-138">Character data is flushed by XMLOuput while XML data isn't.</action>
+      <action dev="dion" type="fix" issue="JELLY-138">Character data is flushed by XMLOutput while XML data isn't.</action>
       <action dev="dion" type="update">Move to beanutils 1.7.0.</action>
       <action dev="dion" type="fix" issue="JELLY-45">Scripts set the context URL when executing so that resources are found relative to the current script.</action>
       <action dev="dion" type="add" issue="JELLY-49">Add Regexp taglib</action>
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index 9a706f9..12f985f 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -178,7 +178,7 @@
                     </a>
         </dt>
         <dd>
-            When you build a binary disitribution of Jelly, 
+            When you build a binary distribution of Jelly, 
             there is a jelly script which works on Windows and Unixes to run Jelly.
             You can create a binary distribution of Jelly via
             <code>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index b63b0de..c16a077 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -39,7 +39,7 @@
 to <a href="http://jakarta.apache.org/ant/">Ant</a> 
 such as in the <a href="http://maven.apache.org/">Maven</a>
 project, as a testing framework such as <a href="jellyunit.html">JellyUnit</a>, 
-in an intergration or workflow
+in an integration or workflow
 system such as <a href="http://werkflow.werken.com/">werkflow</a> 
 or as a page templating system inside engines like 
 <a href="http://cocoon.apache.org/">Cocoon</a>.
@@ -283,7 +283,7 @@
   <ul>
     <li><a href="http://java.sun.com/products/jsp/jstl/1.1/docs/tlddocs/index.html">JSTL Tag reference</a></li>
     <li><a href="http://java.sun.com/products/jsp/jstl/1.1/docs/api/index.html">JSTL API</a></li>
-    <li><a href="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html">Apache JSTL Implementation</a></li>
+    <li><a href="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html">Apache JSTL Implementstion</a></li>
   </ul>
 </section>
 
diff --git a/xdocs/jellyswing.xml b/xdocs/jellyswing.xml
index 41bdfb1..67133c9 100644
--- a/xdocs/jellyswing.xml
+++ b/xdocs/jellyswing.xml
@@ -31,7 +31,7 @@
         of your front end and allowing you to bind to Java code for the business objects and models. 
       </p>
       <p>
-        This mechanism uses seperation of concerns and MVC ideas from web applications, allowing the rendering
+        This mechanism uses separation of concerns and MVC ideas from web applications, allowing the rendering
         of your Swing front end to be easily transformed (since its XML) into different styles while leaving your
         model and business objects untouched. It also allows different views to be constructed independently of your models.
       </p>
@@ -81,7 +81,7 @@
         for templating HTML.
       </p>
       <p>
-        The demo was orignally written in
+        The demo was originally written in
         <a href="http://svn.apache.org/repos/asf/commons/proper/jelly/trunk/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/HomepageBuilder.java">Java code</a>
          
         to implement a simple Swing UI
@@ -89,7 +89,7 @@
        <a href="http://svn.apache.org/repos/asf/commons/proper/jelly/trunk/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/homepageBuilder.jelly">as a JellyScript</a>
         as well.
         While this is a fairly simple Swing UI and not a particularly great example of the power of JellySwing,
-        it does highlight the main difference between the two appraches.
+        it does highlight the main difference between the two approaches.
       </p>
     </section>
     
diff --git a/xdocs/jellyswt.xml b/xdocs/jellyswt.xml
index 82bc789..26b04c9 100644
--- a/xdocs/jellyswt.xml
+++ b/xdocs/jellyswt.xml
@@ -31,7 +31,7 @@
         of your front end and allowing you to bind to Java code for the business objects and models. 
       </p>
       <p>
-        This mechanism uses seperation of concerns and MVC ideas from web applications, allowing the rendering
+        This mechanism uses separation of concerns and MVC ideas from web applications, allowing the rendering
         of your SWT front end to be easily transformed (since its XML) into different styles while leaving your
         model and business objects untouched. It also allows different views to be constructed independently of your models.
       </p>
diff --git a/xdocs/todo.xml b/xdocs/todo.xml
index fd85a98..f166993 100644
--- a/xdocs/todo.xml
+++ b/xdocs/todo.xml
@@ -32,7 +32,7 @@
       
     <section name="Core tasks"> 
       <ul>
-        <li>Implementa a META-INF/services mechanism for mapping Jelly libraries to namespace URIs
+        <li>Implements a META-INF/services mechanism for mapping Jelly libraries to namespace URIs
             in a similar way to how the commons-discovery and JAXP libraries work.
             This would allow Jelly libraries to be distributed in a self contained JAR then just put
             on the classpath and they'd be usable.                
@@ -42,7 +42,7 @@
             automatically download the jar and its dependencies from some local/remote repository.
         </li>
         <li>Maybe add a Scope class to make it easier to plugin custom scopes such as 
-            request, session, applicaiton, initParams, params, transation etc.
+            request, session, application, initParams, params, transaction etc.
             In a workflow setting this could also include transient and persistent scopes
         </li>
         <li>Write a JellyServlet so that Jelly can be used as a page templating system.
@@ -90,7 +90,7 @@
             Also we could consider using class names or XSD type names to do conversions of values, maybe using
             the ConvertUtils class in beanutils.
         </li>
-        <li>conside a tag library which implements the <a href="http://stx.gingerall.cz/stx/index.html">STX</a>
+        <li>consider a tag library which implements the <a href="http://stx.gingerall.cz/stx/index.html">STX</a>
             specification for the SAX based transformation of XML. This is kinda like XPath and XSLT but is based
             purely on a SAX stream. Maybe we could wrap <a href="http://www.obqo.de/joost">Joost</a>
             in a Jelly tag library
diff --git a/xdocs/tutorial.xml b/xdocs/tutorial.xml
index 5971275..cafc329 100644
--- a/xdocs/tutorial.xml
+++ b/xdocs/tutorial.xml
@@ -215,7 +215,7 @@
 </p>
 
 <p>
-When you run the program, it will open a window where you can choose a template, and specify a few paramters. Then you simply click on "build page" and voila, your home page is generated by Jelly.
+When you run the program, it will open a window where you can choose a template, and specify a few parameters. Then you simply click on "build page" and voila, your home page is generated by Jelly.
 </p>
 
 <p>
@@ -272,7 +272,7 @@
 </source>
 
 <p>
-As you can see, it's pretty straighforward to call a Jelly script programatically. First you need a context to run the script in. You can think of the context as the "environment" in which the script runs. The script can use and modify variables in the context however it wishes. Then you need an XML output stream where the output of the script will be sent. In some cases, like this one, the XML output is the essential product of the script. In other cases, it may just be a "byproduct" of running the script, used for logging, etc. This is the case when you are running a maven build, for example.
+As you can see, it's pretty straighforward to call a Jelly script programmatically. First you need a context to run the script in. You can think of the context as the "environment" in which the script runs. The script can use and modify variables in the context however it wishes. Then you need an XML output stream where the output of the script will be sent. In some cases, like this one, the XML output is the essential product of the script. In other cases, it may just be a "byproduct" of running the script, used for logging, etc. This is the case when you are running a maven build, for example.
 </p>
 
 <p>
@@ -290,7 +290,7 @@
 </p>
 
 <p>
-To run the demo type "maven demo:jsl" (View the <a href="http://svn.apache.org/repos/asf/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/example.jelly">demo source</a>). The demo transforms the demo source into HTML and ouputs it to the command line, like this:
+To run the demo type "maven demo:jsl" (View the <a href="http://svn.apache.org/repos/asf/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/example.jelly">demo source</a>). The demo transforms the demo source into HTML and outputs it to the command line, like this:
 </p>
 
 <source>