diff --git a/build.xml b/build.xml
index 410cb5c95..dc97ec03e 100644
--- a/build.xml
+++ b/build.xml
@@ -13,9 +13,9 @@
 
   <!-- Give user a chance to override without editing this file
        (and without typing -D each time it compiles it) -->
-  <property file=".ant.properties" />
-  <property file="${user.home}/.ant.properties" />
-  <property environment="env" />
+  <property file=".ant.properties"/>
+  <property file="${user.home}/.ant.properties"/>
+  <property environment="env"/>
 
 
   <property name="Name" value="Apache Ant"/>
@@ -23,12 +23,12 @@
   <property name="version" value="1.6alpha"/>
   <property name="manifest-version" value="1.5.9"/>
 
-  <property name="debug" value="true" />
-  <property name="chmod.fail" value="true" />
-  <property name="deprecation" value="false" />
-  <property name="optimize" value="true" />
-  <property name="javac.target" value="1.1" />
-  <property name="junit.fork" value="false" />
+  <property name="debug" value="true"/>
+  <property name="chmod.fail" value="true"/>
+  <property name="deprecation" value="false"/>
+  <property name="optimize" value="true"/>
+  <property name="javac.target" value="1.1"/>
+  <property name="junit.fork" value="false"/>
   <property name="junit.filtertrace" value="off"/>
   <property name="junit.summary" value="no"/>
 
@@ -75,19 +75,19 @@
 
   <!-- empty for JDK 1.2+, contains classes.zip otherwise -->
   <path id="classes.zip">
-    <fileset dir="${java.home}" includes="lib/classes.zip" />
+    <fileset dir="${java.home}" includes="lib/classes.zip"/>
   </path>
 
   <path id="tests-classpath">
-    <pathelement location="${build.classes}" />
-    <pathelement location="${build.tests}" />
+    <pathelement location="${build.classes}"/>
+    <pathelement location="${build.tests}"/>
     <!--
         include the test source and test data dirs
         so that we can pick resources via getResource(AsStream)
      -->
     <pathelement location="${tests.dir}"/>
     <pathelement location="${tests.etc.dir}"/>
-    <path refid="classpath" />
+    <path refid="classpath"/>
   </path>
 <!--   turn this path into a string which is passed to the tests -->
   <property name="tests-classpath.value"
@@ -123,68 +123,68 @@
   <!-- depends on JDK version -->
   <patternset id="needs.jdk1.2+">
     <exclude name="${optional.package}/extension/**/*.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${util.package}/optional/NoExitSecurityManager.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${optional.package}/Javah.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${optional.package}/metamata/*.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${optional.package}/ejb/EjbJar.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${optional.package}/ejb/*DeploymentTool.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${optional.package}/ejb/IPlanet*.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${optional.package}/ejb/Borland*.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${optional.package}/j2ee/*.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <!-- uses the context classloader -->
     <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <!-- use various 1.2 methods -->
     <exclude name="${optional.package}/sitraka/**/*.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${optional.package}/ide/VAJ*.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
     <exclude name="${optional.package}/starteam/*.java"
-             unless="jdk1.2+" />
+             unless="jdk1.2+"/>
   </patternset>
   <patternset id="needs.jdk1.3+">
     <exclude name="${ant.package}/taskdefs/TestProcess.java"
-             unless="jdk1.3+" />
+             unless="jdk1.3+"/>
     <exclude name="${optional.package}/extension/**/*.java"
-             unless="jdk1.3+" />
+             unless="jdk1.3+"/>
   </patternset>
   <patternset id="needs.jdk1.4+">
     <exclude name="${regexp.package}/Jdk14Regexp*.java"
-             unless="jdk1.4+" />
+             unless="jdk1.4+"/>
   </patternset>
 
   <!-- classes that should be present in Sun based JVMs, but not in
        Kaffe for example -->
   <patternset id="needs.sun.tools">
     <exclude name="${optional.package}/Native2Ascii.java"
-             unless="sun.tools.present" />
+             unless="sun.tools.present"/>
     <exclude name="${optional.package}/Javah.java"
-             unless="sun.tools.present" />
+             unless="sun.tools.present"/>
   </patternset>
   <patternset id="needs.sun.uue">
     <exclude name="${ant.package}/taskdefs/email/UUMailer.java"
-             unless="sunuue.present" />
+             unless="sunuue.present"/>
   </patternset>
   <patternset id="needs.sun.b64">
     <exclude name="${ant.package}/taskdefs/Get.java"
-             unless="base64.present" />
+             unless="base64.present"/>
     <exclude name="${optional.package}/splash/SplashTask.java"
-             unless="base64.present" />
+             unless="base64.present"/>
   </patternset>
 
   <!-- depends on external libraries -->
   <patternset id="needs.trax">
     <exclude name="${optional.package}/TraXLiaison*.java"
-             unless="trax.present" />
+             unless="trax.present"/>
     <exclude name="${optional.package}/sitraka/**"
              unless="trax.present"/>
     <exclude name="${optional.package}/metamata/MMetrics*"
@@ -196,121 +196,121 @@
   </patternset>
   <patternset id="needs.xalan1">
     <exclude name="${optional.package}/XalanLiaison*.java"
-             unless="xalan.present" />
+             unless="xalan.present"/>
     <exclude name="${optional.package}/junit/Xalan1Executor.java"
-             unless="xalan.present" />
+             unless="xalan.present"/>
   </patternset>
   <patternset id="needs.xalan2">
     <exclude name="${optional.package}/junit/Xalan2Executor.java"
-             unless="xalan2.present" />
+             unless="xalan2.present"/>
   </patternset>
   <patternset id="needs.xslp">
     <exclude name="${optional.package}/XslpLiaison*.java"
-             unless="xslp.present" />
+             unless="xslp.present"/>
   </patternset>
   <patternset id="needs.junit">
-    <exclude name="${optional.package}/junit/*.java" unless="junit.present" />
+    <exclude name="${optional.package}/junit/*.java" unless="junit.present"/>
   </patternset>
   <patternset id="needs.jakarta.regexp">
     <exclude name="${regexp.package}/JakartaRegexp*.java"
-             unless="jakarta.regexp.present" />
+             unless="jakarta.regexp.present"/>
   </patternset>
   <patternset id="needs.jakarta.oro">
     <exclude name="${regexp.package}/JakartaOro*.java"
-             unless="jakarta.oro.present" />
+             unless="jakarta.oro.present"/>
     <exclude name="${optional.package}/perforce/*.java"
-             unless="jakarta.oro.present" />
+             unless="jakarta.oro.present"/>
     <exclude name="${optional.package}/metamata/MAudit*.java"
              unless="jakarta.oro.present"/>
   </patternset>
   <patternset id="needs.jakarta.bcel">
     <exclude name="${ant.package}/filters/util/JavaClassHelper.java"
-             unless="bcel.present" />
+             unless="bcel.present"/>
     <exclude name="${util.package}/depend/bcel/*.java"
-             unless="bcel.present" />
+             unless="bcel.present"/>
     <exclude name="${optional.type.package}/depend/ClassFileSetTest.java"
-             unless="bcel.present" />
+             unless="bcel.present"/>
   </patternset>
   <patternset id="needs.jakarta.log4j">
     <exclude name="${ant.package}/listener/Log4jListener.java"
-             unless="log4j.present" />
+             unless="log4j.present"/>
   </patternset>
   <patternset id="needs.commons.logging">
     <exclude name="${ant.package}/listener/CommonsLoggingListener.java"
-             unless="commons.logging.present" />
+             unless="commons.logging.present"/>
   </patternset>
   <patternset id="needs.bsf">
     <exclude name="${optional.package}/Script.java"
-             unless="bsf.present" />
+             unless="bsf.present"/>
   </patternset>
   <patternset id="needs.stylebook">
     <exclude name="${optional.package}/StyleBook.java"
-             unless="stylebook.present" />
+             unless="stylebook.present"/>
   </patternset>
   <patternset id="needs.javamail">
     <exclude name="${ant.package}/taskdefs/email/MimeMailer.java"
-             unless="javamail.complete" />
+             unless="javamail.complete"/>
   </patternset>
   <patternset id="needs.icontract">
     <exclude name="${optional.package}/IContract.java"
-             unless="icontract.present" />
+             unless="icontract.present"/>
   </patternset>
   <patternset id="needs.netrexx">
     <exclude name="${optional.package}/NetRexxC.java"
-             unless="netrexx.present" />
+             unless="netrexx.present"/>
   </patternset>
   <patternset id="needs.weblogic.ejbc">
     <exclude name="${optional.package}/ejb/Ejbc*.java"
-             unless="ejb.ejbc.present" />
+             unless="ejb.ejbc.present"/>
   </patternset>
   <patternset id="needs.weblogic.ddcreator">
     <exclude name="${optional.package}/ejb/DDCreator*.java"
-             unless="ejb.DDCreator.present" />
+             unless="ejb.DDCreator.present"/>
   </patternset>
   <patternset id="needs.weblogic.server">
     <exclude name="${optional.package}/ejb/WLRun.java"
-             unless="ejb.wls.present" />
+             unless="ejb.wls.present"/>
     <exclude name="${optional.package}/ejb/WLStop.java"
-             unless="ejb.wls.present" />
+             unless="ejb.wls.present"/>
   </patternset>
   <patternset id="needs.netcomponents">
     <exclude name="${optional.package}/net/FTP.java"
-             unless="netcomp.present" />
+             unless="netcomp.present"/>
     <exclude name="${optional.package}/net/TelnetTask.java"
-             unless="netcomp.present" />
+             unless="netcomp.present"/>
   </patternset>
   <patternset id="needs.starteam">
     <exclude name="${optional.package}/scm/AntStarTeam*.java"
-             unless="starteam.present" />
+             unless="starteam.present"/>
     <exclude name="${optional.package}/starteam/*.java"
-             unless="starteam.present" />
+             unless="starteam.present"/>
   </patternset>
   <patternset id="needs.vaj">
     <exclude name="${optional.package}/ide/VAJ*.java"
-             unless="vaj.present" />
+             unless="vaj.present"/>
   </patternset>
   <patternset id="needs.antlr">
-    <exclude name="${optional.package}/ANTLR*.java" unless="antlr.present" />
+    <exclude name="${optional.package}/ANTLR*.java" unless="antlr.present"/>
   </patternset>
   <patternset id="needs.servletapi">
     <exclude name="${optional.package}/ide/VAJ*Servlet.java"
-             unless="servlet.present" />
+             unless="servlet.present"/>
   </patternset>
   <patternset id="needs.jmf">
-    <exclude name="${optional.package}/sound/*.java" unless="jmf.present" />
+    <exclude name="${optional.package}/sound/*.java" unless="jmf.present"/>
   </patternset>
   <patternset id="needs.jai">
     <exclude name="${optional.package}/image/*.java" unless="jai.present"/>
     <exclude name="${ant.package}/types/optional/image/*.java" unless="jai.present"/>
   </patternset>
   <patternset id="needs.jdepend">
-    <exclude name="${optional.package}/jdepend/*" unless="jdepend.present" />
+    <exclude name="${optional.package}/jdepend/*" unless="jdepend.present"/>
   </patternset>
   <patternset id="onlinetests">
-    <exclude name="**/GetTest.java" if="offline" />
+    <exclude name="**/GetTest.java" if="offline"/>
   </patternset>
   <patternset id="needs.swing">
-    <exclude name="${optional.package}/splash/*.java" unless="swing.present" />
+    <exclude name="${optional.package}/splash/*.java" unless="swing.present"/>
   </patternset>
   <patternset id="teststhatfail">
     <exclude name="${ant.package}/types/XMLCatalogTest.java"/>
@@ -323,11 +323,11 @@
        ===================================================================
   -->
   <patternset id="useful.tests">
-    <include name="${ant.package}/BuildFileTest*" />
-    <include name="${regexp.package}/RegexpMatcherTest*" />
-    <include name="${regexp.package}/RegexpTest*" />
-    <include name="${optional.package}/AbstractXSLTLiaisonTest*" />
-    <include name="${ant.package}/types/AbstractFileSetTest*" />
+    <include name="${ant.package}/BuildFileTest*"/>
+    <include name="${regexp.package}/RegexpMatcherTest*"/>
+    <include name="${regexp.package}/RegexpTest*"/>
+    <include name="${optional.package}/AbstractXSLTLiaisonTest*"/>
+    <include name="${ant.package}/types/AbstractFileSetTest*"/>
   </patternset>
   
   <!--
@@ -336,13 +336,13 @@
        ===================================================================
   -->
   <target name="check_for_optional_packages">
-    <available property="jdk1.2+" classname="java.lang.ThreadLocal" />
-    <available property="jdk1.3+" classname="java.lang.StrictMath" />
-    <available property="jdk1.4+" classname="java.lang.CharSequence" />
-    <available property="kaffe" classname="kaffe.util.NotImplemented" />
+    <available property="jdk1.2+" classname="java.lang.ThreadLocal"/>
+    <available property="jdk1.3+" classname="java.lang.StrictMath"/>
+    <available property="jdk1.4+" classname="java.lang.CharSequence"/>
+    <available property="kaffe" classname="kaffe.util.NotImplemented"/>
     <available property="bsf.present"
                classname="com.ibm.bsf.BSFManager"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <condition property="netrexx.present">
       <and>
         <isset property="jdk1.2+"/>
@@ -352,44 +352,44 @@
     </condition>
     <available property="trax.present"
                classname="javax.xml.transform.Transformer"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <condition property="trax.impl.present">
       <or>
         <and>
           <isset property="javax.xml.transform.TransformerFactory"/>
           <available classname="${javax.xml.transform.TransformerFactory}"
-                     classpathref="classpath" />
+                     classpathref="classpath"/>
         </and>
         <available resource="META-INF/services/javax.xml.transform.TransformerFactory"/>
       </or>
     </condition>
     <available property="xslp.present"
                classname="com.kvisco.xsl.XSLProcessor"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="xalan.present"
                classname="org.apache.xalan.xslt.XSLTProcessorFactory"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="xalan2.present"
                classname="org.apache.xalan.transformer.TransformerImpl"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="ejb.ejbc.present"
                classname="weblogic.ejbc"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="ejb.DDCreator.present"
                classname="weblogic.ejb.utils.DDCreator"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="ejb.wls.present"
                classname="weblogic.Server"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="junit.present"
                classname="junit.framework.TestCase"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="netcomp.present"
                classname="com.oroinc.net.ftp.FTPClient"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="starteam.present"
                classname="com.starbase.util.Platform"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="antlr.present"
                classname="antlr.Tool"
                classpathref="classpath"/>
@@ -404,7 +404,7 @@
                classpathref="classpath"/>
     <available property="jakarta.oro.present"
                classname="org.apache.oro.text.regex.Perl5Matcher"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="jmf.present"
                classname="javax.sound.sampled.Clip"
                classpathref="classpath"/>
@@ -429,10 +429,10 @@
                classpathref="classpath"/>
     <available property="xalan.envcheck"
                classname="org.apache.xalan.xslt.EnvironmentCheck"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <available property="which.present"
                classname="org.apache.env.Which"
-               classpathref="classpath" />
+               classpathref="classpath"/>
 
     <available property="servlet.present"
                classname="javax.servlet.Servlet"
@@ -440,7 +440,7 @@
 
     <available property="xerces.present"
                classname="org.apache.xerces.parsers.SAXParser"
-               classpathref="classpath" />
+               classpathref="classpath"/>
     <condition property="bcel.present">
         <and>
             <isset property="jdk1.2+"/>
@@ -450,7 +450,7 @@
     </condition>
     <available property="sunuue.present"
                classname="sun.misc.UUEncoder"
-               classpathref="classpath" />
+               classpathref="classpath"/>
 
     <condition property="javamail.complete">
       <and>
@@ -463,53 +463,53 @@
 
     <condition property="some.regexp.support">
       <or>
-        <isset property="jdk1.4+" />
-        <isset property="jakarta.regexp.present" />
-        <isset property="jakarta.oro.present" />
+        <isset property="jdk1.4+"/>
+        <isset property="jakarta.regexp.present"/>
+        <isset property="jakarta.oro.present"/>
       </or>
     </condition>
 
     <condition property="tests.and.ant.share.classloader">
       <or>
-        <equals arg1="${junit.fork}" arg2="true" />
-        <equals arg1="${build.sysclasspath}" arg2="only" />
+        <equals arg1="${junit.fork}" arg2="true"/>
+        <equals arg1="${build.sysclasspath}" arg2="only"/>
       </or>
     </condition>
 
     <condition property="sun.tools.present">
       <and>
-        <available classname="sun.tools.native2ascii.Main" />
-        <available classname="com.sun.tools.javah.Main" />
+        <available classname="sun.tools.native2ascii.Main"/>
+        <available classname="com.sun.tools.javah.Main"/>
       </and>
     </condition>
 
-    <available property="base64.present" classname="sun.misc.BASE64Encoder" />
+    <available property="base64.present" classname="sun.misc.BASE64Encoder"/>
 
-    <property name="build.tests.resolved" location="${build.tests}" />
+    <property name="build.tests.resolved" location="${build.tests}"/>
     <condition property="tests.are.on.system.classpath">
       <or>
         <!-- relative paths in CLASSPATH -->
         <contains string="${java.class.path}"
-                  substring="${build.tests}" />
+                  substring="${build.tests}"/>
         <!-- absolute paths in CLASSPATH -->
         <contains string="${java.class.path}"
-                  substring="${build.tests.resolved}" />
+                  substring="${build.tests.resolved}"/>
       </or>
     </condition>
 
     <condition property="jasper.present">
       <and>
-        <available classname="org.apache.jasper.compiler.Compiler" />
-        <available classname="org.apache.jasper.JasperException" />
+        <available classname="org.apache.jasper.compiler.Compiler"/>
+        <available classname="org.apache.jasper.JasperException"/>
       </and>
     </condition>
 
     <condition property="swing.present">
       <or>
         <and>
-          <isset property="jdk1.2+" />
+          <isset property="jdk1.2+"/>
           <not>
-            <isset property="kaffe" />
+            <isset property="kaffe"/>
           </not>
         </and>
         <available classname="javax.swing.ImageIcon"
@@ -519,17 +519,17 @@
 
    <condition property="wsdl.found">
       <or>
-        <available file="wsdl"     filepath="${env.PATH}" />
-        <available file="wsdl.exe" filepath="${env.PATH}" />
-        <available file="wsdl.exe" filepath="${env.Path}" />
+        <available file="wsdl"     filepath="${env.PATH}"/>
+        <available file="wsdl.exe" filepath="${env.PATH}"/>
+        <available file="wsdl.exe" filepath="${env.Path}"/>
       </or>
     </condition>
    <echo level="verbose"> wsdl.found=${wsdl.found}</echo>
    <condition property="csc.found">
       <or>
