diff --git a/docs/src/anttask.xml b/docs/src/anttask.xml index 94b00b26..b8ef30c9 100644 --- a/docs/src/anttask.xml +++ b/docs/src/anttask.xml @@ -70,18 +70,17 @@ Calabash from Apache Ant using the inPort is omitted) are applied to the inPort port. Those input elements may contain - zero or more elements selecting an Ant resource collection + zero or more Ant resources (i.e., fileset, dirset, etc.) that may each select zero or more - files. + >dirset, etc.). input elements for ports other than the inPort port may contain - either zero or more resource collection elements or an Ant + either zero or more Ant resources or an Ant mapper element (i.e., mapper, globmapper, etc.) that maps the current inPort file(s) name(s) to other file name(s) that are used as the input file(s) for that - port. You cannot specify both resource collections and a mapper + port. You cannot specify both Ant resources and a mapper for an input port (nor can you specify a mapper for the inPort port). You can as well or instead specify a file to contain the output of @@ -101,12 +100,12 @@ Calabash from Apache Ant using the Other output elements may each be used for any of the other output ports of the pipeline. output elements may contain either - zero or more resource collection elements or an Ant mapper + zero or more Ant resources or an Ant mapper element (i.e., mapper, globmapper, etc.) that maps the current inPort file(s) name(s) to a file name that is used as the output file for that port. You - cannot specify both resource collections and a mapper for an + cannot specify both Ant resources and a mapper for an output port, and the output cannot result in more than one file name. When no files are specified for either the from Apache Ant using the ports, the implicit fileset (formed based on includes and other attributes of calabash) and / or an explicit file - set (formed from nested resource collection elements (outside of - any in input or Ant resources (outside of + any input or output elements) makes a set of files that are processed one at a time as the input to the inPort port in separate runs of @@ -136,7 +135,8 @@ Calabash from Apache Ant using the using a nested mapper instead of extension) determine the filename to use for the output of the outPort port, and the - resource collections or mapper for other input and output ports + Ant resources + or mapper for other input and output ports determine the file(s) from which to read or the file to which to write for those ports. @@ -289,7 +289,7 @@ Calabash from Apache Ant using the failOnNoResources Whether the build should fail if the explicit - fileset from a nested resource collection is + fileset from nested Ant resources is empty No; default is true @@ -393,7 +393,7 @@ Calabash from Apache Ant using the Parameters specified as nested elements
input - Specification of resources to apply to an input port. May specify + Specification of resources to apply to an input port. May specify additional or alternative inputs to be applied to the inPort port or may be fixed or mapped resources to be applied to other ports. @@ -435,11 +435,11 @@ Calabash from Apache Ant using the
Parameters specified as nested elements - Either resource collections or a + Either Ant resources or a mapper may be specified, but not both.
- any resource collection - Use resource collections to specify + any <link xlink:href="http://ant.apache.org/manual/Types/resources.html">Ant resource</link> + Use Ant resources to specify fixed resources that should be applied to this port. Any readable resource can be used, e. g. @@ -497,8 +497,8 @@ Calabash from Apache Ant using the
Parameters specified as nested elements
- any resource collection - Any resource collection can be used, but only + any <link xlink:href="http://ant.apache.org/manual/Types/resources.html">Ant resource</link> + Any Ant resource can be used, but only one single readable resource may be contained in it, e. g. @@ -558,15 +558,13 @@ Calabash from Apache Ant using the
Parameters specified as nested elements - Either resource collections or a - mapper may be specified, but not both. + Either Ant resources + or a mapper may be specified, but not both.
- any resource collection - Use resource collections to specify fixed + any <link xlink:href="http://ant.apache.org/manual/Types/resources.html">Ant resource</link> + Use Ant resources to specify fixed resources that should be applied to this - port. Any resource collection can be used, - but only writable resources may be contained - in it, e. g. + port. Any writable Ant resource can be used, e. g. @@ -582,9 +580,9 @@ Calabash from Apache Ant using the
- any resource collection - Use resource collections to specify fixed resources that - should processed consecutively in a sequence of Calabash + any <link xlink:href="http://ant.apache.org/manual/Types/resources.html">Ant resource</link> + Use readable Ant resources to specify fixed resources that + should be processed consecutively in a sequence of Calabash runs.
@@ -779,9 +777,8 @@ Calabash from Apache Ant using the
Parameters specified as nested elements
- any resource collection - Any resource collection can be used, but only - readable resources may be contained in it, e. g. + any <link xlink:href="http://ant.apache.org/manual/Types/resources.html">Ant resources</link> + Any readable Ant resource can be used, e. g. ]]>