diff --git a/CONTRIBUTORS b/CONTRIBUTORS index b989752d2..4d4105d07 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -112,6 +112,7 @@ Kevin Ross Kevin Z Grey Kirk Wylie Kyle Adams +Larry Shatzer Larry Streepy Les Hughes Levi Cook diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/CoreTasks/ant.html index 134d0d14b..6366fe5c0 100644 --- a/docs/manual/CoreTasks/ant.html +++ b/docs/manual/CoreTasks/ant.html @@ -33,14 +33,14 @@ by using nested property tags. These properties are always passed to the new project and any project created in that project regardless of the setting of inheritAll. This allows you to parameterize your subprojects. Properties defined on the command line -can not be overridden by nested <property> elements.

+can not be overridden by nested <property> elements.

References to data types can also be passed to the new project, but by default they are not. If you set the inheritrefs attribute to true, all references will be copied, but they will not override references defined in the new project.

-

Nested <reference> elements +

Nested <reference> elements can also be used to copy references from the calling project to the new project, optionally under a different id. References taken from nested elements will override existing references that have been @@ -105,7 +105,7 @@ inside of targets.

task.
These properties become equivalent to properties you define on the command line. These are special properties and they will always get passed -down, even through additional <*ant*> tasks with inheritall set to +down, even through additional <*ant*> tasks with inheritall set to false (see above).
Note that the refid attribute points to a reference in the calling project, not in the new one.

@@ -142,7 +142,7 @@ href="../CoreTypes/propertyset.html">propertysets.

target

-

You can specify multiple targets using nested <target> elements +

You can specify multiple targets using nested <target> elements instead of using the target attribute. These will be executed as if Ant had been invoked with a single target whose dependencies are the targets so specified, in the order specified.

@@ -186,12 +186,12 @@ details:

omitted true basedir of calling project (the one whose build - file contains the <ant> task). + file contains the <ant> task). omitted false - basedir attribute of the <project> element + basedir attribute of the <project> element of the new project diff --git a/docs/manual/CoreTasks/antcall.html b/docs/manual/CoreTasks/antcall.html index 2dc04c5b1..2d984d5e6 100644 --- a/docs/manual/CoreTasks/antcall.html +++ b/docs/manual/CoreTasks/antcall.html @@ -26,9 +26,9 @@ by using nested param tags. These properties are always passed to the new project and any project created in that project regardless of the setting of inheritAll. This allows you to parameterize your subprojects. Properties defined on the command line -can not be overridden by nested <param> elements.

+can not be overridden by nested <param> elements.

-

Nested <reference> elements can +

Nested <reference>; elements can be used to copy references from the calling project to the new project, optionally under a different id. References taken from nested elements will override existing references that have been @@ -91,7 +91,7 @@ attribute).

href="property.html">property for usage guidelines.
These properties become equivalent to properties you define on the command line. These are special properties and they will always get passed -down, even through additional <*ant*> tasks with inheritall set to +down, even through additional <*ant*> tasks with inheritall set to false (see above).

@@ -127,7 +127,7 @@ href="../CoreTypes/propertyset.html">propertysets.

target

-

You can specify multiple targets using nested <target> elements +

You can specify multiple targets using nested <target> elements instead of using the target attribute. These will be executed as if Ant had been invoked with a single target whose dependencies are the targets so specified, in the order specified.

diff --git a/docs/manual/CoreTasks/apply.html b/docs/manual/CoreTasks/apply.html index 44fde923c..5d9e88426 100644 --- a/docs/manual/CoreTasks/apply.html +++ b/docs/manual/CoreTasks/apply.html @@ -46,7 +46,7 @@ to send input to it is via the input and inputstring attributes.

dest - the directory where the <apply> expects the target files will be placed by the + the directory where the <apply> expects the target files will be placed by the command, when it is executed. Yes, if you specify a nested mapper @@ -360,24 +360,24 @@ the .o and SOURCEFILE with the absolute name of the 
 <mapper id="out" type="glob"
            from="src${file.separator}*.file"
-           to="dest${file.separator}*.out" />
+           to="dest${file.separator}*.out"/>
 
 <apply executable="processfile" dest="dest">
   <fileset dir="src" includes="*.file"/>
-  <mapper refid="out" />
+  <mapper refid="out"/>
   <redirector>
-    <outputmapper refid="out" />
+    <outputmapper refid="out"/>
   </redirector>
 </apply>
Applies the fictitious "processfile" executable to all files matching *.file in the src directory. -The out <mapper> has been set up to map -*.file to *.out, then this <mapper> +The out <mapper> has been set up to map +*.file to *.out, then this <mapper> is used to specify targetfiles for this <apply> task. A reference to out is then used as an -<outputmapper> nested in a <redirector>, which in turn is -nested beneath this <apply> instance. This allows us to perform +<outputmapper> nested in a <redirector>, which in turn is +nested beneath this <apply> instance. This allows us to perform dependency checking against output files--the target files in this case.

Copyright © 2000-2004 The Apache Software Foundation. All rights diff --git a/docs/manual/CoreTasks/apt.html b/docs/manual/CoreTasks/apt.html index 004533a2c..e1f0279c2 100644 --- a/docs/manual/CoreTasks/apt.html +++ b/docs/manual/CoreTasks/apt.html @@ -23,13 +23,13 @@ compile After running the Apt, should the code be compiled. (see the - "-nocompile" flag on the Apt executable) + -nocompile flag on the Apt executable) No, defaults to false. factory The fully qualified classname of the AnnotationProcessFactory to be used - to construct annotation processors. This represents the "-factory" + to construct annotation processors. This represents the -factory command line flag of the Apt executable. No @@ -37,13 +37,13 @@ factorypathref The reference id of the path used to find the classes needed by the AnnotationProcessorFactory (and the location of the factory itself). - This represents the "-factorypath" flag on the Apt executable. + This represents the -factorypath flag on the Apt executable. No preprocessdir The directory used for preprocessing. This is the directory where the - generated source code will be place. This represents the "-s" flag on + generated source code will be place. This represents the -s flag on the Apt executable. No @@ -56,13 +56,13 @@

You can specify the path used to find the classes needed by the AnnotationProcessorFactory at runtime, using this element. It is represents as a generic path like structure. This - represents the "-factorypath" flag on the Apt executable.

+ represents the -factorypath flag on the Apt executable.

option

-

Used to represent a generic option to pass to Apt. This represents the "-A" flag on the - Apt executable. You can specify zero or more <option> elements.

+

Used to represent a generic option to pass to Apt. This represents the -A flag on the + Apt executable. You can specify zero or more <option> elements.

@@ -128,19 +128,19 @@ The "compiler" attribute is ignored, as it is forced to use the Apt compiler <javac srcdir="${src}" destdir="${build}" classpath="xyz.jar" - debug="on" /> + debug="on"/> <javac srcdir="${preprocess.dir}" destdir="${build}" classpath="xyz.jar" - debug="true" /> + debug="true"/> This may involve more build file coding, but the speedup gained from switching to jikes may justify the effort.

-

Copyright ÂĐ 2004 The Apache Software Foundation. +

Copyright © 2004 The Apache Software Foundation. All rights Reserved.

\ No newline at end of file diff --git a/docs/manual/CoreTasks/changelog.html b/docs/manual/CoreTasks/changelog.html index 09a24244c..b2b657296 100644 --- a/docs/manual/CoreTasks/changelog.html +++ b/docs/manual/CoreTasks/changelog.html @@ -12,7 +12,7 @@

Generates an XML-formatted report file of the change logs recorded in a CVS repository.

Important: This task needs "cvs" on the path. If it isn't, you will get -an error (such as error 2 on windows). If <cvs> doesn't work, try to execute cvs.exe +an error (such as error 2 on windows). If <cvs> doesn't work, try to execute cvs.exe from the command line in the target directory in which you are working.

Parameters

@@ -48,7 +48,7 @@ from the command line in the target directory in which you are working. - + @@ -184,7 +184,7 @@ It writes these changes into the file changelog.xml.

Generates a change log report on the ANT_16_BRANCH.

  <cvschangelog dir="c:/dev/asf/ant.head" passfile="c:/home/myself/.cvspass"
-                destfile="changelogant.xml" tag="ANT_16_BRANCH" />
+                destfile="changelogant.xml" tag="ANT_16_BRANCH"/>

Generate Report

Ant includes a basic XSLT stylesheet that you can use to generate diff --git a/docs/manual/CoreTasks/copy.html b/docs/manual/CoreTasks/copy.html index bf9b7b3f0..3faa91792 100644 --- a/docs/manual/CoreTasks/copy.html +++ b/docs/manual/CoreTasks/copy.html @@ -162,9 +162,9 @@ tokens in files that are copied. FilterChains.

-If <filterset> and <filterchain> elements are used inside the -same <copy> task, all <filterchain> elements are processed first -followed by <filterset> elements. +If <filterset> and <filterchain> elements are used inside the +same <copy> task, all <filterchain> elements are processed first +followed by <filterset> elements.

Examples

diff --git a/docs/manual/CoreTasks/cvspass.html b/docs/manual/CoreTasks/cvspass.html index b26c1c5b8..b7afc64fe 100644 --- a/docs/manual/CoreTasks/cvspass.html +++ b/docs/manual/CoreTasks/cvspass.html @@ -30,7 +30,7 @@ - +
passfile Password file to read passwords from.No, default file ~/.cvspass.No, default file ~/.cvspass.
failonerror
passfile Password file to add the entry to.No, default is ~/.cvspass.No, default is ~/.cvspass.

Examples

@@ -40,7 +40,7 @@

Adds an entry into the ~/.cvspass password file.

-

Copyright © 2001,2003 Apache Software Foundation. All rights +

Copyright © 2001,2003-2004 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTasks/cvstagdiff.html b/docs/manual/CoreTasks/cvstagdiff.html index d57e46b57..b7e216fa7 100644 --- a/docs/manual/CoreTasks/cvstagdiff.html +++ b/docs/manual/CoreTasks/cvstagdiff.html @@ -9,7 +9,7 @@

Generates an XML-formatted report file of the changes between two tags or dates recorded in a CVS repository.

Important: This task needs "cvs" on the path. If it isn't, you will get -an error (such as error 2 on windows). If <cvs> doesn't work, try to execute cvs.exe +an error (such as error 2 on windows). If <cvs> doesn't work, try to execute cvs.exe from the command line in the target directory in which you are working.

Parameters

@@ -92,7 +92,7 @@ from the command line in the target directory in which you are working. - + diff --git a/docs/manual/CoreTasks/dependset.html b/docs/manual/CoreTasks/dependset.html index 5b7aa1ba8..625b43b47 100644 --- a/docs/manual/CoreTasks/dependset.html +++ b/docs/manual/CoreTasks/dependset.html @@ -34,7 +34,7 @@ FileList, all target files will be removed.

DependSet is useful to capture dependencies that are not or cannot be -determined algorithmically. For example, the <style> task only +determined algorithmically. For example, the <style> task only compares the source XML file and XSLT stylesheet against the target file to determined whether to restyle the source. Using dependset you can extend this dependency checking to include a DTD or XSD file as diff --git a/docs/manual/CoreTasks/exec.html b/docs/manual/CoreTasks/exec.html index f08be7609..e46724be1 100644 --- a/docs/manual/CoreTasks/exec.html +++ b/docs/manual/CoreTasks/exec.html @@ -1,4 +1,4 @@ - +html> @@ -21,7 +21,7 @@ EOF (-1). This is a change from Ant 1.5, where such an attempt would block.

Windows Users

-

The <exec> task delegates to Runtime.exec which in turn +

The <exec> task delegates to Runtime.exec which in turn apparently calls ::CreateProcess. It is the latter Win32 function that defines the exact semantics of the call. In particular, if you do not put a file extension @@ -31,7 +31,7 @@ types listed in the environment variable PATHEXT. That is only used by the shell

Cygwin Users

-

In general the <exec> task will not understand paths such as /bin/sh for +

In general the <exec> task will not understand paths such as /bin/sh for the executable parameter. This is because the Java VM in which Ant is running is a Windows executable and is not aware of Cygwin conventions.

@@ -299,14 +299,14 @@ will fall back to the task level attributes. In practice this means that defaults can be specified for input, output, and error output files.

Errors and return codes

-By default the return code of a <exec> is ignored; when you set +By default the return code of a <exec> is ignored; when you set failonerror="true" then any return code signaling failure (OS specific) causes the build to fail. Alternatively, you can set resultproperty to the name of a property and have it assigned to the result code (barring immutability, of course).

If the attempt to start the program fails with an OS dependent error code, -then <exec> halts the build unless failifexecutionfails +then <exec> halts the build unless failifexecutionfails is set to false. You can use that to run a program if it exists, but otherwise do nothing.

@@ -349,10 +349,10 @@ ant process. The browser will let be open.

errorproperty="redirector.err" inputstring="blah before blah"> <inputfilterchain> - <replacestring from="before" to="after" /> + <replacestring from="before" to="after"/> </inputfilterchain> - <outputmapper type="merge" to="redirector.out" /> - <errormapper type="merge" to="redirector.err" /> + <outputmapper type="merge" to="redirector.out"/> + <errormapper type="merge" to="redirector.err"/> </redirector> </exec> diff --git a/docs/manual/CoreTasks/fail.html b/docs/manual/CoreTasks/fail.html index 5ac9994c6..33b710a3e 100644 --- a/docs/manual/CoreTasks/fail.html +++ b/docs/manual/CoreTasks/fail.html @@ -49,7 +49,7 @@ or character data nested into the element.