-        <available file="csc"     filepath="${env.PATH}" />
-        <available file="csc.exe" filepath="${env.PATH}" />
-        <available file="csc.exe" filepath="${env.Path}" />
+        <available file="csc"     filepath="${env.PATH}"/>
+        <available file="csc.exe" filepath="${env.PATH}"/>
+        <available file="csc.exe" filepath="${env.Path}"/>
       </or>
     </condition>
    <echo level="verbose"> csc.found=${csc.found}</echo>
@@ -550,13 +550,13 @@
   -->
   <target name="prepare">
     <tstamp>
-      <format property="year" pattern="yyyy" />
+      <format property="year" pattern="yyyy"/>
     </tstamp>
     <filterchain id="ant.filters">
       <replacetokens>
-        <token key="VERSION" value="${version}" />
-        <token key="DATE" value="${TODAY}" />
-        <token key="TIME" value="${TSTAMP}" />
+        <token key="VERSION" value="${version}"/>
+        <token key="DATE" value="${TODAY}"/>
+        <token key="TIME" value="${TSTAMP}"/>
       </replacetokens>
     </filterchain>
   </target>
@@ -579,64 +579,64 @@
            deprecation="${deprecation}"
            target="${javac.target}"
            optimize="${optimize}" >
-      <classpath refid="classpath" />
-
-      <patternset refid="needs.jdk1.2+" />
-      <patternset refid="needs.jdk1.3+" />
-      <patternset refid="needs.jdk1.4+" />
-
-      <patternset refid="needs.jakarta.regexp" />
-      <patternset refid="needs.jakarta.oro" />
-      <patternset refid="needs.jakarta.log4j" />
-      <patternset refid="needs.commons.logging" />
-      <patternset refid="needs.sun.uue" />
-      <patternset refid="needs.javamail" />
-      <patternset refid="needs.icontract" />
-      <patternset refid="needs.bsf" />
-      <patternset refid="needs.stylebook" />
-      <patternset refid="needs.netrexx" />
-      <patternset refid="needs.trax" />
-      <patternset refid="needs.xslp" />
-      <patternset refid="needs.xalan1" />
-      <patternset refid="needs.weblogic.ejbc" />
-      <patternset refid="needs.weblogic.ddcreator" />
-      <patternset refid="needs.weblogic.server" />
-      <patternset refid="needs.junit" />
-      <patternset refid="needs.netcomponents" />
-      <patternset refid="needs.starteam" />
-      <patternset refid="needs.antlr" />
-      <patternset refid="needs.vaj" />
-      <patternset refid="needs.servletapi" />
-      <patternset refid="needs.jmf" />
+      <classpath refid="classpath"/>
+
+      <patternset refid="needs.jdk1.2+"/>
+      <patternset refid="needs.jdk1.3+"/>
+      <patternset refid="needs.jdk1.4+"/>
+
+      <patternset refid="needs.jakarta.regexp"/>
+      <patternset refid="needs.jakarta.oro"/>
+      <patternset refid="needs.jakarta.log4j"/>
+      <patternset refid="needs.commons.logging"/>
+      <patternset refid="needs.sun.uue"/>
+      <patternset refid="needs.javamail"/>
+      <patternset refid="needs.icontract"/>
+      <patternset refid="needs.bsf"/>
+      <patternset refid="needs.stylebook"/>
+      <patternset refid="needs.netrexx"/>
+      <patternset refid="needs.trax"/>
+      <patternset refid="needs.xslp"/>
+      <patternset refid="needs.xalan1"/>
+      <patternset refid="needs.weblogic.ejbc"/>
+      <patternset refid="needs.weblogic.ddcreator"/>
+      <patternset refid="needs.weblogic.server"/>
+      <patternset refid="needs.junit"/>
+      <patternset refid="needs.netcomponents"/>
+      <patternset refid="needs.starteam"/>
+      <patternset refid="needs.antlr"/>
+      <patternset refid="needs.vaj"/>
+      <patternset refid="needs.servletapi"/>
+      <patternset refid="needs.jmf"/>
       <patternset refid="needs.jai"/>
-      <patternset refid="needs.xalan2" />
-      <patternset refid="needs.jdepend" />
-      <patternset refid="needs.sun.tools" />
-      <patternset refid="needs.sun.b64" />
-      <patternset refid="needs.jakarta.bcel" />
-      <patternset refid="needs.swing" />
+      <patternset refid="needs.xalan2"/>
+      <patternset refid="needs.jdepend"/>
+      <patternset refid="needs.sun.tools"/>
+      <patternset refid="needs.sun.b64"/>
+      <patternset refid="needs.jakarta.bcel"/>
+      <patternset refid="needs.swing"/>
     </javac>
 
     <copy todir="${build.classes}">
       <fileset dir="${java.dir}">
-        <include name="**/*.properties" />
-        <include name="**/*.dtd" />
+        <include name="**/*.properties"/>
+        <include name="**/*.dtd"/>
       </fileset>
     </copy>
 
     <copy todir="${build.classes}"
           overwrite="true">
       <fileset dir="${java.dir}">
-        <include name="**/version.txt" />
-        <include name="**/defaultManifest.mf" />
+        <include name="**/version.txt"/>
+        <include name="**/defaultManifest.mf"/>
       </fileset>
       <filterchain refid="ant.filters"/>
     </copy>
 
     <copy todir="${build.classes}/${optional.package}/junit/xsl">
        <fileset dir="${etc.dir}">
-         <include name="junit-frames.xsl" />
-         <include name="junit-noframes.xsl" />
+         <include name="junit-frames.xsl"/>
+         <include name="junit-noframes.xsl"/>
        </fileset>
     </copy>
 
@@ -653,86 +653,86 @@
 
     <copy todir="${build.dir}">
       <fileset dir=".">
-        <include name="LICENSE" />
-        <include name="LICENSE.xerces" />
-        <include name="LICENSE.dom" />
-        <include name="LICENSE.sax" />
+        <include name="LICENSE"/>
+        <include name="LICENSE.xerces"/>
+        <include name="LICENSE.dom"/>
+        <include name="LICENSE.sax"/>
       </fileset>
-      <mapper type="glob" from="*" to="*.txt" />
+      <mapper type="glob" from="*" to="*.txt"/>
     </copy>
 
     <jar destfile="${build.lib}/${name}.jar"
          basedir="${build.classes}"
          manifest="${manifest}">
-      <exclude name="${optional.package}/**" />
-      <exclude name="${optional.type.package}/**" />
-      <exclude name="${util.package}/depend/**" />
-      <exclude name="${util.package}/optional/**" />
-      <exclude name="${util.package}/regexp/Jakarta*" />
-      <exclude name="${util.package}/regexp/Jdk*" />
-      <exclude name="${ant.package}/listener/Log4jListener.class" />
-      <exclude name="${ant.package}/listener/CommonsLoggingListener.class" />
-      <exclude name="${ant.package}/taskdefs/email/UUMailer.class" />
-      <exclude name="${ant.package}/taskdefs/email/MimeMailer.class" />
-      <exclude name="${ant.package}/taskdefs/Get.class" />
+      <exclude name="${optional.package}/**"/>
+      <exclude name="${optional.type.package}/**"/>
+      <exclude name="${util.package}/depend/**"/>
+      <exclude name="${util.package}/optional/**"/>
+      <exclude name="${util.package}/regexp/Jakarta*"/>
+      <exclude name="${util.package}/regexp/Jdk*"/>
+      <exclude name="${ant.package}/listener/Log4jListener.class"/>
+      <exclude name="${ant.package}/listener/CommonsLoggingListener.class"/>
+      <exclude name="${ant.package}/taskdefs/email/UUMailer.class"/>
+      <exclude name="${ant.package}/taskdefs/email/MimeMailer.class"/>
+      <exclude name="${ant.package}/taskdefs/Get.class"/>
       <metainf dir="${build.dir}" includes="LICENSE.txt"/>
 
       <manifest>
         <section name="${ant.package}/">
           <attribute name="Extension-name"
-                     value="org.apache.tools.ant" />
+                     value="org.apache.tools.ant"/>
           <attribute name="Specification-Title"
-                     value="Apache Ant" />
+                     value="Apache Ant"/>
           <attribute name="Specification-Version"
-                     value="${manifest-version}" />
+                     value="${manifest-version}"/>
           <attribute name="Specification-Vendor"
-                     value="Apache Software Foundation" />
+                     value="Apache Software Foundation"/>
           <attribute name="Implementation-Title"
-                     value="org.apache.tools.ant" />
+                     value="org.apache.tools.ant"/>
           <attribute name="Implementation-Version"
-                     value="${manifest-version}" />
+                     value="${manifest-version}"/>
           <attribute name="Implementation-Vendor"
-                     value="Apache Software Foundation" />
+                     value="Apache Software Foundation"/>
         </section>
       </manifest>
 
       <fileset dir="${docs.dir}">
-        <include name="images/ant_logo_large.gif" />
+        <include name="images/ant_logo_large.gif"/>
       </fileset>
     </jar>
 
     <jar destfile="${build.lib}/optional.jar"
          basedir="${build.classes}"
          manifest="${manifest}">
-      <include name="${optional.package}/**" />
-      <include name="${optional.type.package}/**" />
-      <include name="${util.package}/depend/**" />
-      <include name="${util.package}/optional/**" />
-      <include name="${util.package}/regexp/Jakarta*" />
-      <include name="${util.package}/regexp/Jdk*" />
-      <include name="${ant.package}/listener/Log4jListener.class" />
-      <include name="${ant.package}/listener/CommonsLoggingListener.class" />
-      <include name="${ant.package}/taskdefs/email/UUMailer.class" />
-      <include name="${ant.package}/taskdefs/email/MimeMailer.class" />
-      <include name="${ant.package}/taskdefs/Get.class" />
+      <include name="${optional.package}/**"/>
+      <include name="${optional.type.package}/**"/>
+      <include name="${util.package}/depend/**"/>
+      <include name="${util.package}/optional/**"/>
+      <include name="${util.package}/regexp/Jakarta*"/>
+      <include name="${util.package}/regexp/Jdk*"/>
+      <include name="${ant.package}/listener/Log4jListener.class"/>
+      <include name="${ant.package}/listener/CommonsLoggingListener.class"/>
+      <include name="${ant.package}/taskdefs/email/UUMailer.class"/>
+      <include name="${ant.package}/taskdefs/email/MimeMailer.class"/>
+      <include name="${ant.package}/taskdefs/Get.class"/>
       <metainf dir="${build.dir}" includes="LICENSE.txt"/>
 
       <manifest>
         <section name="${optional.package}/">
           <attribute name="Extension-name"
-                     value="org.apache.tools.ant.taskdefs.optional" />
+                     value="org.apache.tools.ant.taskdefs.optional"/>
           <attribute name="Specification-Title"
-                     value="Apache Ant Optional Tasks" />
+                     value="Apache Ant Optional Tasks"/>
           <attribute name="Specification-Version"
-                     value="${manifest-version}" />
+                     value="${manifest-version}"/>
           <attribute name="Specification-Vendor"
-                     value="Apache Software Foundation" />
+                     value="Apache Software Foundation"/>
           <attribute name="Implementation-Title"
-                     value="org.apache.tools.ant.taskdefs.optional" />
+                     value="org.apache.tools.ant.taskdefs.optional"/>
           <attribute name="Implementation-Version"
-                     value="${manifest-version}" />
+                     value="${manifest-version}"/>
           <attribute name="Implementation-Vendor"
-                     value="Apache Software Foundation" />
+                     value="Apache Software Foundation"/>
         </section>
       </manifest>
     </jar>
@@ -746,7 +746,7 @@
 
     <jar destfile="${build.lib}/${name}-testutil.jar"
          basedir="${build.tests}">
-      <patternset refid="useful.tests" />
+      <patternset refid="useful.tests"/>
     </jar>
   </target>
 
@@ -768,26 +768,26 @@
     </copy>
 
     <copy todir="${dist.bin}">
-      <fileset dir="${script.dir}/" />
+      <fileset dir="${script.dir}/"/>
     </copy>
 
-    <fixcrlf srcdir="${dist.bin}" eol="crlf" includes="*.bat" />
+    <fixcrlf srcdir="${dist.bin}" eol="crlf" includes="*.bat"/>
     <fixcrlf srcdir="${dist.bin}" eol="lf">
-      <include name="ant" />
-      <include name="antRun" />
-      <include name="*.pl" />
+      <include name="ant"/>
+      <include name="antRun"/>
+      <include name="*.pl"/>
     </fixcrlf>
 
     <chmod perm="ugo+rx" dir="${dist.dir}" type="dir" includes="**"
-           failonerror="${chmod.fail}" />
+           failonerror="${chmod.fail}"/>
     <chmod perm="ugo+r" dir="${dist.dir}" type="file" includes="**"
-           failonerror="${chmod.fail}" />
+           failonerror="${chmod.fail}"/>
     <chmod perm="ugo+x" type="file" failonerror="${chmod.fail}">
        <fileset dir="${dist.bin}">
-         <include name="**/ant" />
-         <include name="**/antRun" />
-         <include name="**/*.pl" />
-         <include name="**/*.py" />
+         <include name="**/ant"/>
+         <include name="**/antRun"/>
+         <include name="**/*.pl"/>
+         <include name="**/*.py"/>
        </fileset>
     </chmod>
 
@@ -800,7 +800,7 @@
   -->
   <target name="dist" description="--> creates a complete distribution">
     <antcall inheritAll="false" target="internal_dist">
-      <param name="dist.dir" value="${dist.name}" />
+      <param name="dist.dir" value="${dist.name}"/>
     </antcall>
   </target>
 
@@ -818,8 +818,8 @@
 
     <copy todir="${dist.lib}">
       <fileset dir="${lib.dir}">
-        <include name="*.jar" />
-        <include name="*.zip" />
+        <include name="*.jar"/>
+        <include name="*.zip"/>
       </fileset>
     </copy>
 
@@ -849,15 +849,15 @@
     </copy>
 
     <chmod perm="ugo+rx" dir="${dist.dir}" type="dir" includes="**"
-           failonerror="${chmod.fail}" />
+           failonerror="${chmod.fail}"/>
     <chmod perm="ugo+r" dir="${dist.dir}" type="file" includes="**"
-           failonerror="${chmod.fail}" />
+           failonerror="${chmod.fail}"/>
     <chmod perm="ugo+x" type="file" failonerror="${chmod.fail}">
        <fileset dir="${dist.bin}">
-         <include name="**/ant" />
-         <include name="**/antRun" />
-         <include name="**/*.pl" />
-         <include name="**/*.py" />
+         <include name="**/ant"/>
+         <include name="**/antRun"/>
+         <include name="**/*.pl"/>
+         <include name="**/*.py"/>
        </fileset>
     </chmod>
 
@@ -888,7 +888,7 @@
   -->
   <target name="bootstrap" description="--> creates a bootstrap build">
     <antcall inheritAll="false" target="dist-lite">
-      <param name="dist.dir" value="${bootstrap.dir}" />
+      <param name="dist.dir" value="${bootstrap.dir}"/>
     </antcall>
   </target>
 
@@ -901,12 +901,12 @@
   <target name="src-dist"
           description="--> creates a source distribution">
 
-    <mkdir dir="${src.dist.dir}" />
+    <mkdir dir="${src.dist.dir}"/>
 
     <copy todir="${src.dist.lib}">
       <fileset dir="${lib.dir}">
-        <include name="*.jar" />
-        <include name="*.zip" />
+        <include name="*.jar"/>
+        <include name="*.zip"/>
         <include name="README"/>
       </fileset>
     </copy>
@@ -940,27 +940,27 @@
       </fileset>
     </copy>
 
-    <fixcrlf srcdir="${src.dist.dir}" eol="crlf" includes="*.bat" />
+    <fixcrlf srcdir="${src.dist.dir}" eol="crlf" includes="*.bat"/>
     <fixcrlf srcdir="${src.dist.dir}" eol="lf">
-      <include name="**/*.sh" />
-      <include name="**/*.pl" />
-      <include name="**/ant" />
-      <include name="**/antRun" />
+      <include name="**/*.sh"/>
+      <include name="**/*.pl"/>
+      <include name="**/ant"/>
+      <include name="**/antRun"/>
     </fixcrlf>
     <fixcrlf srcdir="${src.dist.dir}">
-      <include name="**/*.java" />
+      <include name="**/*.java"/>
     </fixcrlf>
 
     <chmod perm="ugo+x" dir="${src.dist.dir}" type="dir"
-           failonerror="${chmod.fail}" />
-    <chmod perm="ugo+r" dir="${src.dist.dir}" failonerror="${chmod.fail}" />
+           failonerror="${chmod.fail}"/>
+    <chmod perm="ugo+r" dir="${src.dist.dir}" failonerror="${chmod.fail}"/>
     <chmod perm="ugo+x" failonerror="${chmod.fail}">
        <fileset dir="${src.dist.dir}">
-         <include name="**/.sh" />
-         <include name="**/.pl" />
-         <include name="**/.py" />
-         <include name="**/ant" />
-         <include name="**/antRun" />
+         <include name="**/.sh"/>
+         <include name="**/.pl"/>
+         <include name="**/.py"/>
+         <include name="**/ant"/>
+         <include name="**/antRun"/>
        </fileset>
     </chmod>
 
@@ -973,13 +973,13 @@
   -->
   <target name="main_distribution"
           description="--> creates the zip and tar distributions">
-    <delete dir="${dist.name}" />
+    <delete dir="${dist.name}"/>
     <mkdir dir="${dist.base}"/>
     <mkdir dir="${dist.base}/src"/>
     <mkdir dir="${dist.base}/bin"/>
 
     <antcall inheritAll="false" target="internal_dist">
-      <param name="dist.dir" value="${dist.name}" />
+      <param name="dist.dir" value="${dist.name}"/>
     </antcall>
     <zip destfile="${dist.base}/bin/${dist.name}-bin.zip"
          basedir="${dist.name}/.."
@@ -1005,17 +1005,17 @@
     <bzip2 zipfile="${dist.base}/bin/${dist.name}-bin.tar.bz2"
            src="${dist.base}/bin/${dist.name}-bin.tar"/>
     <delete file="${dist.base}/bin/${dist.name}-bin.tar"/>
-    <delete dir="${dist.name}" />
+    <delete dir="${dist.name}"/>
     <checksum fileext=".md5">
       <fileset dir="${dist.base}/bin/">
-        <include name="**/*" />
-        <exclude name="**/*.asc" />
-        <exclude name="**/*.md5" />
+        <include name="**/*"/>
+        <exclude name="**/*.asc"/>
+        <exclude name="**/*.md5"/>
       </fileset>
     </checksum>
 
     <antcall inheritAll="false" target="src-dist">
-      <param name="src.dist.dir" value="${dist.name}" />
+      <param name="src.dist.dir" value="${dist.name}"/>
     </antcall>
     <zip destfile="${dist.base}/src/${dist.name}-src.zip"
          basedir="${dist.name}/.."
@@ -1037,12 +1037,12 @@
     <bzip2 zipfile="${dist.base}/src/${dist.name}-src.tar.bz2"
            src="${dist.base}/src/${dist.name}-src.tar"/>
     <delete file="${dist.base}/src/${dist.name}-src.tar"/>
