diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html
index c3c0ee7cf..236c80fe1 100644
--- a/docs/manual/OptionalTasks/ejb.html
+++ b/docs/manual/OptionalTasks/ejb.html
@@ -48,9 +48,9 @@ In general these tasks are specific to the particular vendor's EJB Server.</p>
   jboss 2.1</a> and above EJB servers</li>
   <li><a href="http://www.bea.com" target="_top">Weblogic</a>
    4.5.1, 5.1, and 6.0 EJB servers</li>
-  <li><a href="http://www.objectweb.com/jonas/" target="_top">JOnAS</a>
+  <li><a href="http://www.objectweb.org/jonas/" target="_top">JOnAS</a>
    2.4 Open Source EJB server</li>
-  <li>IBM WebSphere 4.0</li>
+  <li><a href="http://www.ibm.com/websphere">IBM WebSphere</a> 4.0</li>
 </ul>
   Over time we expect further optional tasks  to support additional EJB Servers.
 </p>
@@ -65,11 +65,11 @@ In general these tasks are specific to the particular vendor's EJB Server.</p>
  <tr><td><a href="#iplanet-ejbc">iplanet-ejbc</a></td><td colspan="2">iPlanet Application Server 6.0</td></tr>
  <tr><td rowspan="7"><a href="#ejbjar">ejbjar</a></td><td colspan="2" align="center"><b>Nested Elements</b></td></tr>
  <tr><td><a href="BorlandEJBTasks.html">borland</a></td><td>Borland Application Server 4.5</td></tr>
- <tr><td><a href="#ejbjar_jboss">jBoss</a></td><td>jBoss</td></tr>
  <tr><td><a href="#ejbjar_iplanet">iPlanet</a></td><td>iPlanet Application Server 6.0</td></tr>
+ <tr><td><a href="#ejbjar_jboss">jBoss</a></td><td>jBoss</td></tr>
+ <tr><td><a href="#ejbjar_jonas">jonas</a></td><td>JOnAS 2.4</td></tr>
  <tr><td><a href="#ejbjar_weblogic">weblogic</a></td><td>Weblogic 5.1 &amp; 6.0</td></tr>
  <tr><td><a href="#ejbjar_websphere">websphere</a></td><td>IBM WebSphere 4.0</td></tr>
- <tr><td><a href="#ejbjar_jonas">jonas</a></td><td>JOnAS 2.4</td></tr>
  <tr><td><a href="#wlrun">wlrun</a></td><td colspan="2">Weblogic 4.5.1, 5.1 &amp; 6.0</td></tr>
  <tr><td><a href="#wlstop">wlstop</a></td><td colspan="2">Weblogic 4.5.1, 5.1 &amp; 6.0</td></tr>
 
@@ -97,7 +97,7 @@ is based on the standard Ant include and exclude selection mechanisms.
   </tr>
   <tr>
     <td valign="top">dest</td>
-    <td valign="top">The directory where the serialised deployment descriptors will be written</td>
+    <td valign="top">The directory where the serialized deployment descriptors will be written</td>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
@@ -118,20 +118,20 @@ is based on the standard Ant include and exclude selection mechanisms.
 <hr>
 <h2><a name="ejbc">ejbc</a></h2>
 <h3><b>Description:</b></h3>
-<p>The ejbc task will run Weblogic's ejbc tool. This tool will take a serialised deployment descriptor,
+<p>The ejbc task will run Weblogic's ejbc tool. This tool will take a serialized deployment descriptor,
 examine the various EJB interfaces and bean classes and then generate the required support classes
 necessary to deploy the bean in a Weblogic EJB container. This will include the RMI stubs and skeletons
 as well as the classes which implement the bean's home and remote interfaces.</p>
 <p>
 The ant task which runs this tool is able to compile several beans in a single operation. The beans to be
-compiled are selected by including their serialised deployment descriptors. The standard ant
+compiled are selected by including their serialized deployment descriptors. The standard ant
 <code>include</code> and <code>exclude</code> constructs can be used to select the deployment descriptors
 to be included. </p>
 <p>
 Each descriptor is examined to determine whether the generated classes are out of date and need to be
 regenerated. The deployment descriptor is de-serialized to discover the home, remote and
 implementation classes. The corresponding source files are determined and checked to see their