As an alternative to the if/unless attributes, conditional failure can be achieved using a single nested - <condition> element, which should contain exactly one + <condition> element, which should contain exactly one core or custom condition. For information about conditions, see here.
Since Ant 1.6.2

diff --git a/docs/manual/CoreTasks/import.html b/docs/manual/CoreTasks/import.html index dd0011d4b..560c8cd67 100644 --- a/docs/manual/CoreTasks/import.html +++ b/docs/manual/CoreTasks/import.html @@ -136,13 +136,13 @@ project).

passfile Password file to read passwords from.No, default file ~/.cvspass.No, default file ~/.cvspass.
failonerror

Examples

-
  <import file="../common-targets.xml" />
+
  <import file="../common-targets.xml"/>
 

 
 
Imports targets from the common-targets.xml file that is in a parent
 directory.

 
-
  <import file="${deploy-platform}.xml" />
+
  <import file="${deploy-platform}.xml"/>
 

 
 
Imports the project defined by the property deploy-platform

diff --git a/docs/manual/CoreTasks/java.html b/docs/manual/CoreTasks/java.html
index c546514d1..8d4d494a7 100644
--- a/docs/manual/CoreTasks/java.html
+++ b/docs/manual/CoreTasks/java.html
@@ -268,7 +268,7 @@ will fall back to the task level attributes.  In practice this means that
 defaults can be specified for input, output, and error output files.
 

 
Errors and return codes

-By default the return code of a <java> is ignored. Alternatively, you can set resultproperty to the name
+By default the return code of a <java> is ignored. Alternatively, you can set resultproperty to the name
 of a property and have it assigned to the result code (barring immutability,
 of course).
 When you set failonerror="true", the only possible value for resultproperty is 0. Any non zero response is treated as an
@@ -313,7 +313,7 @@ and with a maximum memory of 128MB. Any non zero return code breaks the build.
 

 Note: you can not specify the (highly deprecated) MSJVM, "jview.exe" as the
 JVM, as it takes different parameters for other JVMs,
-That JVM can be started from <exec> if required.
+That JVM can be started from <exec> if required.
 

 
Copyright © 2000-2004 The Apache Software Foundation. All rights
 Reserved.

diff --git a/docs/manual/CoreTasks/javac.html b/docs/manual/CoreTasks/javac.html
index d928ca069..5fff13770 100644
--- a/docs/manual/CoreTasks/javac.html
+++ b/docs/manual/CoreTasks/javac.html
@@ -511,8 +511,8 @@ javac's default searching mechanism then you can unset the sourcepath
 attribute:
 
  <javac sourcepath="" srcdir="${src}"
          destdir="${build}" >
-    <include name="**/*.java" />
-    <exclude name="**/Example.java" />
+    <include name="**/*.java"/>
+    <exclude name="**/Example.java"/>
   </javac>

 That way the javac will compile all java source files under "${src}"
 directory but skip the examples. The compiler will even produce errors if some of
diff --git a/docs/manual/CoreTasks/javadoc.html b/docs/manual/CoreTasks/javadoc.html
index 7164ed040..b18723012 100644
--- a/docs/manual/CoreTasks/javadoc.html
+++ b/docs/manual/CoreTasks/javadoc.html
@@ -254,8 +254,8 @@ means any VM of at least version 1.2.

   
   
     linkoffline
-    Link to docs at <url> using package list at
-    <url2> - separate the URLs by using a space character -- see
+    Link to docs at <url> using package list at
+    <url2> - separate the URLs by using a space character -- see
     also the nested link element.
     1.2+
     No
@@ -694,7 +694,7 @@ only available with Java 1.4.

     path
     A path specifying the search path for the taglet class
             (e.g. /home/taglets).
-            The path may also be specified by a nested <path> element
+            The path may also be specified by a nested <path> element
     No
   
 