-    <delete dir="${dist.name}" />
+    <delete dir="${dist.name}"/>
     <checksum fileext=".md5">
       <fileset dir="${dist.base}/src/">
-        <include name="**/*" />
-        <exclude name="**/*.asc" />
-        <exclude name="**/*.md5" />
+        <include name="**/*"/>
+        <exclude name="**/*.asc"/>
+        <exclude name="**/*.md5"/>
       </fileset>
     </checksum>
   </target>
@@ -1059,9 +1059,9 @@
   -->
   <target name="clean"
           description="--> cleans up build and dist directories">
-    <delete dir="${build.dir}" />
-    <delete dir="${dist.base}" />
-    <delete dir="${dist.dir}" />
+    <delete dir="${build.dir}"/>
+    <delete dir="${dist.base}"/>
+    <delete dir="${dist.dir}"/>
     <delete>
       <fileset dir="." includes="**/*~" defaultexcludes="no"/>
     </delete>
@@ -1075,10 +1075,10 @@
   <target name="allclean"
           depends="clean"
           description="--> cleans up everything">
-    <delete file="${bootstrap.dir}/bin/antRun" />
-    <delete file="${bootstrap.dir}/bin/antRun.bat" />
-    <delete file="${bootstrap.dir}/bin/*.pl" />
-    <delete file="${bootstrap.dir}/bin/*.py" />
+    <delete file="${bootstrap.dir}/bin/antRun"/>
+    <delete file="${bootstrap.dir}/bin/antRun.bat"/>
+    <delete file="${bootstrap.dir}/bin/*.pl"/>
+    <delete file="${bootstrap.dir}/bin/*.py"/>
   </target>
 
   <!--
@@ -1088,13 +1088,13 @@
   -->
   <target name="install" if="ant.install">
     <antcall inheritAll="false" target="internal_dist">
-      <param name="dist.dir" value="${ant.install}" />
+      <param name="dist.dir" value="${ant.install}"/>
     </antcall>
   </target>
 
   <target name="install-lite" if="ant.install">
     <antcall inheritAll="false" target="dist-lite">
-      <param name="dist.dir" value="${ant.install}" />
+      <param name="dist.dir" value="${ant.install}"/>
     </antcall>
   </target>
 
@@ -1111,7 +1111,7 @@
     <uptodate property="tests.javadoc.notrequired"
               targetfile="${build.tests.javadocs}/packages.html" >
       <srcfiles dir= "${tests.dir}">
-        <patternset refid="useful.tests" />
+        <patternset refid="useful.tests"/>
       </srcfiles>
     </uptodate>
   </target>
@@ -1128,17 +1128,17 @@
              windowtitle="${Name} API"
              doctitle="${Name}">
 
-      <packageset dir="${java.dir}" />
+      <packageset dir="${java.dir}"/>
 
-      <tag name="todo" description="To do:" scope="all" />
-      <tag name="ant.task" enabled="false" description="Task:" scope="types" />
-      <tag name="ant.datatype" enabled="false" description="Data type:" scope="types" />
-      <group title="Apache Ant Core" packages="org.apache.tools.ant*" />
-      <group title="Core Tasks" packages="org.apache.tools.ant.taskdefs*" />
-      <group title="Core Types" packages="org.apache.tools.ant.types*" />
-      <group title="Optional Tasks" packages="org.apache.tools.ant.taskdefs.optional*" />
-      <group title="Optional Types" packages="org.apache.tools.ant.types.optional*" />
-      <group title="Ant Utilities" packages="org.apache.tools.ant.util*" />
+      <tag name="todo" description="To do:" scope="all"/>
+      <tag name="ant.task" enabled="false" description="Task:" scope="types"/>
+      <tag name="ant.datatype" enabled="false" description="Data type:" scope="types"/>
+      <group title="Apache Ant Core" packages="org.apache.tools.ant*"/>
+      <group title="Core Tasks" packages="org.apache.tools.ant.taskdefs*"/>
+      <group title="Core Types" packages="org.apache.tools.ant.types*"/>
+      <group title="Optional Tasks" packages="org.apache.tools.ant.taskdefs.optional*"/>
+      <group title="Optional Types" packages="org.apache.tools.ant.types.optional*"/>
+      <group title="Ant Utilities" packages="org.apache.tools.ant.util*"/>
 
       <bottom>Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved.</bottom>
     </javadoc>
@@ -1157,7 +1157,7 @@
              doctitle="${Name}">
 
       <fileset dir="${tests.dir}">
-        <patternset refid="useful.tests" />
+        <patternset refid="useful.tests"/>
       </fileset>
 
       <bottom>Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved.</bottom>
@@ -1177,38 +1177,38 @@
            debug="${debug}"
            target="${javac.target}"
            deprecation="${deprecation}" >
-      <classpath refid="tests-classpath" />
+      <classpath refid="tests-classpath"/>
 
-      <patternset refid="needs.antlr" />
+      <patternset refid="needs.antlr"/>
 
-      <patternset refid="needs.jdk1.2+" />
-      <patternset refid="needs.jdk1.3+" />
-      <patternset refid="needs.jdk1.4+" />
+      <patternset refid="needs.jdk1.2+"/>
+      <patternset refid="needs.jdk1.3+"/>
+      <patternset refid="needs.jdk1.4+"/>
 
-      <patternset refid="needs.jakarta.regexp" />
-      <patternset refid="needs.jakarta.oro" />
+      <patternset refid="needs.jakarta.regexp"/>
+      <patternset refid="needs.jakarta.oro"/>
       <patternset refid="needs.jai"/>
 
-      <patternset refid="needs.trax" />
-      <patternset refid="needs.xslp" />
-      <patternset refid="needs.xalan1" />
-      <patternset refid="needs.jakarta.bcel" />
+      <patternset refid="needs.trax"/>
+      <patternset refid="needs.xslp"/>
+      <patternset refid="needs.xalan1"/>
+      <patternset refid="needs.jakarta.bcel"/>
     </javac>
   </target>
 
-  <target name="dump-info" depends="dump-sys-properties,run-which" />
+  <target name="dump-info" depends="dump-sys-properties,run-which"/>
 
   <target name="dump-sys-properties" unless="which.present"
           depends="xml-check">
-    <echo message="java.vm.info=${java.vm.info}" />
-    <echo message="java.vm.name=${java.vm.name}" />
-    <echo message="java.vm.vendor=${java.vm.vendor}" />
-    <echo message="java.vm.version=${java.vm.version}" />
-    <echo message="os.arch=${os.arch}" />
-    <echo message="os.name=${os.name}" />
-    <echo message="os.version=${os.version}" />
-    <echo message="file.encoding=${file.encoding}" />
-    <echo message="user.language=${user.language}" />
+    <echo message="java.vm.info=${java.vm.info}"/>
+    <echo message="java.vm.name=${java.vm.name}"/>
+    <echo message="java.vm.vendor=${java.vm.vendor}"/>
+    <echo message="java.vm.version=${java.vm.version}"/>
+    <echo message="os.arch=${os.arch}"/>
+    <echo message="os.name=${os.name}"/>
+    <echo message="os.version=${os.version}"/>
+    <echo message="file.encoding=${file.encoding}"/>
+    <echo message="user.language=${user.language}"/>
   </target>
 
   <!-- helper class from Xalan2 to check for jar versioning of xml/xsl processors -->
@@ -1250,48 +1250,48 @@
            fork="${junit.fork}">
 <!--      <jvmarg value="-classic"/> -->
       <classpath refid="tests-classpath"/>
-      <classpath refid="classes.zip" />
+      <classpath refid="classes.zip"/>
 
-      <sysproperty key="ant.home" value="${ant.home}" />
+      <sysproperty key="ant.home" value="${ant.home}"/>
       <sysproperty key="build.tests" value="${build.tests}"/>
       <sysproperty key="tests-classpath.value"
-                   value="${tests-classpath.value}" />
+                   value="${tests-classpath.value}"/>
 
-      <formatter type="brief" usefile="false" />
+      <formatter type="brief" usefile="false"/>
 
       <batchtest>
         <fileset dir="${tests.dir}">
-          <include name="**/*Test*" />
+          <include name="**/*Test*"/>
 
           <!-- abstract classes, not testcases -->
-          <exclude name="${ant.package}/taskdefs/TaskdefsTest.java" />
-          <exclude name="${ant.package}/BuildFileTest.java" />
-          <exclude name="${regexp.package}/RegexpMatcherTest.java" />
-          <exclude name="${regexp.package}/RegexpTest.java" />
-          <exclude name="${optional.package}/AbstractXSLTLiaisonTest.java" />
-          <exclude name="${ant.package}/types/AbstractFileSetTest.java" />
-          <exclude name="${ant.package}/types/selectors/BaseSelectorTest.java" />
+          <exclude name="${ant.package}/taskdefs/TaskdefsTest.java"/>
+          <exclude name="${ant.package}/BuildFileTest.java"/>
+          <exclude name="${regexp.package}/RegexpMatcherTest.java"/>
+          <exclude name="${regexp.package}/RegexpTest.java"/>
+          <exclude name="${optional.package}/AbstractXSLTLiaisonTest.java"/>
+          <exclude name="${ant.package}/types/AbstractFileSetTest.java"/>
+          <exclude name="${ant.package}/types/selectors/BaseSelectorTest.java"/>
 
           <!-- helper classes, not testcases -->
-          <exclude name="org/example/**" />
-          <exclude name="${ant.package}/taskdefs/TaskdefTest*Task.java" />
+          <exclude name="org/example/**"/>
+          <exclude name="${ant.package}/taskdefs/TaskdefTest*Task.java"/>
 
           <!-- interactive test -->
-          <exclude name="${ant.package}/taskdefs/TestProcess.java" />
+          <exclude name="${ant.package}/taskdefs/TestProcess.java"/>
 
           <!-- only run these tests if their required libraries are
                installed -->
-          <patternset refid="needs.jdk1.2+" />
-          <patternset refid="needs.jdk1.4+" />
-          <patternset refid="needs.jakarta.regexp" />
-          <patternset refid="needs.jakarta.oro" />
-          <patternset refid="needs.jai" />
-          <patternset refid="needs.vaj" />
-          <patternset refid="needs.antlr" />
-          <patternset refid="needs.xalan1" />
-          <patternset refid="needs.xslp" />
-          <patternset refid="needs.jakarta.bcel" />
-          <patternset refid="needs.trax" />
+          <patternset refid="needs.jdk1.2+"/>
+          <patternset refid="needs.jdk1.4+"/>
+          <patternset refid="needs.jakarta.regexp"/>
+          <patternset refid="needs.jakarta.oro"/>
+          <patternset refid="needs.jai"/>
+          <patternset refid="needs.vaj"/>
+          <patternset refid="needs.antlr"/>
+          <patternset refid="needs.xalan1"/>
+          <patternset refid="needs.xslp"/>
+          <patternset refid="needs.jakarta.bcel"/>
+          <patternset refid="needs.trax"/>
           <!-- fails under 1.1 -->
           <exclude name="${optional.package}/perforce/P4ChangeTest.java"
                    unless="jdk1.2+"/>
@@ -1300,14 +1300,14 @@
           <patternset refid="onlinetests"/>
 
           <!-- failing tests excluded unless run.failing.tests is set -->
-          <patternset refid="teststhatfail" />
+          <patternset refid="teststhatfail"/>
 
           <!-- runtime dependencies that are different from compile
                time dependencies -->
           <exclude name="${optional.package}/ReplaceRegExpTest.java"
-                   unless="some.regexp.support" />
+                   unless="some.regexp.support"/>
           <exclude name="${optional.package}/sitraka/*.java"
-                   unless="some.regexp.support" />
+                   unless="some.regexp.support"/>
 
           <!-- fail if testcases can be loaded from the system classloader -->
           <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
@@ -1316,7 +1316,7 @@
                    if="tests.are.on.system.classpath"/>
 
           <!-- these tests need to be localised before being ran???? -->
-          <exclude name="${optional.package}/PvcsTest.java" />
+          <exclude name="${optional.package}/PvcsTest.java"/>
 
           <!-- These tests need a TraX implementation like xalan2 or saxon -->
           <exclude name="${optional.package}/TraXLiaisonTest.java"
@@ -1328,44 +1328,44 @@
 
           <!-- needs BSF to work -->
           <exclude name="${optional.package}/XalanLiaisonTest.java"
-                   unless="bsf.present" />
+                   unless="bsf.present"/>
 
           <!--
           XXX need to figure out what's causing this InvocationTargetException
           -->
           <exclude name="${optional.package}/junit/JUnitTestRunnerTest.java"
-                   unless="jdk1.2+" />
+                   unless="jdk1.2+"/>
           <!-- DateTime handling seems to be broken in JDK 1.1 -->
           <exclude name="${util.package}/DateUtilsTest.java"
-                   unless="jdk1.2+" />
+                   unless="jdk1.2+"/>
 
-          <exclude name="${optional.package}/JspcTest.java" />
+          <exclude name="${optional.package}/JspcTest.java"/>
           <!-- misc oneoff tests -->
           <exclude name="${optional.package}/WsdlToDotnetTest.java"
-                   unless="dotnetapps.found" />
+                   unless="dotnetapps.found"/>
 
           <!--  These tests only passes if testcases and Ant classes have
           been loaded by the same classloader - will throw
           IllegalAccessExceptions otherwise.  -->
           <exclude name="${ant.package}/taskdefs/SQLExecTest.java"
-                   unless="tests.and.ant.share.classloader" />
+                   unless="tests.and.ant.share.classloader"/>
           <exclude name="${optional.package}/sos/SOSTest.java"
-                   unless="tests.and.ant.share.classloader" />
+                   unless="tests.and.ant.share.classloader"/>
           <exclude name="${optional.package}/TraXLiaisonTest.java"
-                   unless="tests.and.ant.share.classloader" />
+                   unless="tests.and.ant.share.classloader"/>
           <exclude name="${optional.package}/metamata/MAuditParserTest.java"
-                   unless="tests.and.ant.share.classloader" />
+                   unless="tests.and.ant.share.classloader"/>
 
           <!-- can only run if cvs is installed on your machine
                enable by setting the property have.cvs
           -->
           <exclude name="${ant.package}/taskdefs/AbstractCvsTaskTest.java"
-                   unless="have.cvs" />
+                   unless="have.cvs"/>
 
         </fileset>
       </batchtest>
       <test name="org.apache.tools.ant.taskdefs.optional.JspcTest"
-            if="jasper.present" />
+            if="jasper.present"/>
     </junit>
   </target>
 
@@ -1378,14 +1378,14 @@
           fork="${junit.fork}"
           filtertrace="${junit.filtertrace}">
 <!--      <jvmarg value="-classic"/> -->
-      <sysproperty key="ant.home" value="${ant.home}" />
+      <sysproperty key="ant.home" value="${ant.home}"/>
       <sysproperty key="build.tests" value="${build.tests}"/>
       <sysproperty key="tests-classpath.value"
-                   value="${tests-classpath.value}" />
-      <classpath refid="classes.zip" />
+                   value="${tests-classpath.value}"/>
+      <classpath refid="classes.zip"/>
       <classpath refid="tests-classpath"/>
-      <formatter type="plain" usefile="false" />
-      <test name="${testcase}" />
+      <formatter type="plain" usefile="false"/>
+      <test name="${testcase}"/>
     </junit>
   </target>
 
@@ -1394,7 +1394,7 @@
           if="jdk1.3+">
     <java classpathref="tests-classpath"
           classname="org.apache.tools.ant.taskdefs.TestProcess"
-          fork="true" />
+          fork="true"/>
   </target>
 
   <!--
@@ -1404,6 +1404,6 @@
   -->
   <target name="main"
           description="--> creates a minimum distribution in ./dist"
-          depends="dist-lite" />
+          depends="dist-lite"/>
 
 </project>
diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/CoreTasks/ant.html
index d5827840d..3ae2bc5be 100644
--- a/docs/manual/CoreTasks/ant.html
+++ b/docs/manual/CoreTasks/ant.html
@@ -172,10 +172,10 @@ details:</p>
 <pre>
   &lt;path id="path1"&gt;
     ...
-  &lt;/&gt;
+  &lt;/path&gt;
   &lt;path id="path2"&gt;
     ...
-  &lt;/&gt;
+  &lt;/path&gt;
 </pre>
 
 <p>and the called build file (<code>subbuild.xml</code>) also defines
@@ -183,7 +183,7 @@ a <code>&lt;path&gt;</code> with the id <code>path1</code>, but
 <code>path2</code> is not defined:</p>
 
 <pre>
-  &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;true&quot; /&gt;
+  &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;true&quot;/&gt;
 </pre>
 
 <p>will not override <code>subbuild</code>'s definition of
@@ -191,21 +191,21 @@ a <code>&lt;path&gt;</code> with the id <code>path1</code>, but
 <code>path2</code> available in the subbuild.</p>
 
 <pre>
-  &lt;ant antfile=&quot;subbuild.xml&quot; /&gt;
+  &lt;ant antfile=&quot;subbuild.xml&quot;/&gt;
 </pre>
 
 <p>as well as</p>
 
 <pre>
-  &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot; /&gt;
+  &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;/&gt;
 </pre>
 
 <p>will neither override <code>path1</code> nor copy
 <code>path2</code>.</p>
 
 <pre>
-  &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot; &gt;
-    &lt;reference refid=&quot;path1&quot; /&gt;
+  &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;&gt;
+    &lt;reference refid=&quot;path1&quot;/&gt;
   &lt;/ant&gt;
 </pre>
 
@@ -213,8 +213,8 @@ a <code>&lt;path&gt;</code> with the id <code>path1</code>, but
 <code>path1</code>.</p>
 
 <pre>
-  &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot; &gt;
-    &lt;reference refid=&quot;path1&quot; torefid=&quot;path2&quot; /&gt;
+  &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;&gt;
+    &lt;reference refid=&quot;path1&quot; torefid=&quot;path2&quot;/&gt;
   &lt;/ant&gt;
 </pre>
 
diff --git a/docs/manual/CoreTasks/antcall.html b/docs/manual/CoreTasks/antcall.html
index b251537cb..2a5d3ade9 100644
--- a/docs/manual/CoreTasks/antcall.html
+++ b/docs/manual/CoreTasks/antcall.html
@@ -105,7 +105,7 @@ optionally changing their id.</p>
 
 <pre>
   &lt;antcall ... &gt;
-    &lt;reference refid=&quot;path1&quot; torefid=&quot;path2&quot; /&gt;
+    &lt;reference refid=&quot;path1&quot; torefid=&quot;path2&quot;/&gt;
   &lt;/antcall&gt;
 </pre>
 
diff --git a/docs/manual/CoreTasks/apply.html b/docs/manual/CoreTasks/apply.html
index cdee5493f..50470415f 100644
--- a/docs/manual/CoreTasks/apply.html
+++ b/docs/manual/CoreTasks/apply.html
@@ -157,7 +157,7 @@ system command via nested <code>&lt;env&gt;</code> elements. See the
 description in the section about <a href="exec.html#env">exec</a></p>
 <h3>Examples</h3>
 <blockquote><pre>
