diff --git a/manual/Tasks/antlr.html b/manual/Tasks/antlr.html
index d162bbbb5..b7783e5db 100644
--- a/manual/Tasks/antlr.html
+++ b/manual/Tasks/antlr.html
@@ -113,9 +113,9 @@ the <code>antlr-all.jar</code> target of the Makefile provided with the download
   </tr>
 </table>
 
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 
-<p><code>ANTLR</code> supports a nested <code>&lt;classpath&gt;</code> element, that represents
+<p>The task supports a nested <code>&lt;classpath&gt;</code> element, that represents
 a <a href="../using.html#path">path-like structure</a>. It is given as a convenience if you have to
 specify the original ANTLR directory. In most cases, dropping the appropriate ANTLR jar in the
 normal Ant lib repository will be enough.</p>
diff --git a/manual/Tasks/apply.html b/manual/Tasks/apply.html
index 2266dd7cd..24d03aa83 100644
--- a/manual/Tasks/apply.html
+++ b/manual/Tasks/apply.html
@@ -263,16 +263,18 @@ standard input.</p>
 <h4>fileset</h4>
 <p>You can use any number of nested <code>&lt;fileset&gt;</code> elements to define the files for
 this task and refer to <code>&lt;fileset&gt;</code>s defined elsewhere.</p>
+
 <h4>filelist</h4>
 <p><em>Since Ant 1.6</em></p>
 <p>You can use any number of nested <code>&lt;filelist&gt;</code> elements to define the files for
 this task and refer to <code>&lt;filelist&gt;</code>s defined elsewhere.</p>
+
 <h4>dirset</h4>
 <p><em>Since Ant 1.6</em></p>
 <p>You can use any number of nested <code>&lt;dirset&gt;</code> elements to define the directories
 for this task and refer to <code>&lt;dirset&gt;</code>s defined elsewhere.</p>
 
-<h4>Any other <a href="../Types/resources.html#collection">Resource Collection</a></h4>
+<h4>Any other <a href="../Types/resources.html#collection">resource collection</a></h4>
 <p><em>Since Ant 1.7</em></p>
 <p>You can use any number of nested resource collections.</p>
 
@@ -281,14 +283,16 @@ for this task and refer to <code>&lt;dirset&gt;</code>s defined elsewhere.</p>
 attribute for dependency checking. If the <var>dest</var> attribute is specified it will be used as
 a base directory for resolving relative pathnames returned by the mapper. At least one
 <code>&lt;fileset&gt;</code> or <code>&lt;filelist&gt;</code> is required.</p>
+
 <h4>arg</h4>
 <p>Command line arguments should be specified as nested <code>&lt;arg&gt;</code>
 elements. See <a href="../using.html#arg">Command line arguments</a>.</p>
+
 <h4>srcfile</h4>
 <p>By default the file names of the source files will be added to the end of the command line
-(unless you set addsourcefile to <q>false</q>). If you need to place it somewhere different, use a
-nested <code>&lt;srcfile&gt;</code> element between your <code>&lt;arg&gt;</code> elements to mark
-the insertion point.</p>
+(unless you set <var>addsourcefile</var> to <q>false</q>). If you need to place it somewhere
+different, use a nested <code>&lt;srcfile&gt;</code> element between your <code>&lt;arg&gt;</code>
+elements to mark the insertion point.</p>
 <table class="attr">
   <tr>
     <th>Attribute</th>
diff --git a/manual/Tasks/attrib.html b/manual/Tasks/attrib.html
index 79ea43178..1051644fe 100644
--- a/manual/Tasks/attrib.html
+++ b/manual/Tasks/attrib.html
@@ -38,7 +38,7 @@ nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and <code>&lt;f
 elements.</p>
 
 <p><em>Since Ant 1.7</em>, this task supports
-arbitrary <a href="../Types/resources.html#collection">Resource Collection</a>s as nested
+arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
 elements.</p>
 
 <!--p>By default this task will use a single invocation of the underlying
diff --git a/manual/Tasks/checksum.html b/manual/Tasks/checksum.html
index dc4b0b5d8..0970dea4c 100644
--- a/manual/Tasks/checksum.html
+++ b/manual/Tasks/checksum.html
@@ -168,7 +168,7 @@ Architecture Standard Algorithm Name Documentation</a></p>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>resource collection</h4>
+<h4>resource collections</h4>
 <p><a href="../Types/resources.html#collection">Resource collections</a> are used to select files
 for which checksums should be generated.</p>
 
diff --git a/manual/Tasks/chgrp.html b/manual/Tasks/chgrp.html
index 6fdcd5965..941c9498d 100644
--- a/manual/Tasks/chgrp.html
+++ b/manual/Tasks/chgrp.html
@@ -38,7 +38,7 @@ nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and <code>&lt;f
 elements.</p>
 
 <p><em>Since Ant 1.7</em>, this task supports