@@ -724,7 +724,7 @@ arguments. Since Ant 1.6

            windowtitle="Test API">
     <doctitle><![CDATA[<h1>Test</h1>]]></doctitle>
     <bottom><![CDATA[<i>Copyright &#169; 2000 Dummy Corp. All Rights Reserved.</i>]]></bottom>
-    <tag name="todo" scope="all" description="To do:" />
+    <tag name="todo" scope="all" description="To do:"/>
     <group title="Group 1 Packages" packages="com.dummy.test.a*"/>
     <group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/>
     <link offline="true" href="http://java.sun.com/products/jdk/1.2/docs/api/" packagelistLoc="C:\tmp"/>
@@ -741,13 +741,13 @@ arguments. Since Ant 1.6

            windowtitle="Test API">
 
     <packageset dir="src" defaultexcludes="yes">
-      <include name="com/dummy/test/**" />
+      <include name="com/dummy/test/**"/>
       <exclude name="com/dummy/test/doc-files/**"/>
     </packageset>
 
     <doctitle><![CDATA[<h1>Test</h1>]]></doctitle>
     <bottom><![CDATA[<i>Copyright &#169; 2000 Dummy Corp. All Rights Reserved.</i>]]></bottom>
-    <tag name="todo" scope="all" description="To do:" />
+    <tag name="todo" scope="all" description="To do:"/>
     <group title="Group 1 Packages" packages="com.dummy.test.a*"/>
     <group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/>
     <link offline="true" href="http://java.sun.com/products/jdk/1.2/docs/api/" packagelistLoc="C:\tmp"/>
@@ -764,13 +764,13 @@ arguments. Since Ant 1.6

            windowtitle="Test API">
 
     <fileset dir="src" defaultexcludes="yes">
-      <include name="com/dummy/test/**" />
+      <include name="com/dummy/test/**"/>
       <exclude name="com/dummy/test/doc-files/**"/>
     </fileset>
 
     <doctitle><![CDATA[<h1>Test</h1>]]></doctitle>
     <bottom><![CDATA[<i>Copyright &#169; 2000 Dummy Corp. All Rights Reserved.</i>]]></bottom>
-    <tag name="todo" scope="all" description="To do:" />
+    <tag name="todo" scope="all" description="To do:"/>
     <group title="Group 1 Packages" packages="com.dummy.test.a*"/>
     <group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/>
     <link offline="true" href="http://java.sun.com/products/jdk/1.2/docs/api/" packagelistLoc="C:\tmp"/>
diff --git a/docs/manual/CoreTasks/loadproperties.html b/docs/manual/CoreTasks/loadproperties.html
index 3e32f8ce0..1bba870c2 100644
--- a/docs/manual/CoreTasks/loadproperties.html
+++ b/docs/manual/CoreTasks/loadproperties.html
@@ -10,8 +10,8 @@
 
Description

 

 Load a file's contents as Ant properties.  This is equivalent
-to <property file|resource="..."/> except that it
-supports nested <filterchain> elements.
+to <property file|resource="..."/> except that it
+supports nested <filterchain> elements.
 

 
 
If you want to simulate property's
@@ -49,7 +49,7 @@ filter.

     classpathref
     the classpath to use when looking up a resource,
       given as reference
-      to a <path> defined elsewhere..
+      to a <path> defined elsewhere..
     No
   
 
diff --git a/docs/manual/CoreTasks/macrodef.html b/docs/manual/CoreTasks/macrodef.html
index 595e7a168..9bbc51c00 100644
--- a/docs/manual/CoreTasks/macrodef.html
+++ b/docs/manual/CoreTasks/macrodef.html
@@ -16,10 +16,10 @@
     
MacroDef

     
Description

     

-      This defines a new task using a <sequential>
-      nested task as a template. Nested elements <attribute> and
-      <element> are used to specify attributes and elements of
-      the new task. These get substituted into the  <sequential>
+      This defines a new task using a <sequential>
+      nested task as a template. Nested elements <attribute> and
+      <element> are used to specify attributes and elements of
+      the new task. These get substituted into the <sequential>
       task when the new task is run.
     

     
Note

@@ -225,10 +225,10 @@

- The following fragment defines a task called <call-cc> which + The following fragment defines a task called <call-cc> which take the attributes "target", "link" and "target.dir" and the nested element "cc-elements". The body of the task - uses the <cc> task from the + uses the <cc> task from the ant-contrib project.

diff --git a/docs/manual/CoreTasks/mail.html b/docs/manual/CoreTasks/mail.html index 2fcb2508d..986b33937 100644 --- a/docs/manual/CoreTasks/mail.html +++ b/docs/manual/CoreTasks/mail.html @@ -250,7 +250,7 @@ will be replaced with the buildname property's value.

<mail mailhost="somehost@xyz.com" mailport="25" subject="Test build" charset="utf-8"> <from address="me@myist.com"/> - <to address="all@xyz.com" /> + <to address="all@xyz.com"/> <message>some international text:${line2}</message> </mail>
diff --git a/docs/manual/CoreTasks/move.html b/docs/manual/CoreTasks/move.html index 470ca7cfd..60bf4614e 100644 --- a/docs/manual/CoreTasks/move.html +++ b/docs/manual/CoreTasks/move.html @@ -139,9 +139,9 @@ href="../CoreTypes/mapper.html#identity-mapper">identity.

FilterChains.

-If <filterset> and <filterchain> elements are used inside the -same <move> task, all <filterchain> elements are processed first -followed by <filterset> elements. +If <filterset> and <filterchain> elements are used inside the +same <move> task, all <filterchain> elements are processed first +followed by <filterset> elements.

Examples

@@ -161,7 +161,7 @@ followed by <filterset> elements. or, since Ant 1.6.3: 
-  <move file="src/dir" tofile="new/dir/to/move/to" />
+  <move file="src/dir" tofile="new/dir/to/move/to"/>

Move a set of files to a new directory

diff --git a/docs/manual/CoreTasks/nice.html b/docs/manual/CoreTasks/nice.html
index b4df03821..4403b089a 100644
--- a/docs/manual/CoreTasks/nice.html
+++ b/docs/manual/CoreTasks/nice.html
@@ -35,12 +35,12 @@
   
 
 
Examples

-
   <nice newpriority="10" />

+
   <nice newpriority="10"/>

 Set the Thread priority to 10.
-
   <nice currentpriority="priority" />

+
   <nice currentpriority="priority"/>

 Store the current Thread priority in the user property "priority".
 
-   <nice currentpriority="currentpriority" newpriority="1" />
+   <nice currentpriority="currentpriority" newpriority="1"/>
 

 
Set the current Thread priority to 1, storing the original
 priority in the user property "currentpriority".  This
diff --git a/docs/manual/CoreTasks/parallel.html b/docs/manual/CoreTasks/parallel.html
index aacdd12f9..8f1df0e83 100644
--- a/docs/manual/CoreTasks/parallel.html
+++ b/docs/manual/CoreTasks/parallel.html
@@ -59,7 +59,7 @@ threads do not interact. For example, two javac compile tasks which write
 classes into the same destination directory may interact where one tries to
 read a class for dependency information while the other task is writing the
 class file. Be sure to avoid these types of interactions within a
-<parallel> task

+<parallel> task

 
 
Any valid Ant task may be embedded within a
 parallel task, including other parallel tasks.

@@ -71,7 +71,7 @@ flag is set, the parallel task will complete without waiting for other nested
 tasks to complete in other threads.
 

 
-
If any of the tasks within the <parallel> task fails and failonany is
+
If any of the tasks within the <parallel> task fails and failonany is
 not set, the remaining tasks in other threads will continue to run until
 all threads have completed. In this situation, the parallel task will also fail.

 
@@ -104,7 +104,7 @@ semantics and is best used for "embarassingly parallel" tasks.

 
 
daemons

 

-The parallel task supports a <daemons> nested element. This is a list of tasks
+The parallel task supports a <daemons> nested element. This is a list of tasks
 which are to be run in parallel daemon threads. The parallel task will not wait for
 these tasks to complete. Being daemon threads, however, they will not prevent Ant from
 completing, whereupon the threads are terminated. Failures in daemon threads which
@@ -114,7 +114,7 @@ reported.
 

 
 
Daemon tasks can be used, for example, to start test servers which might not be easily
-terminated from Ant. By using <daemons> such servers do not halt the build.
+terminated from Ant. By using <daemons> such servers do not halt the build.
 

 
 
diff --git a/docs/manual/CoreTasks/presetdef.html b/docs/manual/CoreTasks/presetdef.html
index 71be361eb..bb8c60b48 100644
--- a/docs/manual/CoreTasks/presetdef.html
+++ b/docs/manual/CoreTasks/presetdef.html
@@ -49,7 +49,7 @@
     
     
Parameters specified as nested elements

     
another type with attributes or elements set

-    
The <presetdef> task takes one nested element as a parameter.
+    
The <presetdef> task takes one nested element as a parameter.
       This nested element can be any other type or task. The attributes
       and elements that need to be preset are placed here.
     

@@ -146,7 +146,7 @@ called:
-

Copyright © 2003 Apache Software +

Copyright © 2003-2004 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTasks/property.html b/docs/manual/CoreTasks/property.html index 2a988e9b6..e88bd3e22 100644 --- a/docs/manual/CoreTasks/property.html +++ b/docs/manual/CoreTasks/property.html @@ -119,7 +119,7 @@ SYSTEM). classpathref the classpath to use when looking up a resource, - given as reference to a <path> defined + given as reference to a <path> defined elsewhere.. No diff --git a/docs/manual/CoreTasks/style.html b/docs/manual/CoreTasks/style.html index c260f34c8..60e231066 100644 --- a/docs/manual/CoreTasks/style.html +++ b/docs/manual/CoreTasks/style.html @@ -28,11 +28,11 @@ inclusion/exclusion of files works, and how to write patterns.

attributes of <fileset> (dir becomes basedir) as well as the nested <include>, <exclude> and <patternset> elements.

-

This task supports the use of a nested <param> element which is used to pass values - to an <xsl:param> declaration.

+

This task supports the use of a nested <param> element which is used to pass values + to an <xsl:param> declaration.

This task supports the use of a nested xmlcatalog element which is used to perform Entity and URI resolution

-

<style> and <xslt> refer to the same Ant task and can be used interchangeably.

+

<style> and <xslt> refer to the same Ant task and can be used interchangeably.

If you want to use Xalan-J 1 or XSL:P, you also need Ant's optional.jar

Parameters

@@ -57,7 +57,7 @@ element which is used to perform Entity and URI resolution

+ a nested <mapper> has been specified. diff --git a/docs/manual/CoreTasks/subant.html b/docs/manual/CoreTasks/subant.html index 267b1016f..0e9563525 100644 --- a/docs/manual/CoreTasks/subant.html +++ b/docs/manual/CoreTasks/subant.html @@ -491,7 +491,7 @@ diff --git a/docs/manual/CoreTasks/tempfile.html b/docs/manual/CoreTasks/tempfile.html index 0b2e43554..9669e6e56 100644 --- a/docs/manual/CoreTasks/tempfile.html +++ b/docs/manual/CoreTasks/tempfile.html @@ -46,7 +46,7 @@
extension desired file extension to be used for the targets. If not specified, the default is ".html". Will be ignored if - a nested <mapper> has been specified. No
- Copyright © 2000-2004, Apache Software Foundation + Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
- This task sets a property to the name of a temporary file. Unlike the Java1.2 method to create a temporary file, this task does work on Java1.1. Also, it does not actually create the temporary file, but it does guarantee that the file did not exist when the task was executed.

Examples 

<tempfile property="temp.file" />
create a temporary file 
<tempfile property="temp.file" suffix=".xml" />
create a temporary file with the .xml suffix. 
<tempfile property="temp.file" destDir="build"/>
create a temp file in the build subdir + This task sets a property to the name of a temporary file. Unlike the Java1.2 method to create a temporary file, this task does work on Java1.1. Also, it does not actually create the temporary file, but it does guarantee that the file did not exist when the task was executed.

Examples 

<tempfile property="temp.file"/>
create a temporary file 
<tempfile property="temp.file" suffix=".xml"/>
create a temporary file with the .xml suffix. 
<tempfile property="temp.file" destDir="build"/>
create a temp file in the build subdir
@@ -178,7 +178,7 @@
- Copyright © 2000-2003, Apache Software Foundation + Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
diff --git a/docs/manual/CoreTasks/tstamp.html b/docs/manual/CoreTasks/tstamp.html index b9ee00493..a8ad56927 100644 --- a/docs/manual/CoreTasks/tstamp.html +++ b/docs/manual/CoreTasks/tstamp.html @@ -15,7 +15,7 @@ properties in the current project. By default, the DSTAMP property is in the format "yyyyMMdd", TSTAMP is in the format "hhmm", and TODAY is in the -format "MMMM dd yyyy". Use the nested <format> element +format "MMMM dd yyyy". Use the nested <format> element to specify a different format.

These properties can be used in the build-file, for instance, to create @@ -128,7 +128,7 @@ using English locale (eg. 21-May-2001).

Creates a timestamp, in the property touch.time, 5 hours before the current time. The format in this example -is suitable for use with the <touch> task. The standard properties are set also.

+is suitable for use with the <touch> task. The standard properties are set also.

   <tstamp prefix="start"/>
diff --git a/docs/manual/CoreTasks/uptodate.html b/docs/manual/CoreTasks/uptodate.html
index a2afed338..6b745f926 100644
--- a/docs/manual/CoreTasks/uptodate.html
+++ b/docs/manual/CoreTasks/uptodate.html
@@ -119,10 +119,10 @@ if /usr/local/bin/testit is newer than
   

   
     <uptodate property="checkUptodate.uptodate">
-      <srcfiles dir="src" includes="*" />
+      <srcfiles dir="src" includes="*"/>
       <mapper type="merge" to="../dest/output.done"/>
     </uptodate>
-    <echo message="checkUptodate result: ${checkUptodate.uptodate}" />
+    <echo message="checkUptodate result: ${checkUptodate.uptodate}"/>
   

   

     The previous example can be a bit confusing, so it may be better to
@@ -131,7 +131,7 @@ if /usr/local/bin/testit is newer than
   
     <property name="dest.dir" location="dest"/>
     <uptodate property="checkUptodate.uptodate">
-      <srcfiles dir="src" includes="*" />
+      <srcfiles dir="src" includes="*"/>
       <mapper type="merge" to="${dest.dir}/output.done"/>
     </uptodate>
   

diff --git a/docs/manual/CoreTasks/whichresource.html b/docs/manual/CoreTasks/whichresource.html
index c0303eb80..5d8593dcc 100644
--- a/docs/manual/CoreTasks/whichresource.html
+++ b/docs/manual/CoreTasks/whichresource.html
@@ -198,7 +198,7 @@
   
     
       

-        Copyright © 2000-2003, Apache Software Foundation
+        Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
       

     
   
diff --git a/docs/manual/CoreTasks/xmlproperty.html b/docs/manual/CoreTasks/xmlproperty.html
index 618902c8e..002e9b25e 100644
--- a/docs/manual/CoreTasks/xmlproperty.html
+++ b/docs/manual/CoreTasks/xmlproperty.html
@@ -153,7 +153,7 @@ element is used to perform entity resolution.

 
 
default loading

 
This entry in a build file:
-
   <xmlproperty file="somefile.xml" />

+
   <xmlproperty file="somefile.xml"/>

 is equivalent to the following properties:
 
    root-tag(myattr)=true
diff --git a/docs/manual/CoreTasks/zip.html b/docs/manual/CoreTasks/zip.html
index 2d828be6e..8652fa161 100644
--- a/docs/manual/CoreTasks/zip.html
+++ b/docs/manual/CoreTasks/zip.html
@@ -59,7 +59,7 @@ filenames contain non US-ASCII characters. Use the encoding attribute
 and set it to UTF8 to create zip files that can safely be read by
 Java.

 
-
Starting with Ant 1.5.2, <zip> can store Unix permissions
+
Starting with Ant 1.5.2, <zip> can store Unix permissions
 inside the archive (see description of the filemode and dirmode
 attributes for <zipfileset>).
 Unfortunately there is no portable way to store these permissions.
diff --git a/docs/manual/CoreTypes/antlib.html b/docs/manual/CoreTypes/antlib.html
index 8afaf2030..7b1985643 100644
--- a/docs/manual/CoreTypes/antlib.html
+++ b/docs/manual/CoreTypes/antlib.html
@@ -41,7 +41,7 @@
       

     
     

-      The other attributes of <typedef> may be used as well.
+      The other attributes of <typedef> may be used as well.
       For example, assuming that the sample.xml is in a jar
       file sample.jar also containing the classes, the
       following build fragment will define the if and scriptpathmapper
@@ -115,12 +115,12 @@
     

       Definitions defined in antlibs may be used in antlibs. However
       the namespace that definitions are placed in are dependent on
-      the <typedef> that uses the antlib. To deal with this
+      the <typedef> that uses the antlib. To deal with this
       problem, the definitions are placed in the namepace URI ant:current
       for the duration of the antlib execution.
-      For example the following antlib defines the task <if>, the
-      type <isallowed> and a macro
-      <ifallowed> that makes use of the task and type:
+      For example the following antlib defines the task <if>, the
+      type <isallowed> and a macro
+      <ifallowed> that makes use of the task and type:
     

     

       
@@ -148,7 +148,7 @@
     

     

       As the names defined in the antlib are in the namespace uri as
-      specified by the calling <typedef> or by automatic element
+      specified by the calling <typedef> or by automatic element
       resolution, one may reuse names from core ant types and tasks,
       provided the caller uses a namespace uri. For example, the
       following antlib may be used to define defaults for various
diff --git a/docs/manual/CoreTypes/assertions.html b/docs/manual/CoreTypes/assertions.html
index d5614c8e2..b314c00ca 100644
--- a/docs/manual/CoreTypes/assertions.html
+++ b/docs/manual/CoreTypes/assertions.html
@@ -11,8 +11,8 @@
 

 The assertions type enables or disables the Java 1.4 assertions feature,
 on a whole Java program, or components of a program. It can be used
-in <java> and
-<junit> to add extra validation to code.  
+in <java> and
+<junit> to add extra validation to code.  
 
 

 Assertions are covered in the 
diff --git a/docs/manual/CoreTypes/custom-programming.html b/docs/manual/CoreTypes/custom-programming.html
index 674ab62e9..fc67a75f2 100644
--- a/docs/manual/CoreTypes/custom-programming.html
+++ b/docs/manual/CoreTypes/custom-programming.html
@@ -231,7 +231,7 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
       This method is still supported for backward compatibility.
     

     
You can write your own selectors and use them within the selector
-      containers by specifying them within the <custom> tag.

+      containers by specifying them within the <custom> tag.

 
         
To create a new Custom Selector, you have to create a class that
         implements
diff --git a/docs/manual/CoreTypes/filterchain.html b/docs/manual/CoreTypes/filterchain.html
index 38c2245d2..097891ab6 100644
--- a/docs/manual/CoreTypes/filterchain.html
+++ b/docs/manual/CoreTypes/filterchain.html
@@ -16,8 +16,8 @@ to a file 'bar' - you would do something like

 cat foo|head -n10|grep blee > bar
 

 Ant was not flexible enough.  There was no way for the
-<copy> task to do something similar.  If you wanted
-the <copy> task to get the first 10 lines, you would have
+<copy> task to do something similar.  If you wanted
+the <copy> task to get the first 10 lines, you would have
 had to create special attributes:

 
 <copy file="foo" tofile="bar" head="10" contains="blee"/>
@@ -37,7 +37,7 @@ tasks to support FilterChains.  A FilterChain is a group of
 ordered FilterReaders.  Users can define their own FilterReaders
 by just extending the java.io.FilterReader class.  Such custom
 FilterReaders can be easily plugged in as nested elements of
-<filterchain> by using <filterreader> elements.
+<filterchain> by using <filterreader> elements.
 

 Example:
 
@@ -79,7 +79,7 @@ is equivalent to:
 </loadfile>
 

 
-The following built-in tasks support nested <filterchain> elements.

+The following built-in tasks support nested <filterchain> elements.

 Concat,

 Copy,

 LoadFile,

@@ -135,8 +135,8 @@ org.apache.tools.type.Parameterizable.
 
 

 
Nested Elements:

-<filterreader> supports <classpath> and <param>
-as nested elements.  Each <param> element may take in the following
+<filterreader> supports <classpath> and <param>
+as nested elements.  Each <param> element may take in the following
 attributes - name, type and value.
 

 The following FilterReaders are supplied with the default
@@ -209,7 +209,7 @@ This results in the property modifiedmessage holding the value
   message="All these moments will be lost in time, like teardrops in the ${weather}"
   file="loadfile1.tmp"
   />
-<property name="weather" value="rain" />
+<property name="weather" value="rain"/>
 <loadfile property="modifiedmessage" srcFile="loadfile1.tmp">
   <filterchain>
     <filterreader classname="org.apache.tools.ant.filters.ExpandProperties"/>
@@ -223,7 +223,7 @@ Convenience method:
   message="All these moments will be lost in time, like teardrops in the ${weather}"
   file="loadfile1.tmp"
   />
-<property name="weather" value="rain" />
+<property name="weather" value="rain"/>
 <loadfile property="modifiedmessage" srcFile="loadfile1.tmp">
   <filterchain>
     <expandproperties/>
@@ -1308,7 +1308,7 @@ Custom string filters and tokenizers may be plugged in by
 extending the interfaces org.apache.tools.ant.filters.TokenFilter.Filter
 and org.apache.tools.ant.util.Tokenizer respectly.
 
-They are defined the build file using <typedef/>. For
+They are defined the build file using <typedef/>. For
 example a string filter that capitalizes words may be declared as:
 
 package my.customant;
diff --git a/docs/manual/CoreTypes/mapper.html b/docs/manual/CoreTypes/mapper.html
index c73bbb25c..e56a081a3 100644
--- a/docs/manual/CoreTypes/mapper.html
+++ b/docs/manual/CoreTypes/mapper.html
@@ -93,7 +93,7 @@ implicitly configured as a composite mapper.
 Examples:
 
 <mapper type="identity"/>
-<identitymapper />
+<identitymapper/>
 

 
@@ -124,7 +124,7 @@ leading directory information stripped off. Both to and
 Examples:
 <mapper type="flatten"/>
-<flattenmapper />
+<flattenmapper/>
 

   

 
 

@@ -444,7 +444,7 @@ with <uptodate> and <junit> output.
Examples:
 <compositemapper>
-  <identitymapper />
+  <identitymapper/>
   <packagemapper from="*.java" to="*"/>
 </compositemapper>
 

@@ -473,7 +473,7 @@ with <uptodate> and <junit> output.
Examples:
 <chainedmapper>
-  <flattenmapper />
+  <flattenmapper/>
   <globmapper from="*" to="new/path/*"/>
   <mapper>
     <globmapper from="*" to="*1"/>
diff --git a/docs/manual/CoreTypes/namespace.html b/docs/manual/CoreTypes/namespace.html
index ebd68ac88..289c5fced 100644
--- a/docs/manual/CoreTypes/namespace.html
+++ b/docs/manual/CoreTypes/namespace.html
@@ -17,7 +17,7 @@
         prefixes in tag names a special meaning, and thus build files using
         colons in user-defined tasks and types will break.
       
-      
  •  Attributes with the names 'xmlns' and 'xmlns:<prefix>'
+      
  •  Attributes with the names 'xmlns' and 'xmlns:<prefix>'
         are not treated specially, which means that custom tasks and types have
         actually been able to use such attributes as parameter names. Again,
         such tasks/types are going to break when namespace support is enabled
@@ -34,15 +34,15 @@
       easy to get into name conflicts. When individual types are defined, the
       build file writer can do some name-spacing manually (for example, using
       "tomcat-deploy" instead of just "deploy"). But when defining whole
-      libraries of types using the <typedef> 'resource' attribute, the
+      libraries of types using the <typedef> 'resource' attribute, the
       build file writer has no chance to override or even prefix the names
       supplied by the library. 
    
     
    Assigning Namespaces
    
 
     
    
-      Adding a 'prefix' attribute to <typedef> might have been enough,
+      Adding a 'prefix' attribute to <typedef> might have been enough,
       but XML already has a well-known method for name-spacing. Thus, instead
-      of adding a 'prefix' attribute, the <typedef> and <taskdef>
+      of adding a 'prefix' attribute, the <typedef> and <taskdef>
       tasks get a 'uri' attribute, which stores the URI of the XML namespace
       with which the type should be associated:
     
     <typedef resource="org/example/tasks.properties" uri="http://example.org/tasks"/>
@@ -73,7 +73,7 @@
  </project>
 
    
     
    
-      Here, the namespace is set as the default namespace for the <task>
+      Here, the namespace is set as the default namespace for the <task>
       element and all its descendants.
     
    
     
    Default namespace
    
@@ -171,9 +171,9 @@
       Ant types and tasks are now free to accept arbritrary named types as
       nested elements, as long as the concrete type implements the interface
       expected by the task/type. The most obvioius example for this is the
-      <condition> task, which supports various nested conditions, all
+      <condition> task, which supports various nested conditions, all
       of which extend the interface Condition. To integrate a
-      custom condition in Ant, you can now simply <typedef> the
+      custom condition in Ant, you can now simply <typedef> the
       condition, and then use it anywhere develop.html#nestedtypwhere conditions are allowed
       (assuming the containing element has a generic add(Condition) or addConfigured(Configured)method):
 
     <typedef resource="org/example/conditions.properties" uri="http://example.org/conditions"/>
diff --git a/docs/manual/CoreTypes/patternset.html b/docs/manual/CoreTypes/patternset.html
index 45e3616cf..0b10269c9 100644
--- a/docs/manual/CoreTypes/patternset.html
+++ b/docs/manual/CoreTypes/patternset.html
@@ -124,7 +124,7 @@ by tasks that support this feature, or by FileSets.
    
 
    Note that while the includes and
 excludes attributes accept
 multiple elements separated by commas or spaces, the nested
-<include> and <exclude> elements expect their name
+<include> and <exclude> elements expect their name
 attribute to hold a single pattern.
    
 
    The nested elements allow you to use if and unless arguments to
 specify that the element should only be used if a property is set, or
diff --git a/docs/manual/CoreTypes/permissions.html b/docs/manual/CoreTypes/permissions.html
index 1ae16b967..8d4e2f19a 100644
--- a/docs/manual/CoreTypes/permissions.html
+++ b/docs/manual/CoreTypes/permissions.html
@@ -120,7 +120,7 @@ A permissions set implictly contains the following permissions:
 <grant class="java.util.PropertyPermission" name="java.vm.vendor" actions="read">
 <grant class="java.util.PropertyPermission" name="java.vm.name" actions="read">
 
    • 
-These permissions can be revoked via <revoke> elements if necessary.
+These permissions can be revoked via <revoke> elements if necessary.
 
 
    Examples
    diff --git a/docs/manual/CoreTypes/redirector.html b/docs/manual/CoreTypes/redirector.html
index ccf667e53..65a1161f4 100644
--- a/docs/manual/CoreTypes/redirector.html
+++ b/docs/manual/CoreTypes/redirector.html
@@ -14,7 +14,7 @@ task, used to execute an external process, stands as a very
 basic example.  The executed process may accept input, produce
 output, or do either or both depending upon various circumstances.
 Output may be classified as "output" or as "error
-output."  The <redirector> type provides a concrete means
+output."  The <redirector> type provides a concrete means
 of redirecting input and output featuring the use of
 File Mappers to specify
 source (input) and destination (output/error) files.  Since Ant 1.6.2
@@ -119,19 +119,19 @@ source (input) and destination (output/error) files.  Since Ant 1.6.2
 input.  Multiple mapping results should concatenate all mapped files as input.
 Mapping will ordinarily be performed on a task-specified sourcefile;
 consult the documentation of the individual task for more details.
-A nested <inputmapper> is not compatible with either of the
+A nested <inputmapper> is not compatible with either of the
 input or inputstring attributes.
    
 
    outputmapper
    
 
    A single File Mapper used to redirect process
 output.  Mapping will ordinarily be performed on a task-specified sourcefile;
 consult the documentation of the individual task for more details.
-A nested <outputmapper> is not compatible with the
+A nested <outputmapper> is not compatible with the
 output attribute.
    
 
    errormapper
    
 
    A single File Mapper used to redirect error
 output.  Mapping will ordinarily be performed on a task-specified sourcefile;
 consult the documentation of the individual task for more details.
-A nested <errormapper> is not compatible with the
+A nested <errormapper> is not compatible with the
 error attribute.
    
 
    inputfilterchain
    
 
    A FilterChain can be
@@ -149,7 +149,7 @@ Tasks known to support I/O redirection:
 
  • Apply
    • 
 
  • Java
    • 
 
-
    The expected behavior of a <redirector> is to a great degree
+
    The expected behavior of a <redirector> is to a great degree
 dependent on the supporting task.  Any possible points of confusion
 should be noted at the task level.
    
 
    
diff --git a/docs/manual/CoreTypes/selectors.html b/docs/manual/CoreTypes/selectors.html
index 0bc1a366c..d0a0a64a3 100755
--- a/docs/manual/CoreTypes/selectors.html
+++ b/docs/manual/CoreTypes/selectors.html
@@ -8,7 +8,7 @@
   
     
    Selectors
    
 
-    
    Selectors are a mechanism whereby the files that make up a fileset
+    
    Selectors are a mechanism whereby the files that make up a fileset<depend>
     can be selected based on criteria other than filename as provided
     by the <include> and <exclude>
     tags.
    
@@ -16,7 +16,7 @@
     
    How to use a Selector
    
 
     
    A selector is an element of FileSet, and appears within it. It can
-    also be defined outside of any target by using the <selector> tag
+    also be defined outside of any target by using the <selector> tag
     and then using it as a reference.
     
    
 
@@ -40,30 +40,30 @@
     
    The core selectors are:
    
 
     
      
-      
    • <contains> - Select
+      
    • <contains> - Select
         files that contain a particular text string
      • 
-      
    • <date> - Select files
+      
    • <date> - Select files
         that have been modified either before or after a particular date
         and time
      • 
-      
    • <depend> - Select files
+      
    • <depend> - Select files
         that have been modified more recently than equivalent files
         elsewhere
      • 
-      
    • <depth> - Select files
+      
    • <depth> - Select files
         that appear so many directories down in a directory tree
      • 
-      
    • <different> - Select files
+      
    • <different> - Select files
         that are different from those elsewhere
      • 
-      
    • <filename> - Select
+      
    • <filename> - Select
         files whose name matches a particular pattern. Equivalent to
         the include and exclude elements of a patternset.
      • 
-      
    • <present> - Select
+      
    • <present> - Select
         files that either do or do not exist in some other location
      • 
-      
    • <containsregexp> - Select
+      
    • <containsregexp> - Select
         files that match a regular expression
      • 
-      
    • <size> - Select files
+      
    • <size> - Select files
         that are larger or smaller than a particular number of bytes.
      • 
-      
    • <type> - Select files
+      
    • <type> - Select files
         that are either regular files or directories.
      • 
-      
    • <modified> - Select files if
+      
    • <modified> - Select files if
         the return value of the configured algorithm is different from that
         stored in a cache.
      • 
     
    
@@ -310,7 +310,7 @@
     so their dependencies are driven on the absolute state of the files, not just
     a timestamp. For example: anything fetched from a web site, or the output of
     some program. To reduce the amount of checking, when using this task inside
-    a <copy> task, set the preservelastmodified to propagate the timestamp
+    a <copy> task, set the preservelastmodified to propagate the timestamp
     from source file to destintaion file.
 
 
@@ -469,7 +469,7 @@
               src and target directory trees
           
           Default is both. Setting this attribute to "srconly"
-          is equivalent to wrapping the selector in the <not>
+          is equivalent to wrapping the selector in the <not>
           selector container.
         
         
    
@@ -633,7 +633,7 @@
 
     
     
    Modified Selector
    
-    
    The <modified> selector computes a value for a file, compares that
+    
    The <modified> selector computes a value for a file, compares that
     to the value stored in a cache and select the file, if these two values
     differ.
    
     
    Because this selector is highly configurable the order in which the selection is done
@@ -729,7 +729,7 @@
       
    
   
    
 
 
 
 
 No
    
     
    
 
-    
    These attributes can be set with nested <param/> tags. With <param/>
+    
    These attributes can be set with nested <param/> tags. With <param/>
     tags you can set other values too - as long as they are named according to
     the following rules: 
      
         
    •   algorithm : same as attribute algorithm 
      • 
@@ -906,17 +906,17 @@
     
      The selector containers are:
      
 
     
        
-      
      • <and> - select a file only if all
+      
      • <and> - select a file only if all
         the contained selectors select it.
-      
      • <majority> - select a file
+      
      • <majority> - select a file
         if a majority of its selectors select it.
-      
      • <none> - select a file only if
+      
      • <none> - select a file only if
         none of the contained selectors select it.
-      
      • <not> - can contain only one
+      
      • <not> - can contain only one
         selector, and reverses what it selects and doesn't select.
-      
      • <or> - selects a file if any one
+      
      • <or> - selects a file if any one
         of the contained selectors selects it.
-      
      • <selector> - contains only one
+      
      • <selector> - contains only one
         selector and forwards all requests to it without alteration, provided
         that any "if" or
         "unless" conditions are met. This
@@ -932,20 +932,20 @@
     selector elements within a container:
        
 
     
          
-      
        • <and>
-      
        • <contains>
-      
        • <custom>
-      
        • <date>
-      
        • <depend>
-      
        • <depth>
-      
        • <filename>
-      
        • <majority>
-      
        • <none>
-      
        • <not>
-      
        • <or>
-      
        • <present>
-      
        • <selector>
-      
        • <size>
+      
        • <and>
          • 
+      
        • <contains>
          • 
+      
        • <custom>
          • 
+      
        • <date>
          • 
+      
        • <depend>
          • 
+      
        • <depth>
          • 
+      
        • <filename>
          • 
+      
        • <majority>
          • 
+      
        • <none>
          • 
+      
        • <not>
          • 
+      
        • <or>
          • 
+      
        • <present>
          • 
+      
        • <selector>
          • 
+      
        • <size>
          • 
     
        
 
     
@@ -1194,7 +1194,7 @@
     
        Custom Selectors
        
 
     
        You can write your own selectors and use them within the selector
-    containers by specifying them within the <custom> tag.
        
+    containers by specifying them within the <custom> tag.
        
 
     
        First, you have to write your selector class in Java. The only
     requirement it must meet in order to be a selector is that it implements
@@ -1253,7 +1253,7 @@
 
    
 
     
    A number of core selectors can also be used as custom selectors
-    by specifying their attributes using <param> elements. These
+    by specifying their attributes using <param> elements. These
     are
    
 
     
      
diff --git a/docs/manual/Integration/VAJAntTool.html b/docs/manual/Integration/VAJAntTool.html
index 9f96468be..e08d1fe4a 100644
--- a/docs/manual/Integration/VAJAntTool.html
+++ b/docs/manual/Integration/VAJAntTool.html
@@ -113,7 +113,7 @@ workspace.
      
        remote
        
       
      name and port of a remote tool server. (format:
-      <servername>:<port no>).
      If this
+      <servername>:<port no>).
      If this
       attribute is set, the tasks will be executed on the specified tool
       server. 
      
        no
@@ -210,7 +210,7 @@ files
        remote
        
       
      name and port of a remote tool server. (format:
-      <servername>:<port no>).
      If this
+      <servername>:<port no>).
      If this
       attribute is set, the tasks will be executed on the specified tool
       server. 
      
        no
@@ -308,7 +308,7 @@ from the file system into VAJ. These imports can be specified with a fileset.
        remote
        
       
      name and port of a remote tool server. (format:
-      <servername>:<port no>).
      If this
+      <servername>:<port no>).
      If this
       attribute is set, the tasks will be executed on the specified tool
       server. 
      
        no
@@ -562,7 +562,7 @@ JDK independent by now.
        
        
      Added documentation for haltonerror, "*" and "**" version qualifiers.
      
 
      
-
      Copyright © 2001-2004 The Apache Software
+
      Copyright © 2001-2004 The Apache Software
 Foundation. All rights Reserved.
      
 
 
diff --git a/docs/manual/OptionalTasks/BorlandEJBTasks.html b/docs/manual/OptionalTasks/BorlandEJBTasks.html
index bbff55f46..53ccacd44 100644
--- a/docs/manual/OptionalTasks/BorlandEJBTasks.html
+++ b/docs/manual/OptionalTasks/BorlandEJBTasks.html
@@ -64,7 +64,7 @@ his homepage.
      
       DTD which covers the Borland specific deployment descriptors.
       This should not be necessary if you have borland in your classpath. If you
       do not, you should use a nested
-      <dtd> element, described
+      <dtd> element, described
       in the ejbjar task documentation.
     no
   
@@ -73,7 +73,7 @@ his homepage.
      
     Deprecated. Defines the location of the
       ejb-jar DTD in the class hierarchy. This should not be necessary
       if you have borland in your classpath. If you do not, you should use a
-      nested <dtd> element,
+      nested <dtd> element,
       described in the ejbjar task
       documentation. 
     no
diff --git a/docs/manual/OptionalTasks/ccm.html b/docs/manual/OptionalTasks/ccm.html
index b89cec53e..3d3ebe4ab 100644
--- a/docs/manual/OptionalTasks/ccm.html
+++ b/docs/manual/OptionalTasks/ccm.html
@@ -109,7 +109,7 @@ Task to perform a Checkout command to Continuus
 
      
   
      <ccmcheckout  comment="mycomment">
   <fileset dir="lib" >
-    <include name="**/*.jar" />
+    <include name="**/*.jar"/>
   </fileset>
 </ccmcheckout >
   
      
@@ -189,7 +189,7 @@ Task to perform an reconfigure command to Continuus.
 
      Examples
      
 
      
  
      <ccmreconfigure ccmproject="ANTCCM_TEST#BMO_1"
-         verbose="true" />
+         verbose="true"/>
 
      
 
      
 
      Does a Continuus reconfigure on the project ANTCCM_TEST#BMO_1.
@@ -244,7 +244,7 @@ Create a Continuus task.
 
      Examples
      
 
      
   
      <ccmcreatetask resolver="${user.name}"
-            release="ANTCCM_TEST" comment="blahblah" />
+            release="ANTCCM_TEST" comment="blahblah"/>
 
      
 
      
 
      Creates a task for the release ANTCCM_TEST with the
diff --git a/docs/manual/OptionalTasks/csc.html b/docs/manual/OptionalTasks/csc.html
index f2da7dd87..3e6aaa4be 100644
--- a/docs/manual/OptionalTasks/csc.html
+++ b/docs/manual/OptionalTasks/csc.html
@@ -46,7 +46,7 @@
       
 
       
      
-        Compiles C# source into executables or modules. csc.exe on Windows or mcs on any other platform must be on the execute path, unless another executable or the full path to that executable is specified in the executable parameter 
       All parameters are optional: <csc/> should suffice to produce a debug build of all *.cs files. However, naming an destFilestops the csc compiler from choosing an output name from random, and allows the dependency checker to determine if the file is out of date. 
       The task is a directory based task, so attributes like includes="*.cs"  and excludes="broken.cs" can be used to control the files pulled in. By default, all *.cs files from the project folder down are included in the command. When this happens the output file -if not specified- is taken as the first file in the list, which may be somewhat hard to control. Specifying the output file with destFile seems prudent. 
       
       For more complex source trees, nested src elements can be supplied. When such an element is present, the implicit fileset is ignored. This makes sense, when you think about it :) 
       References to external files can be made through the references attribute, or (since Ant1.6), via nested <reference> filesets. With the latter, the timestamps of the references are also used in the dependency checking algorithm. 
       Example 
      <csc optimize="true" debug="false" docFile="documentation.xml" warnLevel="4" unsafe="false" targetType="exe" incremental="false" mainClass = "MainApp" destFile="NetApp.exe" > <src dir="src" includes="*.cs" /> <reference file="${testCSC.dll}" /> <define name="RELEASE" /> <define name="DEBUG" if="debug.property"/> <define name="def3" unless="def3.property"/> </csc> 
      
+        Compiles C# source into executables or modules. csc.exe on Windows or mcs on any other platform must be on the execute path, unless another executable or the full path to that executable is specified in the executable parameter 
       All parameters are optional: <csc/> should suffice to produce a debug build of all *.cs files. However, naming an destFilestops the csc compiler from choosing an output name from random, and allows the dependency checker to determine if the file is out of date. 
       The task is a directory based task, so attributes like includes="*.cs"  and excludes="broken.cs" can be used to control the files pulled in. By default, all *.cs files from the project folder down are included in the command. When this happens the output file -if not specified- is taken as the first file in the list, which may be somewhat hard to control. Specifying the output file with destFile seems prudent. 
       
       For more complex source trees, nested src elements can be supplied. When such an element is present, the implicit fileset is ignored. This makes sense, when you think about it :) 
       References to external files can be made through the references attribute, or (since Ant1.6), via nested <reference> filesets. With the latter, the timestamps of the references are also used in the dependency checking algorithm. 
       Example 
      <csc optimize="true" debug="false" docFile="documentation.xml" warnLevel="4" unsafe="false" targetType="exe" incremental="false" mainClass = "MainApp" destFile="NetApp.exe" > <src dir="src" includes="*.cs"/> <reference file="${testCSC.dll}"/> <define name="RELEASE"/> <define name="DEBUG" if="debug.property"/> <define name="def3" unless="def3.property"/> </csc> 
      
       
      
 
     
