diff --git a/manual/Tasks/antversion.html b/manual/Tasks/antversion.html index c7fb97a27..3e9919f20 100644 --- a/manual/Tasks/antversion.html +++ b/manual/Tasks/antversion.html @@ -44,7 +44,7 @@ Stores the Apache Ant version (when used as task) or checks for a specific Ant v The version that this Ant is of at least. The format is major.minor.point. No - One of these. + Exactly one of these exactly diff --git a/manual/Tasks/attrib.html b/manual/Tasks/attrib.html index 22840f06c..86200b83f 100644 --- a/manual/Tasks/attrib.html +++ b/manual/Tasks/attrib.html @@ -71,13 +71,13 @@ directory tree), so you'll have to experiment a little. file the file or directory of which the permissions must be changed. - Yes or nested - <fileset/list> elements. + Yes, or nested + <fileset/list> elements readonly the readonly permission. - at least one of the four. + At least one of the four archive diff --git a/manual/Tasks/checksum.html b/manual/Tasks/checksum.html index ebd386a06..8abb45fcc 100644 --- a/manual/Tasks/checksum.html +++ b/manual/Tasks/checksum.html @@ -62,8 +62,8 @@ or set the fileext attribute. The names of common hashing algorithms ca file The file to generate checksum for. - One of either file or - at least one nested (filesystem-only) resource collection. + Yes, unless + at least one nested (filesystem-only) resource collection is specified. todir diff --git a/manual/Tasks/chmod.html b/manual/Tasks/chmod.html index bb37cd6ea..5dd369a08 100644 --- a/manual/Tasks/chmod.html +++ b/manual/Tasks/chmod.html @@ -77,7 +77,7 @@ could use as initial value for these experiments.

file the file or single directory of which the permissions must be changed. - exactly one of the two or nested <fileset/list> elements. + Exactly one of the two, or nested <fileset/list>s dir diff --git a/manual/Tasks/clearcase.html b/manual/Tasks/clearcase.html index 1302103a3..18e4e666b 100644 --- a/manual/Tasks/clearcase.html +++ b/manual/Tasks/clearcase.html @@ -86,14 +86,12 @@ Task to perform a "cleartool checkin" command to ClearCase. comment - Specify a comment. Only one of comment or commentfile may be used. - No + Specify a comment + No; only one of the two may be used commentfile - Specify a file containing a comment. Only one of comment or commentfile - may be used. - No + Specify a file containing a comment nowarn @@ -185,14 +183,12 @@ Task to perform a "cleartool checkout" command to ClearCase. comment - Specify a comment. Only one of comment or commentfile may be used. - No + Specify a comment + No; only one of the two may be used commentfile - Specify a file containing a comment. Only one of comment or - commentfile may be used. - No + Specify a file containing a comment notco @@ -348,47 +344,46 @@ Task to perform a "mklbtype" command to ClearCase. typename Name of the label type to create Yes - + vob Name of the VOB No - + replace Replace an existing label definition of the same type No - + global Either global or ordinary can be specified, not both. Creates a label type that is global to the VOB or to VOBs that use this VOB No - + ordinary Either global or ordinary can be specified, not both. Creates a label type that can be used only in the current VOB. Default No - + pbranch Allows the label type to be used once per branch in a given element's version tree No - + shared Sets the way mastership is checked by ClearCase. See ClearCase documentation for details No - + comment - Specify a comment. Only one of comment or cfile may be used. - No - + Specify a comment + No; only one of the two may be used + commentfile - Specify a file containing a comment. Only one of comment or cfile may be used. - No - + Specify a file containing a comment + failonerr Throw an exception if the command fails. Default is true.
@@ -423,42 +418,41 @@ Task to perform a "mklabel" command to ClearCase. typename Name of the label type Yes - + viewpath Path to the ClearCase view file or directory that the command will operate on No - + replace Replace a label of the same type on the same branch No - + recurse Process each subdirectory under viewpath No - + version Identify a specific version to attach the label to No - + vob Name of the VOB No - + comment - Specify a comment. Only one of comment or cfile may be used. - No - + Specify a comment + No; only one of the two may be used + commentfile - Specify a file containing a comment. Only one of comment or cfile may be used. - No - + Specify a file containing a comment + failonerr Throw an exception if the command fails. Default is true.
@@ -533,35 +527,34 @@ Task to perform a "rmtype" command to ClearCase. Yes - + typename The name of the type to remove Yes - + ignore Used with trigger types only. Forces removal of trigger type even if a pre-operation trigger would prevent its removal No - + rmall Removes all instances of a type and the type object itself No - + comment - Specify a comment. Only one of comment or cfile may be used. - No - + Specify a comment + No; only one of the two may be used + commentfile - Specify a file containing a comment. Only one of comment or cfile may be used. - No - + Specify a file containing a comment + failonerr - Throw an exception if the command fails. Default is true + Throw an exception if the command fails. Default is true. Since Ant 1.6.1 No @@ -594,44 +587,44 @@ Task to perform a "cleartool lock" command to ClearCase. replace Specifies replacing an existing lock No - + nusers Specifies user(s) who can still modify the object No - + obsolete Specifies that the object should be marked obsolete No - + comment Specifies how to populate comments fields No - + pname Specifies the object pathname to be locked. No + objselect - This variable is obsolete. Should use objsel instead. + Obsolete. Use objsel instead. No - + objsel Specifies the object(s) to be locked.
- Since Ant 1.6.1 + Since Ant 1.6.1 No + - - failonerr - Throw an exception if the command fails. Default is true.
- Since Ant 1.6.1 - No - - + failonerr + Throw an exception if the command fails. Default is true.
+ Since Ant 1.6.1 + No +