-&lt;apply executable=&quot;ls&quot; &gt;
+&lt;apply executable=&quot;ls&quot;&gt;
   &lt;arg value=&quot;-l&quot;/&gt;
   &lt;fileset dir=&quot;/tmp&quot;&gt;
     &lt;patternset&gt;
@@ -172,7 +172,7 @@ files below <code>/tmp</code> not ending in <code>.txt</code> and all
 files of the FileSet with <code>id</code> <code>other.files</code> to
 the command line.</p>
 <blockquote><pre>
-&lt;apply executable=&quot;somecommand&quot; parallel=&quot;false&quot; &gt;
+&lt;apply executable=&quot;somecommand&quot; parallel=&quot;false&quot;&gt;
   &lt;arg value=&quot;arg1&quot;/&gt;
   &lt;srcfile/&gt;
   &lt;arg value=&quot;arg2&quot;/&gt;
diff --git a/docs/manual/CoreTasks/concat.html b/docs/manual/CoreTasks/concat.html
index 2da8c2a64..f3bdff5b3 100644
--- a/docs/manual/CoreTasks/concat.html
+++ b/docs/manual/CoreTasks/concat.html
@@ -103,7 +103,7 @@
 
       <pre>
   &lt;concat&gt;
-    &lt;fileset dir=&quot;messages&quot; includes=&quot;*important*&quot; /&gt;
+    &lt;fileset dir=&quot;messages&quot; includes=&quot;*important*&quot;/&gt;
   &lt;/concat&gt;
       </pre>
 
@@ -111,7 +111,7 @@
 
       <pre>
   &lt;concat destfile=&quot;NOTES&quot; append=&quot;true&quot;&gt;
-    &lt;filelist dir=&quot;notes&quot; files=&quot;note.txt&quot; /&gt;
+    &lt;filelist dir=&quot;notes&quot; files=&quot;note.txt&quot;/&gt;
   &lt;/concat&gt;
       </pre>
 
@@ -121,10 +121,10 @@
       <pre>
   &lt;concat destfile=&quot;${docbook.dir}/all-sections.xml&quot;&gt;
     &lt;filelist dir=&quot;${docbook.dir}/sections&quot; 
-         files=&quot;introduction.xml,overview.xml&quot; /&gt;
+         files=&quot;introduction.xml,overview.xml&quot;/&gt;
     &lt;fileset dir=&quot;${docbook.dir}&quot; 
          includes=&quot;sections/*.xml&quot; 
-         excludes=&quot;introduction.xml,overview.xml&quot; /&gt;
+         excludes=&quot;introduction.xml,overview.xml&quot;/&gt;
   &lt;/concat&gt;
       </pre>
 
diff --git a/docs/manual/CoreTasks/condition.html b/docs/manual/CoreTasks/condition.html
index 74cb50a86..78a00c6d6 100644
--- a/docs/manual/CoreTasks/condition.html
+++ b/docs/manual/CoreTasks/condition.html
@@ -45,8 +45,8 @@ complete list see <a href="conditions.html">here</a>.</p>
 <pre>
   &lt;condition property=&quot;javamail.complete&quot;&gt;
     &lt;and&gt;
-      &lt;available classname=&quot;javax.activation.DataHandler&quot; /&gt;
-      &lt;available classname=&quot;javax.mail.Transport&quot; /&gt;
+      &lt;available classname=&quot;javax.activation.DataHandler&quot;/&gt;
+      &lt;available classname=&quot;javax.mail.Transport&quot;/&gt;
     &lt;/and&gt;
   &lt;/condition&gt;
 </pre>
@@ -57,9 +57,11 @@ classpath.</p>
 <pre>
   &lt;condition property=&quot;isMacOsButNotMacOsX&quot;&gt;
     &lt;and&gt;
-      &lt;os family=&quot;mac&quot; /&gt;
+      &lt;os family=&quot;mac&quot;/&gt;
+
       &lt;not&gt;
-        &lt;os family=&quot;unix&quot; /&gt;
+        &lt;os family=&quot;unix&quot;/&gt;
+
       &lt;/not&gt;
     &lt;/and&gt;
   &lt;/condition&gt;
@@ -70,7 +72,8 @@ in the Unix family as well.</p>
 
 <pre>
   &lt;condition property=&quot;isSunOSonSparc&quot;&gt;
-    &lt;os name=&quot;SunOS&quot; arch=&quot;sparc&quot; /&gt;
+    &lt;os name=&quot;SunOS&quot; arch=&quot;sparc&quot;/&gt;
+
   &lt;/condition&gt;
 </pre>
 <p>sets the property <code>isSunOSonSparc</code> if the current
@@ -82,4 +85,3 @@ Foundation. All rights Reserved.</p>
 
 </body>
 </html>
-
diff --git a/docs/manual/CoreTasks/conditions.html b/docs/manual/CoreTasks/conditions.html
index bade380f5..eef5c597f 100644
--- a/docs/manual/CoreTasks/conditions.html
+++ b/docs/manual/CoreTasks/conditions.html
@@ -268,8 +268,8 @@ that is "true","yes", or "on"</p>
   </tr>
 </table>
 <pre>
-    &lt;istrue value=&quot;${someproperty}&quot; /&gt;
-    &lt;istrue value=&quot;false&quot; /&gt;
+    &lt;istrue value=&quot;${someproperty}&quot;/&gt;
+    &lt;istrue value=&quot;false&quot;/&gt;
 </pre>
 
 <h4>isfalse</h4>
@@ -288,8 +288,8 @@ that is "true","yes", or "on"</p>
   </tr>
 </table>
 <pre>
-    &lt;isfalse value=&quot;${someproperty}&quot; /&gt;
-    &lt;isfalse value=&quot;false&quot; /&gt;
+    &lt;isfalse value=&quot;${someproperty}&quot;/&gt;
+    &lt;isfalse value=&quot;false&quot;/&gt;
 </pre>
 
 <hr>
diff --git a/docs/manual/CoreTasks/copy.html b/docs/manual/CoreTasks/copy.html
index 8997d0761..eb54a84b0 100644
--- a/docs/manual/CoreTasks/copy.html
+++ b/docs/manual/CoreTasks/copy.html
@@ -140,21 +140,21 @@ followed by &lt;filterset&gt; elements.
 </pre>
 <p><b>Copy a set of files to a directory</b></p>
 <pre>
-  &lt;copy todir=&quot;../dest/dir&quot; &gt;
-    &lt;fileset dir=&quot;src_dir&quot; &gt;
+  &lt;copy todir=&quot;../dest/dir&quot;&gt;
+    &lt;fileset dir=&quot;src_dir&quot;&gt;
       &lt;exclude name=&quot;**/*.java&quot;/&gt;
     &lt;/fileset&gt;
   &lt;/copy&gt;
 
-  &lt;copy todir=&quot;../dest/dir&quot; &gt;
+  &lt;copy todir=&quot;../dest/dir&quot;&gt;
     &lt;fileset dir=&quot;src_dir&quot; excludes=&quot;**/*.java&quot;/&gt;
   &lt;/copy&gt;
 </pre>
 <p><b>Copy a set of files to a directory, appending
 <code>.bak</code> to the file name on the fly</b></p>
 <pre>
-  &lt;copy todir=&quot;../backup/dir&quot; &gt;
-    &lt;fileset dir=&quot;src_dir&quot; /&gt;
+  &lt;copy todir=&quot;../backup/dir&quot;&gt;
+    &lt;fileset dir=&quot;src_dir&quot;/&gt;
     &lt;mapper type=&quot;glob&quot; from=&quot;*&quot; to=&quot;*.bak&quot;/&gt;
   &lt;/copy&gt;
 </pre>
@@ -163,10 +163,10 @@ followed by &lt;filterset&gt; elements.
 <p><b>Copy a set of files to a directory, replacing @TITLE@ with Foo Bar
 in all files.</b></p>
 <pre>
-  &lt;copy todir=&quot;../backup/dir&quot; &gt;
-    &lt;fileset dir=&quot;src_dir&quot; /&gt;
+  &lt;copy todir=&quot;../backup/dir&quot;&gt;
+    &lt;fileset dir=&quot;src_dir&quot;/&gt;
     &lt;filterset&gt;
-      &lt;filter token=&quot;TITLE&quot; value=&quot;Foo Bar&quot; /&gt;
+      &lt;filter token=&quot;TITLE&quot; value=&quot;Foo Bar&quot;/&gt;
     &lt;/filterset&gt;
   &lt;/copy&gt;
 </pre>
diff --git a/docs/manual/CoreTasks/copyfile.html b/docs/manual/CoreTasks/copyfile.html
index 855f95af2..e7ad864fd 100644
--- a/docs/manual/CoreTasks/copyfile.html
+++ b/docs/manual/CoreTasks/copyfile.html
@@ -46,12 +46,10 @@ does not exist.</p>
 </table>
 <h3>Examples</h3>
 <blockquote>
-  <p><code>&lt;copyfile src=&quot;test.java&quot; dest=&quot;subdir/test.java&quot;
-  /&gt;</code></p>
-  <p><code>&lt;copyfile src=&quot;${src}/index.html&quot; dest=&quot;${dist}/help/index.html&quot;
-  /&gt;</code></p>
+  <p><code>&lt;copyfile src=&quot;test.java&quot; dest=&quot;subdir/test.java&quot;/&gt;</code></p>
+  <p><code>&lt;copyfile src=&quot;${src}/index.html&quot; dest=&quot;${dist}/help/index.html&quot;/&gt;</code></p>
 </blockquote>
-<hr><p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
+<hr><p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/cvstagdiff.html b/docs/manual/CoreTasks/cvstagdiff.html
index 795b776e6..be4858ab3 100644
--- a/docs/manual/CoreTasks/cvstagdiff.html
+++ b/docs/manual/CoreTasks/cvstagdiff.html
@@ -1,12 +1,9 @@
 <html>
-
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <title>CvsTagDiff Task</title>
 </head>
-
 <body>
-
 <h2><a name="cvstagdiff">CvsTagDiff</a></h2>
 <h3>Description</h3>
 <p>Generates an XML-formatted report file of the changes between two tags or dates recorded in a
diff --git a/docs/manual/CoreTasks/delete.html b/docs/manual/CoreTasks/delete.html
index 797e09b90..98d25d39a 100644
--- a/docs/manual/CoreTasks/delete.html
+++ b/docs/manual/CoreTasks/delete.html
@@ -143,8 +143,8 @@ and subdirectories of <code>lib</code>.</p>
 </pre>
 <p>deletes all files with the extension <code>.bak</code> from the current directory 
 and any subdirectories.</p>
-<pre>  &lt;delete includeEmptyDirs=&quot;true&quot; &gt;
-    &lt;fileset dir=&quot;build&quot; /&gt;
+<pre>  &lt;delete includeEmptyDirs=&quot;true&quot;&gt;
+    &lt;fileset dir=&quot;build&quot;/&gt;
   &lt;/delete&gt;
 </pre>
 <p>deletes all files and subdirectories of <code>build</code>, including
diff --git a/docs/manual/CoreTasks/echo.html b/docs/manual/CoreTasks/echo.html
index d23acd333..7553f24bf 100644
--- a/docs/manual/CoreTasks/echo.html
+++ b/docs/manual/CoreTasks/echo.html
@@ -66,16 +66,16 @@ three lines; the first line is a blank
 As XML parsers are wont to do, the first newline in the text element
 has been included in the text. 
 
-<pre>&lt;echo message=&quot;Deleting drive C:&quot; level=&quot;debug&quot; /&gt;</pre>
+<pre>&lt;echo message=&quot;Deleting drive C:&quot; level=&quot;debug&quot;/&gt;</pre>
 A message which only appears in <tt>-debug</tt> mode.
-<pre>&lt;echo level=&quot;error&quot; &gt;
+<pre>&lt;echo level=&quot;error&quot;&gt;
 Imminent failure in the antimatter containment facility.
 Please withdraw to safe location at least 50km away.  
 &lt;/echo&gt;
 </pre>
 A message which appears even in <tt>-quiet</tt> mode.
 
-<pre>&lt;echo file="runner.csh" append="false" &gt;#\!/bin/tcsh
+<pre>&lt;echo file="runner.csh" append="false"&gt;#\!/bin/tcsh
 java-1.3.1 -mx1024m ${project.entrypoint} $$*
 </echo></pre>
 Generate a shell script by echoing to a file.
@@ -83,7 +83,7 @@ Note the use of a double $ symbol to stop Ant
 filtering out the single $ during variable expansion   
 <hr>
 
-<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
diff --git a/docs/manual/CoreTasks/exec.html b/docs/manual/CoreTasks/exec.html
index 6a29b2fe5..1847e4190 100644
--- a/docs/manual/CoreTasks/exec.html
+++ b/docs/manual/CoreTasks/exec.html
@@ -170,7 +170,7 @@ but some configuration problem on your machine.
 
 <h3>Examples</h3>
 <blockquote><pre>
-&lt;exec executable=&quot;emacs&quot; &gt;
+&lt;exec executable=&quot;emacs&quot;&gt;
   &lt;env key=&quot;DISPLAY&quot; value=&quot;:1.0&quot;/&gt;
 &lt;/exec&gt;
 </pre></blockquote>
diff --git a/docs/manual/CoreTasks/get.html b/docs/manual/CoreTasks/get.html
index 9233787c1..ad22900c0 100644
--- a/docs/manual/CoreTasks/get.html
+++ b/docs/manual/CoreTasks/get.html
@@ -93,7 +93,7 @@ for progress information.
 <pre>  &lt;get src=&quot;https://insecure-bank.org/statement/user=1214&quot; 
     dest=&quot;statement.html&quot; 
     username="1214";
-    password="secret" /&gt;</pre>
+    password="secret"/&gt;</pre>
 <p>
 Fetches some file from a server with access control. Because https is being used the
 fact that basic auth sends passwords in plaintext is moot.
diff --git a/docs/manual/CoreTasks/input.html b/docs/manual/CoreTasks/input.html
index 674b8acd9..3700794fc 100644
--- a/docs/manual/CoreTasks/input.html
+++ b/docs/manual/CoreTasks/input.html
@@ -80,7 +80,7 @@ continue...&quot; and pause the build run until return key is pressed
     addproperty=&quot;do.delete&quot;
   /&gt;
   &lt;condition property=&quot;do.abort&quot;&gt;
-    &lt;equals arg1=&quot;n&quot; arg2=&quot;${do.delete}&quot; /&gt;
+    &lt;equals arg1=&quot;n&quot; arg2=&quot;${do.delete}&quot;/&gt;
   &lt;/condition&gt;
   &lt;fail if=&quot;do.abort&quot;&gt;Build aborted by user.&lt;/fail&gt;
 </pre>
diff --git a/docs/manual/CoreTasks/java.html b/docs/manual/CoreTasks/java.html
index 7b8823ab4..e35c6fb16 100644
--- a/docs/manual/CoreTasks/java.html
+++ b/docs/manual/CoreTasks/java.html
@@ -138,7 +138,7 @@ section about <a href="exec.html#env">exec</a></p>
 <p>Settings will be ignored if fork is disabled.</p>
 <h3>Examples</h3>
 <pre>  
-       &lt;java classname=&quot;test.Main&quot; &gt;
+       &lt;java classname=&quot;test.Main&quot;&gt;
          &lt;arg value=&quot;-h&quot;/&gt; 
          &lt;classpath&gt;
            &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
diff --git a/docs/manual/CoreTasks/javadoc.html b/docs/manual/CoreTasks/javadoc.html
index 925cc3dca..0a12a0a38 100644
--- a/docs/manual/CoreTasks/javadoc.html
+++ b/docs/manual/CoreTasks/javadoc.html
@@ -579,7 +579,7 @@ therefore, if they can be interpreted by the doclet in use.</p>
 element. These paramaters are restricted to simple strings. An example usage
 of the doclet element is shown below:</p>
 
-<pre>  &lt;javadoc ...&gt;
+<pre>  &lt;javadoc ... &gt;
      &lt;doclet name=&quot;theDoclet&quot;
              path=&quot;path/to/theDoclet&quot;&gt;
         &lt;param name=&quot;-foo&quot; value=&quot;foovalue&quot;/&gt;
@@ -688,7 +688,7 @@ respectively.</p>
 
     &lt;packageset dir=&quot;src&quot; defaultexcludes=&quot;yes&quot;&gt;
       &lt;include name=&quot;com/dummy/test/**&quot; /&gt;
-      &lt;exclude name=&quot;com/dummy/test/doc-files/**&quot; /&gt;
+      &lt;exclude name=&quot;com/dummy/test/doc-files/**&quot;/&gt;
     &lt;/packageset&gt;
 
     &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
@@ -711,7 +711,7 @@ respectively.</p>
 
     &lt;fileset dir=&quot;src&quot; defaultexcludes=&quot;yes&quot;&gt;
       &lt;include name=&quot;com/dummy/test/**&quot; /&gt;
-      &lt;exclude name=&quot;com/dummy/test/doc-files/**&quot; /&gt;
+      &lt;exclude name=&quot;com/dummy/test/doc-files/**&quot;/&gt;
     &lt;/fileset&gt;
 
     &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
diff --git a/docs/manual/CoreTasks/loadfile.html b/docs/manual/CoreTasks/loadfile.html
index 99d372f53..14b1c03c1 100644
--- a/docs/manual/CoreTasks/loadfile.html
+++ b/docs/manual/CoreTasks/loadfile.html
@@ -48,21 +48,21 @@ FilterChain</a>s.
 
 <h3>Examples</h3>
 <pre>    &lt;loadfile property="message"
-      srcFile="message.txt" /&gt;
+      srcFile="message.txt"/&gt;
 </pre>
 Load file message.txt into property "message"; an <tt>&lt;echo&gt;</tt>
 can print this.
 
 <pre>    &lt;loadfile property="encoded-file"
       srcFile="loadfile.xml"
-      encoding="ISO-8859-1" /&gt;
+      encoding="ISO-8859-1"/&gt;
 </pre>
 Load a file using the latin-1 encoding
 
 <pre>    &lt;loadfile
       property="optional.value"
       srcFile="optional.txt"
-      failonerror="false" /&gt;
+      failonerror="false"/&gt;
 </pre>
 Load a file, don't fail if it is missing (a message is printed, though)
 
diff --git a/docs/manual/CoreTasks/loadproperties.html b/docs/manual/CoreTasks/loadproperties.html
index 6e9fdcf1c..893dd6057 100644
--- a/docs/manual/CoreTasks/loadproperties.html
+++ b/docs/manual/CoreTasks/loadproperties.html
@@ -39,7 +39,7 @@ The LoadProperties task supports nested <a href="../CoreTypes/filterchain.html">
 FilterChain</a>s.
 
 <h3>Examples</h3>
-<pre>    &lt;loadproperties srcFile="file.properties" /&gt;
+<pre>    &lt;loadproperties srcFile="file.properties"/&gt;
 </pre>
 Load contents of file.properties as Ant properties.
 
diff --git a/docs/manual/CoreTasks/mail.html b/docs/manual/CoreTasks/mail.html
index 665b362af..a11ad4c7d 100644
--- a/docs/manual/CoreTasks/mail.html
+++ b/docs/manual/CoreTasks/mail.html
@@ -164,7 +164,7 @@ the <code>&lt;message&gt;</code> element.</p>
 &lt;mail from=&quot;me&quot;
       tolist=&quot;you&quot;
       subject=&quot;Results of nightly build&quot;
-      files=&quot;build.log&quot; /&gt;
+      files=&quot;build.log&quot;/&gt;
 </pre></blockquote>
 
 <p>Sends an email from <i>me</i> to <i>you</i> with a subject of
diff --git a/docs/manual/CoreTasks/manifest.html b/docs/manual/CoreTasks/manifest.html
index f3c94dc81..a602a7f18 100644
--- a/docs/manual/CoreTasks/manifest.html
+++ b/docs/manual/CoreTasks/manifest.html
@@ -88,12 +88,12 @@ href="#attribute">attribute</a> elements into sections.</p>
   &lt;manifest file=&quot;MANIFEST.MF&quot;&gt;
     &lt;attribute name=&quot;Built-By&quot; value=&quot;${user.name}&quot;/&gt;
     &lt;section name=&quot;common&quot;&gt;
-      &lt;attribute name=&quot;Specification-Title&quot; value=&quot;Example&quot; /&gt;
-      &lt;attribute name=&quot;Specification-Version&quot; value=&quot;${version}&quot; /&gt;
-      &lt;attribute name=&quot;Specification-Vendor&quot; value=&quot;Example Organization&quot; /&gt;
-      &lt;attribute name=&quot;Implementation-Title&quot; value=&quot;common&quot; /&gt;
-      &lt;attribute name=&quot;Implementation-Version&quot; value=&quot;${version} ${TODAY}&quot; /&gt; 
-      &lt;attribute name=&quot;Implementation-Vendor&quot; value=&quot;Example Corp.&quot; /&gt;
+      &lt;attribute name=&quot;Specification-Title&quot; value=&quot;Example&quot;/&gt;
+      &lt;attribute name=&quot;Specification-Version&quot; value=&quot;${version}&quot;/&gt;
+      &lt;attribute name=&quot;Specification-Vendor&quot; value=&quot;Example Organization&quot;/&gt;
+      &lt;attribute name=&quot;Implementation-Title&quot; value=&quot;common&quot;/&gt;
+      &lt;attribute name=&quot;Implementation-Version&quot; value=&quot;${version} ${TODAY}&quot;/&gt; 
+      &lt;attribute name=&quot;Implementation-Vendor&quot; value=&quot;Example Corp.&quot;/&gt;
     &lt;/section&gt;
     &lt;section name=&quot;common/class1.class&quot;&gt;
       &lt;attribute name=&quot;Sealed&quot; value=&quot;false&quot;/&gt;
diff --git a/docs/manual/CoreTasks/move.html b/docs/manual/CoreTasks/move.html
index 01ca9d5b5..56202adff 100644
--- a/docs/manual/CoreTasks/move.html
+++ b/docs/manual/CoreTasks/move.html
@@ -103,8 +103,8 @@ followed by &lt;filterset&gt; elements.
 </pre>
 <p><b>Move a set of files to a new directory</b></p>
 <pre>
-  &lt;move todir=&quot;some/new/dir&quot; &gt;
-    &lt;fileset dir=&quot;my/src/dir&quot; &gt;
+  &lt;move todir=&quot;some/new/dir&quot;&gt;
+    &lt;fileset dir=&quot;my/src/dir&quot;&gt;
       &lt;include name=&quot;**/*.jar&quot;/&gt;
       &lt;exclude name=&quot;**/ant.jar&quot;/&gt;
     &lt;/fileset&gt;