-arbitrary <a href="../Types/resources.html#collection">Resource Collection</a>s as nested
+arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
 elements.</p>
 
 <p>By default this task will use a single invocation of the underlying <code>chgrp</code> command.
diff --git a/manual/Tasks/chmod.html b/manual/Tasks/chmod.html
index 36a59e3f6..e855e9edb 100644
--- a/manual/Tasks/chmod.html
+++ b/manual/Tasks/chmod.html
@@ -41,7 +41,7 @@ elements.</p>
 nested <a href="../Types/filelist.html">filelist</a>s.</p>
 
 <p><em>Since Ant 1.7</em>, this task supports
-arbitrary <a href="../Types/resources.html#collection">Resource Collection</a>s as nested
+arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
 elements.</p>
 
 <p>By default this task will use a single invocation of the underlying <code>chmod</code> command.
diff --git a/manual/Tasks/chown.html b/manual/Tasks/chown.html
index 4b0b928e2..f00da0e86 100644
--- a/manual/Tasks/chown.html
+++ b/manual/Tasks/chown.html
@@ -38,7 +38,7 @@ nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and <code>&lt;f
 elements.</p>
 
 <p><em>Since Ant 1.7</em>, this task supports
-arbitrary <a href="../Types/resources.html#collection">Resource Collection</a>s as nested
+arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
 elements.</p>
 
 <p>By default this task will use a single invocation of the underlying <code>chown</code> command.
diff --git a/manual/Tasks/concat.html b/manual/Tasks/concat.html
index f92f71bdc..a7e6aaff1 100644
--- a/manual/Tasks/concat.html
+++ b/manual/Tasks/concat.html
@@ -33,12 +33,12 @@
       list is empty and <var>ignoreempty</var> is <q>true</q>.</p>
 
     <p><em>Since Apache Ant 1.7.1</em>, this task can be used as
-      a <a href="../Types/resources.html#collection">Resource Collection</a> that will return
+      a <a href="../Types/resources.html#collection">resource collection</a> that will return
       exactly one <a href="../Types/resources.html">resource</a>.</p>
 
-    <p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select
+    <p><a href="../Types/resources.html#collection">Resource collections</a> are used to select
       which resources are to be concatenated. There is no singular attribute to specify a single
-      resource to <code>cat</code>.</p>
+      resource to <code>concat</code>.</p>
 
     <h3>Parameters</h3>
 
@@ -141,15 +141,15 @@
     </table>
 
     <h3>Parameters specified as nested elements</h3>
-    <h4>Resource Collection</h4>
+    <h4>resource collection</h4>
     <p><em>Since Ant 1.7</em>.</p>
 
-    <p>Any of the various <a href="../Types/resources.html#collection">Resource Collection</a> types
+    <p>Any of the various <a href="../Types/resources.html#collection">resource collection</a> types
       can specify the resources to be concatenated.</p>
 
     <h4>filterchain</h4>
     <p><em>Since Ant 1.6</em>.</p>
-    <p>The concat task supports nested <a href="../Types/filterchain.html">FilterChain</a>s.</p>
+    <p>The task supports nested <a href="../Types/filterchain.html">FilterChain</a>s.</p>
 
     <h4>header, footer</h4>
     <p><em>Since Ant 1.6</em>.</p>
diff --git a/manual/Tasks/copy.html b/manual/Tasks/copy.html
index 9c2cc9018..7ea31d245 100644
--- a/manual/Tasks/copy.html
+++ b/manual/Tasks/copy.html
@@ -30,7 +30,7 @@
 copied if the source file is newer than the destination file, or when the destination file does not
 exist.  However, you can explicitly overwrite files with the <var>overwrite</var> attribute.</p>
 
-<p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select a group
+<p><a href="../Types/resources.html#collection">Resource collections</a> are used to select a group
 of files to copy.  To use a resource collection, the <var>todir</var> attribute must be
 set. <strong>Note</strong> that some resources (for example
 the <a href="../Types/resources.html#file">file</a> resource) return absolute paths as names and the
@@ -152,8 +152,8 @@ note</a></em>.</p>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>fileset or any other resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select groups
+<h4>any filesystem based resource collection</h4>
+<p><a href="../Types/resources.html#collection">Resource collections</a> are used to select groups
 of files to copy.  To use a resource collection, the <var>todir</var> attribute must be set.</p>
 <p>Prior to Ant 1.7, only <code>&lt;fileset&gt;</code> has been supported as a nested element.</p>
 
