You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/03/05 16:40:50 UTC
ant git commit: use lowercase for simplicity
Repository: ant
Updated Branches:
refs/heads/master aa4f45e25 -> 677f5275d
use lowercase for simplicity
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/677f5275
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/677f5275
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/677f5275
Branch: refs/heads/master
Commit: 677f5275dd60f5e551c1f8772290ecd2c1ff4d14
Parents: aa4f45e
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Mon Mar 5 17:35:30 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Mon Mar 5 17:36:10 2018 +0100
----------------------------------------------------------------------
manual/Tasks/antlr.html | 4 ++--
manual/Tasks/apply.html | 12 ++++++++----
manual/Tasks/attrib.html | 2 +-
manual/Tasks/checksum.html | 2 +-
manual/Tasks/chgrp.html | 2 +-
manual/Tasks/chmod.html | 2 +-
manual/Tasks/chown.html | 2 +-
manual/Tasks/concat.html | 12 ++++++------
manual/Tasks/copy.html | 6 +++---
manual/Tasks/dependset.html | 4 ++--
manual/Tasks/ear.html | 2 +-
manual/Tasks/ejb.html | 8 ++++----
manual/Tasks/get.html | 2 +-
manual/Tasks/input.html | 2 +-
manual/Tasks/jar.html | 2 +-
manual/Tasks/jdepend.html | 2 +-
manual/Tasks/junit.html | 6 +++---
manual/Tasks/junitreport.html | 2 +-
manual/Tasks/length.html | 8 ++++----
manual/Tasks/manifest.html | 2 +-
manual/Tasks/move.html | 2 +-
manual/Tasks/pack.html | 1 +
manual/Tasks/pathconvert.html | 8 ++++----
manual/Tasks/pvcstask.html | 4 ++--
manual/Tasks/replaceregexp.html | 2 +-
manual/Tasks/resourcecount.html | 12 ++++++------
manual/Tasks/rexec.html | 2 +-
manual/Tasks/schemavalidate.html | 2 +-
manual/Tasks/scp.html | 4 ++--
manual/Tasks/scriptdef.html | 2 +-
manual/Tasks/serverdeploy.html | 2 +-
manual/Tasks/setpermissions.html | 2 +-
manual/Tasks/sound.html | 4 ++--
manual/Tasks/style.html | 2 +-
manual/Tasks/sync.html | 6 +++---
manual/Tasks/tar.html | 6 +++---
manual/Tasks/telnet.html | 2 +-
manual/Tasks/tstamp.html | 4 ++--
manual/Tasks/unzip.html | 2 +-
manual/Tasks/waitfor.html | 2 +-
manual/Tasks/war.html | 2 +-
manual/Tasks/xmlproperty.html | 2 +-
manual/Tasks/xmlvalidate.html | 2 +-
manual/Tasks/zip.html | 2 +-
manual/Types/resources.html | 10 +++++-----
manual/using.html | 2 +-
46 files changed, 90 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/antlr.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antlr.html b/manual/Tasks/antlr.html
index d162bbb..b7783e5 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><classpath></code> element, that represents
+<p>The task supports a nested <code><classpath></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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/apply.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/apply.html b/manual/Tasks/apply.html
index 2266dd7..24d03aa 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><fileset></code> elements to define the files for
this task and refer to <code><fileset></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><filelist></code> elements to define the files for
this task and refer to <code><filelist></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><dirset></code> elements to define the directories
for this task and refer to <code><dirset></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><dirset></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><fileset></code> or <code><filelist></code> is required.</p>
+
<h4>arg</h4>
<p>Command line arguments should be specified as nested <code><arg></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><srcfile></code> element between your <code><arg></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><srcfile></code> element between your <code><arg></code>
+elements to mark the insertion point.</p>
<table class="attr">
<tr>
<th>Attribute</th>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/attrib.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/attrib.html b/manual/Tasks/attrib.html
index 79ea431..1051644 100644
--- a/manual/Tasks/attrib.html
+++ b/manual/Tasks/attrib.html
@@ -38,7 +38,7 @@ nested <code><fileset></code>, <code><dirset></code> and <code><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
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/checksum.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/checksum.html b/manual/Tasks/checksum.html
index dc4b0b5..0970dea 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/chgrp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chgrp.html b/manual/Tasks/chgrp.html
index 6fdcd59..941c949 100644
--- a/manual/Tasks/chgrp.html
+++ b/manual/Tasks/chgrp.html
@@ -38,7 +38,7 @@ nested <code><fileset></code>, <code><dirset></code> and <code><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.
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/chmod.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chmod.html b/manual/Tasks/chmod.html
index 36a59e3..e855e9e 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.
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/chown.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chown.html b/manual/Tasks/chown.html
index 4b0b928..f00da0e 100644
--- a/manual/Tasks/chown.html
+++ b/manual/Tasks/chown.html
@@ -38,7 +38,7 @@ nested <code><fileset></code>, <code><dirset></code> and <code><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.
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/concat.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/concat.html b/manual/Tasks/concat.html
index f92f71b..a7e6aaf 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/copy.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/copy.html b/manual/Tasks/copy.html
index 9c2cc90..7ea31d2 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><fileset></code> has been supported as a nested element.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/dependset.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/dependset.html b/manual/Tasks/dependset.html
index ff2196f..ff043ee 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/ear.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ear.html b/manual/Tasks/ear.html
index 688b5f6..6796982 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
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/ejb.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html
index 74b9b67..c72abe1 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><classpath></code>
+<p>The <code>wlrun</code> task supports nested <code><classpath></code>
and <code><wlclasspath></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><classpath></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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/get.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/get.html b/manual/Tasks/get.html
index 8098380..46f1944 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
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/input.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/input.html b/manual/Tasks/input.html
index 0281c43..b847c1c 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><handler></code> element can be used to specify
an <code>InputHandler</code>, so that different <code>InputHandler</code>s may be used among
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/jar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jar.html b/manual/Tasks/jar.html
index 1330b56..1664bbc 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
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/jdepend.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jdepend.html b/manual/Tasks/jdepend.html
index e3b9d2e..2263689 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><classpath></code>, <code><classespath></code>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/junit.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html
index c4ad1e3..1382816 100644
--- a/manual/Tasks/junit.html
+++ b/manual/Tasks/junit.html
@@ -223,7 +223,7 @@ the following string patterns:</p>
"junit.framework.JUnit4TestAdapter"
" more"</pre>
-<h3 id="nested">Nested Elements</h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
<p>The <code><junit></code> task supports a nested <code><classpath></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><fileset></code> has been supported.</p>
<table class="attr">
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/junitreport.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/junitreport.html b/manual/Tasks/junitreport.html
index ebf79bc..e4e0a3f 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><FileSet></code></a> element.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/length.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/length.html b/manual/Tasks/length.html
index 674ebe8..9a90252 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/manifest.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/manifest.html b/manual/Tasks/manifest.html
index 8ecd37e..1c8a205 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/move.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/move.html b/manual/Tasks/move.html
index 27b9aa9..d93095c 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
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/pack.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/pack.html b/manual/Tasks/pack.html
index ffb2b32..58a22fb 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/pathconvert.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/pathconvert.html b/manual/Tasks/pathconvert.html
index 15ed82a..40b4045 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><map></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><mapper></code></a> element can be
specified to perform any of various filename transformations (<em>since Ant 1.6.2</em>).</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/pvcstask.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/pvcstask.html b/manual/Tasks/pvcstask.html
index 077b145..2d3dabe 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><pvcsproject></code> element, that represents a
+<p>The task supports a nested <code><pvcsproject></code> element, that represents a
project within the PVCS repository to extract files from. By nesting
multiple <code><pvcsproject></code> elements under the <code><pvcs></code> task,
multiple projects can be specified.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/replaceregexp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/replaceregexp.html b/manual/Tasks/replaceregexp.html
index cd36c32..4224a85 100644
--- a/manual/Tasks/replaceregexp.html
+++ b/manual/Tasks/replaceregexp.html
@@ -113,7 +113,7 @@ datatype instance.</p>
<regexp id="id" pattern="alpha(.+)beta"/>
<regexp refid="id"/></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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/resourcecount.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/resourcecount.html b/manual/Tasks/resourcecount.html
index ebb3e72..3c2adda 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/rexec.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/rexec.html b/manual/Tasks/rexec.html
index 609d0c2..34d1bf2 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/schemavalidate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/schemavalidate.html b/manual/Tasks/schemavalidate.html
index 6130a08..628dc14 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/scp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scp.html b/manual/Tasks/scp.html
index b5486cd..14781fa 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/scriptdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html
index 59de23e..e214a07 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/serverdeploy.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/serverdeploy.html b/manual/Tasks/serverdeploy.html
index ec90ce1..6db2a64 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/setpermissions.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/setpermissions.html b/manual/Tasks/setpermissions.html
index bab640b..b9c6a1b 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/sound.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sound.html b/manual/Tasks/sound.html
index 19d1c39..4020680 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><success></code>
and <code><fail></code> elements:</p>
<table class="attr">
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/style.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html
index 7d98ca0..267d524 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/sync.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sync.html b/manual/Tasks/sync.html
index 916cc73..312409f 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><fileset></code> has been supported as a nested element.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/tar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/tar.html b/manual/Tasks/tar.html
index c16041c..8a7cf26 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><fileset></code> has been supported as a nested
element.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/telnet.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/telnet.html b/manual/Tasks/telnet.html
index 5f19231..3f81e46 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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/tstamp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/tstamp.html b/manual/Tasks/tstamp.html
index 3d83e8a..e2086d1 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><format></code> nested element that allows a
+<h3>Parameters specified as nested elements</h3>
+<p>The task supports a <code><format></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>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/unzip.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/unzip.html b/manual/Tasks/unzip.html
index ce2982a..3306127 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>,
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/waitfor.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/waitfor.html b/manual/Tasks/waitfor.html
index f0ba880..dc98f3b 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><waitfor></code> task are the same as those
for the <a href="condition.html"><code><condition></code></a>
task. See <a href="conditions.html">here</a> for the full list.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/war.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/war.html b/manual/Tasks/war.html
index 56decf0..f4d9e44 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
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/xmlproperty.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/xmlproperty.html b/manual/Tasks/xmlproperty.html
index 7bc3f0b..40d2e5c 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><xmlcatalog></code></a> element is used to
perform entity resolution.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/xmlvalidate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/xmlvalidate.html b/manual/Tasks/xmlvalidate.html
index 8512e55..236401f 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><dtd></code> is used to specify different locations for DTD resolution.</p>
<table class="attr">
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Tasks/zip.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html
index db3eb0f..4958376 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><fileset></code> and <code><zipfileset></code> have been
supported as nested elements.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/Types/resources.html
----------------------------------------------------------------------
diff --git a/manual/Types/resources.html b/manual/Types/resources.html
index 10060d2..62277cc 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><resources></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>).
http://git-wip-us.apache.org/repos/asf/ant/blob/677f5275/manual/using.html
----------------------------------------------------------------------
diff --git a/manual/using.html b/manual/using.html
index 406259e..7fde71f 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><classpath path="${classpath}"/></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