@@ -113,8 +113,8 @@ followed by &lt;filterset&gt; elements.
 <p><b>Append <code>&quot;.bak&quot;</code> to the names of all files
 in a directory.</b></p>
 <pre>
-  &lt;move todir=&quot;my/src/dir&quot; &gt;
-    &lt;fileset dir=&quot;my/src/dir&quot; &gt;
+  &lt;move todir=&quot;my/src/dir&quot;&gt;
+    &lt;fileset dir=&quot;my/src/dir&quot;&gt;
       &lt;exclude name=&quot;**/*.bak&quot;/&gt;
     &lt;/fileset&gt;
     &lt;mapper type=&quot;glob&quot; from=&quot;*&quot; to=&quot;*.bak&quot;/&gt;
diff --git a/docs/manual/CoreTasks/pack.html b/docs/manual/CoreTasks/pack.html
index cb5d82180..717aa0d0d 100644
--- a/docs/manual/CoreTasks/pack.html
+++ b/docs/manual/CoreTasks/pack.html
@@ -32,12 +32,10 @@ file is newer.</p>
 </table>
 <h3>Examples</h3>
 <blockquote>
-  <p><code>&lt;gzip src=&quot;test.tar&quot; zipfile=&quot;test.tar.gz&quot;
-  /&gt;</code></p>
+  <p><code>&lt;gzip src=&quot;test.tar&quot; zipfile=&quot;test.tar.gz&quot;/&gt;</code></p>
 </blockquote>
 <blockquote>
-  <p><code>&lt;bzip2 src=&quot;test.tar&quot; zipfile=&quot;test.tar.bz2&quot;
-  /&gt;</code></p>
+  <p><code>&lt;bzip2 src=&quot;test.tar&quot; zipfile=&quot;test.tar.bz2&quot;/&gt;</code></p>
 </blockquote>
 <hr>
 <p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
diff --git a/docs/manual/CoreTasks/parallel.html b/docs/manual/CoreTasks/parallel.html
index 45aa0dc32..aec859f56 100644
--- a/docs/manual/CoreTasks/parallel.html
+++ b/docs/manual/CoreTasks/parallel.html
@@ -44,10 +44,10 @@ within the parallel block</p>
 <h3>Examples</h3>
 <pre>
 &lt;parallel&gt;
-  &lt;wlrun ...&gt;
+  &lt;wlrun ... &gt;
   &lt;sequential&gt;
     &lt;sleep seconds=&quot;30&quot;/&gt;
-    &lt;junit ...&gt;
+    &lt;junit ... &gt;
     &lt;wlstop/&gt;
   &lt;/sequential&gt;
 &lt;/parallel&gt;
@@ -76,7 +76,7 @@ noted above, you need to be careful that the two tasks are independent, both in
 terms of their dependencies and in terms of their potential interactions in
 Ant's external environment.</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>
diff --git a/docs/manual/CoreTasks/recorder.html b/docs/manual/CoreTasks/recorder.html
index fd660a8e4..850310477 100644
--- a/docs/manual/CoreTasks/recorder.html
+++ b/docs/manual/CoreTasks/recorder.html
@@ -77,9 +77,9 @@ to record just the <code>&lt;javac&gt;</code> task:</p>
 <pre>
     ...
     &lt;compile &gt;
-        &lt;record name=&quot;log.txt&quot; action=&quot;start&quot; /&gt;
+        &lt;record name=&quot;log.txt&quot; action=&quot;start&quot;/&gt;
         &lt;javac ...
-        &lt;record name=&quot;log.txt&quot; action=&quot;stop&quot; /&gt;
+        &lt;record name=&quot;log.txt&quot; action=&quot;stop&quot;/&gt;
     &lt;compile/&gt;
     ...
 </pre>
@@ -90,8 +90,8 @@ recorders: one to file &quot;records-simple.log&quot; at logging level <code>inf
 <code>verbose</code>.</p>
 <pre>
     ...
-    &lt;record name=&quot;records-simple.log&quot; /&gt;
-    &lt;record name=&quot;ISO.log&quot; loglevel=&quot;verbose&quot; /&gt;
+    &lt;record name=&quot;records-simple.log&quot;/&gt;
+    &lt;record name=&quot;ISO.log&quot; loglevel=&quot;verbose&quot;/&gt;
     ...
 </pre>
 
diff --git a/docs/manual/CoreTasks/replace.html b/docs/manual/CoreTasks/replace.html
index f791c668b..b8bf8acc9 100644
--- a/docs/manual/CoreTasks/replace.html
+++ b/docs/manual/CoreTasks/replace.html
@@ -162,9 +162,9 @@ token]]&gt;&lt;/replacevalue&gt;
 &lt;replace 
     file=&quot;configure.sh&quot;
     value=&quot;defaultvalue&quot;
-    propertyFile=&quot;source/name.properties&quot; &gt;
+    propertyFile=&quot;source/name.properties&quot;&gt;
   &lt;replacefilter 
-    token=&quot;@token1@&quot; /&gt;
+    token=&quot;@token1@&quot;/&gt;
   &lt;replacefilter 
     token=&quot;@token2@&quot; 
     value=&quot;value2&quot;/&gt;
diff --git a/docs/manual/CoreTasks/sequential.html b/docs/manual/CoreTasks/sequential.html
index 87f361892..edab21a10 100644
--- a/docs/manual/CoreTasks/sequential.html
+++ b/docs/manual/CoreTasks/sequential.html
@@ -21,10 +21,10 @@ sequential task.</p>
 <h3>Example</h3>
 <pre>
 &lt;parallel&gt;
-  &lt;wlrun ...&gt;
+  &lt;wlrun ... &gt;
   &lt;sequential&gt;
     &lt;sleep seconds=&quot;30&quot;/&gt;
-    &lt;junit ...&gt;
+    &lt;junit ... &gt;
     &lt;wlstop/&gt;
   &lt;/sequential&gt;
 &lt;/parallel&gt;
@@ -33,7 +33,7 @@ sequential task.</p>
 sequence, while another task is being executed in a separate thread. </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>
diff --git a/docs/manual/CoreTasks/sleep.html b/docs/manual/CoreTasks/sleep.html
index c732e3acc..61c65dd3c 100644
--- a/docs/manual/CoreTasks/sleep.html
+++ b/docs/manual/CoreTasks/sleep.html
@@ -59,11 +59,11 @@ Sleep for about 10 mS.
 Sleep for about 2 seconds. 
 <pre>   &lt;sleep hours=&quot;1&quot; minutes=&quot;-59&quot; seconds=&quot;-58&quot;/&gt;</pre>
 <p>Sleep for one hour less 59:58, or two seconds again </p>
-<pre>   &lt;sleep /&gt;</pre>
+<pre>   &lt;sleep/&gt;</pre>
 Sleep for no time at all. This may yield the CPU time to another thread or process. 
 <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>
diff --git a/docs/manual/CoreTasks/sql.html b/docs/manual/CoreTasks/sql.html
index 6e9cbee43..f7084b75d 100644
--- a/docs/manual/CoreTasks/sql.html
+++ b/docs/manual/CoreTasks/sql.html
@@ -218,9 +218,9 @@ operation on <i>some_other_table</i>.</p>
     url=&quot;jdbc:database-url&quot;
     userid=&quot;sa&quot;
     password=&quot;pass&quot; &gt;
-  &lt;transaction  src=&quot;data1.sql&quot; /&gt;
-  &lt;transaction  src=&quot;data2.sql&quot; /&gt;
-  &lt;transaction  src=&quot;data3.sql&quot; /&gt;
+  &lt;transaction  src=&quot;data1.sql&quot;/&gt;
+  &lt;transaction  src=&quot;data2.sql&quot;/&gt;
+  &lt;transaction  src=&quot;data3.sql&quot;/&gt;
   &lt;transaction&gt;
     truncate table some_other_table;
   &lt;/transaction&gt;
@@ -236,9 +236,9 @@ run before <code>data2.sql</code>.</p>
     driver=&quot;org.database.jdbcDriver&quot;
     url=&quot;jdbc:database-url&quot;
     userid=&quot;sa&quot;
-    password=&quot;pass&quot; &gt;
+    password=&quot;pass&quot;&gt;
   &lt;fileset dir=&quot;.&quot;&gt;
-    &lt;include name=&quot;data*.sql&quot; /&gt;
+    &lt;include name=&quot;data*.sql&quot;/&gt;
   &lt;/fileset&gt;
   &lt;transaction&gt;
     truncate table some_other_table;
diff --git a/docs/manual/CoreTasks/unzip.html b/docs/manual/CoreTasks/unzip.html
index 94d6a1e02..6433dc4e3 100644
--- a/docs/manual/CoreTasks/unzip.html
+++ b/docs/manual/CoreTasks/unzip.html
@@ -55,8 +55,7 @@ to perform unarchival upon.
 </table>
 <h3>Examples</h3>
 <blockquote>
-  <p><code>&lt;unzip src=&quot;${tomcat_src}/tools-src.zip&quot; dest=&quot;${tools.home}&quot;
-  /&gt;</code></p>
+  <p><code>&lt;unzip src=&quot;${tomcat_src}/tools-src.zip&quot; dest=&quot;${tools.home}&quot;/&gt;</code></p>
 </blockquote>
 <blockquote>
   <p><code>
diff --git a/docs/manual/CoreTasks/xmlproperty.html b/docs/manual/CoreTasks/xmlproperty.html
index b8a330bea..44df5b105 100644
--- a/docs/manual/CoreTasks/xmlproperty.html
+++ b/docs/manual/CoreTasks/xmlproperty.html
@@ -72,7 +72,7 @@ file's element and attribute names.</p>
 
 <p>These are the properties loaded by this task from the previous example file.</p>
 
-<pre>   &lt;xmlproperty file="somefile.xml" collapseAttributes="true" /&gt;</pre>
+<pre>   &lt;xmlproperty file="somefile.xml" collapseAttributes="true"/&gt;</pre>
 
 <p>Load contents of somefile.xml as Ant properties collapsing attributes as nodes.</p>
 
diff --git a/docs/manual/CoreTypes/dirset.html b/docs/manual/CoreTypes/dirset.html
index d2be70272..c84ae13dc 100644
--- a/docs/manual/CoreTypes/dirset.html
+++ b/docs/manual/CoreTypes/dirset.html
@@ -93,7 +93,7 @@ that have the text <code>Test</code> in their name.</p>
 a PatternSet that can be referenced in other
 <code>&lt;dirset&gt;</code> elements, rooted at a different directory.</p>
 <blockquote><pre>
-&lt;dirset dir=&quot;${debug_build.dir}&quot; &gt;
+&lt;dirset dir=&quot;${debug_build.dir}&quot;&gt;
   &lt;patternset refid=&quot;non.test.classes&quot;/&gt;
 &lt;/dirset&gt;
 </pre></blockquote>
diff --git a/docs/manual/CoreTypes/fileset.html b/docs/manual/CoreTypes/fileset.html
index f9a2a6377..29bd91ffb 100644
--- a/docs/manual/CoreTypes/fileset.html
+++ b/docs/manual/CoreTypes/fileset.html
@@ -84,7 +84,7 @@ platforms.</p>
 
 <h4>Examples</h4>
 <blockquote><pre>
-&lt;fileset dir=&quot;${server.src}&quot; casesensitive=&quot;yes&quot; &gt;
+&lt;fileset dir=&quot;${server.src}&quot; casesensitive=&quot;yes&quot;&gt;
   &lt;include name=&quot;**/*.java&quot;/&gt;
   &lt;exclude name=&quot;**/*Test*&quot;/&gt;
 &lt;/fileset&gt;
@@ -93,8 +93,8 @@ platforms.</p>
 source files and don't have the text <code>Test</code> in their
 name.</p>
 <blockquote><pre>
-&lt;fileset dir=&quot;${server.src}&quot; casesensitive=&quot;yes&quot; &gt;
-  &lt;patternset id=&quot;non.test.sources&quot; &gt;
+&lt;fileset dir=&quot;${server.src}&quot; casesensitive=&quot;yes&quot;&gt;
+  &lt;patternset id=&quot;non.test.sources&quot;&gt;
     &lt;include name=&quot;**/*.java&quot;/&gt;
     &lt;exclude name=&quot;**/*Test*&quot;/&gt;
   &lt;/patternset&gt;
diff --git a/docs/manual/CoreTypes/filterset.html b/docs/manual/CoreTypes/filterset.html
index 169d5f4a7..ad9edc6c0 100644
--- a/docs/manual/CoreTypes/filterset.html
+++ b/docs/manual/CoreTypes/filterset.html
@@ -106,7 +106,7 @@ but wish to replace the token <code>%DATE*</code> with today's date.</p>
 
 <p>Copy all the docs but change all dates and appropriate notices as stored in a file.</p>
 <BLOCKQUOTE><PRE>
-&lt;copy toDir=&quot;${dist.dir}/docs&quot; &gt;
+&lt;copy toDir=&quot;${dist.dir}/docs&quot;&gt;
   &lt;fileset dir=&quot;${build.dir}/docs&quot;&gt;
     &lt;include name=&quot;**/*.html&quot;&gt;
   &lt;/fileset&gt;
diff --git a/docs/manual/CoreTypes/patternset.html b/docs/manual/CoreTypes/patternset.html
index 29fc5661d..08d8322bb 100644
--- a/docs/manual/CoreTypes/patternset.html
+++ b/docs/manual/CoreTypes/patternset.html
@@ -111,7 +111,7 @@ you can use to test the existance of a property.</p>
 patterns to the parent patternset.</p>
 <h3>Examples</h3>
 <blockquote><pre>
-&lt;patternset id=&quot;non.test.sources&quot; &gt;
+&lt;patternset id=&quot;non.test.sources&quot;&gt;
   &lt;include name=&quot;**/*.java&quot;/&gt;
   &lt;exclude name=&quot;**/*Test*&quot;/&gt;
 &lt;/patternset&gt;
@@ -131,7 +131,7 @@ specify that the element should only be used if a property is set, or
 that it should be used only if a property is not set.</p>
 <p>For example</p>
 <blockquote><pre>