@@ -503,7 +503,7 @@
   
     
       
      
-        Copyright © 2000-2003, Apache Software Foundation
+        Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
       
      
     
   
diff --git a/docs/manual/OptionalTasks/dotnet.html b/docs/manual/OptionalTasks/dotnet.html
index 661eb08c2..6f7d1a2ff 100644
--- a/docs/manual/OptionalTasks/dotnet.html
+++ b/docs/manual/OptionalTasks/dotnet.html
@@ -45,7 +45,7 @@ the server's WSDL and running it against the server.
 Axis tasks to create JUnit tests to call the endpoints.
 
 
    • Patching .NET type libraries to work with more complex IDL than the
-basic <importtypelib> wrapper around tlbimport supports. Hence the
+basic <importtypelib> wrapper around tlbimport supports. Hence the
 disassembler and the reassembler.
 
      • 
 
@@ -148,7 +148,7 @@ executable or library will be rebuilt.
 
      Examples
      
 
 
      -<resource file="app.ico" name="icon" />
+<resource file="app.ico" name="icon"/>
 <resource file="splash.jpg"/>
 <resource name="splash" file="splash.jpg" public="false"/>
 
      
@@ -194,7 +194,7 @@ build the code when the defines are likely to be different.
 
      Examples
      
 
 
      -<define name="unsafe" />