Examples

@@ -646,7 +639,7 @@ Task to perform a "cleartool lock" command to ClearCase.

Description

Task to perform a "cleartool unlock" command to ClearCase.

Parameters

- +
@@ -656,31 +649,31 @@ Task to perform a "cleartool unlock" command to ClearCase. - + + - + - + + Since Ant 1.6.1 + - - - - - - + + + +
Attribute Valuescomment Specifies how to populate comments fields No
pname Specifies the object pathname to be unlocked. No
objselectThis variable is obsolete. Should use objsel instead.Obsolete. Use objsel instead. No
objsel Specifies the object(s) to be unlocked.
- Since Ant 1.6.1
No
failonerrThrow an exception if the command fails. Default is true.
- Since Ant 1.6.1
No
failonerrThrow an exception if the command fails. Default is true.
+ Since Ant 1.6.1
No
-

Examples

+

Examples

 <ccunlock
@@ -701,14 +694,12 @@ Task to perform a "cleartool mkbl" command to ClearCase.
    
    
       comment
-      Specify a comment. Only one of comment or cfile may be
-used.
-      No
+      Specify a comment
+      No; only one of the two may be used
    
    
       commentfile
-      Specify a file containing a comment. Only one of comment or
-cfile may be used.
+      Specify a file containing a comment
       No
    
    
@@ -720,11 +711,11 @@ cfile may be used.
       nowarn
       Suppress warning messages
       No
-   
+   
    
       identical
       Allows the baseline to be created even if it is identical to the
-previous baseline.
+       previous baseline.
       No
    
    
@@ -740,7 +731,7 @@ previous baseline.
   
     failonerr
     Throw an exception if the command fails. Default is true.
