More corrections of tag soup;

reviewed use of multiple-choice attributes and definition of “unix” (see conditions)

manual/Tasks/antversion.html

@@ -44,7 +44,7 @@ Stores the Apache Ant version (when used as task) or checks for a specific Ant v
     <td valign="top">The version that this Ant is of at least.
       The format is <code>major.minor.point</code>.</td>
     <td valign="top" align="center">No</td>
-    <td valign="top" rowspan="2" align="center">One of these.</td>
+    <td valign="top" rowspan="2" align="center">Exactly one of these</td>
   </tr>
   <tr>
     <td valign="top">exactly</td>

manual/Tasks/attrib.html

@@ -71,13 +71,13 @@ directory tree), so you'll have to experiment a little.</p-->
     <td valign="top">file</td>
     <td valign="top">the file or directory of which the permissions must be
     changed.</td>
-    <td valign="top" align="center">Yes or nested
-    <code>&lt;fileset/list&gt;</code> elements.</td>
+    <td valign="top" align="center">Yes, or nested
+    <code>&lt;fileset/list&gt;</code> elements</td>
   </tr>
   <tr>
     <td valign="top">readonly</td>
     <td valign="top">the readonly permission.</td>
-    <td valign="top" rowspan="4">at least one of the four.</td>
+    <td valign="top" rowspan="4">At least one of the four</td>
   </tr>
   <tr>
     <td valign="top">archive</td>

manual/Tasks/checksum.html

@@ -62,8 +62,8 @@ or set the <tt>fileext</tt> attribute. The names of common hashing algorithms ca
   <tr>
     <td valign="top">file</td>
     <td valign="top">The file to generate checksum for.</td>
-    <td valign="top" align="center">One of either <var>file</var> or
-    at least one nested (filesystem-only) resource collection.</td>
+    <td valign="top" align="center">Yes, unless
+    at least one nested (filesystem-only) resource collection is specified.</td>
   </tr>
   <tr>
     <td valign="top">todir</td>

manual/Tasks/chmod.html

@@ -77,7 +77,7 @@ could use as initial value for these experiments.</p>
     <td valign="top">file</td>
     <td valign="top">the file or single directory of which the permissions
       must be changed.</td>
-    <td valign="top" align="center" rowspan="2">exactly one of the two or nested <code>&lt;fileset/list&gt;</code> elements.</td>
+    <td valign="top" align="center" rowspan="2">Exactly one of the two, or nested <code>&lt;fileset/list&gt;</code>s</td>
   </tr>
   <tr>
     <td valign="top">dir</td>

manual/Tasks/clearcase.html

@@ -86,14 +86,12 @@ Task to perform a "cleartool checkin" command to ClearCase.
   </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or commentfile may be used.</td>
-    <td>No</td>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
   </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or commentfile
-        may be used.</td>
-    <td>No</td>
+    <td>Specify a file containing a comment</td>
   </tr>
   <tr>
     <td>nowarn</td>
@@ -185,14 +183,12 @@ Task to perform a "cleartool checkout" command to ClearCase.
   </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or commentfile may be used.</td>
-    <td>No</td>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
   </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or
-        commentfile may be used.</td>
-    <td>No</td>
+    <td>Specify a file containing a comment</td>
   </tr>
   <tr>
     <td>notco</td>
@@ -348,47 +344,46 @@ Task to perform a "mklbtype" command to ClearCase.
     <td>typename</td>
     <td>Name of the label type to create</td>
     <td>Yes</td>
-  <tr>
+  </tr>
   <tr>
     <td>vob</td>
     <td>Name of the VOB</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>replace</td>
     <td>Replace an existing label definition of the same type</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>global</td>
     <td>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</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>ordinary</td>
     <td>Either global or ordinary can be specified, not both. Creates a label type that can be used only in the current VOB. <b>Default</b></td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>pbranch</td>
     <td>Allows the label type to be used once per branch in a given element's version tree</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>shared</td>
     <td>Sets the way mastership is checked by ClearCase. See ClearCase documentation for details</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr></tr>
+    <td>Specify a file containing a comment</td>
+  </tr>
   <tr>
     <td>failonerr</td>
     <td>Throw an exception if the command fails. Default is true.<br>