-&lt;patternset id=&quot;sources&quot; &gt;
+&lt;patternset id=&quot;sources&quot;&gt;
   &lt;include name=&quot;std/**/*.java&quot;/&gt;
   &lt;include name=&quot;prof/**/*.java&quot; if=&quot;professional&quot;/&gt;
   &lt;exclude name=&quot;**/*Test*&quot;/&gt;
@@ -141,19 +141,19 @@ that it should be used only if a property is not set.</p>
 <em>professional</em> is set to some value.</p>
 <p>The two sets</p>
 <blockquote><pre>
-&lt;patternset includesfile=&quot;some-file&quot; /&gt;
+&lt;patternset includesfile=&quot;some-file&quot;/&gt;
 </pre></blockquote>
 <p>and</p>
 <blockquote><pre>
 &lt;patternset&gt;
-  &lt;includesfile name=&quot;some-file&quot; /&gt; 
+  &lt;includesfile name=&quot;some-file&quot;/&gt; 
 &lt;patternset/&gt;
 </pre></blockquote>
 <p>are identical.  The include patterns will be read from the file
 <code>some-file</code>, one pattern per line.</p>
 <blockquote><pre>
 &lt;patternset&gt;
-  &lt;includesfile name=&quot;some-file&quot; /&gt; 
+  &lt;includesfile name=&quot;some-file&quot;/&gt; 
   &lt;includesfile name=&quot;${some-other-file}&quot; 
                 if=&quot;some-other-file&quot;
   /&gt; 
diff --git a/docs/manual/Integration/VAJAntTool.html b/docs/manual/Integration/VAJAntTool.html
index 0a9915ee9..8539bb729 100644
--- a/docs/manual/Integration/VAJAntTool.html
+++ b/docs/manual/Integration/VAJAntTool.html
@@ -22,16 +22,16 @@ Version 1.2 - 2001/06/14<br>
   <li><A href="#introduction">Introduction</A>
   <li><A href="#tasks">The Tasks</A><A href="#introduction"></A>
   <ul>
-    <li><A href="#vajload">VAJLoad</A>&gt;
-    <li><A href="#vajexport">VAJExport</A>&gt;
-    <li><A href="#vajimport">VAJImport</A>&gt;</LI></UL>
+    <li><A href="#vajload">VAJLoad</A>
+    <li><A href="#vajexport">VAJExport</A>
+    <li><A href="#vajimport">VAJImport</A></LI></UL>
   <li><A href="#sample_buildfile">A sample build file</A><br>
   <li><A href="#plugin">The Plugin</A>
   <ul>
-    <li><A href="#installation">Installation</A>&gt;
+    <li><A href="#installation">Installation</A>
     <li><A href="#usage">Usage</A> </LI></UL>
-  <li><A href="#faq">Frequently Asked Questions</A>&gt;
-  <li><A href="#va_versions">Visual Age Versions</A>&gt;
+  <li><A href="#faq">Frequently Asked Questions</A>
+  <li><A href="#va_versions">Visual Age Versions</A>
   <li><A href="#history">History</A><A href="#history"></A> </LI></UL>
 
 <hr>
@@ -130,7 +130,7 @@ workspace.</P>
 <h3>Example</H3>
 <pre>&lt;vajload remote="localhost:32767"&gt;
     &lt;vajproject name="My Testcases" version="1.7beta"/&gt;
-    &lt;vajproject name="JUnit" version="3.2" /&gt;
+    &lt;vajproject name="JUnit" version="3.2"/&gt;
 &lt;/vajload&gt;
 </PRE>
 
diff --git a/docs/manual/OptionalTasks/BorlandEJBTasks.html b/docs/manual/OptionalTasks/BorlandEJBTasks.html
index 0c04a1f3c..17ea9570b 100644
--- a/docs/manual/OptionalTasks/BorlandEJBTasks.html
+++ b/docs/manual/OptionalTasks/BorlandEJBTasks.html
@@ -94,9 +94,9 @@
 <h3>Examples</h3>
 <p>The following build.xml snippet is an example of how to use Borland element
   into the ejbjar task</p>
-<pre>    &lt;ejbjar srcdir=&quot;${build.classes}&quot;  basejarname=&quot;vsmp&quot;  descriptordir=&quot;${rsc.dir}/hrmanager&quot;&gt;
+<pre>    &lt;ejbjar srcdir=&quot;${build.classes}&quot; basejarname=&quot;vsmp&quot; descriptordir=&quot;${rsc.dir}/hrmanager&quot;&gt;
         &lt;borland destdir=&quot;lib&quot; verify=&quot;on&quot; generateclient=&quot;on&quot; version=&quot;5&quot;&gt;
-          &lt;classpath refid=&quot;classpath&quot; /&gt;
+          &lt;classpath refid=&quot;classpath&quot;/&gt;
         &lt;/borland&gt;
         &lt;include name=&quot;**\ejb-jar.xml&quot;/&gt;
         &lt;support dir=&quot;${build.classes}&quot;&gt;
diff --git a/docs/manual/OptionalTasks/antlr.html b/docs/manual/OptionalTasks/antlr.html
index dea2ee983..fdb20badd 100644
--- a/docs/manual/OptionalTasks/antlr.html
+++ b/docs/manual/OptionalTasks/antlr.html
@@ -146,7 +146,7 @@ ANTLR jar in the normal Ant lib repository will be enough.</p>
 VM via nested <code>&lt;jvmarg&gt;</code> attributes, for example:</p>
 
 <pre>
-&lt;antlr target=...&gt;
+&lt;antlr target="..."&gt;
   &lt;jvmarg value=&quot;-Djava.compiler=NONE&quot;/&gt;
   ...
 &lt;/antlr&gt;
diff --git a/docs/manual/OptionalTasks/ccm.html b/docs/manual/OptionalTasks/ccm.html
index ba6a8ebcb..cd82b03bf 100644
--- a/docs/manual/OptionalTasks/ccm.html
+++ b/docs/manual/OptionalTasks/ccm.html
@@ -53,7 +53,7 @@ Task to checkin a file
 <h3>Examples</h3>
 <blockquote>
   <pre>&lt;ccmcheckin file=&quot;c:/wa/com/foo/MyFile.java&quot;
-        comment=&quot;mycomment&quot; /&gt;
+        comment=&quot;mycomment&quot;/&gt;
 </pre>
 </blockquote>
 <p>Checks in the file <i>c:/wa/com/foo/MyFile.java</i>. 
diff --git a/docs/manual/OptionalTasks/clearcase.html b/docs/manual/OptionalTasks/clearcase.html
index 6edfd07ad..9bc26f042 100644
--- a/docs/manual/OptionalTasks/clearcase.html
+++ b/docs/manual/OptionalTasks/clearcase.html
@@ -69,9 +69,9 @@ Task to perform a Checkin command to ClearCase.
 <blockquote>
 <pre>
 &lt;cccheckin viewpath=&quot;c:/views/viewdir/afile&quot;
-        commentfile=&quot;acomment.txt&quot;/&gt;
+        commentfile=&quot;acomment.txt&quot;
         nowarn=&quot;true&quot;
-        identical=&quot;true&quot;
+        identical=&quot;true&quot;/&gt;
 </pre>
 </blockquote>
 <p>Does a ClearCase <i>checkin</i> on the file <i>c:/views/viewdir/afile</i>. 
@@ -254,7 +254,7 @@ A graphical dialog will be displayed. The output will be logged to
 time will be set to the current time.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 
diff --git a/docs/manual/OptionalTasks/echoproperties.html b/docs/manual/OptionalTasks/echoproperties.html
index 6119526dd..765c89112 100644
--- a/docs/manual/OptionalTasks/echoproperties.html
+++ b/docs/manual/OptionalTasks/echoproperties.html
@@ -54,11 +54,11 @@ but is really for debugging build files.</p>
 </table>
 <h3>Examples</h3>
 <blockquote><pre>
-  &lt;echoproperties /&gt;
+  &lt;echoproperties/&gt;
 </pre></blockquote>
 <p>Report the current properties to the log.</p>
 <blockquote><pre>
-  &lt;echoproperties destfile="my.properties" /&gt;
+  &lt;echoproperties destfile="my.properties"/&gt;
 </pre></blockquote>
 <p>Report the current properties to the file "my.properties", and will
 fail the build if the file could not be created or written to.</p>
diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html
index b5a2bbd82..a85653f80 100644
--- a/docs/manual/OptionalTasks/ejb.html
+++ b/docs/manual/OptionalTasks/ejb.html
@@ -111,7 +111,7 @@ is based on the standard Ant include and exclude selection mechanisms.
 <pre>&lt;ddcreator descriptors=&quot;${dd.dir}&quot;
            dest=&quot;${gen.classes}&quot;
            classpath=&quot;${descriptorbuild.classpath}&quot;&gt;
-  &lt;include name=&quot;*.txt&quot; /&gt;
+  &lt;include name=&quot;*.txt&quot;/&gt;
 &lt;/ddcreator&gt;
 </pre>
 
@@ -183,7 +183,7 @@ or are out of date, the ejbc tool is run to generate new versions.</p>
            dest=&quot;${gen.classes}&quot;
            manifest=&quot;${build.manifest}&quot;
            classpath=&quot;${descriptorbuild.classpath}&quot;&gt;
-  &lt;include name=&quot;*.ser&quot; /&gt;
+  &lt;include name=&quot;*.ser&quot;/&gt;
 &lt;/ejbc&gt;
 </pre>
 
@@ -295,20 +295,22 @@ Examples</h3>
 <pre>&lt;iplanet-ejbc ejbdescriptor="ejb-jar.xml"
               iasdescriptor="ias-ejb-jar.xml"
               dest="${build.classesdir}"
-              classpath="${ias.ejbc.cpath}" /&gt;
+              classpath="${ias.ejbc.cpath}"/&gt;
+
 
 &lt;iplanet-ejbc ejbdescriptor="ejb-jar.xml"
               iasdescriptor="ias-ejb-jar.xml"
               dest="${build.classesdir}"
               keepgenerated="yes"
               debug="yes"
-              iashome="${ias.home}" &gt;
+              iashome="${ias.home}"&gt;
               &lt;classpath&gt;
-                  &lt;pathelement path="." /&gt;
-                  &lt;pathelement path="${build.classpath}" /&gt;
+                  &lt;pathelement path="."/&gt;
+                  &lt;pathelement path="${build.classpath}"/&gt;
               &lt;/classpath&gt;
 &lt;/iplanet-ejbc&gt;
 
+
 </pre>
 
 <hr>
@@ -1347,7 +1349,7 @@ in the descriptor dir:</p>
       &lt;websphere dbvendor="DB2UDBOS390_V6"
                  ejbdeploy="true"
                  oldCMP="false"
-         tempdir="/tmp"
+                 tempdir="/tmp"
                  destdir="${dist.server}"&gt;
         &lt;wasclasspath&gt;
           &lt;pathelement location="${was4.home}/deploytool/itp/plugins/org.eclipse.core.boot/boot.jar"/&gt;
@@ -1368,7 +1370,8 @@ in the descriptor dir:</p>
 
 <h3><a name="ejbjar_iplanet">iPlanet Application Server (iAS) element</a></h3>
 
-The &lt;iplanet&gt; nested element is used to build iAS-specific stubs and
+The &lt;iplanet&lt; nested element is used to build iAS-specific stubs and
+
 skeletons and construct a JAR file which may be deployed to the iPlanet
 Application Server 6.0.  The build process will always determine if
 the EJB stubs/skeletons and the EJB-JAR file are up to date, and it will
@@ -1471,35 +1474,40 @@ It will name each EJB-JAR using the "basename" prepended to each standard
 EJB descriptor.  For example, if the descriptor named "Account-ejb-jar.xml"
 is processed, the EJB-JAR will be named "Account.jar"
 <pre>    &lt;ejbjar srcdir="${build.classesdir}"
-            descriptordir="${src}" &gt;
+            descriptordir="${src}"&gt;
+
             &lt;iplanet destdir="${assemble.ejbjar}"
-                     classpath="${ias.ejbc.cpath}" /&gt;
+                     classpath="${ias.ejbc.cpath}"/&gt;
             &lt;include name="**/*-ejb-jar.xml"/&gt;
             &lt;exclude name="**/*ias-*.xml"/&gt;
     &lt;/ejbjar&gt;</pre>
+
 This example demonstrates the use of a nested classpath element as well
 as some of the other optional attributes.
 <pre>    &lt;ejbjar srcdir="${build.classesdir}"
-            descriptordir="${src}" &gt;
+            descriptordir="${src}"&gt;
+
             &lt;iplanet destdir="${assemble.ejbjar}"
                      iashome="${ias.home}"
                      debug="yes"
-                     keepgenerated="yes" &gt;
+                     keepgenerated="yes"&gt;
                      &lt;classpath&gt;
-                         &lt;pathelement path="." /&gt;
-                         &lt;pathelement path="${build.classpath}" /&gt;
+                         &lt;pathelement path="."/&gt;
+                         &lt;pathelement path="${build.classpath}"/&gt;
                      &lt;/classpath&gt;
             &lt;/iplanet&gt;
             &lt;include name="**/*-ejb-jar.xml"/&gt;
             &lt;exclude name="**/*ias-*.xml"/&gt;
     &lt;/ejbjar&gt;</pre>
+
 This example demonstrates the use of basejarname attribute.  In this
 case, the completed EJB-JAR will be named "HelloWorld.jar"  If multiple
 EJB descriptors might be found, care must be taken to ensure that the completed
 JAR files don't overwrite each other.
 <pre>    &lt;ejbjar srcdir="${build.classesdir}"
             descriptordir="${src}"
-            basejarname="HelloWorld" &gt;
+            basejarname="HelloWorld"&gt;
+
             &lt;iplanet destdir="${assemble.ejbjar}"
                      classpath="${ias.ejbc.cpath}"/&gt;
             &lt;include name="**/*-ejb-jar.xml"/&gt;
@@ -1513,9 +1521,10 @@ local DTDs are found in the [iAS-install-directory]/dtd directory.
 <pre>    &lt;ejbjar srcdir="${build.classesdir}"
             descriptordir="${src}"&gt;
             &lt;iplanet destdir="${assemble.ejbjar}"&gt;
-                     classpath="${ias.ejbc.cpath}" /&gt;
+                     classpath="${ias.ejbc.cpath}"/&gt;
             &lt;include name="**/*-ejb-jar.xml"/&gt;
             &lt;exclude name="**/*ias-*.xml"/&gt;
+
             &lt;dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
                  location="${ias.home}/APPS/ejb-jar_1_1.dtd"/&gt;
             &lt;dtd publicId="-//Sun Microsystems, Inc.//DTD iAS Enterprise JavaBeans 1.0//EN"
@@ -1686,7 +1695,7 @@ directory.&nbsp;</p>
               descriptordir="${descriptor.dir}"&gt;
         &lt;jonas destdir="${deploymentjars.dir}"
              jonasroot="${jonas.root}"
-             orb="RMI" /&gt;
+             orb="RMI"/&gt;
         &lt;include name="**/*.xml"/&gt;
         &lt;exclude name="**/jonas-*.xml"/&gt;
         &lt;support dir="${build.classes}"&gt;
@@ -1707,7 +1716,7 @@ descriptors to use the naming standard. This will create only one ejb jar file -
         &lt;jonas destdir="${deploymentjars.dir}"
                   jonasroot="${jonas.root}"
                   suffix=".jar"
-                  classpath="${descriptorbuild.classpath}" /&gt;
+                  classpath="${descriptorbuild.classpath}"/&gt;
         &lt;include name="**/ejb-jar.xml"/&gt;
         &lt;exclude name="**/jonas-ejb-jar.xml"/&gt;
       &lt;/ejbjar&gt;
@@ -1721,4 +1730,3 @@ Reserved.</p>
 </body>
 
 </html>
-
diff --git a/docs/manual/OptionalTasks/ftp.html b/docs/manual/OptionalTasks/ftp.html
index f05dda222..b0b07e005 100644
--- a/docs/manual/OptionalTasks/ftp.html
+++ b/docs/manual/OptionalTasks/ftp.html
@@ -205,7 +205,7 @@ into.  The file structure from the FTP site is preserved on the local machine.</
        server=&quot;ftp.apache.org&quot;
        userid=&quot;anonymous&quot;
        password=&quot;me@myorg.com&quot;&gt;
-    &lt;fileset dir=&quot;htdocs/manual&quot; &gt;
+    &lt;fileset dir=&quot;htdocs/manual&quot;&gt;
       &lt;include name=&quot;**/*.html&quot;/&gt;
     &lt;/fileset&gt;
   &lt;/ftp&gt;
@@ -224,7 +224,7 @@ fact, the dir attribute of the fileset is ignored completely.
   &lt;ftp action=&quot;del&quot;
        server=&quot;ftp.apache.org&quot;
        userid=&quot;anonymous&quot;
-       password=&quot;me@myorg.com&quot; &gt;
+       password=&quot;me@myorg.com&quot;&gt;
     &lt;fileset&gt;
       &lt;include name=&quot;**/*.tmp&quot;/&gt;
     &lt;/fileset&gt;
@@ -239,7 +239,7 @@ If you don't have permission to delete a file, a BuildException is thrown.</p>
        server=&quot;ftp.apache.org&quot;
        userid=&quot;anonymous&quot;
        password=&quot;me@myorg.com&quot; 
-       listing=&quot;data/ftp.listing&quot; &gt;
+       listing=&quot;data/ftp.listing&quot;&gt;
     &lt;fileset&gt;
       &lt;include name=&quot;**&quot;/&gt;
     &lt;/fileset&gt;
@@ -257,7 +257,7 @@ remotedir attribute.</p>
        server=&quot;ftp.apache.org&quot;
        userid=&quot;anonymous&quot;
        password=&quot;me@myorg.com&quot; 
-       remotedir=&quot;some/remote/dir&quot; /&gt;
+       remotedir=&quot;some/remote/dir&quot;/&gt;
 </pre>
 <p>This creates the directory <code>some/remote/dir</code> beneath the default root
 directory.  As with all other actions, the directory separator character must be correct
diff --git a/docs/manual/OptionalTasks/javah.html b/docs/manual/OptionalTasks/javah.html
index 2640947e4..9a2acbb03 100644
--- a/docs/manual/OptionalTasks/javah.html
+++ b/docs/manual/OptionalTasks/javah.html
@@ -77,7 +77,7 @@ systems are used.</p>
 </table>
 <p>Either outputFile or destdir must be supplied, but not both.&nbsp;</p>
 <h3>Examples</h3>
-<pre>  &lt;javah destdir=&quot;c&quot; class=&quot;org.foo.bar.Wibble&quot; /&gt;</pre>
+<pre>  &lt;javah destdir=&quot;c&quot; class=&quot;org.foo.bar.Wibble&quot;/&gt;</pre>
 <p>makes a JNI header of the named class, using the JDK1.2 JNI model. Assuming
 the directory 'c' already exists, the file <tt>org_foo_bar_Wibble.h</tt>
 is created there. If this file already exists, it is left unchanged.</p>
@@ -112,7 +112,7 @@ describe its progress.</p>
 <hr>
 
 <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>
 
diff --git a/docs/manual/OptionalTasks/jdepend.html b/docs/manual/OptionalTasks/jdepend.html
index ccbb2854d..b66e7f102 100644
--- a/docs/manual/OptionalTasks/jdepend.html
+++ b/docs/manual/OptionalTasks/jdepend.html
@@ -90,9 +90,10 @@ that represent <a href="../using.html#path">PATH like structures</a>.</p>
 <pre>
 &lt;jdepend classpathref="base.path"&gt;
 &nbsp;&nbsp;&nbsp; &lt;sourcespath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="src" /&gt;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="src"/&gt;
 &nbsp;&nbsp;&nbsp; &lt;/sourcespath&gt;
 &lt;/jdepend&gt;
+
 </pre>
 </blockquote>
 