+<define name="unsafe"/>
 <define name="debug" if="build.debug"/>
 <define name="dotnet" unless="build.mono"/>
 
      
diff --git a/docs/manual/OptionalTasks/echoproperties.html b/docs/manual/OptionalTasks/echoproperties.html
index 3489aa26f..77ae1d711 100644
--- a/docs/manual/OptionalTasks/echoproperties.html
+++ b/docs/manual/OptionalTasks/echoproperties.html
@@ -82,7 +82,7 @@ href="../CoreTypes/propertyset.html">propertysets.
      
 
      Report the current properties to the file "my.properties", and will
 fail the build if the file could not be created or written to.
      
 
      -  <echoproperties destfile="my.properties" failonerror="false" />
+  <echoproperties destfile="my.properties" failonerror="false"/>
 
      
 
      Report the current properties to the file "my.properties", and will
 log a message if the file could not be created or written to, but will still
diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html
index 0639586e7..8f1b7444f 100644
--- a/docs/manual/OptionalTasks/ejb.html
+++ b/docs/manual/OptionalTasks/ejb.html
@@ -426,7 +426,7 @@ and hence ant, will not complete until the weblogic instance is stopped.
      
 
 
      Nested Elements
      
 
-
      The wlrun task supports nested <classpath> and <wlclasspath>
+
      The wlrun task supports nested <classpath> and <wlclasspath>
 elements to set the respective classpaths.
      
 
 
      Examples
      
@@ -512,7 +512,7 @@ specify the BEA Home to have this task work correctly under 6.0
      
 
 
      Nested Element
      
 
-
      The classpath of the wlstop task can be set by a <classpath> nested element.
      
+
      The classpath of the wlstop task can be set by a <classpath> nested element.
      
 
 
      Examples
      
 
@@ -554,7 +554,7 @@ server descriptors are found. For each descriptor found, ejbjar will parse the
 deployment descriptor to determine the necessary class files which implement the
 bean. These files are assembled along with the deployment descriptors into a
 well formed EJB jar file. Any support files which need to be included in the
-generated jar can be added with the <support> nested element. For each
+generated jar can be added with the <support> nested element. For each
 class included in the jar, ejbjar will scan for any super classes or super
 interfaces. These will be added to the generated jar.
      
 
@@ -600,10 +600,10 @@ is deployed in separate beans.
 deploying the same bean classes in different beans, with different deployment characteristics.
 
 
    • ejb-name
      • 
-
       This naming scheme uses the <ejb-name> element from the deployment descriptor to
+
       This naming scheme uses the <ejb-name> element from the deployment descriptor to
 determine the bean name. In this situation, the descriptors normally use the generic
 descriptor names, such as ejb-jar.xml along with any associated vendor specific descriptor
-names. For example, If the value of the <ejb-name> were to be given in the deployment descriptor
+names. For example, If the value of the <ejb-name> were to be given in the deployment descriptor
 as follows:
 
       <ejb-jar>
@@ -634,7 +634,7 @@ although that is not mandatory. This scheme can handle multiple beans per jar.
 
 
    • basejarname
      • 
 
      
-The final scheme supported by the <ejbjar> task is used when you want to specify the generated
+The final scheme supported by the <ejbjar> task is used when you want to specify the generated
 bean jar name directly. In this case the name of the generated jar is specified by the
 "basejarname" attribute. Since all generated beans will have the same name, this task should
 be only used when each descriptor is in its own directory.
@@ -796,22 +796,22 @@ three nested elements. 
      
 
 
      Classpath
      
 
-
      The <classpath> nested element allows the classpath
+
      The <classpath> nested element allows the classpath
 to be set. It is useful when setting the classpath from a reference path. In all
 other respects the behaviour is the same as the classpath attribute.
      
 
 
      dtd
      
 
-
      The <dtd> element is used to specify the local location of DTDs to be
+
      The <dtd> element is used to specify the local location of DTDs to be
 used when parsing the EJB deployment descriptor. Using a local DTD is much
 faster than loading the DTD across the net. If you are running ejbjar behind a
 firewall you may not even be able to access the remote DTD. The supported
 vendor-specific nested elements know the location of the required DTDs within
-the vendor class hierarchy and, in general, this means <dtd> elements are
+the vendor class hierarchy and, in general, this means <dtd> elements are
 not required. It does mean, however, that the vendor's class hierarchy must be
 available in the classpath when Ant is started. If your want to run Ant without
 requiring the vendor classes in the classpath, you would need to use a
-<dtd> element.
      
+<dtd> element.
      
 
 
@@ -834,10 +834,10 @@ requiring the vendor classes in the classpath, you would need to use a
 
 
      support
      
 
-
      The <support> nested element is used to supply additional classes
-(files) to be included in the generated jars. The <support> element is a
+
      The <support> nested element is used to supply additional classes
+(files) to be included in the generated jars. The <support> element is a
 FileSet, so it can either reference a fileset declared elsewhere or it can be
-defined in-place with the appropriate <include> and <exclude> nested
+defined in-place with the appropriate <include> and <exclude> nested
 elements. The files in the support fileset are added into the generated EJB jar
 in the same relative location as their location within the support fileset. Note
 that when ejbjar generates more than one jar file, the support files are added
@@ -914,7 +914,7 @@ generating weblogic EJB jars. Prior to Ant 1.3, the method of locating CMP
 descriptors was to use the ejbjar naming convention. So if your ejb-jar was
 called, Customer-ejb-jar.xml, your weblogic descriptor was called Customer-
 weblogic-ejb-jar.xml and your CMP descriptor had to be Customer-weblogic-cmp-
-rdbms-jar.xml. In addition, the <type-storage> element in the weblogic
+rdbms-jar.xml. In addition, the <type-storage> element in the weblogic
 descriptor had to be set to the standard name META-INF/weblogic-cmp-rdbms-
 jar.xml, as that is where the CMP descriptor was mapped to in the generated
 jar.
      
@@ -927,7 +927,7 @@ deployment descriptors generated by some tools.
      
 CMP descriptors, which are then included automatically. This behaviour is
 controlled by the newCMP attribute. Note that if you move to the new method of
 determining CMP descriptors, you will need to update your weblogic deployment
-descriptor's <type-storage> element. In the above example, you would
+descriptor's <type-storage> element. In the above example, you would
 define this as META-INF/Customer-weblogic-cmp-rdbms-jar.xml.
      
   
      
 
 
      
@@ -1029,9 +1029,9 @@ define this as META-INF/Customer-weblogic-cmp-rdbms-jar.xml.
      
@@ -1040,7 +1040,7 @@ define this as META-INF/Customer-weblogic-cmp-rdbms-jar.xml.
      
@@ -1050,7 +1050,7 @@ define this as META-INF/Customer-weblogic-cmp-rdbms-jar.xml.
      