@@ -423,42 +418,41 @@ Task to perform a "mklabel" command to ClearCase.
     <td>typename</td>
     <td>Name of the label type</td>
     <td>Yes</td>
-  <tr>
+  </tr>
   <tr>
     <td>viewpath</td>
     <td>Path to the ClearCase view file or directory that the command will operate on</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>replace</td>
     <td>Replace a label of the same type on the same branch</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>recurse</td>
     <td>Process each subdirectory under viewpath</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>version</td>
     <td>Identify a specific version to attach the label to</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>vob</td>
     <td>Name of the VOB</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr></tr>
+    <td>Specify a file containing a comment</td>
+  </tr>
   <tr>
     <td>failonerr</td>
     <td>Throw an exception if the command fails. Default is true.<br>
@@ -533,35 +527,34 @@ Task to perform a "rmtype" command to ClearCase.
       </table>
     </td>
     <td>Yes</td>
-  <tr>
+  </tr>
   <tr>
     <td>typename</td>
     <td>The name of the type to remove</td>
     <td>Yes</td>
-  <tr>
+  </tr>
   <tr>
     <td>ignore</td>
     <td>Used with trigger types only. Forces removal of trigger type even if a pre-operation trigger would prevent its removal</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>rmall</td>
     <td>Removes all instances of a type and the type object itself</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr></tr>
+    <td>Specify a file containing a comment</td>
+  </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true
+    <td>Throw an exception if the command fails. Default is true.
     <em>Since Ant 1.6.1</em></td>
     <td>No</td>
   </tr>
@@ -594,44 +587,44 @@ Task to perform a "cleartool lock" command to ClearCase.
       <td>replace</td>
       <td>Specifies replacing an existing lock</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>nusers</td>
       <td>Specifies user(s) who can still modify the object</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>obsolete</td>
       <td>Specifies that the object should be marked obsolete</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>comment</td>
       <td>Specifies how to populate comments fields</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>pname</td>
       <td>Specifies the object pathname to be locked.</td>
       <td>No</td>
+   </tr>
    <tr>
       <td>objselect</td>
-      <td>This variable is obsolete. Should use <i>objsel</i> instead.</td>
+      <td><em>Obsolete</em>. Use <i>objsel</i> instead.</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>objsel</td>
       <td>Specifies the object(s) to be locked.<br>
-      <em>Since Ant 1.6.1</em></td>
+       <em>Since Ant 1.6.1</em></td>
       <td>No</td>
+   </tr>
    <tr>
-  <tr>
-    <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
-    <em>Since Ant 1.6.1</em></td>
-    <td>No</td>
-  </tr>
-
+     <td>failonerr</td>
+     <td>Throw an exception if the command fails. Default is true.<br>
+       <em>Since Ant 1.6.1</em></td>
+     <td>No</td>
+   </tr>
  </table>
 <h3>Examples</h3>
 <blockquote>
@@ -646,7 +639,7 @@ Task to perform a "cleartool lock" command to ClearCase.
 <h3>Description</h3>
 Task to perform a "cleartool unlock" command to ClearCase.
 <h3>Parameters</h3>
-<table>
+ <table>
    <tr>
      <th>Attribute</th>
      <th>Values</th>
@@ -656,31 +649,31 @@ Task to perform a "cleartool unlock" command to ClearCase.
       <td>comment</td>
       <td>Specifies how to populate comments fields</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>pname</td>
       <td>Specifies the object pathname to be unlocked.</td>
       <td>No</td>
+   </tr>
    <tr>
       <td>objselect</td>
-      <td>This variable is obsolete. Should use <i>objsel</i> instead.</td>
+      <td><em>Obsolete</em>. Use <i>objsel</i> instead.</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>objsel</td>
       <td>Specifies the object(s) to be unlocked.<br>
-      <em>Since Ant 1.6.1</em></td>
+       <em>Since Ant 1.6.1</em></td>
       <td>No</td>
+   </tr>
    <tr>
-  <tr>
-    <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
-    <em>Since Ant 1.6.1</em></td>
-    <td>No</td>
-  </tr>
-
+     <td>failonerr</td>
+     <td>Throw an exception if the command fails. Default is true.<br>
+       <em>Since Ant 1.6.1</em></td>
+     <td>No</td>
+   </tr>
  </table>