@@ -103,13 +104,14 @@ The classpath is defined using a classpath reference.
 <pre>
 &lt;jdepend outputfile="docs/jdepend.xml" fork="yes" format="xml"&gt;
 &nbsp;&nbsp;&nbsp; &lt;sourcespath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="src" /&gt;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="src"/&gt;
 &nbsp;&nbsp;&nbsp; &lt;/sourcespath&gt;
 &nbsp;&nbsp;&nbsp; &lt;classpath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="classes" /&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="lib/jdepend.jar" /&gt;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="classes"/&gt;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="lib/jdepend.jar"/&gt;
 &nbsp;&nbsp;&nbsp; &lt;/classpath&gt;
 &lt;/jdepend&gt;
+
 </pre>
 </blockquote>
 
@@ -123,4 +125,3 @@ Reserved.</p>
 </html>
 
 
-
diff --git a/docs/manual/OptionalTasks/jspc.html b/docs/manual/OptionalTasks/jspc.html
index 079af8088..516b2ba78 100644
--- a/docs/manual/OptionalTasks/jspc.html
+++ b/docs/manual/OptionalTasks/jspc.html
@@ -219,7 +219,7 @@ package heirarchy beginning with com.i3sp.jsp.
          srcdir="interim"
          destdir="build"
          classpath="lib/taglibs.jar"
-         debug="on" /&gt;
+         debug="on"/&gt;
 </pre>
 Generate jsp pages then javac them down to
 bytecodes. Include lib/taglib jar in the java compilation.
diff --git a/docs/manual/OptionalTasks/junit.html b/docs/manual/OptionalTasks/junit.html
index 548524f33..a9a968377 100644
--- a/docs/manual/OptionalTasks/junit.html
+++ b/docs/manual/OptionalTasks/junit.html
@@ -425,7 +425,7 @@ generates a test class name for each file that ends in
 
 <pre>
 &lt;junit&gt;
-  &lt;test name="my.test.TestCase" /&gt;
+  &lt;test name="my.test.TestCase"/&gt;
 &lt;/junit&gt;
 </pre>
 
@@ -434,8 +434,8 @@ VM. No output will be generated unless the test fails.</p>
 
 <pre>
 &lt;junit printsummary="yes" fork="yes" haltonfailure="yes"&gt;
-  &lt;formatter type="plain" /&gt;
-  &lt;test name="my.test.TestCase" /&gt;
+  &lt;formatter type="plain"/&gt;
+  &lt;test name="my.test.TestCase"/&gt;
 &lt;/junit&gt;
 </pre>
 
@@ -448,20 +448,20 @@ stopped if the test fails.</p>
 <pre>
 &lt;junit printsummary="yes" haltonfailure="yes"&gt;
   &lt;classpath&gt;
-    &lt;pathelement location="${build.tests}" /&gt;
-    &lt;pathelement path="${java.class.path}" /&gt;
+    &lt;pathelement location="${build.tests}"/&gt;
+    &lt;pathelement path="${java.class.path}"/&gt;
   &lt;/classpath&gt;
 
-  &lt;formatter type="plain" /&gt;
+  &lt;formatter type="plain"/&gt;
 
-  &lt;test name="my.test.TestCase" haltonfailure="no" outfile="result" &gt;
-    &lt;formatter type="xml" /&gt;
+  &lt;test name="my.test.TestCase" haltonfailure="no" outfile="result"&gt;
+    &lt;formatter type="xml"/&gt;
   &lt;/test&gt;
 
   &lt;batchtest fork="yes" todir="${reports.tests}"&gt;
     &lt;fileset dir="${src.tests}"&gt;
-      &lt;include name="**/*Test*.java" /&gt;
-      &lt;exclude name="**/AllTests.java" /&gt;
+      &lt;include name="**/*Test*.java"/&gt;
+      &lt;exclude name="**/AllTests.java"/&gt;
     &lt;/fileset&gt;
   &lt;/batchtest&gt;
 &lt;/junit&gt;
diff --git a/docs/manual/OptionalTasks/mmetrics.html b/docs/manual/OptionalTasks/mmetrics.html
index 78e8cdb23..50caa6cb4 100644
--- a/docs/manual/OptionalTasks/mmetrics.html
+++ b/docs/manual/OptionalTasks/mmetrics.html
@@ -112,7 +112,7 @@ The stylesheet takes an <i>output.dir</i> parameter (otherwise it will be genera
 in the current directory), it can be run in Ant as follows:
 <pre>
 &lt;style in=java &quot;${metrics.xml}&quot; style=&quot;mmetrics-frames.xsl&quot; out="null.tmp"&gt;
-    &lt;param name=&quot;output.dir&quot; expression=&quot;${report.dir}quot;/&gt;
+    &lt;param name=&quot;output.dir&quot; expression=&quot;${report.dir}&quot;/&gt;
 &lt;/style&gt;
 </pre>
 <hr>
diff --git a/docs/manual/OptionalTasks/native2ascii.html b/docs/manual/OptionalTasks/native2ascii.html
index b633e9aa2..21b605708 100644
--- a/docs/manual/OptionalTasks/native2ascii.html
+++ b/docs/manual/OptionalTasks/native2ascii.html
@@ -111,7 +111,7 @@
 
     <pre>
 &lt;native2ascii encoding=&quot;EUCJIS&quot; src=&quot;srcdir&quot; dest=&quot;srcdir&quot;
-   includes=&quot;**/*.eucjis&quot; ext=&quot;.java&quot; /&gt;
+   includes=&quot;**/*.eucjis&quot; ext=&quot;.java&quot;/&gt;
     </pre>
 
     <p>
@@ -121,8 +121,8 @@
     </p>
 
 <pre>
-&lt;native2ascii encoding='EUCJIS&quot; src=&quot;native/japanese&quot; dest=&quot;src&quot;
-   includes=&quot;**/*.java /&gt;
+&lt;native2ascii encoding=&quot;EUCJIS&quot; src=&quot;native/japanese&quot; dest=&quot;src&quot;
+   includes=&quot;**/*.java&quot;/&gt;
 </pre>
 
     <p>
diff --git a/docs/manual/OptionalTasks/perforce.html b/docs/manual/OptionalTasks/perforce.html
index af8c11df7..06640ec86 100644
--- a/docs/manual/OptionalTasks/perforce.html
+++ b/docs/manual/OptionalTasks/perforce.html
@@ -175,16 +175,16 @@ available from the <a href="http://www.perforce.com/" target="_top">Perforce web
 <h3>Taskdefs</h3>
 <p>Standard taskdefs (for you to copy'n'paste) -- normally this is done automatically if you install this optional task.</p>
 <pre>
-    &lt;taskdef name=&quot;p4sync&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Sync&quot; /&gt;
-    &lt;taskdef name=&quot;p4change&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Change&quot; /&gt;
-    &lt;taskdef name=&quot;p4edit&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Edit&quot; /&gt;
-    &lt;taskdef name=&quot;p4submit&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Submit&quot; /&gt;
-    &lt;taskdef name=&quot;p4have&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Have&quot; /&gt;
-    &lt;taskdef name=&quot;p4label&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Label&quot; /&gt;
-    &lt;taskdef name=&quot;p4counter&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Counter&quot; /&gt;
-    &lt;taskdef name=&quot;p4reopen&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Reopen&quot; /&gt;
-    &lt;taskdef name=&quot;p4revert&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Revert&quot; /&gt;
-    &lt;taskdef name=&quot;p4add&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Add&quot; /&gt;
+    &lt;taskdef name=&quot;p4sync&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Sync&quot;/&gt;
+    &lt;taskdef name=&quot;p4change&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Change&quot;/&gt;
+    &lt;taskdef name=&quot;p4edit&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Edit&quot;/&gt;
+    &lt;taskdef name=&quot;p4submit&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Submit&quot;/&gt;
+    &lt;taskdef name=&quot;p4have&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Have&quot;/&gt;
+    &lt;taskdef name=&quot;p4label&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Label&quot;/&gt;
+    &lt;taskdef name=&quot;p4counter&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Counter&quot;/&gt;
+    &lt;taskdef name=&quot;p4reopen&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Reopen&quot;/&gt;
+    &lt;taskdef name=&quot;p4revert&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Revert&quot;/&gt;
+    &lt;taskdef name=&quot;p4add&quot; classname=&quot;org.apache.tools.ant.taskdefs.optional.perforce.P4Add&quot;/&gt;
 </pre>
 
 <hr>
@@ -215,8 +215,8 @@ available from the <a href="http://www.perforce.com/" target="_top">Perforce web
 </table>
 
 <h3>Examples</h3>
-<pre>&lt;p4sync label=&quot;nightlybuild-0.0123&quot; force=&quot;foo&quot; /&gt;
-&lt;p4sync view=&quot;//depot/projects/projectfoo/main/src/...&quot; /&gt;
+<pre>&lt;p4sync label=&quot;nightlybuild-0.0123&quot; force=&quot;foo&quot;/&gt;
+&lt;p4sync view=&quot;//depot/projects/projectfoo/main/src/...&quot;/&gt;
 </pre>
 <hr>
 
@@ -280,7 +280,7 @@ although P4Edit can open files to the default change,  P4Submit cannot yet submi
 <pre>
 &lt;p4edit
     view=&quot;//depot/projects/projectfoo/main/src/Blah.java...&quot;
-    change=&quot;${p4.change}&quot; /&gt;
+    change=&quot;${p4.change}&quot;/&gt;
 </pre>
 <hr>
 
@@ -306,7 +306,7 @@ although P4Edit can open files to the default change,  P4Submit cannot yet submi
 </table>
 
 <h3>Examples</h3>
-<pre>&lt;p4submit change=&quot;${p4.change}&quot; /&gt;
+<pre>&lt;p4submit change=&quot;${p4.change}&quot;/&gt;
 </pre>
 <hr>
 
@@ -332,7 +332,7 @@ although P4Edit can open files to the default change,  P4Submit cannot yet submi
 </table>
 
 <h3>Examples</h3>
-<pre>&lt;p4have /&gt;
+<pre>&lt;p4have/&gt;
 </pre>
 <hr>
 
@@ -426,16 +426,16 @@ as defined by Perforce protections in order for this task to succeed.
 <h3>Examples</h3>
 Print the value of the counter named &quot;last-clean-build&quot; to the output stream:
 <pre>
-&lt;p4counter name=&quot;last-clean-build&quot; /&gt;
+&lt;p4counter name=&quot;last-clean-build&quot;/&gt;
 </PRE>
 Set the value of the counter based on the value of the &quot;TSTAMP&quot; property:
 <PRE>
-&lt;p4counter name=&quot;last-clean-build&quot; value=&quot;${TSTAMP}&quot; /&gt;
+&lt;p4counter name=&quot;last-clean-build&quot; value=&quot;${TSTAMP}&quot;/&gt;
 </PRE>
 Set the value of the &quot;p4.last.clean.build&quot; property to the current
 value of the &quot;last-clean-build&quot; counter:
 <PRE>
-&lt;p4counter name=&quot;last-clean-build&quot; property=&quot;${p4.last.clean.build}&quot; /&gt;
+&lt;p4counter name=&quot;last-clean-build&quot; property=&quot;${p4.last.clean.build}&quot;/&gt;
 </pre>
 <hr>
 
@@ -464,12 +464,12 @@ Move (or reopen in Perforce speak) checkout files between changelists.
 <h3>Examples</h3>
 Move all open files to the default changelist
 <pre>
-&lt;p4reopen view=&quot;//...&quot; tochange=&quot;default&quot; /&gt;
+&lt;p4reopen view=&quot;//...&quot; tochange=&quot;default&quot;/&gt;
 </PRE>
 Create a new changelist then reopen into it, any files from the view //projects/foo/main/...
 <PRE>
-&lt;p4change description="Move files out of the way" /&gt;
-&lt;p4reopen view=&quot;//projects/foo/main/...&quot; tochange=&quot;${p4.change}&quot; /&gt;
+&lt;p4change description="Move files out of the way"/&gt;
+&lt;p4reopen view=&quot;//projects/foo/main/...&quot; tochange=&quot;${p4.change}&quot;/&gt;
 </pre>
 <hr>
 
@@ -503,11 +503,11 @@ Reverts files.
 <h3>Examples</h3>
 Revert everything!
 <pre>
-&lt;p4revert view=&quot;//...&quot; /&gt;
+&lt;p4revert view=&quot;//...&quot;/&gt;
 </PRE>
 Revert any unchanged files in the default change
 <PRE>
-&lt;p4revert change="default" revertonlyunchanged=&quot;true&quot; /&gt;
+&lt;p4revert change="default" revertonlyunchanged=&quot;true&quot;/&gt;
 </pre>
 <hr>
 
diff --git a/docs/manual/OptionalTasks/propertyfile.html b/docs/manual/OptionalTasks/propertyfile.html
index fa3931655..91b266748 100644
--- a/docs/manual/OptionalTasks/propertyfile.html
+++ b/docs/manual/OptionalTasks/propertyfile.html
@@ -152,8 +152,8 @@ The slashes conform to the expectations of the Properties class.  The file will
 
 <blockquote><pre>&lt;propertyfile
     file=&quot;my.properties&quot;
-    comment&quot;My properties&quot; &gt;
-  &lt;entry  key=&quot;akey&quot; value=&quot;avalue&quot; /&gt;
+    comment&quot;My properties&quot;&gt;
+  &lt;entry  key=&quot;akey&quot; value=&quot;avalue&quot;/&gt;
   &lt;entry  key=&quot;adate&quot; type=&quot;date&quot; value=&quot;now&quot;/&gt;
   &lt;entry  key=&quot;anint&quot; type=&quot;int&quot; operation=&quot;+&quot;/&gt;
   &lt;entry  key=&quot;formated.int&quot; type=&quot;int&quot; default=&quot;0013&quot; operation=&quot;+&quot; pattern=&quot;0000&quot;/&gt;
@@ -164,7 +164,7 @@ The slashes conform to the expectations of the Properties class.  The file will
 To produce dates relative from today :</p>
 <blockquote><pre>&lt;propertyfile
     file=&quot;my.properties&quot;
-    comment=&quot;My properties&quot; &gt;
+    comment=&quot;My properties&quot;&gt;
   &lt;entry  key=&quot;formated.date-1&quot;
       type=&quot;date&quot; default=&quot;now&quot; pattern=&quot;DDD&quot;
       operation=&quot;-&quot; value=&quot;1&quot;/&gt;
@@ -178,7 +178,7 @@ To produce dates relative from today :</p>
 Concatenation of strings :</p>
 <blockquote><pre>&lt;propertyfile
     file=&quot;my.properties&quot;
-    comment=&quot;My properties&quot; &gt;
+    comment=&quot;My properties&quot;&gt;
   &lt;entry  key=&quot;progress&quot; default=&quot;&quot; operation=&quot;+&quot; value=&quot;.&quot;/&gt;
 &lt;/propertyfile&gt;
 </pre></blockquote>
diff --git a/docs/manual/OptionalTasks/replaceregexp.html b/docs/manual/OptionalTasks/replaceregexp.html
index 1a120a777..7b3b97f14 100644
--- a/docs/manual/OptionalTasks/replaceregexp.html
+++ b/docs/manual/OptionalTasks/replaceregexp.html
@@ -86,7 +86,7 @@ We <b>strongly</b> recommend that you use Jakarta Oro.
 <pre>  &lt;replaceregexp file=&quot;${src}/build.properties&quot;
                          match=&quot;OldProperty=(.*)&quot;
                          replace=&quot;NewProperty=\1&quot;
-                         byline=&quot;true&quot; /&gt;
+                         byline=&quot;true&quot;/&gt;
 </pre>
 <p>replaces occurrences of the property name &quot;OldProperty&quot;
  with &quot;NewProperty&quot; in a properties file, preserving the existing
@@ -98,24 +98,24 @@ value, in the file <code>${src}/build.properties</code></p>
    the regular expression.  You can use this element to refer to a previously
    defined regular expression datatype instance.</p>
 <blockquote>
-     &lt;regexp id="id" pattern="expression" /&gt;<br />
-     &lt;regexp refid="id" /&gt;
+     &lt;regexp id="id" pattern="expression"/&gt;<br />
+     &lt;regexp refid="id"/&gt;
 </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 substitution pattern datatype instance.</p>
 <blockquote>
-     &lt;substitution id="id" pattern="expression" /&gt;<br />
-     &lt;substitution refid="id" /&gt;
+     &lt;substitution id="id" pattern="expression"/&gt;<br />
+     &lt;substitution refid="id"/&gt;
 </blockquote>
 <h3>Examples</h3>
 <blockquote>
   <pre>
 &lt;replaceregexp byline=&quot;true&quot;&gt;
-  &lt;regexp expression=&quot;OldProperty=(.*)&quot; /&gt;
-  &lt;substitution expression=&quot;NewProperty=\1&quot; /&gt;
+  &lt;regexp expression=&quot;OldProperty=(.*)&quot;/&gt;
+  &lt;substitution expression=&quot;NewProperty=\1&quot;/&gt;
   &lt;fileset dir=&quot;.&quot;&gt;
-   &lt;includes=&quot;*.properties&quot; /&gt;
+   &lt;includes=&quot;*.properties&quot;/&gt;
   &lt;/fileset&gt;
  &lt;/replaceregexp&gt;
 </pre></blockquote>
diff --git a/docs/manual/OptionalTasks/serverdeploy.html b/docs/manual/OptionalTasks/serverdeploy.html
index 7d8ff47ed..dc18fa3a2 100644
--- a/docs/manual/OptionalTasks/serverdeploy.html
+++ b/docs/manual/OptionalTasks/serverdeploy.html
@@ -288,10 +288,11 @@ task.
 
 <pre>
     &lt;serverdeploy action=&quot;deploy&quot; source=&quot;${lib.dir}/ejb_myApp.jar&quot;&gt;
-        &lt;jonas server=&quot;MyJOnAS&quot; jonasroot="${jonas.root}" &gt;
+        &lt;jonas server=&quot;MyJOnAS&quot; jonasroot="${jonas.root}"&gt;
+
            &lt;classpath&gt;
-               &lt;pathelement path=&quot;${jonas.root}/lib/RMI_jonas.jar&quot; /&gt;
-               &lt;pathelement path=&quot;${jonas.root}/config/&quot; /&gt;
+               &lt;pathelement path=&quot;${jonas.root}/lib/RMI_jonas.jar&quot;/&gt;
+               &lt;pathelement path=&quot;${jonas.root}/config/&quot;/&gt;
            &lt;/classpath&gt;
         &lt;/jonas&gt;
     &lt;/serverdeploy&gt;
@@ -301,8 +302,8 @@ task.
 JOnAS server and a WebLogic server:</p>
 
 <pre>
-    &lt;serverdeploy action=&quot;list&quot; /&gt
-        &lt;jonas jonasroot=&quot;${jonas.root}&quot; orb=&quot;JEREMIE&quot; /&gt;
+    &lt;serverdeploy action=&quot;list&quot;/&gt
+        &lt;jonas jonasroot=&quot;${jonas.root}&quot; orb=&quot;JEREMIE&quot;/&gt;
         &lt;weblogic application=&quot;myapp&quot
             server=&quot;t3://myserver:7001&quot;
             classpath=&quot;${weblogic.home}/lib/weblogic.jar&quot;