-modification times. These times and the modification time of the serialised descriptor itself are
+modification times. These times and the modification time of the serialized descriptor itself are
 compared with the modification time of the generated classes. If the generated classes are not present
 or are out of date, the ejbc tool is run to generate new versions.</p>
 <h3>Parameters:</h3>
@@ -143,7 +143,7 @@ or are out of date, the ejbc tool is run to generate new versions.</p>
   </tr>
   <tr>
     <td valign="top">descriptors</td>
-    <td valign="top">This is the base directory from which the serialised deployment descriptors are selected.</td>
+    <td valign="top">This is the base directory from which the serialized deployment descriptors are selected.</td>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
@@ -165,7 +165,7 @@ or are out of date, the ejbc tool is run to generate new versions.</p>
   <tr>
     <td valign="top">classpath</td>
     <td valign="top">This classpath must include both the <code>weblogic.ejbc</code> class and the
-                     classfiles of the bean, home interface, remote interface, etc of the bean being
+                     class files of the bean, home interface, remote interface, etc of the bean being
                      processed.</td>
     <td valign="top" align="center">No</td>
   </tr>
@@ -578,8 +578,8 @@ following values
 name of the deployment descriptor.  For an Account bean, for example, the deployment
 descriptor would be named <code>Account-ejb-jar.xml</code>. Vendor specific descriptors are
 located using the same naming convention. The weblogic bean, for example, would be named
-<code>Account-weblogic-ejb-jar.xml</code>. Under this arrangment, the deployment descriptors
-can be separated from the code implementing the beans, which can be useful whe the same bean code
+<code>Account-weblogic-ejb-jar.xml</code>. Under this arrangement, the deployment descriptors
+can be separated from the code implementing the beans, which can be useful when the same bean code
 is deployed in separate beans.
 </p>
 
@@ -792,7 +792,7 @@ deployment element are detailed here.
 
 <p>The jboss element searches for the jboss specific deployment descriptors and adds them
 to the final ejb jar file. Jboss has two deployment descriptors jboss.xml and jaws.xml
-(for container manager persistance only). The Jboss server uses hot deployment and does
+(for container manager persistence only). The Jboss server uses hot deployment and does
 not require compilation of additional stubs and skeletons.</p>
 
 <table border="1" cellpadding="2" cellspacing="0">
@@ -1140,7 +1140,7 @@ This will create only one TOPLink-enabled ejb jar file - 'Address.jar'.</p>
 <h3><a name="ejbjar_websphere">WebSphere element</a></h3>
 
 <p>The websphere element searches for the websphere specific deployment descriptors and
-adds them to the final ejb jar file. Websphere has two specific desriptors for session
+adds them to the final ejb jar file. Websphere has two specific descriptors for session
 beans:
 <ul>
    <li>ibm-ejb-jar-bnd.xmi</li>
@@ -1201,7 +1201,7 @@ the classpath of the ejbdeploy tool (look at the examples below).
   <tr>
     <td valign="top">alwaysrebuild</td>
     <td valign="top">This controls whether ejbdeploy is called although no changes
-                     have occured.</td>
+                     have occurred.</td>
     <td valign="top" align="center">No, defaults to false</td>
   </tr>
   <tr>
@@ -1287,7 +1287,7 @@ the task will fail) and a JAR file named ejb/Account.jar will be written
 in the destination directory.  Note that when the EJB descriptors
 are added to the JAR file, they are automatically renamed META-INF/ejb-jar.xml
 and META-INF/ias-ejb-jar.xml.</p>
-<p>Of course, this naming behavior can be modified by specifying attributes
+<p>Of course, this naming behaviour can be modified by specifying attributes
 in the ejbjar task (for example, basejarname, basenameterminator, and flatdestdir)
 as well as the iplanet element (for example, suffix).  Refer to the
 appropriate documentation for more details.</p>
@@ -1450,7 +1450,7 @@ up to date, and it will do the minimum amount of work required. </p>
  ejb/Account.jar will be written in the destination directory.
 
  </p>