diff --git a/manual/Tasks/dependset.html b/manual/Tasks/dependset.html
index ff2196fdb..ff043ee06 100644
--- a/manual/Tasks/dependset.html
+++ b/manual/Tasks/dependset.html
@@ -34,7 +34,7 @@ A task to manage arbitrary dependencies between resources.
 the sources has been modified more recently than any of the target files, all of the target files
 are removed.</p>
 <p>Sources and target files are specified via
-nested <a href="../Types/resources.html#collection">Resource Collection</a>s; sources can be
+nested <a href="../Types/resources.html#collection">resource collections</a>; sources can be
 resources of any type, while targets are restricted to files only. At least one set of sources and
 one set of targets is required.</p>
 <p>Use a FileSet when you want to use wildcard include or exclude patterns and don't care about
@@ -62,7 +62,7 @@ well as other stylesheets imported by the main stylesheet.</p>
   </tr>
 </table>
 
-<h3>Parameters Specified as Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
 <h4>sources</h4>
 
diff --git a/manual/Tasks/ear.html b/manual/Tasks/ear.html
index 688b5f647..67969825c 100644
--- a/manual/Tasks/ear.html
+++ b/manual/Tasks/ear.html
@@ -244,7 +244,7 @@ attribute to a value other than its default, <q>add</q>.</strong></p>
   </tr>
 </table>
 
-<h3>Nested elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
 <h4>metainf</h4>
 <p>The nested <code>metainf</code> element specifies
diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html
index 74b9b6761..c72abe1a7 100644
--- a/manual/Tasks/ejb.html
+++ b/manual/Tasks/ejb.html
@@ -391,9 +391,9 @@ stopped.</p>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
-<p>The wlrun task supports nested <code>&lt;classpath&gt;</code>
+<p>The <code>wlrun</code> task supports nested <code>&lt;classpath&gt;</code>
 and <code>&lt;wlclasspath&gt;</code> elements to set the respective classpaths.</p>
 
 <h3>Examples</h3>
@@ -473,7 +473,7 @@ the <var>BEAHome</var> to have this task work correctly under 6.0</p>
   </tr>
 </table>
 
-<h3>Nested Element</h3>
+<h3>Parameters specified as nested elements</h3>
 
 <p>The classpath of the <code>wlstop</code> task can be set by a <code>&lt;classpath&gt;</code>
 nested element.</p>
@@ -711,7 +711,7 @@ not, <code>ejbjar</code> will drop back to the behaviour corresponding to the va
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
 <p>In addition to the vendor specific nested elements, the <code>ejbjar</code> task provides three
 nested elements.</p>
diff --git a/manual/Tasks/get.html b/manual/Tasks/get.html
index 80983803e..46f1944c9 100644
--- a/manual/Tasks/get.html
+++ b/manual/Tasks/get.html
@@ -134,7 +134,7 @@ the request is relayed to the proxy.</p>
 <h3>Parameters specified as nested elements</h3>
 <h4>any resource collection</h4>
 
-<p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select groups
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
 of URLs to download.  If the collection contains more than one resource, the <var>dest</var>
 attribute must point to a directory if it exists or a directory will be created if it doesn't exist.
 The destination file name use the last part of the path of the source URL unless you also specify a
diff --git a/manual/Tasks/input.html b/manual/Tasks/input.html
index 0281c4371..b847c1c65 100644
--- a/manual/Tasks/input.html
+++ b/manual/Tasks/input.html
@@ -89,7 +89,7 @@ the <code>input</code> task.</p>
     <td>No</td>
   </tr>
 </table>
-<h3>Parameters Specified as Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 <h4>Handler</h4>
 <p><em>Since Ant 1.7</em>, a nested <code>&lt;handler&gt;</code> element can be used to specify
 an <code>InputHandler</code>, so that different <code>InputHandler</code>s may be used among
diff --git a/manual/Tasks/jar.html b/manual/Tasks/jar.html
index 1330b560f..1664bbc60 100644
--- a/manual/Tasks/jar.html
+++ b/manual/Tasks/jar.html
@@ -308,7 +308,7 @@ e.g. decreasing the size by deleting 'same' classes from the versions-branches,
   </tr>
 </table>
 
-<h3>Nested elements</h3>
+<h3>Parameters specified as nested elements</h3>
 <h4>metainf</h4>
 <p>The nested <code>metainf</code> element specifies
 a <a href="../Types/fileset.html">FileSet</a>. All files included in this fileset will end up in
diff --git a/manual/Tasks/jdepend.html b/manual/Tasks/jdepend.html
index e3b9d2e88..2263689d9 100644
--- a/manual/Tasks/jdepend.html
+++ b/manual/Tasks/jdepend.html
@@ -101,7 +101,7 @@ default the task writes its report to the standard output.</p>
   </tr>
 </table>
 
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 
 <p><code>jdepend</code> supports four nested
 elements: <code>&lt;classpath&gt;</code>, <code>&lt;classespath&gt;</code>
diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html
index c4ad1e3bf..13828160f 100644
--- a/manual/Tasks/junit.html
+++ b/manual/Tasks/junit.html
@@ -223,7 +223,7 @@ the following string patterns:</p>
    &quot;junit.framework.JUnit4TestAdapter&quot;
    &quot; more&quot;</pre>
 
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 
 <p>The <code>&lt;junit&gt;</code> task supports a nested <code>&lt;classpath&gt;</code> element that
 represents a <a href="../using.html#path">PATH like structure</a>.</p>
@@ -498,11 +498,11 @@ to <samp><i>java-tmp-dir</i>/FailedTests</samp>.</p>
 <p>Define a number of tests based on pattern matching.</p>
 
 <p><code>batchtest</code> collects the included <a href="../Types/resources.html">resources</a> from
-any number of nested <a href="../Types/resources.html#collection">Resource Collection</a>s. It then
+any number of nested <a href="../Types/resources.html#collection">resource collections</a>. It then
 generates a test class name for each resource that ends in <samp>.java</samp>
 or <samp>.class</samp>.</p>
 
-<p>Any type of Resource Collection is supported as a nested element, prior to Ant 1.7
+<p>Any type of resource collection is supported as a nested element, prior to Ant 1.7
 only <code>&lt;fileset&gt;</code> has been supported.</p>
 
 <table class="attr">
diff --git a/manual/Tasks/junitreport.html b/manual/Tasks/junitreport.html
index ebf79bcc6..e4e0a3faf 100644
--- a/manual/Tasks/junitreport.html
+++ b/manual/Tasks/junitreport.html
@@ -72,7 +72,7 @@ for quite some time.</p>
     <td>No; defaults to current directory</td>
   </tr>
 </table>
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 <h4>fileset</h4>
 <p><code>junitreport</code> collects individual xml files generated by the <code>JUnit</code> task
 using the nested <a href="../Types/fileset.html"><code>&lt;FileSet&gt;</code></a> element.</p>
diff --git a/manual/Tasks/length.html b/manual/Tasks/length.html
index 674ebe83f..9a902520a 100644
--- a/manual/Tasks/length.html
+++ b/manual/Tasks/length.html
@@ -28,7 +28,7 @@
 <p><em>Since Apache Ant 1.6.3</em></p>
 <h3>Description</h3>
 <p>Display or set a property containing length information for a string, a file, or one or more
-nested <a href="../Types/resources.html#collection">Resource Collection</a>s.  Can also be used as
+nested <a href="../Types/resources.html#collection">resource collections</a>.  Can also be used as
 a <code>condition</code>.</p>
 <h3>Parameters</h3>
 <table class="attr">
@@ -94,9 +94,9 @@ a <code>condition</code>.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>Resource Collections</h4>
-<p>You can include resources via nested <a href="../Types/resources.html#collection">Resource
-Collection</a>s.</p>
+<h4>resource collections</h4>
+<p>You can include resources via nested <a href="../Types/resources.html#collection">resource
+collection</a>s.</p>
 
 <h3>Examples</h3>
 
diff --git a/manual/Tasks/manifest.html b/manual/Tasks/manifest.html
index 8ecd37ed8..1c8a2053d 100644
--- a/manual/Tasks/manifest.html
+++ b/manual/Tasks/manifest.html
@@ -89,7 +89,7 @@ the JAR, feeding in the hand-crafted manifest.</p>
   </tr>
 </table>
 
-<h3>Nested elements</h3>
+<h3>Parameters specified as nested elements</h3>
 <h4 id="attribute">attribute</h4>
 <p>One attribute for the manifest file.  Those attributes that are not nested into a section will be
 added to the main section.</p>
diff --git a/manual/Tasks/move.html b/manual/Tasks/move.html
index 27b9aa946..d93095ca1 100644
--- a/manual/Tasks/move.html
+++ b/manual/Tasks/move.html
@@ -31,7 +31,7 @@ the destination file is overwritten if it already exists.  When <var>overwrite</
 then files are only moved if the source file is newer than the destination file, or when the
 destination file does not exist.</p>
 
-<p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select a group
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select a group
 of files to move.  Only file system based resource collections are supported, this
 includes <a href="../Types/fileset.html">fileset</a>s, <a href="../Types/filelist.html">filelist</a>
 and <a href="../using.html#path">path</a>.  Prior to Apache Ant 1.7
diff --git a/manual/Tasks/pack.html b/manual/Tasks/pack.html
index ffb2b326f..58a22fb0d 100644
--- a/manual/Tasks/pack.html
+++ b/manual/Tasks/pack.html
@@ -55,6 +55,7 @@ See <a href="../install.html#librarydependencies">Library Dependencies</a> for m
     <td class="left"><em><u>deprecated</u></em> old name of <var>destfile</var>.</td>
   </tr>
 </table>