@@ -1107,9 +1107,9 @@ define this as META-INF/Customer-weblogic-cmp-rdbms-jar.xml.
      
     
      Deprecated. Defines the location of the ejb-jar DTD in
                      the weblogic class hierarchy. This should not be necessary if you
                      have weblogic in your classpath. If you do not, you should use a
-                     nested <dtd> element, described above. If you do choose
+                     nested <dtd> element, described above. If you do choose
                      to use an attribute, you should use a
-                     nested <dtd> element.
+                     nested <dtd> element.
                      
     No.
   
      
     
      Deprecated. Defines the location of the weblogic-ejb-jar
                      DTD which covers the Weblogic specific deployment descriptors.
                      This should not be necessary if you have weblogic in your
-                     classpath. If you do not, you should use a nested <dtd>
+                     classpath. If you do not, you should use a nested <dtd>
                      element, described above.
                      
     No.
     Deprecated. Defines the location of the ejb-jar DTD in
                      the weblogic class hierarchy. This should not be necessary if you
                      have weblogic in your classpath. If you do not, you should use a
-                     nested <dtd> element, described above.
+                     nested <dtd> element, described above.
                      
     No.
   
      
 
      
 
 
      The weblogic nested element supports three nested elements. The
-first two, <classpath> and <wlclasspath>, are used to set the
+first two, <classpath> and <wlclasspath>, are used to set the
 respective classpaths. These nested elements are useful when setting up
-class paths using reference Ids. The last, <sysproperty>, allows
+class paths using reference Ids. The last, <sysproperty>, allows
 Java system properties to be set during the compiler run. This turns out
 to be necessary for supporting CMP EJB compilation in all environments.
 
      
@@ -1228,7 +1228,7 @@ This will create only one TOPLink-enabled ejb jar file - 'Address.jar'.
      
 
      
 
 
      This final example shows how you would set-up ejbjar under Weblogic 6.0. It also shows the use of the
-<support> element to add support files
      
+<support> element to add support files
      
 
 
           <ejbjar descriptordir="${dd.dir}" srcdir="${build.classes.server}">
@@ -1485,11 +1485,11 @@ If omitted, it defaults to ".jar". 
 
 
 
-
      As noted above, the iplanet element supports additional <classpath>
+
      As noted above, the iplanet element supports additional <classpath>
 nested elements.
      
 
      
 Examples
      
-This example demonstrates the typical use of the <iplanet> nested element.
+This example demonstrates the typical use of the <iplanet> nested element.
 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"
@@ -1553,7 +1553,7 @@ local DTDs are found in the [iAS-install-directory]/dtd directory.
 
 
      JOnAS (Java Open Application Server) element
      
 
-
      The <jonas> nested element is used to build JOnAS-specific stubs and
+
      The <jonas> nested element is used to build JOnAS-specific stubs and
 skeletons thanks to the GenIC specific tool, and construct a JAR
 file which may be deployed to the JOnAS Application Server. The build process
 will always determine if the EJB stubs/skeletons and the EJB-JAR file are up to
@@ -1562,13 +1562,13 @@ date, and it will do the minimum amount of work required.
      
 
      Like the WebLogic element, a naming convention for the EJB descriptors is
 most commonly used to specify the name for the completed JAR file. For example,
 if the EJB descriptor ejb/Account-ejb-jar.xml is found in the
-descriptor directory, the <jonas> element will search for a JOnAS-specific
+descriptor directory, the <jonas> element will search for a JOnAS-specific
 EJB descriptor file named ejb/Account-jonas-ejb-jar.xml and a JAR
 file named ejb/Account.jar will be written in the destination
-directory. But the <jonas> element can also use the JOnAS naming
+directory. But the <jonas> element can also use the JOnAS naming
 convention. With the same example as below, the EJB descriptor can also be named
 ejb/Account.xml (no base name terminator here) in the descriptor
-directory. Then the <jonas> element will search for a JOnAS-specific EJB
+directory. Then the <jonas> element will search for a JOnAS-specific EJB
 descriptor file called ejb/jonas-Account.xml. This convention do
 not follow strictly the ejb-jar naming convention recommendation but is
 supported for backward compatibility with previous version of JOnAS.
      
@@ -1698,7 +1698,7 @@ documentation for more details.
      
   
 
 
-
      As noted above, the jonas element supports additional <classpath>
+
      As noted above, the jonas element supports additional <classpath>
 nested elements.
      
 
 
      Examples
      
diff --git a/docs/manual/OptionalTasks/ftp.html b/docs/manual/OptionalTasks/ftp.html
index 6173b2092..2e57612de 100644
--- a/docs/manual/OptionalTasks/ftp.html
+++ b/docs/manual/OptionalTasks/ftp.html
@@ -27,7 +27,7 @@ tasks, on how the inclusion/exclusion of files works, and how to
 write patterns.
      
 
      
 This task does not currently use the proxy information set by the
-<setproxy> task, and cannot go through
+<setproxy> task, and cannot go through
 a firewall via socks. 
 
      
 Warning:  there have been problems reported concerning the ftp get with newer attribute.
diff --git a/docs/manual/OptionalTasks/ilasm.html b/docs/manual/OptionalTasks/ilasm.html
index f88bf9fc7..caf963cd3 100644
--- a/docs/manual/OptionalTasks/ilasm.html
+++ b/docs/manual/OptionalTasks/ilasm.html
@@ -46,7 +46,7 @@
       
 
       
      
-        Assembles .NET Intermediate Language files. ilasm.exe must be on the execute path, unless another executable or the full path to that executable is specified in the executable parameter 
       
       All parameters are optional: <il/> should suffice to produce a debug build of all *.il files. The option set is roughly compatible with the CSharp class; even though the command line options are only vaguely equivalent. [The low level commands take things like /OUT=file, csc wants /out:file ... /verbose is used some places; /quiet here in ildasm... etc.] It would be nice if someone made all the command line tools consistent (and not as brittle as the java cmdline tools) 
       
       The task is a directory based task, so attributes like includes="*.il"  and excludes="broken.il" can be used to control the files pulled in. You can also use nested <src> filesets to refer to source. 
      
+        Assembles .NET Intermediate Language files. ilasm.exe must be on the execute path, unless another executable or the full path to that executable is specified in the executable parameter 
       
       All parameters are optional: <il/> should suffice to produce a debug build of all *.il files. The option set is roughly compatible with the CSharp class; even though the command line options are only vaguely equivalent. [The low level commands take things like /OUT=file, csc wants /out:file ... /verbose is used some places; /quiet here in ildasm... etc.] It would be nice if someone made all the command line tools consistent (and not as brittle as the java cmdline tools) 
       
       The task is a directory based task, so attributes like includes="*.il"  and excludes="broken.il" can be used to control the files pulled in. You can also use nested <src> filesets to refer to source. 
      
       
      
 
     
@@ -277,7 +277,7 @@
   
     
       
      
-        Copyright © 2000-2003, Apache Software Foundation
+        Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
       
      
     
   
diff --git a/docs/manual/OptionalTasks/ildasm.html b/docs/manual/OptionalTasks/ildasm.html
index f143f47ce..f11e01120 100644
--- a/docs/manual/OptionalTasks/ildasm.html
+++ b/docs/manual/OptionalTasks/ildasm.html
@@ -327,7 +327,7 @@
   
     
       
      
-        Copyright © 2000-2003, Apache Software Foundation
+        Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
       
      
     
   
diff --git a/docs/manual/OptionalTasks/importtypelib.html b/docs/manual/OptionalTasks/importtypelib.html
index 83d00a554..9a59f1853 100644
--- a/docs/manual/OptionalTasks/importtypelib.html
+++ b/docs/manual/OptionalTasks/importtypelib.html
@@ -195,7 +195,7 @@
   
     
       
      
-        Copyright © 2000-2003, Apache Software Foundation
+        Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
       
      
     
   
diff --git a/docs/manual/OptionalTasks/jdepend.html b/docs/manual/OptionalTasks/jdepend.html
index 6ac5a8940..dbd1478ce 100644
--- a/docs/manual/OptionalTasks/jdepend.html
+++ b/docs/manual/OptionalTasks/jdepend.html
@@ -95,10 +95,10 @@ href="../using.html#path">PATH like structures, and
 
      <sourcespath> is used to define the paths of the
 source code to analyze, but it is deprecated. With version 2.5 of
 JDepend, only class files are analyzed. The nested element
-<classespath> replaces <sourcespath> and is used to define
-the paths of compiled class code to analyze; the <sourcespath>
+<classespath> replaces <sourcespath> and is used to define
+the paths of compiled class code to analyze; the <sourcespath>
 variable is still available in case you are using an earlier version
-of JDepend.  The <exclude> element can be used to set packages
+of JDepend.  The <exclude> element can be used to set packages
 to ignore (requires JDepend 2.5 or above).
      
 
 
      Examples
      
diff --git a/docs/manual/OptionalTasks/jsharpc.html b/docs/manual/OptionalTasks/jsharpc.html
index dc3c1a822..817b5104c 100644
--- a/docs/manual/OptionalTasks/jsharpc.html
+++ b/docs/manual/OptionalTasks/jsharpc.html
@@ -443,7 +443,7 @@
   
     
       
      
-        Copyright © 2000-2003, Apache Software Foundation
+        Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
       
      
     
   
diff --git a/docs/manual/OptionalTasks/jspc.html b/docs/manual/OptionalTasks/jspc.html
index eee085217..75d686f39 100644
--- a/docs/manual/OptionalTasks/jspc.html
+++ b/docs/manual/OptionalTasks/jspc.html
@@ -26,7 +26,7 @@ or simply to syntax check the pages without deploying them.
 In most cases, a javac task is usually the next stage in the build process.
 The task does basic dependency checking to prevent unnecessary recompilation -this
 checking compares source and destination timestamps, and does not factor
-in class or taglib dependencies, or <jsp:include> references.
+in class or taglib dependencies, or <jsp:include> references.
 
 
      
 By default the task uses the Jasper JSP compiler. This
@@ -233,7 +233,7 @@ When used, the task hands off all dependency checking to the compiler.
       package="com.i3sp.jsp"
       compiler="jasper41"
       verbose="9">
-  <include name="**/*.jsp" />
+  <include name="**/*.jsp"/>
 </jspc>
 
      
 Build all jsp pages under src/war into the destination /gensrc, in a
@@ -246,7 +246,7 @@ package hierarchy beginning with com.i3sp.jsp.
       srcdir="src"
       compiler="jasper41"
       package="com.i3sp.jsp">
-  <include name="**/*.jsp" />
+  <include name="**/*.jsp"/>
 </jspc>
 <depend
          srcdir="interim"
diff --git a/docs/manual/OptionalTasks/native2ascii.html b/docs/manual/OptionalTasks/native2ascii.html
index 3637c2344..459e10727 100644
--- a/docs/manual/OptionalTasks/native2ascii.html
+++ b/docs/manual/OptionalTasks/native2ascii.html
@@ -25,10 +25,10 @@
       If ext is specified, then output files are renamed
       to use it as a new extension.
       More sophisticated file name translations can be achieved using a nested
-      <mapper> element. By default an
+      <mapper> element. By default an
       identity mapper will be used.
       If dest and src point to the same directory,
-      the ext attribute or a nested <mapper>
+      the ext attribute or a nested <mapper>
       is required.
     
      
 
diff --git a/docs/manual/OptionalTasks/pvcstask.html b/docs/manual/OptionalTasks/pvcstask.html
index c9ed19c35..a09c7a895 100644
--- a/docs/manual/OptionalTasks/pvcstask.html
+++ b/docs/manual/OptionalTasks/pvcstask.html
@@ -240,7 +240,7 @@ The following set-up extracts the latest version of the files in the pvcs reposi
   Total time: 19 seconds
    
 
 This next example extracts the latest version of the files in the pvcs
-repository from two projects using nested <pvcsproject> elements.
+repository from two projects using nested <pvcsproject> elements.
 
       <!-- ===================================================================-->
   <!-- Get latest from myprj and myprj2                                   -->
@@ -273,7 +273,7 @@ repository from two projects using nested <pvcsproject> elements.
   Total time: 22 seconds
    
 
 
    
-
    Copyright © 2001-2003 Apache Software
+
    Copyright © 2001-2004 Apache Software
 Foundation. All rights Reserved.
    
 
    PVCS is a registered trademark of MERANT.
    
 
diff --git a/docs/manual/OptionalTasks/replaceregexp.html b/docs/manual/OptionalTasks/replaceregexp.html
index e60ace63e..b4283a0e9 100644
--- a/docs/manual/OptionalTasks/replaceregexp.html
+++ b/docs/manual/OptionalTasks/replaceregexp.html
@@ -32,18 +32,18 @@ See details in the documentation of the file
     file for which the regular expression should be replaced.
-    Yes if no nested <fileset> is used
+    Yes if no nested <fileset> is used
   
   
     match
     The regular expression pattern to match in the file(s)
-    Yes, if no nested <regexp> is used
+    Yes, if no nested <regexp> is used
   
   
     replace
     The substitution pattern to place in the file(s) in place
                      of the regular expression.
-    Yes, if no nested <substitution> is used
+    Yes, if no nested <substitution> is used
   
   
     flags
@@ -115,7 +115,7 @@ value, in all files ending in .properties in the current directory<
 
 
    
 
    <replaceregexp match="\s+" replace=" " flags="g" byline="true">
-    <fileset dir="${html.dir}" includes="**/*.html" />
+    <fileset dir="${html.dir}" includes="**/*.html"/>
 </replaceregexp>
 
    
 
    replaces all whitespaces (blanks, tabs, etc) by one blank remaining the