- Since Ant 1.6.1 + Since Ant 1.6.1 No @@ -801,12 +792,12 @@ Task to perform a "cleartool mkattr" command to ClearCase.
comment - Specify a comment. Only one of comment or cfile may be used. - No + Specify a comment + No; only one of the two may be used commentfile - Specify a file containing a comment. Only one of comment or cfile may be used. + Specify a file containing a comment No @@ -844,13 +835,12 @@ Task to perform a "cleartool mkdir" command to ClearCase.
comment - Specify a comment. Only one of comment or cfile may be used. - No + Specify a comment + No; only one of the two may be used commentfile - Specify a file containing a comment. Only one of comment or cfile may be used. - No + Specify a file containing a comment nocheckout @@ -889,52 +879,52 @@ Task to perform a "cleartool mkelem" command to ClearCase.
viewpath Path to the ClearCase view file or directory that the command will operate on Yes - + comment - Specify a comment. Only one of comment or cfile may be used. - No - + Specify a comment + No; only one of the two may be used + commentfile - Specify a file containing a comment. Only one of comment or cfile may be used. + Specify a file containing a comment No - + nowarn Suppress warning messages No - + nocheckout Do not checkout after element creation No - + checkin Checkin element after creation No - + preservetime Preserve the modification time (for checkin) No - + master Assign mastership of the main branch to the current site No - + eltype Element type to use during element creation No - + failonerr Throw an exception if the command fails. Default is true No - +

Examples