-<p>Of course, this naming behavior can be modified by specifying attributes
+<p>Of course, this naming behaviour can be modified by specifying attributes
  in the ejbjar task (for example, basejarname, basenameterminator, and flatdestdir)
  as well as the iplanet element (for example, suffix).  Refer to the appropriate
  documentation for more details.</p>
@@ -1531,7 +1531,7 @@ source files will be retained.  If omitted, it defaults to "no". </td>
     <td valign="top">secpropag</td>
     <td valign="top">Modify the RMI Skel. and Stub. to implement the
                      implicit propagation of the security context (note that
-                     the transactionnal context is always provided).
+                     the transactional context is always provided).
                      </td>
     <td valign="top" align="center">No, defaults to false.</td>
   </tr>
diff --git a/docs/manual/OptionalTasks/jdepend.html b/docs/manual/OptionalTasks/jdepend.html
index 17ef1c9b8..134700add 100644
--- a/docs/manual/OptionalTasks/jdepend.html
+++ b/docs/manual/OptionalTasks/jdepend.html
@@ -42,7 +42,7 @@ effectively manage and control package dependencies.&quot;</P>
   </tr>
   <tr>
     <td VALIGN=TOP>format</td>
-    <td VALIGN=TOP>The fomat to write the output in. The default is "text", the alternative is "xml"</td>
+    <td VALIGN=TOP>The format to write the output in. The default is "text", the alternative is "xml"</td>
     <td ALIGN=CENTER VALIGN=TOP>No</td>
   </tr>
   <tr>
@@ -117,7 +117,7 @@ This invokes JDepend in a separate VM on the <code>src</code> and <code>testsrc<
 The classpath is defined using nested elements.
 
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 </html>
diff --git a/docs/manual/OptionalTasks/propertyfile.html b/docs/manual/OptionalTasks/propertyfile.html
index e8fc857c0..edd75658b 100644
--- a/docs/manual/OptionalTasks/propertyfile.html
+++ b/docs/manual/OptionalTasks/propertyfile.html
@@ -56,7 +56,7 @@ are lost.  Work is being done to make this task a bit more &quot;human friendly&
 <h3>Parameters specified as nested elements</h3>
 <h4><a name="entryElement">Entry</a></h4>
 <p>Use nested <code>&lt;entry&gt;</code>
-elements to specify actual modifcations to the property file itself.</p>
+elements to specify actual modifications to the property file itself.</p>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
     <td valign="top"><b>Attribute</b></td>
@@ -97,19 +97,19 @@ elements to specify actual modifcations to the property file itself.</p>
     <td valign="top" align="center">No</td>
   </tr>
 </table>
-<p>The rules used when setting a property value are shown below.&nbsp; The 
+<p>The rules used when setting a property value are shown below.&nbsp; The
 operation occurs <b>after</b> these rules are considered.</p>
 
 <ul>
-  <li>If only value is specified, the property is set to it regardless of its 
+  <li>If only value is specified, the property is set to it regardless of its
   previous value.</li>
-  <li>If only default is specified and the property previously existed in the 
+  <li>If only default is specified and the property previously existed in the
   property file, it is unchanged.</li>
-  <li>If only default is specified and the property did not exist in the 
+  <li>If only default is specified and the property did not exist in the
   property file, the property is set to default.</li>
-  <li>If value and default are both specified and the property previously 
+  <li>If value and default are both specified and the property previously
   existed in the property file, the property is set to value.</li>
-  <li>If value and default are both specified and the property did not exist in 
+  <li>If value and default are both specified and the property did not exist in
   the property file, the property is set to default.</li>
 </ul>
 <p>&nbsp;</p>
@@ -169,7 +169,7 @@ Concatenation of strings :</p>
 <p>Each time called, a &quot;.&quot; will be appended to &quot;progress&quot;
 </p>
 <hr>