- <h3>Examples</h3>
+<h3>Examples</h3>
 <blockquote>
 <pre>
 &lt;ccunlock
@@ -701,14 +694,12 @@ Task to perform a "cleartool mkbl" command to ClearCase.
    </tr>
    <tr>
       <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be
-used.</td>
-      <td>No</td>
+      <td>Specify a comment</td>
+      <td rowspan="2">No; only one of the two may be used</td>
    </tr>
    <tr>
       <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or
-cfile may be used.</td>
+      <td>Specify a file containing a comment</td>
       <td>No</td>
    </tr>
    <tr>
@@ -720,11 +711,11 @@ cfile may be used.</td>
       <td>nowarn</td>
       <td>Suppress warning messages</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>identical</td>
       <td>Allows the baseline to be created even if it is identical to the
-previous baseline.</td>
+       previous baseline.</td>
       <td>No</td>
    </tr>
    <tr>
@@ -740,7 +731,7 @@ previous baseline.</td>
   <tr>
     <td>failonerr</td>
     <td>Throw an exception if the command fails. Default is true.<br>
-    <em>Since Ant 1.6.1</em></td>
+       <em>Since Ant 1.6.1</em></td>
     <td>No</td>
   </tr>
  </table>
@@ -801,12 +792,12 @@ Task to perform a &quot;cleartool mkattr&quot; command to ClearCase.<br>
    </tr>
    <tr>
       <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
+      <td>Specify a comment</td>
+      <td rowspan="2">No; only one of the two may be used</td>
    </tr>
    <tr>
       <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
+      <td>Specify a file containing a comment</td>
       <td>No</td>
    </tr>
    <tr>
@@ -844,13 +835,12 @@ Task to perform a &quot;cleartool mkdir&quot; command to ClearCase.<br>
    </tr>
    <tr>
       <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
+      <td>Specify a comment</td>
+      <td rowspan="2">No; only one of the two may be used</td>
    </tr>
    <tr>
       <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
+      <td>Specify a file containing a comment</td>
    </tr>
    <tr>
       <td>nocheckout</td>
@@ -889,52 +879,52 @@ Task to perform a &quot;cleartool mkelem&quot; command to ClearCase.<br>
       <td>viewpath</td>
       <td>Path to the ClearCase view file or directory that the command will operate on</td>
       <td>Yes</td>
-   <tr>
+   </tr>
    <tr>
       <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   <tr>
+      <td>Specify a comment</td>
+      <td rowspan="2">No; only one of the two may be used</td>
+   </tr>
    <tr>
       <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
+      <td>Specify a file containing a comment</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>nowarn</td>
       <td>Suppress warning messages</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>nocheckout</td>
       <td>Do not checkout after element creation</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>checkin</td>
       <td>Checkin element after creation</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>preservetime</td>
       <td>Preserve the modification time (for checkin)</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>master</td>
       <td>Assign mastership of the main branch to the current site</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>eltype</td>
       <td>Element type to use during element creation</td>
       <td>No</td>
-   <tr>
+   </tr>
    <tr>
       <td>failonerr</td>
       <td>Throw an exception if the command fails. Default is true</td>
       <td>No</td>
-   <tr>
+   </tr>
  </table>
 <h3>Examples</h3>
 <blockquote>

manual/Tasks/conditions.html

@@ -125,8 +125,9 @@ the tests succeed.
   <li>windows (for all versions of Microsoft Windows)</li>
   <li>dos (for all Microsoft DOS based operating systems including
     Microsoft Windows and OS/2)</li>