+<h3>Parameters specified as nested elements</h3>
 <h4>any <a href="../Types/resources.html">resource</a> or single element resource collection</h4>
 <p><em>Since Apache Ant 1.7</em></p>
 <p>The specified resource will be used as <var>src</var>.</p>
diff --git a/manual/Tasks/pathconvert.html b/manual/Tasks/pathconvert.html
index 15ed82a97..40b404514 100644
--- a/manual/Tasks/pathconvert.html
+++ b/manual/Tasks/pathconvert.html
@@ -26,9 +26,9 @@
 
 <h2 id="pathconvert">Pathconvert</h2>
 <h3>Description</h3>
-<p>Converts nested <a href="../Types/resources.html#collection"> ResourceCollection</a>s, or a
+<p>Converts nested <a href="../Types/resources.html#collection">resource collections</a>, or a
 reference to just one, into a path form for a particular platform, optionally storing the result
-into a given property. It can also be used when you need to convert a Resource Collection into a
+into a given property. It can also be used when you need to convert a resource collection into a
 list, separated by a given character, such as a comma or space, or, conversely, e.g. to convert a
 list of files in a FileList into a path.</p>
 <p>Nested <code>&lt;map&gt;</code> elements can be specified to map Windows drive letters to Unix
@@ -114,9 +114,9 @@ being processed.  If no map entries are specified, then no path prefix mapping i
 <p><strong>Note</strong>: The map elements are applied in the order specified, and only the first
 matching map element is applied.  So, the ordering of your map elements can be important, if
 any <var>from</var> values are prefixes of other <var>from</var> values.</p>
-<h4>Resource Collections</h4>
+<h4>resource collections</h4>
 <p>If the <var>refid</var> attribute is not specified, then one or more
-nested <a href="../Types/resources.html#collection">Resource Collection</a>s must be supplied.</p>
+nested <a href="../Types/resources.html#collection">resource collections</a> must be supplied.</p>
 <h4>mapper</h4>
 <p>A single nested <a href="../Types/mapper.html"> <code>&lt;mapper&gt;</code></a> element can be
 specified to perform any of various filename transformations (<em>since Ant 1.6.2</em>).</p>
diff --git a/manual/Tasks/pvcstask.html b/manual/Tasks/pvcstask.html
index 077b14557..2d3dabe7e 100644
--- a/manual/Tasks/pvcstask.html
+++ b/manual/Tasks/pvcstask.html
@@ -158,10 +158,10 @@ the repository.</p>
     <td>No</td>
   </tr>
 </table>
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 
 <h4>pvcsproject element</h4>
-<p><code>pvcs</code> supports a nested <code>&lt;pvcsproject&gt;</code> element, that represents a
+<p>The task supports a nested <code>&lt;pvcsproject&gt;</code> element, that represents a
 project within the PVCS repository to extract files from.  By nesting
 multiple <code>&lt;pvcsproject&gt;</code> elements under the <code>&lt;pvcs&gt;</code> task,
 multiple projects can be specified.</p>
diff --git a/manual/Tasks/replaceregexp.html b/manual/Tasks/replaceregexp.html
index cd36c3226..4224a8550 100644
--- a/manual/Tasks/replaceregexp.html
+++ b/manual/Tasks/replaceregexp.html
@@ -113,7 +113,7 @@ datatype instance.</p>
 &lt;regexp id="id" pattern="alpha(.+)beta"/&gt;
 &lt;regexp refid="id"/&gt;</pre>
 
-<p>This task supports a nested <code>Substitution</code> element to specify the substitution
+<p>This task supports a nested <code>substitution</code> element to specify the substitution
 pattern.  You can use this element to refer to a previously defined substitution pattern datatype
 instance.</p>
 
diff --git a/manual/Tasks/resourcecount.html b/manual/Tasks/resourcecount.html
index ebb3e7200..3c2addac8 100644
--- a/manual/Tasks/resourcecount.html
+++ b/manual/Tasks/resourcecount.html
@@ -28,8 +28,8 @@
 <p><em>Since Apache Ant 1.7</em></p>
 <h3>Description</h3>
 <p>Display or set a property containing the size of a
-nested <a href="../Types/resources.html#collection">Resource Collection</a>.  Can also be used as a
-condition.</p>
+nested <a href="../Types/resources.html#collection">resource collection</a>.  Can also be used as
+a <code>condition</code>.</p>
 <h3>Parameters</h3>
 <table class="attr">
   <tr>
@@ -49,8 +49,8 @@ condition.</p>
   </tr>
   <tr>
     <td>refid</td>