diff --git a/docs/manual/OptionalTasks/rexec.html b/docs/manual/OptionalTasks/rexec.html
index 5a1264f74..c93e0b2db 100644
--- a/docs/manual/OptionalTasks/rexec.html
+++ b/docs/manual/OptionalTasks/rexec.html
@@ -66,7 +66,7 @@ timeout specified for the task as a whole. It also has a string
 attribute, which is an alternative to specifying the string as 
 a text element.
 
    
-It is not necessary to declare a closing <read> element like for the Telnet task. The connection is not broken until the command has completed and
+It is not necessary to declare a closing <read> element like for the Telnet task. The connection is not broken until the command has completed and
 the input stream (output of the command) is terminated.
 
 
    write
    
diff --git a/docs/manual/OptionalTasks/scp.html b/docs/manual/OptionalTasks/scp.html
index d01464743..965ddd5b3 100644
--- a/docs/manual/OptionalTasks/scp.html
+++ b/docs/manual/OptionalTasks/scp.html
@@ -185,7 +185,7 @@ authentication.
    
 
 
    Copy a remote directory to a local directory
    
 
    -  <scp file="user:password@somehost:/home/chuck/*" todir="/home/sara" />
+  <scp file="user:password@somehost:/home/chuck/*" todir="/home/sara"/>
 
    
 
 
    Copy a local directory to a remote directory
    
diff --git a/docs/manual/OptionalTasks/script.html b/docs/manual/OptionalTasks/script.html
index 814737bdd..987c37b82 100644
--- a/docs/manual/OptionalTasks/script.html
+++ b/docs/manual/OptionalTasks/script.html
@@ -19,7 +19,7 @@ accessible from the script, using either their name or
 valid Java identifiers, that is).
 The name "project" is a pre-defined reference to the Project, which can be
 used instead of the project name. The name "self" is a pre-defined reference to the actual
-<script>-Task instance.
    From these objects you have access to the Ant Java API, see the
+<script>-Task instance.
    From these objects you have access to the Ant Java API, see the
     JavaDoc (especially for
 Project and
 Script) for more information.
    
@@ -187,7 +187,7 @@ BUILD SUCCESSFUL

    Now a more complex example using the Java API and the Ant API. The goal is to list the -filesizes of all files a <fileset/> caught.

    +filesizes of all files a <fileset/> caught.

     
 <?xml version="1.0" encoding="ISO-8859-1"?>
@@ -209,7 +209,7 @@ filesizes of all files a <fileset/> caught.
    
       includes = MyProject.getProperty("fs.includes");
       excludes = self.getProject()  .getProperty("fs.excludes");
 
-      // Create a <fileset dir="" includes="" />
+      // Create a <fileset dir="" includes=""/>
       fs = project.createDataType("fileset");
       fs.setDir( new File(dir) );
       fs.setIncludes(includes);
@@ -245,16 +245,16 @@ For other packages you have to prefix the full classified name with PackageFileUtil class can be imported with
 importClass(Package.org.apache.tools.ant.util.FileUtils)
 
    
-The <script> task populates the Project instance under
+The <script> task populates the Project instance under
 the name project, so we can use that reference. Another way is to use its given name
 or getting its reference from the task itself.
    
 The Project provides methods for accessing and setting properties, creating DataTypes and
 Tasks and much more.
    
 After creating a FileSet object we initialize that by calling its set-methods. Then we can
-use that object like a normal Ant task (<copy> for example).
    
+use that object like a normal Ant task (<copy> for example).
    
 For getting the size of a file we instantiate a java.io.File. So we are using
 normal Java API here.
    
-Finally we use the <echo> task for producing the output. The task is not executed by
+Finally we use the <echo> task for producing the output. The task is not executed by
 its execute() method, because the perform() method (implemented in Task itself) does the
 appropriate logging before and after invoking execute().
 
    
diff --git a/docs/manual/OptionalTasks/scriptdef.html b/docs/manual/OptionalTasks/scriptdef.html
index 8284aa676..8870234d3 100755
--- a/docs/manual/OptionalTasks/scriptdef.html
+++ b/docs/manual/OptionalTasks/scriptdef.html
@@ -27,7 +27,7 @@ Ant distribution. See
 for more information.
    
 
 
    The attributes and nested elements supported by the task may be defined
-using <attribute> and <element> nested elements. These are
+using <attribute> and <element> nested elements. These are
 available to the script that implements the task as two collection style
 script variables attributes and elements. The
 elements in the attributes collection may be accessed by the
@@ -45,7 +45,7 @@ to use "someattribute" to retrieve the attribute's value from the
   It can be used for logging purposes
    
 
    The name "project" is a pre-defined reference to the Ant Project. For
 more information on writing scripts, please refer to the
-<script> task
+<script> task
 
    
 
 
@@ -183,7 +183,7 @@ would result in this error
 
    
 
 
    build.xml:15: SyntaxError: missing } in compound
-statement (scriptdef <scripttest2>; line 10)
    
+statement (scriptdef <scripttest2>; line 10)
    
 
 
    
 Script errors are only detected when a script task is actually executed.
diff --git a/docs/manual/OptionalTasks/serverdeploy.html b/docs/manual/OptionalTasks/serverdeploy.html
index f3e9f2381..dd95b47e4 100644
--- a/docs/manual/OptionalTasks/serverdeploy.html
+++ b/docs/manual/OptionalTasks/serverdeploy.html
@@ -138,7 +138,7 @@ possible.
 
    
 
 
    Nested Elements
    
-
    The generic element supports nested <arg> and <jvmarg> elements.
    
+
    The generic element supports nested <arg> and <jvmarg> elements.
    
 
 
    Example
    
 
@@ -279,7 +279,7 @@ task.
 
 
 
    Nested Elements
    
-
    The jonas element supports nested <arg> and <jvmarg> elements.
    
+
    The jonas element supports nested <arg> and <jvmarg> elements.
    
 
 
 
    Examples
    
diff --git a/docs/manual/OptionalTasks/setproxy.html b/docs/manual/OptionalTasks/setproxy.html
index 1d9b9f8da..9f771777a 100644
--- a/docs/manual/OptionalTasks/setproxy.html
+++ b/docs/manual/OptionalTasks/setproxy.html
@@ -211,7 +211,7 @@
   
     
       
    
-        Copyright © 2000-2003, Apache Software Foundation
+        Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
       
    
     
   
diff --git a/docs/manual/OptionalTasks/splash.html b/docs/manual/OptionalTasks/splash.html
index dc861a020..5aee30321 100644
--- a/docs/manual/OptionalTasks/splash.html
+++ b/docs/manual/OptionalTasks/splash.html
@@ -42,7 +42,7 @@ whilst waiting for your builds to complete...
    
 The following properties can be used to configure the proxy settings to retrieve
 an image from behind a firewall. However, the settings apply not just to this
 task, but to all following tasks. Therefore they are now mostly deprecated in 
-preference to the <setproxy> task, that makes it clear to readers of
+preference to the <setproxy> task, that makes it clear to readers of
 the build exactly what is going on. We say mostly as this task's support
 includes proxy authentication, so you may still need to use its
 proxy attributes.
diff --git a/docs/manual/OptionalTasks/stylebook.html b/docs/manual/OptionalTasks/stylebook.html
index 59044bc44..c55e19b5a 100644
--- a/docs/manual/OptionalTasks/stylebook.html
+++ b/docs/manual/OptionalTasks/stylebook.html
@@ -15,7 +15,7 @@ are required to run stylebook.
    
 
    Note: This task depends on external libraries not included in the Ant distribution.
 See Library Dependencies for more information.
    
 
    
- Being extended from <Java>, all the parent's attributes
+ Being extended from <Java>, all the parent's attributes
  and options are available. Do not set any apart from the classpath
  as they are not guaranteed to be there in future.
  
    
@@ -47,7 +47,7 @@ See Library Dependencies for m
   
 
 
    
-The user can also specify the nested <classpath> element which defines classpath 
+The user can also specify the nested <classpath> element which defines classpath 
 in which the task is executed.
    
 
 
    Examples
    
diff --git a/docs/manual/OptionalTasks/symlink.html b/docs/manual/OptionalTasks/symlink.html
index 4d3999df1..7fcf3de9b 100644
--- a/docs/manual/OptionalTasks/symlink.html
+++ b/docs/manual/OptionalTasks/symlink.html
@@ -80,14 +80,14 @@ set of links to record, or a set of property files to create links from. 
    
   "dir.links"
    
   
       <symlink action="record" linkfilename="dir.links">
-     <fileset dir="${dir.top}" includes="subdir/**" />
+     <fileset dir="${dir.top}" includes="subdir/**"/>
   </symlink>
   
    
  
   
     Recreate the links recorded in the previous example:
    
   
       <symlink action="recreate">
-     <fileset dir="${dir.top}" includes="subdir/**/dir.links" />  
+     <fileset dir="${dir.top}" includes="subdir/**/dir.links"/>  
   </symlink>
   
    
  
@@ -117,7 +117,7 @@ set of links to record, or a set of property files to create links from. 
    
   link=subdir/foo.bar and restored as
   link --> subdir/foo.bar
    
 
-
    Copyright © 2002 Apache Software
+
    Copyright © 2002,2004 Apache Software
 Foundation.  All rights Reserved.
    
 
 
diff --git a/docs/manual/OptionalTasks/telnet.html b/docs/manual/OptionalTasks/telnet.html
index eb1f87523..89097de45 100644
--- a/docs/manual/OptionalTasks/telnet.html
+++ b/docs/manual/OptionalTasks/telnet.html
@@ -69,7 +69,7 @@ attribute, which is an alternative to specifying the string as
 a text element.
 
    
 Always declare an opening and closing
-<read> element to ensure that statements are not sent before
+<read> element to ensure that statements are not sent before
 the connection is ready, and that the connection is not broken before
 the final command has completed.
 
@@ -105,7 +105,7 @@ This task can be rewritten as:
 </telnet>
    -A timeout can be specified at the <telnet> level or at the <read> level. +A timeout can be specified at the <telnet> level or at the <read> level. This will connect, issue a sleep command that is suppressed from displaying and wait 10 seconds before quitting. 
    diff --git a/docs/manual/OptionalTasks/test.html b/docs/manual/OptionalTasks/test.html
index 207de2627..951b711ba 100644
--- a/docs/manual/OptionalTasks/test.html
+++ b/docs/manual/OptionalTasks/test.html
@@ -53,7 +53,7 @@ Library Dependencies for more information.
   
 
 
    
-The user can also specify the nested <classpath> element which defines classpath 
+The user can also specify the nested <classpath> element which defines classpath 
 in which the task is executed. The user also specifies a subelement per testlet executed
 which has content that specifies tasklet classname.
    
 
diff --git a/docs/manual/OptionalTasks/vbc.html b/docs/manual/OptionalTasks/vbc.html
index b643d17c8..a165a6813 100644
--- a/docs/manual/OptionalTasks/vbc.html
+++ b/docs/manual/OptionalTasks/vbc.html
@@ -46,7 +46,7 @@
       
 
       
    
-        This task compiles Visual Basic.NET source into executables or modules. The task requires vbc.exe on the execute path, unless it or an equivalent program is specified in the executable parameter 
     All parameters are optional: <vbc/> should suffice to produce a debug build of all *.vb files. 
     The task is a directory based task, so attributes like includes="**\/*.vb" and excludes="broken.vb" can be used to control the files pulled in. By default, all *.vb files from the project folder down are included in the command. When this happens the destFile -if not specified- is taken as the first file in the list, which may be somewhat hard to control. Specifying the output file with destfile is prudent. 
     
     Also, dependency checking only works if destfile is set. As with <csc> nested src filesets of source, reference filesets, definitions and resources can be provided. 
     Example 
     
    <vbc optimize="true" debug="false" warnLevel="4" targetType="exe" definitions="RELEASE" excludes="src/unicode_class.vb" mainClass = "MainApp" destFile="NetApp.exe" optionExplicit="true" optionCompare="text" references="System.Xml,System.Web.Xml" > <reference file="${testCSC.dll}" /> <define name="RELEASE" /> <define name="DEBUG" if="debug.property"/> <define name="def3" unless="def2.property"/> </vbc> 
    
+        This task compiles Visual Basic.NET source into executables or modules. The task requires vbc.exe on the execute path, unless it or an equivalent program is specified in the executable parameter 
     All parameters are optional: <vbc/> should suffice to produce a debug build of all *.vb files. 
     The task is a directory based task, so attributes like includes="**\/*.vb" and excludes="broken.vb" can be used to control the files pulled in. By default, all *.vb files from the project folder down are included in the command. When this happens the destFile -if not specified- is taken as the first file in the list, which may be somewhat hard to control. Specifying the output file with destfile is prudent. 
     
     Also, dependency checking only works if destfile is set. As with <csc> nested src filesets of source, reference filesets, definitions and resources can be provided. 
     Example 
     
    <vbc optimize="true" debug="false" warnLevel="4" targetType="exe" definitions="RELEASE" excludes="src/unicode_class.vb" mainClass = "MainApp" destFile="NetApp.exe" optionExplicit="true" optionCompare="text" references="System.Xml,System.Web.Xml" > <reference file="${testCSC.dll}"/> <define name="RELEASE"/> <define name="DEBUG" if="debug.property"/> <define name="def3" unless="def2.property"/> </vbc> 
    
       
    
 
     