diff --git a/manual/Tasks/conditions.html b/manual/Tasks/conditions.html index 5af685e61..312437ea6 100644 --- a/manual/Tasks/conditions.html +++ b/manual/Tasks/conditions.html @@ -125,8 +125,9 @@ the tests succeed.
  • windows (for all versions of Microsoft Windows)
  • dos (for all Microsoft DOS based operating systems including Microsoft Windows and OS/2)
  • -
  • mac (for all Apple Macintosh systems)
  • -
  • unix (for all Unix and Unix-like operating systems)
  • +
  • mac (for all Apple Macintosh systems prior to Mac OS X)
  • +
  • unix (for all Unix and Unix-like operating systems, including Linux and + Mac OS X/macOS)
  • netware (for Novell NetWare)
  • os/2 (for OS/2)
  • tandem (for HP's NonStop Kernel - formerly Tandem)
  • @@ -470,7 +471,7 @@ tasks, datatypes, scriptdefs, macrodefs and presetdefs.

    name - name of the type + Name of the type Yes @@ -604,12 +605,11 @@ attempting to set the appropriate property/feature/

    property property to set - one of property or feature + Exactly one of the two feature feature to set - one of property or feature value @@ -678,12 +678,11 @@ not reachable on other ports (i.e. port 80), because of firewalls. host host to check for - one of url or host + Exactly one of the two url URL containing hostname - one of url or host timeout @@ -801,7 +800,7 @@ must match. Since Ant 1.7 resource Name of a file that is the resource to test. - One of the two + Exactly one of the two refid @@ -843,18 +842,17 @@ must match. Since Ant 1.7 field name of a field to look for - one of field or method + Exactly one of the two method name of a method to look for - one of field or method ignoreSystemClasses should system classes be ignored? - No -default is false + No - default is false classpath @@ -1044,7 +1042,7 @@ is redundant and will be ignored.

    Specifies the expected modification time of the resource in milliseconds since midnight Jan 1 1970. Exactly one of the - two. + two datetime @@ -1109,8 +1107,7 @@ is redundant and will be ignored.

    The version that this JVM is at least. The format is major.minor.point. Starting with Java 9 really only the major number is determined. - No - One of these. + Exactly one of the two exactly diff --git a/manual/Tasks/cvstagdiff.html b/manual/Tasks/cvstagdiff.html index a9f467291..eb70bd7ce 100644 --- a/manual/Tasks/cvstagdiff.html +++ b/manual/Tasks/cvstagdiff.html @@ -44,7 +44,7 @@ operation may fail when using such an incompatible client. startTag The earliest tag from which diffs are to be included in the report. - exactly one of the two. + Exactly one of the two startDate @@ -56,7 +56,7 @@ operation may fail when using such an incompatible client. endTag The latest tag from which diffs are to be included in the report. - exactly one of the two. + Exactly one of the two endDate diff --git a/manual/Tasks/depend.html b/manual/Tasks/depend.html index c30109d90..1272e1dda 100644 --- a/manual/Tasks/depend.html +++ b/manual/Tasks/depend.html @@ -177,7 +177,7 @@ classes. Defaults to false warnOnRmiStubs Flag to disable warnings about files that look like rmic generated stub/skeleton - classes, and which have no .java source. Useful when doing rmi development. + classes and have no .java source. Useful when doing RMI development. No, default=true diff --git a/manual/Tasks/dependset.html b/manual/Tasks/dependset.html index f306bc17f..cb8a84197 100644 --- a/manual/Tasks/dependset.html +++ b/manual/Tasks/dependset.html @@ -69,7 +69,7 @@ well as other stylesheets imported by the main stylesheet. verbose Makes the task list all deleted targets files and the reason why they get deleted. - No + No diff --git a/manual/Tasks/ear.html b/manual/Tasks/ear.html index cc95603b0..a7b246235 100644 --- a/manual/Tasks/ear.html +++ b/manual/Tasks/ear.html @@ -165,8 +165,8 @@ to a value other than its default, "add".

    Java 5. In order to avoid problems with Ant generated jars on Java 1.4 or earlier Ant will not include META-INF unless - explicitly asked to.
    - Ant 1.8.0 - Defaults to false. + explicitly asked to. Defaults to false
    + Since Ant 1.8.0. No diff --git a/manual/Tasks/echo.html b/manual/Tasks/echo.html index e42ed5a1e..49f5bc67a 100644 --- a/manual/Tasks/echo.html +++ b/manual/Tasks/echo.html @@ -51,7 +51,7 @@ ignored

    file the file to write the message to. - Optionally one of these may be specified. + No; only one of these may be used. output diff --git a/manual/Tasks/echoproperties.html b/manual/Tasks/echoproperties.html index 31a260573..96864c237 100644 --- a/manual/Tasks/echoproperties.html +++ b/manual/Tasks/echoproperties.html @@ -52,8 +52,8 @@ files.

    prefix - a prefix which is used to filter the properties - only those properties starting with this prefix will be echoed. + a prefix which is used to filter the properties: + only properties whose names start with this prefix will be echoed. No @@ -61,7 +61,7 @@ files.

    regex a regular expression which is used to filter the - properties + properties: only those properties whose names match it will be echoed. No diff --git a/manual/Tasks/echoxml.html b/manual/Tasks/echoxml.html index b073f07e2..c0dec59e7 100644 --- a/manual/Tasks/echoxml.html +++ b/manual/Tasks/echoxml.html @@ -50,7 +50,7 @@ Sets the namespace policy as defined by org.apache.tools.ant.util.DOMElementWriter.XmlNamespacePolicy. Valid values are ignore, elementsOnly, or all. - Since Apache Ant 1.8 + Since Apache Ant 1.8 No, default ignore diff --git a/manual/Tasks/exec.html b/manual/Tasks/exec.html index 39fbf55ce..bb7a17af9 100644 --- a/manual/Tasks/exec.html +++ b/manual/Tasks/exec.html @@ -158,7 +158,7 @@ start with something like:

    the command to execute with all command line arguments. deprecated, use executable and nested <arg> elements instead. - Exactly one of the two. + Exactly one of the two executable @@ -168,7 +168,7 @@ start with something like:

    dir the directory in which the command should be executed. - No.
    + No
    Note: the default used when dir has not been specified depends on the vmlauncher attribute. If vmlauncher is true the task will use @@ -351,7 +351,7 @@ system command via nested <env> elements.

    value The literal value for the environment variable. - Exactly one of these. + Exactly one of these path diff --git a/manual/Tasks/jar.html b/manual/Tasks/jar.html index ecc2669b6..321a5862a 100644 --- a/manual/Tasks/jar.html +++ b/manual/Tasks/jar.html @@ -222,8 +222,8 @@ in the JEP 238 example. If you want to tune this k Java 5. In order to avoid problems with Ant generated jars on Java 1.4 or earlier Ant will not include META-INF unless - explicitly asked to.
    - Ant 1.8.0 - Defaults to false. + explicitly asked to. Defaults to false.
    + Since Ant 1.8.0 No diff --git a/manual/Tasks/jarlib-available.html b/manual/Tasks/jarlib-available.html index 616985516..c240887c9 100644 --- a/manual/Tasks/jarlib-available.html +++ b/manual/Tasks/jarlib-available.html @@ -53,8 +53,8 @@ Extension and ExtensionSet documentation for further details

    file The file to check for extension - No, one of file, nested - ExtensionSet or nested fileset must be present. + Yes, unless a nested + extensionSet or fileset is specified

    Parameters specified as nested elements

    diff --git a/manual/Tasks/jarlib-display.html b/manual/Tasks/jarlib-display.html index 1c9d1397f..7f4b81e9e 100644 --- a/manual/Tasks/jarlib-display.html +++ b/manual/Tasks/jarlib-display.html @@ -48,15 +48,14 @@ Extension and ExtensionSet documentation for further details

    file The file to display extension information about. - No, but one of file or fileset must be - present. + Yes, unless a nested fileset is specified

    Parameters specified as nested elements

    fileset

    FileSets contain list of files to - display Extension information about.

    + display Extension information about.

    Examples

    Display Extension info for a single file

    diff --git a/manual/Tasks/jarlib-resolve.html b/manual/Tasks/jarlib-resolve.html index cfb5f5b3b..2bb2e78ed 100644 --- a/manual/Tasks/jarlib-resolve.html +++ b/manual/Tasks/jarlib-resolve.html @@ -106,14 +106,11 @@ Extension and ExtensionSet documentation for further details

    destfile The file to download URL into. - No, But one of destfile or - destdir must be present + Exactly one of the two destdir The directory in which to place downloaded file. - No, But one of destfile or - destdir must be present diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html index 1a7ba5181..70f693290 100644 --- a/manual/Tasks/javac.html +++ b/manual/Tasks/javac.html @@ -579,7 +579,7 @@ used.

    value See Command-line Arguments. - Exactly one of these. + Exactly one of these line diff --git a/manual/Tasks/javah.html b/manual/Tasks/javah.html index d85a6d622..ac6ee3e7b 100644 --- a/manual/Tasks/javah.html +++ b/manual/Tasks/javah.html @@ -154,7 +154,7 @@ only if a given compiler implementation will be used.

    value See Command-line Arguments. - Exactly one of these. + Exactly one of these line diff --git a/manual/Tasks/jlink.html b/manual/Tasks/jlink.html index 0937d1d55..5cf7b341c 100644 --- a/manual/Tasks/jlink.html +++ b/manual/Tasks/jlink.html @@ -107,8 +107,7 @@ relative to the base directory.

    mergefiles files to be merged into the output, if possible. - At least one of -mergefiles or addfiles + Exactly one of the two addfiles diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html index 5e8d7b50a..e53ace722 100644 --- a/manual/Tasks/junit.html +++ b/manual/Tasks/junit.html @@ -424,7 +424,7 @@ the name of the resulting class (without suffix). It defaults to java-tmp-dir type Use a predefined formatter (either xml, plain, brief or failure). - Exactly one of these. + Exactly one of these classname diff --git a/manual/Tasks/mail.html b/manual/Tasks/mail.html index 93209a539..0edc15a09 100644 --- a/manual/Tasks/mail.html +++ b/manual/Tasks/mail.html @@ -76,7 +76,7 @@ tolist Comma-separated list of recipients. At least one of these, or the - equivalent elements. + equivalent nested elements cclist diff --git a/manual/Tasks/mimemail.html b/manual/Tasks/mimemail.html index 4c2a4aeec..44b0e8b28 100644 --- a/manual/Tasks/mimemail.html +++ b/manual/Tasks/mimemail.html @@ -45,9 +45,7 @@ Activation Framework are required for this task.

    message The message body - No, but only one of of 'message' or - 'messageFile' may be specified.  If not specified, a fileset must be - provided. + Exactly one of these, or a nested fileset messageFile @@ -62,18 +60,15 @@ Activation Framework are required for this task.

    tolist Comma-separated list of To: recipients - Yes, at least one of 'tolist', 'cclist', - or 'bcclist' must be specified. + Yes, at least one of these cclist Comma-separated list of CC: recipients -   bcclist Comma-separated list of BCC: recipients -   mailhost diff --git a/manual/Tasks/native2ascii.html b/manual/Tasks/native2ascii.html index d6374e6af..8a43e0813 100644 --- a/manual/Tasks/native2ascii.html +++ b/manual/Tasks/native2ascii.html @@ -170,7 +170,7 @@ only if a given converter implementation will be used.

    value See Command-line Arguments. - Exactly one of these. + Exactly one of these line diff --git a/manual/Tasks/pack.html b/manual/Tasks/pack.html index 92c615720..3ecebca86 100644 --- a/manual/Tasks/pack.html +++ b/manual/Tasks/pack.html @@ -50,7 +50,7 @@ Dependencies for more information.

    destfile the destination file to create. - Exactly one of the two. + Exactly one of the two zipfile diff --git a/manual/Tasks/replace.html b/manual/Tasks/replace.html index 7cc6e0ab6..bc1988fd8 100644 --- a/manual/Tasks/replace.html +++ b/manual/Tasks/replace.html @@ -45,7 +45,7 @@ have been regenerated by this task.

    file file for which the token should be replaced. - Exactly one of the two. + Exactly one of the two dir diff --git a/manual/Tasks/rmic.html b/manual/Tasks/rmic.html index 8de6f5874..92bd28d6b 100644 --- a/manual/Tasks/rmic.html +++ b/manual/Tasks/rmic.html @@ -270,7 +270,7 @@ used.

    value See Command-line Arguments. - Exactly one of these. + Exactly one of these line diff --git a/manual/Tasks/schemavalidate.html b/manual/Tasks/schemavalidate.html index a29a41486..40b3c21f5 100644 --- a/manual/Tasks/schemavalidate.html +++ b/manual/Tasks/schemavalidate.html @@ -155,12 +155,11 @@ the document(s). url URL of the schema - One of url or file is required + Exactly one of the two file file of the schema - One of url or file is required diff --git a/manual/Tasks/vss.html b/manual/Tasks/vss.html index e57beb2a8..a11f8bbfe 100644 --- a/manual/Tasks/vss.html +++ b/manual/Tasks/vss.html @@ -156,7 +156,7 @@ label only one will be used in the order version, date, label.

    version a version number to get - No, only one of these allowed + No; only one of these may be used date @@ -585,7 +585,7 @@ label only one will be used in the order version, date, label.

    version a version number to get - No, only one of these allowed + No; only one of these may be used date diff --git a/manual/Tasks/war.html b/manual/Tasks/war.html index a1dc305ce..50b3c14d9 100644 --- a/manual/Tasks/war.html +++ b/manual/Tasks/war.html @@ -67,7 +67,7 @@ to a value other than its default, "add".

    destfile the WAR file to create. - Exactly one of the two. + Exactly one of the two warfile @@ -87,7 +87,7 @@ to a value other than its default, "add".

    It should be set to false when generating servlet 2.5+ WAR files without a web.xml file. Since Apache Ant 1.7 - No -default "true" + No - default "true" basedir diff --git a/manual/Tasks/whichresource.html b/manual/Tasks/whichresource.html index 0ec09013c..72eb2eeb6 100644 --- a/manual/Tasks/whichresource.html +++ b/manual/Tasks/whichresource.html @@ -53,7 +53,7 @@ The name of the class to look for. - Exactly one of these. + Exactly one of these resource diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html index 137005cee..46e95578a 100644 --- a/manual/Tasks/zip.html +++ b/manual/Tasks/zip.html @@ -117,7 +117,7 @@ archive.

    destfile the zip-file to create. - Exactly one of the two. + Exactly one of the two zipfile