-  <li>mac (for all Apple Macintosh systems)</li>
-  <li>unix (for all Unix and Unix-like operating systems)</li>
+  <li>mac (for all Apple Macintosh systems prior to Mac OS X)</li>
+  <li>unix (for all Unix and Unix-like operating systems, including Linux and
+      Mac OS X/macOS)</li>
   <li>netware (for Novell NetWare)</li>
   <li>os/2 (for OS/2)</li>
   <li>tandem (for HP's NonStop Kernel - formerly Tandem)</li>
@@ -470,7 +471,7 @@ tasks, datatypes, scriptdefs, macrodefs and presetdefs.</p>
   </tr>
   <tr>
     <td valign="top">name</td>
-    <td valign="top">name of the type</td>
+    <td valign="top">Name of the type</td>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
@@ -604,12 +605,11 @@ attempting to set the appropriate property/feature/</p>
   <tr>
     <td valign="top">property</td>
     <td valign="top">property to set</td>
-    <td valign="top" align="center">one of property or feature</td>
+    <td valign="top" align="center" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">feature</td>
     <td valign="top">feature to set</td>
-    <td valign="top" align="center">one of property or feature</td>
   </tr>
   <tr>
     <td valign="top">value</td>
@@ -678,12 +678,11 @@ not reachable on other ports (i.e. port 80), because of firewalls.
   <tr>
     <td valign="top">host</td>
     <td valign="top">host to check for</td>
-    <td valign="top" align="center">one of url or host</td>
+    <td valign="top" align="center" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">url</td>
     <td valign="top">URL containing hostname</td>
-    <td valign="top" align="center">one of url or host</td>
   </tr>
   <tr>
     <td valign="top">timeout</td>
@@ -801,7 +800,7 @@ must match. <em>Since Ant 1.7</em>
     <td valign="top">resource</td>
     <td valign="top">Name of a file that is the resource to test.
     </td>
-    <td align="center" rowspan="2">One of the two</td>
+    <td align="center" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">refid</td>
@@ -843,18 +842,17 @@ must match. <em>Since Ant 1.7</em>
     <tr>
         <td valign="top">field</td>
         <td valign="top">name of a field to look for</td>
-        <td align="center">one of field or method</td>
+        <td align="center" rowspan="2">Exactly one of the two</td>
     </tr>
     <tr>
         <td valign="top">method</td>
         <td valign="top">name of a method to look for</td>
-        <td align="center">one of field or method</td>
     </tr>
 
     <tr>
         <td valign="top">ignoreSystemClasses</td>
         <td valign="top">should system classes be ignored?</td>
-        <td align="center">No -default is false</td>
+        <td align="center">No - default is false</td>
     </tr>
     <tr>
         <td valign="top">classpath</td>
@@ -1044,7 +1042,7 @@ is redundant and will be ignored.</p>
     <td valign="top">Specifies the expected modification time of the resource
       in milliseconds since midnight Jan 1 1970.</td>
     <td valign="center" align="center" rowspan="2">Exactly one of the
-      two.</td>
+      two</td>
   </tr>
   <tr>
     <td valign="top">datetime</td>
@@ -1109,8 +1107,7 @@ is redundant and will be ignored.</p>
     <td valign="top">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.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" rowspan="2" align="center">One of these.</td>
+    <td valign="top" rowspan="2" align="center">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">exactly</td>

manual/Tasks/cvstagdiff.html

@@ -44,7 +44,7 @@ operation may fail when using such an incompatible client.
     <td valign="top">startTag</td>
     <td valign="top">The earliest tag from which diffs are to be
      included in the report.</td>
-    <td align="center" valign="top" rowspan="2">exactly one of the two.</td>
+    <td align="center" valign="top" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">startDate</td>
@@ -56,7 +56,7 @@ operation may fail when using such an incompatible client.
     <td valign="top">endTag</td>
     <td valign="top">The latest tag from which diffs are to be
      included in the report.</td>
-    <td align="center" valign="top" rowspan="2">exactly one of the two.</td>
+    <td align="center" valign="top" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">endDate</td>

manual/Tasks/depend.html

@@ -177,7 +177,7 @@ classes. Defaults to false</td>
   <tr>
     <td valign="top">warnOnRmiStubs</td>
     <td valign="top">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.</td>
+        classes and have no .java source. Useful when doing RMI development.</td>
     <td valign="top" align="center">No, default=true</td>
   </tr>
 </table>

manual/Tasks/dependset.html

@@ -69,7 +69,7 @@ well as other stylesheets imported by the main stylesheet.
     <td valign="top">verbose</td>
     <td valign="top">Makes the task list all deleted targets files
       and the reason why they get deleted.</td>
-    <td align="center" valign="top" rowspan="2">No</td>
+    <td align="center" valign="top">No</td>
   </tr>
 </table>
 

manual/Tasks/ear.html

@@ -165,8 +165,8 @@ to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
       <a href="https://bugs.openjdk.java.net/browse/JDK-4408526">Java
       5</a>.  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.<br/>
-      <em>Ant 1.8.0</em> - Defaults to false.</td>
+      explicitly asked to. Defaults to false<br/>
+      <em>Since Ant 1.8.0</em>.</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>

manual/Tasks/echo.html

@@ -51,7 +51,7 @@ ignored</p>
   <tr>
     <td valign="top">file</td>
     <td valign="top">the file to write the message to.</td>
-    <td valign="top" align="center" rowspan="2">Optionally one of these may be specified.</td>
+    <td valign="top" align="center" rowspan="2">No; only one of these may be used.</td>
   </tr>
   <tr>
     <td valign="top">output</td>

manual/Tasks/echoproperties.html

@@ -52,8 +52,8 @@ files.</p>
   <tr>
     <td valign="top">prefix</td>
     <td valign="top">
-        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.
     </td>
     <td valign="top" align="center">No</td>
   </tr>
@@ -61,7 +61,7 @@ files.</p>
     <td valign="top">regex</td>
     <td valign="top">
         a regular expression which is used to filter the
-        properties
+        properties:
         only those properties whose names match it will be echoed.
     </td>
     <td valign="top" align="center">No</td>

manual/Tasks/echoxml.html

@@ -50,7 +50,7 @@
     <td valign="top">Sets the namespace policy as defined
       by <code>org.apache.tools.ant.util.DOMElementWriter.XmlNamespacePolicy</code>.
       Valid values are <code>ignore</code>, <code>elementsOnly</code>, or <code>all</code>.
-      <strong>Since Apache Ant 1.8</strong>
+      <em>Since Apache Ant 1.8</em>
     </td>
     <td valign="top" align="center">No, default <code>ignore</code></td>
   </tr>

manual/Tasks/exec.html

@@ -158,7 +158,7 @@ start with something like:</p>
     <td valign="top">the command to execute with all command line
       arguments. <b>deprecated, use executable and nested
       <code>&lt;arg&gt;</code> elements instead</b>.</td>
-    <td align="center" rowspan="2">Exactly one of the two.</td>
+    <td align="center" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">executable</td>
@@ -168,7 +168,7 @@ start with something like:</p>
   <tr>
     <td valign="top">dir</td>
     <td valign="top">the directory in which the command should be executed.</td>
-    <td align="center" valign="top">No.<br/>
+    <td align="center" valign="top">No<br/>
       <strong>Note</strong>: the default used when dir has not been
       specified depends on the <code>vmlauncher</code> attribute.  If
       <code>vmlauncher</code> is <code>true</code> the task will use
@@ -351,7 +351,7 @@ system command via nested <code>&lt;env&gt;</code> elements.</p>
   <tr>
     <td valign="top">value</td>
     <td valign="top">The literal value for the environment variable.</td>
-    <td align="center" rowspan="3">Exactly one of these.</td>
+    <td align="center" rowspan="3">Exactly one of these</td>
   </tr>
   <tr>
     <td valign="top">path</td>

manual/Tasks/jar.html

@@ -222,8 +222,8 @@ in the <a href="#jep238-example">JEP 238 example</a>. If you want to tune this k
       <a href="https://bugs.openjdk.java.net/browse/JDK-4408526">Java
       5</a>.  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.<br/>
-      <em>Ant 1.8.0</em> - Defaults to false.</td>
+      explicitly asked to.  Defaults to false.<br/>
+      <em>Since Ant 1.8.0</em></td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>

manual/Tasks/jarlib-available.html

@@ -53,8 +53,8 @@ Extension and ExtensionSet documentation</a> for further details</p>
   <tr>
     <td valign="top">file</td>
     <td valign="top">The file to check for extension</td>
-    <td valign="top" align="center">No, one of file, nested
-    ExtensionSet or nested fileset must be present.</td>
+    <td valign="top" align="center">Yes, unless a nested
+    extensionSet or fileset is specified</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>

manual/Tasks/jarlib-display.html

@@ -48,15 +48,14 @@ Extension and ExtensionSet documentation</a> for further details</p>
   <tr>
     <td valign="top">file</td>
     <td valign="top">The file to display extension information about.</td>
-    <td valign="top" align="center">No, but one of file or fileset must be
-    present.</td>
+    <td valign="top" align="center">Yes, unless a nested fileset is specified</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>fileset</h4>
  <p><a href="../Types/fileset.html">FileSet</a>s contain list of files to
- display Extension information  about.</p>
+ display Extension information about.</p>
 
 <h3>Examples</h3>
 <p><b>Display Extension info for a single file</b></p>

manual/Tasks/jarlib-resolve.html

@@ -106,14 +106,11 @@ Extension and ExtensionSet documentation</a> for further details</p>
   <tr>
     <td valign="top">destfile</td>
     <td valign="top">The file to download URL into.</td>
-    <td valign="top" align="center">No, But one of destfile or
-    destdir must be present</td>
+    <td valign="top" align="center" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">destdir</td>
     <td valign="top">The directory in which to place downloaded file.</td>
-    <td valign="top" align="center">No, But one of destfile or
-    destdir must be present</td>
   </tr>
 </table>
 

manual/Tasks/javac.html

@@ -579,7 +579,7 @@ used.</p>
     <td valign="top">value</td>
     <td align="center" rowspan="4">See
     <a href="../using.html#arg">Command-line Arguments</a>.</td>
-    <td align="center" rowspan="4">Exactly one of these.</td>
+    <td align="center" rowspan="4">Exactly one of these</td>
   </tr>
   <tr>
     <td valign="top">line</td>

manual/Tasks/javah.html

@@ -154,7 +154,7 @@ only if a given compiler implementation will be used.</p>
     <td valign="top">value</td>
     <td align="center" rowspan="4">See
     <a href="../using.html#arg">Command-line Arguments</a>.</td>
-    <td align="center" rowspan="4">Exactly one of these.</td>
+    <td align="center" rowspan="4">Exactly one of these</td>
   </tr>
   <tr>
     <td valign="top">line</td>

manual/Tasks/jlink.html

@@ -107,8 +107,7 @@ relative to the <i>base</i> directory.</p>
    <tr>
      <td valign="top">mergefiles</td>
      <td valign="top">files to be merged into the output, if possible.</td>
-     <td valign="middle" align="center" rowspan="2">At least one of
-mergefiles or addfiles</td>
+     <td valign="middle" align="center" rowspan="2">Exactly one of the two</td>
    </tr>
    <tr>
      <td valign="top">addfiles</td>

manual/Tasks/junit.html

@@ -424,7 +424,7 @@ the name of the resulting class (without suffix). It defaults to <i>java-tmp-dir
     <td valign="top">type</td>
     <td valign="top">Use a predefined formatter (either
       <code>xml</code>, <code>plain</code>, <code>brief</code> or <code>failure</code>).</td>
-    <td align="center" rowspan="2">Exactly one of these.</td>
+    <td align="center" rowspan="2">Exactly one of these</td>
   </tr>
   <tr>
     <td valign="top">classname</td>

manual/Tasks/mail.html

@@ -76,7 +76,7 @@
     <td valign="top">tolist</td>
     <td valign="top">Comma-separated list of recipients.</td>
     <td align="center" valign="middle" rowspan="3">At least one of these, or the
-       equivalent elements.</td>
+       equivalent nested elements</td>
   </tr>
   <tr>
     <td valign="top">cclist</td>

manual/Tasks/mimemail.html

@@ -45,9 +45,7 @@ Activation Framework</a> are required for this task.</p>
   <tr>
     <td valign="top">message</td>
     <td valign="top">The message body</td>
-    <td valign="top" align="center" rowspan="2">No, but only one of of 'message' or
-      'messageFile' may be specified.&nbsp; If not specified, a fileset must be
-      provided.</td>
+    <td valign="top" align="center" rowspan="2">Exactly one of these, or a nested fileset</td>
   </tr>
   <tr>
     <td valign="top">messageFile</td>
@@ -62,18 +60,15 @@ Activation Framework</a> are required for this task.</p>
   <tr>
     <td valign="top">tolist</td>
     <td valign="top">Comma-separated list of To: recipients</td>
-    <td valign="top" align="center" rowspan="3">Yes, at least one of 'tolist', 'cclist',
-      or 'bcclist' must be specified.</td>
+    <td valign="top" align="center" rowspan="3">Yes, at least one of these</td>
   </tr>
   <tr>
     <td valign="top">cclist</td>
     <td valign="top">Comma-separated list of CC: recipients</td>
-    <td valign="top" align="center">&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">bcclist</td>
     <td valign="top">Comma-separated list of BCC: recipients</td>
-    <td valign="top" align="center">&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">mailhost</td>

manual/Tasks/native2ascii.html

@@ -170,7 +170,7 @@ only if a given converter implementation will be used.</p>
     <td valign="top">value</td>
     <td align="center" rowspan="4">See
     <a href="../using.html#arg">Command-line Arguments</a>.</td>
-    <td align="center" rowspan="4">Exactly one of these.</td>
+    <td align="center" rowspan="4">Exactly one of these</td>
   </tr>
   <tr>
     <td valign="top">line</td>

manual/Tasks/pack.html

@@ -50,7 +50,7 @@ Dependencies</a> for more information.</p>
   <tr>
     <td valign="top">destfile</td>
     <td valign="top">the destination file to create.</td>
-    <td align="center" valign="top" rowspan="2">Exactly one of the two.</td>
+    <td align="center" valign="top" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">zipfile</td>

manual/Tasks/replace.html

@@ -45,7 +45,7 @@ have been regenerated by this task.</p>
   <tr>
     <td valign="top">file</td>
     <td valign="top">file for which the token should be replaced.</td>
-    <td align="center" rowspan="2">Exactly one of the two.</td>
+    <td align="center" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">dir</td>

manual/Tasks/rmic.html

@@ -270,7 +270,7 @@ used.</p>
     <td valign="top">value</td>
     <td align="center" rowspan="4">See
     <a href="../using.html#arg">Command-line Arguments</a>.</td>
-    <td align="center" rowspan="4">Exactly one of these.</td>
+    <td align="center" rowspan="4">Exactly one of these</td>
   </tr>
   <tr>
     <td valign="top">line</td>

manual/Tasks/schemavalidate.html

@@ -155,12 +155,11 @@ the document(s).
   <tr>
     <td valign="top">url</td>
     <td valign="top">URL of the schema</td>
-    <td align="center" valign="top">One of url or file is required</td>
+    <td align="center" valign="top" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">file</td>
     <td valign="top">file of the schema</td>
-    <td align="center" valign="top">One of url or file is required</td>
   </tr>
 </table>
 

manual/Tasks/vss.html

@@ -156,7 +156,7 @@ label only one will be used in the order version, date, label.</p>
   <tr>
      <td>version</td>
      <td>a version number to get</td>
-     <td rowspan="3">No, only one of these allowed</td>
+     <td rowspan="3">No; only one of these may be used</td>
   </tr>
   <tr>
      <td>date</td>
@@ -585,7 +585,7 @@ label only one will be used in the order version, date, label.</p>
   <tr>
      <td>version</td>
      <td>a version number to get</td>
-     <td rowspan="3">No, only one of these allowed</td>
+     <td rowspan="3">No; only one of these may be used</td>
   </tr>
   <tr>
      <td>date</td>

manual/Tasks/war.html

@@ -67,7 +67,7 @@ to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
   <tr>
     <td valign="top">destfile</td>
     <td valign="top">the WAR file to create.</td>
-    <td align="center" valign="top" rowspan="2">Exactly one of the two.</td>
+    <td align="center" valign="top" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">warfile</td>
@@ -87,7 +87,7 @@ to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
         It should be set to false when generating
         servlet 2.5+ WAR files without a web.xml file.
         <em>Since Apache Ant 1.7</em></td>
-    <td valign="top" align="center">No -default "true"</td>
+    <td valign="top" align="center">No - default "true"</td>
   </tr>
   <tr>
     <td valign="top">basedir</td>

manual/Tasks/whichresource.html

@@ -53,7 +53,7 @@
         <td valign="top">
           The name of the class to look for.
         </td>
-        <td valign="top" align="center" rowspan="2">Exactly one of these.</td>
+        <td valign="top" align="center" rowspan="2">Exactly one of these</td>
       </tr>
       <tr>
         <td valign="top">resource</td>

manual/Tasks/zip.html

@@ -117,7 +117,7 @@ archive.</p>
   <tr>
     <td valign="top">destfile</td>
     <td valign="top">the zip-file to create.</td>
-    <td align="center" valign="top" rowspan="2">Exactly one of the two.</td>
+    <td align="center" valign="top" rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td valign="top">zipfile</td>