-    <td>A <a href="../using.html#references">reference</a> to a Resource Collection.</td>
-    <td colspan="2">Yes, unless a nested Resource Collection is supplied</td>
+    <td>A <a href="../using.html#references">reference</a> to a resource collection.</td>
+    <td colspan="2">Yes, unless a nested resource collection is supplied</td>
   </tr>
   <tr>
     <td>count</td>
@@ -69,8 +69,8 @@ condition.</p>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<h4>Resource Collection</h4>
-<p>A single <a href="../Types/resources.html#collection">Resource Collection</a> should be specified
+<h4>resource collection</h4>
+<p>A single <a href="../Types/resources.html#collection">resource collection</a> should be specified
 via a nested element or the <var>refid</var> attribute.</p>
 
 <h3>Examples</h3>
diff --git a/manual/Tasks/rexec.html b/manual/Tasks/rexec.html
index 609d0c2af..34d1bf2b9 100644
--- a/manual/Tasks/rexec.html
+++ b/manual/Tasks/rexec.html
@@ -77,7 +77,7 @@ attribute, you must use the <var>username</var> and <var>password</var> attribut
      <td>No; default is no timeout</td>
   </tr>
 </table>
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 <p>The input to send to the server, and responses to wait for, are described as nested elements.</p>
 
 <h4>read</h4>
diff --git a/manual/Tasks/schemavalidate.html b/manual/Tasks/schemavalidate.html
index 6130a08cd..628dc14cc 100644
--- a/manual/Tasks/schemavalidate.html
+++ b/manual/Tasks/schemavalidate.html
@@ -117,7 +117,7 @@ their URL equivalents.</p>
   </tr>
 </table>
 
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 
 <h4>schema</h4>
 <p>Identify the name and location of a schema that may be used in validating the document(s).</p>
diff --git a/manual/Tasks/scp.html b/manual/Tasks/scp.html
index b5486cd9c..14781fa6d 100644
--- a/manual/Tasks/scp.html
+++ b/manual/Tasks/scp.html
@@ -201,9 +201,9 @@ information.  This task has been tested with <code>jsch-0.1.2</code> and later.<
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>fileset or resource collections</h4>
+<h4>resource collections</h4>
 <p><a href="../Types/fileset.html">FileSet</a>s
-or <a href="../Types/resources.html#collection">Resource Collection</a>s are used to select groups
+or other <a href="../Types/resources.html#collection">resource collections</a> are used to select groups
 of files to copy. To use a fileset or a resource collection, the <var>todir</var> attribute must be
 set.</p>
 
diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html
index 59de23ea5..e214a073b 100644
--- a/manual/Tasks/scriptdef.html
+++ b/manual/Tasks/scriptdef.html
@@ -134,7 +134,7 @@ task.</p>
   </tr>
 </table>
 
-<h3>Nested elements</h3>
+<h3>Parameters specified as nested elements</h3>
 <h4>attribute</h4>
 <table class="attr">
   <tr>
diff --git a/manual/Tasks/serverdeploy.html b/manual/Tasks/serverdeploy.html
index ec90ce1b1..6db2a6459 100644
--- a/manual/Tasks/serverdeploy.html
+++ b/manual/Tasks/serverdeploy.html
@@ -84,7 +84,7 @@ which attributes are required, depending on the tool.</p>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
 <p>The <code>serverdeploy</code> task supports a nested <code>classpath</code> element to set the
 classpath.</p>
diff --git a/manual/Tasks/setpermissions.html b/manual/Tasks/setpermissions.html
index bab640b71..b9c6a1beb 100644
--- a/manual/Tasks/setpermissions.html
+++ b/manual/Tasks/setpermissions.html
@@ -77,7 +77,7 @@ different sets of permissions to apply to either type of resource.</p>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>any resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select groups
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
 of resources.</p>
 <h3>Examples</h3>
 <pre>
diff --git a/manual/Tasks/sound.html b/manual/Tasks/sound.html
index 19d1c39dd..402068074 100644
--- a/manual/Tasks/sound.html
+++ b/manual/Tasks/sound.html
@@ -38,13 +38,13 @@ executed.</p>
 <p>Unless you are running on Java 1.3 or later, you need the Java Media Framework on the classpath
 (<code>javax.sound</code>).</p>
 
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 <h4>success</h4>
 <p>Specifies the sound to be played if the build succeeded.</p>
 <h4>fail</h4>
 <p>Specifies the sound to be played if the build failed.</p>
 
-<h3>Nested Element Parameters</h3>
+<h3>Nested element parameters</h3>
 <p>The following attributes may be used on the <code>&lt;success&gt;</code>
 and <code>&lt;fail&gt;</code> elements:</p>
 <table class="attr">
diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html
index 7d98ca00e..267d52497 100644
--- a/manual/Tasks/style.html
+++ b/manual/Tasks/style.html
@@ -58,7 +58,7 @@ parent directory has been matched.  If this behavior is not what you want, set
 the <var>scanincludedirectories</var> attribute to false.</p>
 
 <p><em>Since Ant 1.7</em>, this task supports
-nested <a href="../Types/resources.html#collection">resource collection</a>s in addition to (or
+nested <a href="../Types/resources.html#collection">resource collections</a> in addition to (or
 instead of, depending on the <var>useImplicitFileset</var> attribute) the implicit fileset formed by
 this task.</p>
 
diff --git a/manual/Tasks/sync.html b/manual/Tasks/sync.html
index 916cc73a7..312409fc6 100644
--- a/manual/Tasks/sync.html
+++ b/manual/Tasks/sync.html
@@ -29,7 +29,7 @@
 <h3>Description</h3>
 
 <p>Synchronize a target directory from the files defined in one or
-more <a href="../Types/resources.html#collection">Resource Collection</a>s.</p>
+more <a href="../Types/resources.html#collection">resource collections</a>.</p>
 
 <p>Any file in the target directory that has not been matched by at least one of the nested resource
 collections gets removed.  I.e. if you exclude a file in your sources and a file of that name is
@@ -85,8 +85,8 @@ present in the target dir, it will get removed from the target.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>fileset or any other resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select groups
+<h4>any resource collection</h4>
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
 of files to copy.</p>
 <p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> has been supported as a nested element.</p>
 
diff --git a/manual/Tasks/tar.html b/manual/Tasks/tar.html
index c16041c06..8a7cf268f 100644
--- a/manual/Tasks/tar.html
+++ b/manual/Tasks/tar.html
@@ -137,9 +137,9 @@ to <q>gzip</q>, <q>bzip2</q>, or <q>xz</q>.</p>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
-<p>The tar task supports nested <a href="../Types/tarfileset.html">tarfileset</a> elements. These
+<p>The task supports nested <a href="../Types/tarfileset.html">tarfileset</a> elements. These
 are extended <a href="../Types/fileset.html">FileSets</a> which, in addition to the standard
 elements, support one additional attributes</p>
 
@@ -157,7 +157,7 @@ elements, support one additional attributes</p>
 </table>
 
 <h4>any other resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select groups
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
 of files to archive.</p>
 <p>Prior to Apache Ant 1.7 only <code>&lt;fileset&gt;</code> has been supported as a nested
 element.</p>
diff --git a/manual/Tasks/telnet.html b/manual/Tasks/telnet.html
index 5f1923177..3f81e4606 100644
--- a/manual/Tasks/telnet.html
+++ b/manual/Tasks/telnet.html
@@ -73,7 +73,7 @@ information.</p>
     <td>No; default is no timeout</td>
   </tr>
 </table>
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 <p>The commands to send to the server, and responses to wait for, are described as nested
 elements.</p>
 
diff --git a/manual/Tasks/tstamp.html b/manual/Tasks/tstamp.html
index 3d83e8aa7..e2086d102 100644
--- a/manual/Tasks/tstamp.html
+++ b/manual/Tasks/tstamp.html
@@ -58,8 +58,8 @@ ignored.</p>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
-<p>The <code>Tstamp</code> task supports a <code>&lt;format&gt;</code> nested element that allows a
+<h3>Parameters specified as nested elements</h3>
+<p>The task supports a <code>&lt;format&gt;</code> nested element that allows a
 property to be set to the current date and time in a given format.  The date/time patterns are as
 defined in the
 Java <a href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>
diff --git a/manual/Tasks/unzip.html b/manual/Tasks/unzip.html
index ce2982a7a..33061277f 100644
--- a/manual/Tasks/unzip.html
+++ b/manual/Tasks/unzip.html
@@ -30,7 +30,7 @@
 <p><a href="../Types/patternset.html">PatternSet</a>s are used to select files to
 extract <em>from</em> the archive.  If no patternset is used, all files are extracted.</p>
 
-<p><a href="../Types/resources.html#collection">Resource Collection</a>s may be used to select
+<p><a href="../Types/resources.html#collection">resource collections</a> may be used to select
 archived files to perform unarchival upon.  Only file system based resource collections are
 supported by <code>Unjar</code>/<code>Unwar</code>/<code>Unzip</code>, this
 includes <a href="../Types/fileset.html">fileset</a>, <a href="../Types/filelist.html">filelist</a>, <a href="../using.html#path">path</a>,
diff --git a/manual/Tasks/waitfor.html b/manual/Tasks/waitfor.html
index f0ba88054..dc98f3bf8 100644
--- a/manual/Tasks/waitfor.html
+++ b/manual/Tasks/waitfor.html
@@ -89,7 +89,7 @@ if the condition didn't come true within the specified time.</p>
   </tr>
 </table>
 
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 <p>The available conditions that satisfy the <code>&lt;waitfor&gt;</code> task are the same as those
 for the <a href="condition.html"><code>&lt;condition&gt;</code></a>
 task. See <a href="conditions.html">here</a> for the full list.</p>
diff --git a/manual/Tasks/war.html b/manual/Tasks/war.html
index 56decf06a..f4d9e44f3 100644
--- a/manual/Tasks/war.html
+++ b/manual/Tasks/war.html
@@ -243,7 +243,7 @@ attribute to a value other than its default, <q>add</q>.</strong></p>
   </tr>
 </table>
 
-<h3>Nested elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
 <h4>lib</h4>
 <p>The nested <code>lib</code> element specifies a <a href="../Types/fileset.html">FileSet</a>. All
diff --git a/manual/Tasks/xmlproperty.html b/manual/Tasks/xmlproperty.html
index 7bc3f0bd8..40d2e5c8c 100644
--- a/manual/Tasks/xmlproperty.html
+++ b/manual/Tasks/xmlproperty.html
@@ -132,7 +132,7 @@ the input XML file is loaded:/p>
   </tr>
 </table>
 
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 <h4>xmlcatalog</h4>
 <p>The <a href="../Types/xmlcatalog.html"><code>&lt;xmlcatalog&gt;</code></a> element is used to
 perform entity resolution.</p>
diff --git a/manual/Tasks/xmlvalidate.html b/manual/Tasks/xmlvalidate.html
index 8512e55af..236401fcb 100644
--- a/manual/Tasks/xmlvalidate.html
+++ b/manual/Tasks/xmlvalidate.html
@@ -91,7 +91,7 @@ of <code>xmlvalidate</code>, this warning may not apply.</p>
   </tr>
 </table>
 
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 <h4>dtd</h4>
 <p><code>&lt;dtd&gt;</code> is used to specify different locations for DTD resolution.</p>
 <table class="attr">
diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html
index db3eb0fe7..495837667 100644
--- a/manual/Tasks/zip.html
+++ b/manual/Tasks/zip.html
@@ -383,7 +383,7 @@ read without problems with Java 6 and later.</p>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>any resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select groups
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
 of files to archive.</p>
 <p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> and <code>&lt;zipfileset&gt;</code> have been
 supported as nested elements.</p>
diff --git a/manual/Types/resources.html b/manual/Types/resources.html
index 10060d24e..62277cc93 100644
--- a/manual/Types/resources.html
+++ b/manual/Types/resources.html
@@ -57,8 +57,8 @@ The built-in resource types are:
 <p>
 A basic resource. Other resource types derive from this basic type; as such all its attributes
 are available, though in most cases irrelevant attributes will be ignored. This and all resource
-implementations are also usable as single-element <a href="#collection">Resource
-Collections</a>.
+implementations are also usable as single-element <a href="#collection">resource
+collections</a>.
 </p>
 
 <table class="attr">
@@ -360,9 +360,9 @@ attribute is unset:</p>
 <hr/>
 <h2 id="collection">Resource Collections</h2>
 <p>
-A Resource Collection is an abstraction of an entity that groups together a number
+A resource collection is an abstraction of an entity that groups together a number
 of <a href="#resource">resources</a>. Several of Ant's "legacy" datatypes have been modified to
-behave as Resource Collections:
+behave as resource collections:
 </p>
 <ul>
   <li><a href="fileset.html">fileset</a>,
@@ -426,7 +426,7 @@ The additional built-in resource collections are:
 <p>
 A generic resource collection, designed for use
 with <a href="../using.html#references">references</a>.  For example, if a third-party Ant task
-generates a Resource Collection of an unknown type, it can still be accessed via
+generates a resource collection of an unknown type, it can still be accessed via
 a <code>&lt;resources&gt;</code> collection. The secondary use of this collection type is as a
 container of other resource collections, preserving the order of nested collections as well as
 duplicate resources (contrast with <a href="#union">union</a>).
diff --git a/manual/using.html b/manual/using.html
index 406259e45..7fde71f32 100644
--- a/manual/using.html
+++ b/manual/using.html
@@ -275,7 +275,7 @@ supports <var>path</var> and
 <p>can be abbreviated to:</p>
 <pre>&lt;classpath path=&quot;${classpath}&quot;/&gt;</pre>
 <p>In addition, one or more
-<a href="Types/resources.html#collection">Resource Collection</a>s
+<a href="Types/resources.html#collection">resource collections</a>
 can be specified as nested elements (these must consist of
 <a href="Types/resources.html#file">file</a>-type resources only).
 Additionally, it should be noted that although resource collections are