-<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/manual/OptionalTasks/replaceregexp.html b/docs/manual/OptionalTasks/replaceregexp.html
index 9f880694a..e849e0ad8 100644
--- a/docs/manual/OptionalTasks/replaceregexp.html
+++ b/docs/manual/OptionalTasks/replaceregexp.html
@@ -58,7 +58,7 @@ It is <b>strongly</b> recommended to use Jakarta Oro.
   </tr>
   <tr>
     <td valign="top">replace</td>
-    <td valign="top">The substition pattern to place in the file(s) in place
+    <td valign="top">The substitution pattern to place in the file(s) in place
                      of the regular expression.</td>
     <td align="center">Yes, if no nested &lt;substitution&gt; is used</td>
   </tr>
@@ -66,7 +66,7 @@ It is <b>strongly</b> recommended to use Jakarta Oro.
     <td valign="top">flags</td>
     <td valign="top">The flags to use when matching the regular expression.  For more
                      information, consult the Perl5 syntax<br />
-                     g --> Global replacement.  Replace all occurances found<br />
+                     g --> Global replacement.  Replace all occurences found<br />
                      i --> Case Insensitive.  Do not consider case in the match<br />
                      m --> Multiline.  Treat the string as multiple lines of input, using "^" and "$" as the start or end of any line, respectively, rather than start or end of string.<br />
                      s --> Singleline.  Treat the string as a single line of input, using "." to match any character, including a newline, which normally, it would not match.<br />
@@ -76,7 +76,7 @@ It is <b>strongly</b> recommended to use Jakarta Oro.
     <td valign="top">byline</td>
     <td valign="top">Process the file(s) one line at a time, executing the replacement
                      on one line at a time (<i>true/false</i>).  This is useful if you
-                     want to only replace the first occurance of a regular expression on
+                     want to only replace the first occurence of a regular expression on
                      each line, which is not easy to do when processing the file as a whole.
                      Defaults to <i>false</i>.</td>
     <td valign="top" align="center">No</td>
@@ -103,7 +103,7 @@ value, in the file <code>${src}/build.properties</code></p>
 </blockquote>
 <p>This task supports a nested <i>Substitution</i> element to specify
    the substitution pattern.  You can use this element to refer to a previously
-   defined substition pattern datatype instance.</p>
+   defined substitution pattern datatype instance.</p>
 <blockquote>
      &lt;substitution id="id" pattern="expression" /&gt;<br />
      &lt;substitution refid="id" /&gt;
diff --git a/docs/manual/OptionalTasks/sos.html b/docs/manual/OptionalTasks/sos.html
index 7c6ef1538..bca3ea05c 100644
--- a/docs/manual/OptionalTasks/sos.html
+++ b/docs/manual/OptionalTasks/sos.html
@@ -161,7 +161,7 @@ have been tested with Linux, Solaris &amp; Windows2000.</p>
         </tr>
         <tr>
            <td>nocache</td>
-           <td>true or false - Only needed if SOSHOME is set as an enviroment variable</td>
+           <td>true or false - Only needed if SOSHOME is set as an environment variable</td>
            <td>No</td>
         </tr>
         <tr>
@@ -357,7 +357,7 @@ on the same box as  the  SOS server  &amp; the VSS database is at
     </tr>
     <tr>
        <td>nocache</td>
-       <td>true or false - Only needed if SOSHOME is set as an enviroment variable</td>
+       <td>true or false - Only needed if SOSHOME is set as an environment variable</td>
        <td>No</td>
     </tr>
     <tr>
@@ -478,7 +478,7 @@ messages will be displayed on screen.</small><br>
     </tr>
     <tr>
        <td>nocache</td>
-       <td>true or false - Only needed if SOSHOME is set as an enviroment variable</td>
+       <td>true or false - Only needed if SOSHOME is set as an environment variable</td>
        <td>No</td>
     </tr>
     <tr>
@@ -520,5 +520,8 @@ box (server2) &amp; the VSS database is on a share called "vss". Checks-out
 option was not set. Extra status messages will be displayed on screen. The
 soscmd(.exe) file to be used resides in /usr/local/bin.</small><br>
 <br>
+<hr>
+<p align="center">Copyright &copy; 2002 Apache Software Foundation. All rights
+Reserved.</p>
 </body>
 </html>