@@ -315,4 +316,4 @@ JOnAS server and a WebLogic server:</p>
 <hr>
 <p align="center">Copyright &copy; 2002 Apache Software Foundation. All rights Reserved.</p>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/manual/OptionalTasks/sos.html b/docs/manual/OptionalTasks/sos.html
index 79abbc8fd..4b26f6a71 100644
--- a/docs/manual/OptionalTasks/sos.html
+++ b/docs/manual/OptionalTasks/sos.html
@@ -172,23 +172,17 @@ have been tested with Linux, Solaris &amp; Windows2000.</p>
 </table>
 
 <h3>Example</h3>
-&nbsp;&nbsp;&nbsp;
-<small>&lt;sosget&nbsp;&nbsp;&nbsp;verbose="true"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;recursive="true"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;username="build"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;password="build"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;localpath="tmp"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;projectpath="/SourceRoot/project1"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sosserverpath="192.168.10.6:8888"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vssserverpath="d:\vss\srcsafe.ini"/&gt;</small><br><br>
 
+<pre>
+&lt;sosget verbose="true"
+        recursive="true"
+        username="build"
+        password="build"
+        localpath="tmp"
+        projectpath="/SourceRoot/project1"
+        sosserverpath="192.168.10.6:8888"
+        vssserverpath="d:\vss\srcsafe.ini"/&gt;
+</pre>
 <small>Connects to a SourceOffsite server on 192.168.10.6:8888 with
 build,build as the username &amp; password. The SourceSafe  database resides
 on the same box as the SOS server  &amp; the VSS database  is at
@@ -259,23 +253,14 @@ using tmp as the working directory. </small><br>
 </table>
 
 <h3>Example</h3>
-&nbsp;&nbsp;&nbsp;
-<small>&lt;soslabel&nbsp;&nbsp;&nbsp;username="build"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-password="build"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-label="test label"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-projectpath="/SourceRoot/project1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-sosserverpath="192.168.10.6:8888"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-vssserverpath="d:\vss\srcsafe.ini"/&gt;</small><br><br>
+<pre>
+&lt;soslabel username="build"
+          password="build"
+          label="test label"
+          projectpath="/SourceRoot/project1
+          sosserverpath="192.168.10.6:8888"
+          vssserverpath="d:\vss\srcsafe.ini"/&gt;
+</pre>
 
 <small>Connects to a SourceOffsite server on 192.168.10.6:8888 with
 build,build as the username &amp; password. The SourceSafe database resides
@@ -372,30 +357,16 @@ on the same box as  the  SOS server  &amp; the VSS database is at
 </table>
 
 <h3>Example</h3>
-&nbsp;&nbsp;&nbsp;
-<small>&lt;soscheckin&nbsp;&nbsp;&nbsp;username="build"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;password="build"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;file="foobar.txt"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;verbose="true"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;comment="comment abc"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;projectpath="/SourceRoot/project1"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sosserverpath="server1:8888"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vssserverpath="\\server2\vss\srcsafe.ini"/&gt;
-</small><br><br>
+<pre>
+&lt;soscheckin username="build"
+            password="build"
+            file="foobar.txt"
+            verbose="true"
+            comment="comment abc"
+            projectpath="/SourceRoot/project1"
+            sosserverpath="server1:8888"
+            vssserverpath="\\server2\vss\srcsafe.ini"/&gt;
+</pre>
 
 <small>Connects to a SourceOffsite server on server1:8888 with build,build as
 the username &amp; password. The SourceSafe database resides on a different
@@ -490,27 +461,15 @@ messages will be displayed on screen.</small><br>
      <br>
 
 <h3>Example</h3>
-&nbsp;&nbsp;&nbsp;
-<small>&lt;soscheckout&nbsp;&nbsp;&nbsp;soscmd="/usr/local/bin"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;verbose="true"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;username="build"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;password="build"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;projectpath="/SourceRoot/project1"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sosserverpath="192.168.10.6:8888"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vssserverpath="\\server2\vss\srcsafe.ini"/&gt;
-</small><br><br>
+<pre>
+&lt;soscheckout soscmd="/usr/local/bin"
+             verbose="true"
+             username="build"
+             password="build"
+             projectpath="/SourceRoot/project1"
+             sosserverpath="192.168.10.6:8888"
+             vssserverpath="\\server2\vss\srcsafe.ini"/&gt;
+</pre>
 
 <small>Connects to a SourceOffsite server on server1:8888 with build,build as
 the username &amp; password. The SourceSafe database resides on a different
diff --git a/docs/manual/OptionalTasks/starteam.html b/docs/manual/OptionalTasks/starteam.html
index a285e8862..3a3ec6ce6 100644
--- a/docs/manual/OptionalTasks/starteam.html
+++ b/docs/manual/OptionalTasks/starteam.html
@@ -164,13 +164,13 @@ If false (default) has no effect.
 
 <pre>
   &lt;stcheckout servername="STARTEAM" 
-            serverport="49201"
-            projectname="AProject" 
-            viewname="AView"
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            force="true"
+              serverport="49201"
+              projectname="AProject" 
+              viewname="AView"
+              username="auser"
+              password="secret"
+              rootlocalfolder="C:\dev\buildtest\co"
+              force="true"
   /&gt;
 </pre>
 
@@ -181,23 +181,23 @@ created for them and any non-StarTeam files found in the tree will be deleted.
 
 <pre>
   &lt;stcheckout URL="STARTEAM:49201/Aproject/AView" 
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            forced="true"
+              username="auser"
+              password="secret"
+              rootlocalfolder="C:\dev\buildtest\co"
+              forced="true"
   /&gt;
 </pre>
 And this is a simpler way of accomplishing the same thing as the previous example, using the URL attribute.
 <br></br>
 <pre>
   &lt;stcheckout URL="STARTEAM:49201/Aproject/AView" 
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            rootstarteamfolder="\Dev"
-            excludes="*.bak *.old"
-            label="v2.6.001"
-            forced="true"
+              username="auser"
+              password="secret"
+              rootlocalfolder="C:\dev\buildtest\co"
+              rootstarteamfolder="\Dev"
+              excludes="*.bak *.old"
+              label="v2.6.001"
+              forced="true"
   /&gt;
 </pre>
 
@@ -206,12 +206,12 @@ end in <i>.bak</i> or <i>.old</i> with the label <i>v2.6.001</i>.
 
 <pre>
   &lt;stcheckout URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            includes="*.htm,*.html"
-            excludes="index.*"
-            forced="true"
+              username="auser"
+              password="secret"
+              rootlocalfolder="C:\dev\buildtest\co"
+              includes="*.htm,*.html"
+              excludes="index.*"
+              forced="true"
   /&gt;
 </pre>
 
@@ -222,13 +222,13 @@ not be checked out by this command.
 
 <pre>
   &lt;stcheckout URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            includes="*.htm,*.html"
-            excludes="index.*"
-            forced="true"
-            recursive="false"
+              username="auser"
+              password="secret"
+              rootlocalfolder="C:\dev\buildtest\co"
+              includes="*.htm,*.html"
+              excludes="index.*"
+              forced="true"
+              recursive="false"
   /&gt;
 </pre>
 This example is like the previous one, but will only check out files in 
@@ -236,29 +236,29 @@ C:\dev\buildtest\co, because of the turning off of the recursive attribute.
 
 <pre>
   &lt;stcheckout URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootstarteamfolder="src/java"
-            rootlocalfolder="C:\dev\buildtest\co"
-            forced="true"
+              username="auser"
+              password="secret"
+              rootstarteamfolder="src/java"
+              rootlocalfolder="C:\dev\buildtest\co"
+              forced="true"
   /&gt;
 </pre>
 <br></br>
 <pre>
   &lt;stcheckout URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootstarteamfolder="src/java"
+              username="auser"
+              password="secret"
+              rootstarteamfolder="src/java"
   /&gt;
 </pre>
 <br></br>
 <pre>
  &lt;stcheckout URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootstarteamfolder="src/java"
-            rootlocalfolder="C:\dev\buildtest\co\src\java"
-            forced="true"
+             username="auser"
+             password="secret"
+             rootstarteamfolder="src/java"
+             rootlocalfolder="C:\dev\buildtest\co\src\java"
+             forced="true"
   /&gt;
 </pre>
 
@@ -345,13 +345,13 @@ change it.  If false (default) lock status will not change.
 
 <pre>
   &lt;stcheckin servername="STARTEAM" 
-            serverport="49201"
-            projectname="AProject" 
-            viewname="AView"
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            forced="true"
+             serverport="49201"
+             projectname="AProject" 
+             viewname="AView"
+             username="auser"
+             password="secret"
+             rootlocalfolder="C:\dev\buildtest\co"
+             forced="true"
   /&gt;
 </pre>
 
@@ -362,22 +362,22 @@ For files and folders in the local tree but not in starteam, nothing will be don
 
 <pre>
   &lt;stcheckin URL="STARTEAM:49201/Aproject/AView" 
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            forced="true"
+             username="auser"
+             password="secret"
+             rootlocalfolder="C:\dev\buildtest\co"
+             forced="true"
   /&gt;
 </pre>
 And this is a simpler way of giving the same commands as the command above using the URL shortcut.
 <br></br>
 <pre>
   &lt;stcheckin URL="STARTEAM:49201/Aproject/AView" 
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            rootstarteamfolder="\Dev"
-            excludes="*.bak *.old"
-            forced="true"
+             username="auser"
+             password="secret"
+             rootlocalfolder="C:\dev\buildtest\co"
+             rootstarteamfolder="\Dev"
+             excludes="*.bak *.old"
+             forced="true"
   /&gt;
 </pre>
 
@@ -386,12 +386,12 @@ end in <i>.bak</i> or <i>.old</i> from the tree rooted at"C:\dev\buildtest\co" .
 
 <pre>
   &lt;stcheckin URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            includes="*.htm,*.html"
-            excludes="index.*"
-            forced="true"
+             username="auser"
+             password="secret"
+             rootlocalfolder="C:\dev\buildtest\co"
+             includes="*.htm,*.html"
+             excludes="index.*"
+             forced="true"
   /&gt;
 </pre>
 
@@ -402,14 +402,14 @@ not be checked in by this command.
 
 <pre>
   &lt;stcheckin URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            rootstarteamfolder="src/java"
-            includes="*.htm,*.html"
-            excludes="index.*"
-            forced="true"
-            recursive="false"
+             username="auser"
+             password="secret"
+             rootlocalfolder="C:\dev\buildtest\co"
+             rootstarteamfolder="src/java"
+             includes="*.htm,*.html"
+             excludes="index.*"
+             forced="true"
+             recursive="false"
   /&gt;
 </pre>
 This example is like the previous one, but will only check in files from 
@@ -417,57 +417,57 @@ C:\dev\buildtest\co, because of the turning off of the recursive attribute.
 
 <pre>
   &lt;stcheckin URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            rootstarteamfolder="src/java"
-            includes="version.txt"
-            forced="true"
-            recursive="false"
+             username="auser"
+             password="secret"
+             rootlocalfolder="C:\dev\buildtest\co"
+             rootstarteamfolder="src/java"
+             includes="version.txt"
+             forced="true"
+             recursive="false"
   /&gt;
 </pre>
 This example is like the previous one, but will only check only in one file, C:\dev\buildtest\co\version.txt to the StarTeam folder src/java.
 
 <pre>
   &lt;stcheckin URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootlocalfolder="C:\dev\buildtest\co"
-            rootstarteamfolder="src/java"
-            includes="version.java"
-            forced="true"
-            recursive="false"
-            addUncontrolled="true"
-            comment="Fix Bug #667"
+             username="auser"
+             password="secret"
+             rootlocalfolder="C:\dev\buildtest\co"
+             rootstarteamfolder="src/java"
+             includes="version.java"
+             forced="true"
+             recursive="false"
+             addUncontrolled="true"
+             comment="Fix Bug #667"
   /&gt;
 </pre>
 This example is like the previous one, but will only check only in one file, C:\dev\buildtest\co\version.java to the StarTeam folder src/java.  Because the <i>addUncontrolled</i> attribute has been set, if StarTeam does not already control this file in this location, it will be added to the repository.  Also, it will write a comment to the repository for this version of the file.
 
 <pre>
   &lt;stcheckin URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootstarteamfolder="src/java"
-            rootlocalfolder="C:\dev\buildtest\co"
-            forced="true"
+             username="auser"
+             password="secret"
+             rootstarteamfolder="src/java"
+             rootlocalfolder="C:\dev\buildtest\co"
+             forced="true"
   /&gt;
 </pre>
 <br></br>
 <pre>
   &lt;stcheckin URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootstarteamfolder="src/java"
+             username="auser"
+             password="secret"
+             rootstarteamfolder="src/java"
   /&gt;
 </pre>
 <br></br>
 <pre>
  &lt;stcheckin URL="STARTEAM:49201/Aproject/AView"
-            username="auser"
-            password="secret"
-            rootstarteamfolder="src/java"
-            rootlocalfolder="C:\dev\buildtest\co\src\java"
-            forced="true"
+             username="auser"
+             password="secret"
+             rootstarteamfolder="src/java"
+             rootlocalfolder="C:\dev\buildtest\co\src\java"
+             forced="true"
   /&gt;
 </pre>
 
@@ -520,11 +520,11 @@ This example shows the use of this tag.  It will create a label named <i>Version
     &lt;format property="nowstamp" pattern="yyyyMMddHHmmss" locale="en"/&gt;
   &lt;/tstamp&gt;  
   &lt;stlabel URL="STARTEAM:49201/Aproject/AView"
-              username="auser"
-              password="secret"
-              label="Version 6.2"
-              lastbuild="${nowstamp}"
-              description="Thorough description"
+           username="auser"
+           password="secret"
+           label="Version 6.2"
+           lastbuild="${nowstamp}"
+           description="Thorough description"
   /&gt;
 </pre>
 
@@ -582,8 +582,8 @@ See also <A href="#common-params">the required common StarTeam parameters</A>.<b
 <pre>
 
   &lt;stlist url="WASHINGTON:49201/build"
-             username="auser"
-             password="secret"
+          username="auser"
+          password="secret"
  /&gt;
 </pre>
 
@@ -604,10 +604,10 @@ while adding a <i>rootlocalfolder</i> and an <i>excludes</i> param ...
 <pre>
 
   &lt;stlist url="WASHINGTON:49201/build"
-             username="auser"
-             password="secret"
-             rootlocalfolder="srcdir2"
-             excludes="*.properties"
+          username="auser"
+          password="secret"
+          rootlocalfolder="srcdir2"
+          excludes="*.properties"
  /&gt;
 </pre>
 
diff --git a/docs/manual/OptionalTasks/wljspc.html b/docs/manual/OptionalTasks/wljspc.html
index 181ff65f6..ed33eed52 100644
--- a/docs/manual/OptionalTasks/wljspc.html
+++ b/docs/manual/OptionalTasks/wljspc.html
@@ -57,15 +57,17 @@ It follows the weblogic naming convention of putting classes in<br>
 Example<br>
 </h3>
 <p>
-&lt;target name="jspcompile" depends="compile"&gt;<br>
-&lt;wljspc src="c:\\weblogic\\myserver\\public_html" dest="c:\\weblogic\\myserver\\serverclasses" package="myapp.jsp" &gt;<br>
-&lt;classpath&gt;<br>
-&lt;pathelement location="${weblogic.classpath}" /&gt;<br>
-&lt;pathelement path="${compile.dest}" /&gt;<br>
-&lt;/classpath&gt;<br>
-<br>
-&lt;/wljspc&gt;<br>
+<pre>
+&lt;target name="jspcompile" depends="compile"&gt;
+  &lt;wljspc src="c:\\weblogic\\myserver\\public_html" dest="c:\\weblogic\\myserver\\serverclasses" package="myapp.jsp"&gt
+    &lt;classpath&gt;
+      &lt;pathelement location="${weblogic.classpath}"/&gt;
+      &lt;pathelement path="${compile.dest}"/&gt;
+    &lt;/classpath&gt;
+  &lt;/wljspc&gt;
 &lt;/target&gt;
+</pre>
+
 </p>
 
 <h3>Limitations</h3>
@@ -80,4 +82,3 @@ many files at one go, it is called multiple times with one jsp file each.</li>
 Reserved.</p>
 </body>
 </html>
-
diff --git a/docs/manual/OptionalTasks/xmlvalidate.html b/docs/manual/OptionalTasks/xmlvalidate.html
index 65551f3b5..3655ea7be 100644
--- a/docs/manual/OptionalTasks/xmlvalidate.html
+++ b/docs/manual/OptionalTasks/xmlvalidate.html
@@ -91,7 +91,7 @@ element is used to perform Entity resolution.</p>
 &lt;xmlvalidate file="toto.xml"/&gt;
 
 &lt;xmlvalidate failonerror="no" lenient="yes" warn="yes"
-             classname="org.apache.xerces.parsers.SAXParser" &gt;
+             classname="org.apache.xerces.parsers.SAXParser"&gt;
              classpath="lib/xerces.jar"&gt;
   &lt;fileset dir="src" includes="style/*.xsl"/&gt;
 &lt;/xmlvalidate&gt;
diff --git a/docs/manual/OptionalTypes/classfileset.html b/docs/manual/OptionalTypes/classfileset.html
index ecd1facee..b72b398d4 100644
--- a/docs/manual/OptionalTypes/classfileset.html
+++ b/docs/manual/OptionalTypes/classfileset.html
@@ -81,14 +81,14 @@ then be used to create a jar.
 </p>
 
 <blockquote><pre>
-&lt;jar destfile=&quot;minimal.jar&quot; &gt;
+&lt;jar destfile=&quot;minimal.jar&quot;&gt;
   &lt;fileset refid=&quot;reqdClasses&quot;/&gt;
 &lt;/jar&gt;
 </pre></blockquote>
 
 <blockquote><pre>
 &lt;classfileset id=&quot;reqdClasses&quot; dir=&quot;${classes.dir}&quot;&gt;
-  &lt;rootfileset dir=&quot;${classes.dir}&quot; includes=&quot;org/apache/tools/ant/Project*.class&quot; /&gt;
+  &lt;rootfileset dir=&quot;${classes.dir}&quot; includes=&quot;org/apache/tools/ant/Project*.class&quot;/&gt;
 &lt;/classfileset&gt;
 </pre></blockquote>
 
diff --git a/docs/manual/OptionalTypes/extension.html b/docs/manual/OptionalTypes/extension.html
index 808a2eaf8..34e5ac76d 100644
--- a/docs/manual/OptionalTypes/extension.html
+++ b/docs/manual/OptionalTypes/extension.html
@@ -85,7 +85,7 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html</a>.</p>
 &lt;extension id=&quot;e1&quot;
     extensionName=&quot;MyExtensions&quot;
     specificationVersion=&quot;1.0&quot;
-    specificationVendor=&quot;Peter Donald&quot; /&gt;
+    specificationVendor=&quot;Peter Donald&quot;/&gt;
 </pre></blockquote>
 
 <p>Extension object that just species the specification details.</p>