@@ -479,7 +479,7 @@
   
     
       
    
-        Copyright © 2000-2003, Apache Software Foundation
+        Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
       
    
     
   
diff --git a/docs/manual/OptionalTasks/vss.html b/docs/manual/OptionalTasks/vss.html
index cd4c39212..4bedd05bb 100644
--- a/docs/manual/OptionalTasks/vss.html
+++ b/docs/manual/OptionalTasks/vss.html
@@ -418,7 +418,7 @@ Task to perform HISTORY commands to Microsoft Visual SourceSafe.
 
    
   
     <tstamp>
-  <format property="to.tstamp" pattern="M-d-yy;h:mma" />
+  <format property="to.tstamp" pattern="M-d-yy;h:mma"/>
 </tstamp>
 
 <vsshistory vsspath="$/myProject" recursive="true"
diff --git a/docs/manual/OptionalTasks/wsdltodotnet.html b/docs/manual/OptionalTasks/wsdltodotnet.html
index 3cd786ed2..fd9895359 100644
--- a/docs/manual/OptionalTasks/wsdltodotnet.html
+++ b/docs/manual/OptionalTasks/wsdltodotnet.html
@@ -46,7 +46,7 @@
       
 
       
    
-        Converts a WSDL file or URL resource into a .NET language. Why add a wrapper to the MS WSDL tool? So that you can verify that your web services, be they written with Axis or anyone else's SOAP toolkit, work with .NET clients. This task is dependency aware when using a file as a source and destination; so if you <get> the file (with usetimestamp="true") then you only rebuild stuff when the WSDL file is changed. Of course, if the server generates a new timestamp every time you ask for the WSDL, this is not enough...use the <filesmatch> <condition> to to byte for byte comparison against a cached WSDL file then make the target conditional on that test failing. See "Creating an XML Web Service Proxy", "wsdl.exe" docs in the framework SDK documentation
+        Converts a WSDL file or URL resource into a .NET language. Why add a wrapper to the MS WSDL tool? So that you can verify that your web services, be they written with Axis or anyone else's SOAP toolkit, work with .NET clients. This task is dependency aware when using a file as a source and destination; so if you <get> the file (with usetimestamp="true") then you only rebuild stuff when the WSDL file is changed. Of course, if the server generates a new timestamp every time you ask for the WSDL, this is not enough...use the <filesmatch> <condition> to to byte for byte comparison against a cached WSDL file then make the target conditional on that test failing. See "Creating an XML Web Service Proxy", "wsdl.exe" docs in the framework SDK documentation
       
    
 
     
@@ -219,7 +219,7 @@
   
     
       
    
-        Copyright © 2000-2003, Apache Software Foundation
+        Copyright © 2000-2004, The Apache Software Foundation. All Rights Reserved.
       
    
     
   
diff --git a/docs/manual/OptionalTypes/classfileset.html b/docs/manual/OptionalTypes/classfileset.html
index 487a8d65a..8222e6ba2 100644
--- a/docs/manual/OptionalTypes/classfileset.html
+++ b/docs/manual/OptionalTypes/classfileset.html
@@ -44,7 +44,7 @@ to those supported by the
 
 
    Root
    
 
    
-When more than one root class is required, multiple nested <root> elements
+When more than one root class is required, multiple nested <root> elements
 may be used
 
    
 
@@ -71,7 +71,7 @@ relative location of the classfile in the fileset. So, the file
 
    Examples
     <classfileset id="reqdClasses" dir="${classes.dir}">
-  <root classname="org.apache.tools.ant.Project" />
+  <root classname="org.apache.tools.ant.Project"/>
 </classfileset>
 
    
 
diff --git a/docs/manual/develop.html b/docs/manual/develop.html
index 2eca8440b..0fcc89d23 100644
--- a/docs/manual/develop.html
+++ b/docs/manual/develop.html
@@ -210,7 +210,7 @@ the implementation of your Java virtual machine.
    Nested Types
    
 If your task needs to nest an arbitary type that has been defined
-  using <typedef> you have two options.
+  using <typedef> you have two options.
   
      
     
    1. public void add(Type type)
      2. 
     
    2. public void addConfigured(Type type)
      3. 
@@ -435,9 +435,9 @@ for the following events
      
 
 
 
      If the build file invokes another build file via <ant> or <subant> or uses <antcall>, you are creating a
+href="CoreTasks/ant.html"><ant> or <subant> or uses <antcall>, you are creating a
 new Ant "project" that will send target and task level events of its
 own but never sends build started/finished events.  Ant 1.6.2
 introduces an extension of the BuildListener interface named
diff --git a/docs/manual/dirtasks.html b/docs/manual/dirtasks.html
index 8f73d634f..002cca51c 100644
--- a/docs/manual/dirtasks.html
+++ b/docs/manual/dirtasks.html
@@ -185,39 +185,39 @@ information.
      
 the rules given here. This list, a subset of those, is a list of standard ant
 tasks that can act as an implicit fileset:
      
 
 
 
      Examples
      
diff --git a/docs/manual/intro.html b/docs/manual/intro.html
index b7162ca43..62c75a8a3 100644
--- a/docs/manual/intro.html
+++ b/docs/manual/intro.html
@@ -41,7 +41,7 @@ able to construct a shell command such as
 gives you the ability to be cross-platform - to work anywhere and
 everywhere. And
 hey, if you really need to execute a shell command, Ant has an
-<exec> task that
+<exec> task that
 allows different commands to be executed based on the OS it is executing
 on.
      
 
diff --git a/docs/manual/platform.html b/docs/manual/platform.html
index 2547e139d..c84def148 100644
--- a/docs/manual/platform.html
+++ b/docs/manual/platform.html
@@ -50,7 +50,7 @@ wierd errors about missing files, this is the problem.
 archived, because Java does not let it read or write the permissions.
  Use <chmod> to set permissions, and when creating a 
 tar archive, use the mode attribute of <tarfileset>
-to set the permissions in the tar file, or <apply> the real tar program.
+to set the permissions in the tar file, or <apply> the real tar program.
 
 
    3.  Ant is not symbolic link aware in moves, deletes and when recursing down a tree
 of directories to build up a list of files. Unexpected things can happen.
diff --git a/docs/manual/running.html b/docs/manual/running.html
index 912bf6bcf..d2cd43a5f 100644
--- a/docs/manual/running.html
+++ b/docs/manual/running.html
@@ -405,7 +405,7 @@ org.apache.tools.ant.Executor implementation specified here.
 should not have any problems launching Ant form the Cygwin shell. It is important
 to note however, that once Ant is runing it is part of the JDK which operates as
 a native Windows application. The JDK is not a Cygwin executable, and it therefore
-has no knowledge of the Cygwin paths, etc. In particular when using the <exec>
+has no knowledge of the Cygwin paths, etc. In particular when using the <exec>
 task, executable names such as "/bin/sh" will not work, even though these
 work from the Cygwin shell from which Ant was launched. You can use an executable
 name such as "sh" and rely on that command being available in the Windows
diff --git a/docs/manual/tutorial-tasks-filesets-properties.html b/docs/manual/tutorial-tasks-filesets-properties.html
index f0cf6035b..cf5610b58 100644
--- a/docs/manual/tutorial-tasks-filesets-properties.html
+++ b/docs/manual/tutorial-tasks-filesets-properties.html
@@ -117,7 +117,7 @@ name. Otherwise a message is logged.
      
 
 
      (by the way: a short word to ants "namespaces" (donīt
 be confused with xml namespaces which will be also introduces in the future (1.6 or 1.7):
-an <antcall> creates a new space for property names. All properties from the caller
+an <antcall> creates a new space for property names. All properties from the caller
 are passed to the callee, but the callee can set its own properties without notice by the
 caller.)
      
 
@@ -312,7 +312,7 @@ whithout being complex :-)
      
 
      The test case uses the ant property ant.home as reference. This property is set by the
 Launcher class which starts ant. We can use that property in our buildfiles as a
 build-in property [3]. But if we create a new ant
-environment we have to set that value for our own. And we use the <junit> task in fork-mode.
+environment we have to set that value for our own. And we use the <junit> task in fork-mode.
 Therefore we have do modify our buildfile:
 
           <target name="junit" description="Runs the unit tests" depends="jar">
@@ -333,12 +333,12 @@ Therefore we have do modify our buildfile:
 
 
      Using nested paths
      
 
      A task providing support for filesets is a very comfortable one. But there is another
-possibility of bundling files: the <path>. Fileset are easy if the files are all under
+possibility of bundling files: the <path>. Fileset are easy if the files are all under
 a common base directory. But if this is not the case you have a problem. Another disadvantage
 is its speed: if you have only a few files in a huge directory structure, why not use a
-<filelist> instead? <path>s combines these datatypes in that way that a path contains
+<filelist> instead? <path>s combines these datatypes in that way that a path contains
 other paths, filesets, dirsets and filelists. This is why 
-Ant-Contribs [4] <foreach> task is modified to support paths instead of filesets. So we want that,
+Ant-Contribs [4] <foreach> task is modified to support paths instead of filesets. So we want that,
 too.
      
 
 
      Changing from fileset to path support is very easy:
      
@@ -414,7 +414,7 @@ And would it be good to get all of them? - It depends on ...
      
 
 
      In this section we will extend that task to support returning a list of all files.
 Lists as property values are not supported by Ant natively. So we have to see how other
-tasks use lists. The most famous task using lists is Ant-Contribs <foreach>. All list
+tasks use lists. The most famous task using lists is Ant-Contribs <foreach>. All list
 elements are concatenated and separated with a customizable separator (default ',').
      
 
 
      So we do the following:
      
@@ -799,8 +799,8 @@ failures of our own test (//1 + 2).
      
 
 
      And ... oh, all tests fail: Ant could not find the task or a class this task relies upon.
      
 
-
      Ok: in the earlier steps we told Ant to use the Find class for the <find> task (remember the
-<taskdef> statement in the "use.init" target). But now we want to introduce that task as
+
      Ok: in the earlier steps we told Ant to use the Find class for the <find> task (remember the
+<taskdef> statement in the "use.init" target). But now we want to introduce that task as
 a core task. And nobody wants to taskdef the javac, echo, ... So what to do? The answer is the
 src/main/.../taskdefs/default.properties. Here is the mapping between taskname and implementing
 class done. So we add a find=org.apache.tools.ant.taskdefs.Find as the last core
@@ -900,7 +900,7 @@ entry. For both we need some information:
      
 
    
-  
diff --git a/docs/manual/tutorial-writing-tasks.html b/docs/manual/tutorial-writing-tasks.html
index 2495d57e0..3ea177c30 100644
--- a/docs/manual/tutorial-writing-tasks.html
+++ b/docs/manual/tutorial-writing-tasks.html
@@ -64,7 +64,7 @@ So the buildfile contains three targets.
 
 
 This buildfile uses often the same value (src, classes, MyTask.jar), so we should rewrite that
-using <property>s. On second there are some handicaps: <javac> requires that the destination
+using <property>s. On second there are some handicaps: <javac> requires that the destination
 directory exists; a call of "clean" with a non existing classes directory will fail; "jar" requires
 the execution of some steps bofore. So the refactored code is:
 
@@ -118,7 +118,7 @@ its depends-clause the "compile" is executed before).
 
    But after creating the jar we want to use our new Task. Therefore we need a
 new target "use". Before we can use our new task we have to declare it with
 
-<taskdef> [2]. And for easier process we change the default clause:
+<taskdef> [2]. And for easier process we change the default clause:
 
     <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="MyTask" basedir="." default="use">
@@ -226,8 +226,8 @@ use:
 
 
    Attributes
    
 
    Now we want to specify the text of our message (it seems that we are
-rewriting the <echo/> task :-). First we well do that with an attribute.
-It is very easy - for each attribute provide a public void set<attributename>(<type>
+rewriting the <echo/> task :-). First we well do that with an attribute.
+It is very easy - for each attribute provide a public void set<attributename>(<type>
 newValue) method and Ant will do the rest via reflection.
    
 
     import org.apache.tools.ant.Task;
@@ -281,7 +281,7 @@ would not set the message string to "${msg}" if there is a property "msg" with a
 
 
 
    Nested Text
    
-
    Maybe you have used the <echo> task in a way like <echo>Hello World</echo>.
+
    Maybe you have used the <echo> task in a way like <echo>Hello World</echo>.
 For that you have to provide a public void addText(String text) method.
 
     ...
@@ -305,7 +305,7 @@ the Manual [
 We use the first way of the three described ways. There are several steps for that:
      
 
    1. We create a class for collecting all the infos the nested element should contain.
   This class is created by the same rules for attributes and nested elements
-  as for the task (set<attributename>() methods). 
      2. 
+  as for the task (set<attributename>() methods). 
 
    2. The task holds multiple instances of this class in a list.
      3. 
 
    3. A factory method instantiates an object, saves the reference in the list
   and returns it to Ant Core.
      4. 
@@ -580,8 +580,8 @@ target "test-jar" or you can download a nightly build from
       
 http://gump.covalent.net/jars/latest/ant/ant-testutil.jar [5].
      
 
-
      For executing the test and creating a report we need the optional tasks <junit>
-and <junitreport>. So we add to the buildfile:
+
      For executing the test and creating a report we need the optional tasks <junit>
+and <junitreport>. So we add to the buildfile:
 
       ...
 <project name="MyTask" basedir="." default="test">

    
 
 
   
    
   body
   more details about the pathThis new task looks inside a nested <path/> for occurrences of a file and stores
+  This new task looks inside a nested <path/> for occurrences of a file and stores
       all locations as a property. See the included manual for details.