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/02/28 07:01:59 UTC

[44/47] ant git commit: Use HTML 5(-ish), fix links

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/clearcase.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/clearcase.html b/manual/Tasks/clearcase.html
index d1b5b9c..ad303fa 100644
--- a/manual/Tasks/clearcase.html
+++ b/manual/Tasks/clearcase.html
@@ -19,7 +19,7 @@
 <head>
   <meta http-equiv="Content-Language" content="en-us">
   <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-  <title>Clearcase Tasks</title>
+  <title>ClearCase Tasks</title>
 </head>
 
 <body>
@@ -30,7 +30,7 @@ Sean P. Kane (spkane at genomatica dot com),<br>
 Rob Anderson (Anderson.Rob at vectorscm dot com), and<br>
 Sean Egan    (sean at cm-logic dot com)</p>
 
-<p>Version 1.6 - 02/25/2003</p>
+<p>Version 1.6&mdash;02/25/2003</p>
 
 <h1>ClearCase Support</h1>
 <h2>Table of Contents</h2>
@@ -54,25 +54,22 @@ Sean Egan    (sean at cm-logic dot com)</p>
 
 <hr/>
 <h2 id="introduction">Introduction</h2>
-<p>Apache Ant provides several optional tasks for working with ClearCase. These tasks correspond to various
-ClearCase commands using the Cleartool program. The current tasks available for Ant correspond to only
-a few of the significant ClearCase commands.</p>
-
-<p>More tasks can be easily added by deriving from the ClearCase class and then adding
-functionality that is specific to that ClearCase command.</p>
-<p>
-    Important: these tasks all require <code>cleartool</code> on the command line.
-    If a task fails with an IOException, especially error code 2 on Windows,
-    this is your problem.
-</p>
+<p>Apache Ant provides several optional tasks for working with ClearCase. These tasks correspond to
+various ClearCase commands using the <code>cleartool</code> program. The current tasks available for
+Ant correspond to only a few of the significant ClearCase commands.</p>
 
+<p>More tasks can be easily added by deriving from the ClearCase class and then adding functionality
+that is specific to that ClearCase command.</p>
+<p>Important: these tasks all require <code>cleartool</code> on the command line.  If a task fails
+  with an IOException, especially <code>error=2</code> on Windows, this is your problem.</p>
 
 <hr/>
+
 <h2 id="cccheckin">CCCheckin</h2>
 <h3>Description</h3>
-Task to perform a "cleartool checkin" command to ClearCase.
+<p>Task to perform a <code>cleartool checkin</code> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -80,8 +77,7 @@ Task to perform a "cleartool checkin" command to ClearCase.
   </tr>
   <tr>
     <td>viewpath</td>
-    <td>Path to the ClearCase view file or directory that the command
-        will operate on</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
     <td>No</td>
   </tr>
   <tr>
@@ -91,7 +87,7 @@ Task to perform a "cleartool checkin" command to ClearCase.
   </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment</td>
+    <td class="left">Specify a file containing a comment</td>
   </tr>
   <tr>
     <td>nowarn</td>
@@ -105,40 +101,40 @@ Task to perform a "cleartool checkin" command to ClearCase.
   </tr>
   <tr>
     <td>keepcopy</td>
-    <td>Keeps a copy of the file with a .keep extension</td>
+    <td>Keeps a copy of the file with a <samp>.keep</samp> extension</td>
     <td>No</td>
   </tr>
   <tr>
     <td>identical</td>
-    <td>Allows the file to be checked in even if it is identical
-        to the original</td>
+    <td>Allows the file to be checked in even if it is identical to the original</td>
     <td>No</td>
   </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true</td>
-    <td>No</td>
+    <td>Throw an exception if the command fails</td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
 
 <pre>
 &lt;cccheckin viewpath="c:/views/viewdir/afile"
-        commentfile="acomment.txt"
-        nowarn="true"
-        identical="true"/&gt;
-</pre>
+           commentfile="acomment.txt"
+           nowarn="true"
+           identical="true"/&gt;</pre>
+
+<p>Does a ClearCase <code>checkin</code> on the file <samp>c:/views/viewdir/afile</samp>.  Comment
+text from the file <samp>acomment.txt</samp> is added to ClearCase as a comment.  All warning
+messages are suppressed. The file is checked in even if it is <em>identical</em> to the
+original.</p>
 
-<p>Does a ClearCase <i>checkin</i> on the file <i>c:/views/viewdir/afile</i>.
-Comment text from the file <i>acomment.txt</i> is added to ClearCase as a comment.
-All warning messages are suppressed. The file is checked in even if it is
-<i>identical</i> to the original.</p>
 <hr/>
+
 <h2 id="cccheckout">CCCheckout</h2>
 <h3>Description</h3>
-Task to perform a "cleartool checkout" command to ClearCase.
+<p>Task to perform a <code>cleartool checkout</code> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -146,8 +142,7 @@ Task to perform a "cleartool checkout" command to ClearCase.
   </tr>
   <tr>
     <td>viewpath</td>
-    <td>Path to the ClearCase view file or directory that the command
-        will operate on</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
     <td>No</td>
   </tr>
   <tr>
@@ -162,8 +157,7 @@ Task to perform a "cleartool checkout" command to ClearCase.
   </tr>
   <tr>
     <td>nodata</td>
-    <td>Checks out the file but does not create an editable file
-        containing its data</td>
+    <td>Checks out the file but does not create an editable file containing its data</td>
     <td>No</td>
   </tr>
   <tr>
@@ -173,7 +167,8 @@ Task to perform a "cleartool checkout" command to ClearCase.
   </tr>
   <tr>
     <td>version</td>
-    <td>Allows checkout of a version other than main latest</td>
+    <td>Allows checkout of a version other than <code>/main/LATEST</code> (or whatever is selected
+    by a config spec)</td>
     <td>No</td>
   </tr>
   <tr>
@@ -188,41 +183,41 @@ Task to perform a "cleartool checkout" command to ClearCase.
   </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment</td>
+    <td class="left">Specify a file containing a comment</td>
   </tr>
   <tr>
     <td>notco</td>
-    <td>Fail if it's already checked out to the current view. Set to false to ignore it.<br>
-    <em>Since Ant 1.6.1</em></td>
+    <td>Fail if it's already checked out to the current view. Set to <q>false</q> to ignore
+    it.<br/><em>Since Ant 1.6.1</em></td>
     <td>No</td>
   </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
+    <td>Throw an exception if the command fails.<br>
     <em>Since Ant 1.6.1</em></td>
-    <td>No</td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
 
 <pre>
 &lt;cccheckout viewpath="c:/views/viewdir/afile"
-        reserved="true"
-        branch="abranch"
-        nowarn="true"
-        comment="Some comment text"/&gt;
-</pre>
+            reserved="true"
+            branch="abranch"
+            nowarn="true"
+            comment="Some comment text"/&gt;</pre>
+
+<p>Does a ClearCase <code>checkout</code> on the file <samp>c:/views/viewdir/afile</samp>.  It is
+checked out as <em>reserved</em> on branch called <samp>abranch</samp>. All warning messages are
+suppressed. A &quot;<samp>Some comment text</samp>&quot; is added to ClearCase as a comment.</p>
 
-<p>Does a ClearCase <i>checkout</i> on the file <i>c:/views/viewdir/afile</i>.
-It is checked out as <i>reserved</i> on branch called <i>abranch</i>. All
-warning messages are suppressed. A <i>Some comment text</i> is added to
-ClearCase as a comment.</p>
 <hr/>
+
 <h2 id="ccuncheckout">CCUnCheckout</h2>
 <h3>Description</h3>
-Task to perform a UnCheckout command to ClearCase.
+<p>Task to perform a <code>uncheckout</code> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -230,38 +225,34 @@ Task to perform a UnCheckout command to ClearCase.
   </tr>
   <tr>
     <td>viewpath</td>
-    <td>Path to the ClearCase view file or directory that the command
-        will operate on</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
     <td>No</td>
   </tr>
   <tr>
     <td>keepcopy</td>
-    <td>Specifies whether to keep a copy of the file with a .keep
-        extension or not</td>
+    <td>Specifies whether to keep a copy of the file with a <samp>.keep</samp> extension or not</td>
     <td>No</td>
   </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>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
 
-<pre>
-&lt;ccuncheckout viewpath="c:/views/viewdir/afile"
-        keepcopy="true"/&gt;
-</pre>
+<pre>&lt;ccuncheckout viewpath="c:/views/viewdir/afile" keepcopy="true"/&gt;</pre>
+
+<p>Does a ClearCase <code>uncheckout</code> on the file <samp>c:/views/viewdir/afile</samp>.  A copy
+of the file called <samp>c:/views/viewdir/afile.keep</samp> is kept.</p>
 
-<p>Does a ClearCase <i>uncheckout</i> on the file <i>c:/views/viewdir/afile</i>.
-A copy of the file called <i>c:/views/viewdir/afile.keep</i> is kept.</p>
 <hr/>
+
 <h2 id="ccupdate">CCUpdate</h2>
 <h3>Description</h3>
-Task to perform an "cleartool update" command to ClearCase.
+<p>Task to perform an <code>cleartool update</code> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -269,8 +260,7 @@ Task to perform an "cleartool update" command to ClearCase.
   </tr>
   <tr>
     <td>viewpath</td>
-    <td>Path to the ClearCase snapshot view file or directory that the command
-        will operate on</td>
+    <td>Path to the ClearCase snapshot view file or directory that the command will operate on</td>
     <td>No</td>
   </tr>
   <tr>
@@ -290,51 +280,49 @@ Task to perform an "cleartool update" command to ClearCase.
   </tr>
   <tr>
     <td>rename</td>
-    <td>Specifies that hijacked files should be renamed with a .keep extension</td>
+    <td>Specifies that hijacked files should be renamed with a <samp>.keep</samp> extension</td>
     <td>No</td>
   </tr>
   <tr>
     <td>currenttime</td>
-    <td>Specifies that modification time should be written as the
-        current time. Either currenttime or preservetime can be
-        specified.</td>
+    <td>Specifies that modification time should be written as the current time. Mutually exclusive
+    with <var>preservetime</var>.</td>
     <td>No</td>
   </tr>
   <tr>
     <td>preservetime</td>
-    <td>Specifies that modification time should preserved from the
-        VOB time. Either currenttime or preservetime can be
-        specified.</td>
+    <td>Specifies that modification time should preserved from the VOB time. Mutually exclusive
+    with <var>currenttime</var>.</td>
     <td>No</td>
   </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>
+    <td>Throw an exception if the command fails.<br/>  <em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
 
 <pre>
 &lt;ccupdate viewpath="c:/views/viewdir"
-        graphical="false"
-        log="log.log"
-        overwrite="true"
-        currenttime="true"
-        rename="false"/&gt;
-</pre>
+          graphical="false"
+          log="log.log"
+          overwrite="true"
+          currenttime="true"
+          rename="false"/&gt;</pre>
+
+<p>Does a ClearCase <code>update</code> on the snapshot view
+directory <samp>c:/views/viewdir</samp>.  A graphical dialog will be displayed. The output will be
+logged to <samp>log.log</samp> and it will overwrite any hijacked files. The modified time will be
+set to the current time.</p>
 
-<p>Does a ClearCase <i>update</i> on the snapshot view directory <i>c:/views/viewdir</i>.
-A graphical dialog will be displayed. The output will be logged to
-<i>log.log</i> and it will overwrite any hijacked files. The modified
-time will be set to the current time.</p>
 <hr/>
+
 <h2 id="ccmklbtype">CCMklbtype</h2>
 <h3>Description</h3>
-Task to perform a "mklbtype" command to ClearCase.
+<p>Task to perform a <code>mklbtype</code> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -357,13 +345,13 @@ Task to perform a "mklbtype" command to ClearCase.
   </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>
+    <td>Creates a label type that is global to the VOB or to VOBs that use this VOB.</td>
+    <td rowspan="2">No; only one of the two may be used,
+    default <var>ordinary</var>=<q>true</q></td>
   </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>
+    <td class="left">Creates a label type that can be used only in the current VOB.</td>
   </tr>
   <tr>
     <td>pbranch</td>
@@ -372,7 +360,8 @@ Task to perform a "mklbtype" command to ClearCase.
   </tr>
   <tr>
     <td>shared</td>
-    <td>Sets the way mastership is checked by ClearCase. See ClearCase documentation for details</td>
+    <td>Sets the way mastership is checked by ClearCase. See ClearCase documentation for
+    details</td>
     <td>No</td>
   </tr>
   <tr>
@@ -382,13 +371,13 @@ Task to perform a "mklbtype" command to ClearCase.
   </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment</td>
+    <td class="left">Specify a file containing a comment</td>
   </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
+    <td>Throw an exception if the command fails.<br>
     <em>Since Ant 1.6.1</em></td>
-    <td>No</td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
@@ -396,19 +385,20 @@ Task to perform a "mklbtype" command to ClearCase.
 
 <pre>
 &lt;ccmklbtype typename="VERSION_1"
-        ordinary="true"
-        comment="Development version 1"/&gt;
-</pre>
+            ordinary="true"
+            comment="Development version 1"/&gt;</pre>
+
+<p>Does a ClearCase <code>mklbtype</code> to create a label type named <samp>VERSION_1</samp>.  It
+is created as <em>ordinary</em> so it is available only to the current VOB.  The text <q>Development
+version 1</q> is added as a comment.</p>
 
-<p>Does a ClearCase <i>mklbtype</i> to create a label type named <i>VERSION_1</i>.
-It is created as <i>ordinary</i> so it is available only to the current VOB.
-The text <i>Development version 1</i> is added as a comment.</p>
 <hr/>
+
 <h2 id="ccmklabel">CCMklabel</h2>
 <h3>Description</h3>
-Task to perform a "mklabel" command to ClearCase.
+<p>Task to perform a <code>mklabel</code> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -431,7 +421,7 @@ Task to perform a "mklabel" command to ClearCase.
   </tr>
   <tr>
     <td>recurse</td>
-    <td>Process each subdirectory under viewpath</td>
+    <td>Process each subdirectory under <var>viewpath</var></td>
     <td>No</td>
   </tr>
   <tr>
@@ -451,13 +441,12 @@ Task to perform a "mklabel" command to ClearCase.
   </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment</td>
+    <td class="left">Specify a file containing a comment</td>
   </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>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
@@ -465,21 +454,23 @@ Task to perform a "mklabel" command to ClearCase.
 
 <pre>
 &lt;ccmklabel viewpath="c:/views/viewdir/afile"
-        comment="Some comment text"
-        recurse="true"
-        version="\main\2"
-        typename="VERSION_1"/&gt;
+           comment="Some comment text"
+           recurse="true"
+           version="\main\2"
+           typename="VERSION_1"/&gt;
 </pre>
 
-<p>Does a ClearCase <i>mklabel</i> on the file <i>c:/views/viewdir/afile</i> under
-the main branch for version 2 (<i>\main\2</i>). Text <i>Some comment text</i> is added
-as a comment. It will <i>recurse</i> all subdirectories.
+<p>Does a ClearCase <code>mklabel</code> on the file <samp>c:/views/viewdir/afile</samp> under the
+main branch for version 2 (<samp>\main\2</samp>). Text &quot;<samp>Some comment text</samp>&quot; is
+added as a comment. It will <em>recurse</em> all subdirectories.</p>
+
 <hr/>
+
 <h2 id="ccrmtype">CCRmtype</h2>
 <h3>Description</h3>
-Task to perform a "rmtype" command to ClearCase.
+<p>Task to perform a <code>rmtype</code> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -490,42 +481,34 @@ Task to perform a "rmtype" command to ClearCase.
     <td>The kind of type to create. Valid types are:
       <table>
         <tr>
-          <td>Kind</td>
-          <td>&nbsp;</td>
-          <td>Description</td>
+          <th>Kind</th>
+          <th>Description</th>
         </tr>
         <tr>
-          <td><b>attype</b></td>
-          <td>-</td>
+          <td><q>attype</q></td>
           <td>attribute type</td>
         </tr>
         <tr>
-          <td><b>brtype</b></td>
-          <td>-</td>
+          <td><q>brtype</q></td>
           <td>branch type</td>
         </tr>
         <tr>
-          <td><b>eltype</b></td>
-          <td>-</td>
+          <td><q>eltype</q></td>
           <td>element type</td>
         </tr>
         <tr>
-          <td><b>hltype</b></td>
-          <td>-</td>
-          <td>hyperlink type</td>
+          <td><q>hltype</q></td>
+           <td>hyperlink type</td>
         </tr>
         <tr>
-          <td><b>lbtype</b></td>
-          <td>-</td>
+          <td><q>lbtype</q></td>
           <td>label type</td>
         </tr>
         <tr>
-          <td><b>trtype</b></td>
-          <td>-</td>
+          <td><q>trtype</q></td>
           <td>trigger type</td>
         </tr>
-      </table>
-    </td>
+      </table></td>
     <td>Yes</td>
   </tr>
   <tr>
@@ -535,7 +518,8 @@ Task to perform a "rmtype" command to ClearCase.
   </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>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>
@@ -550,13 +534,12 @@ Task to perform a "rmtype" command to ClearCase.
   </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment</td>
+    <td class="left">Specify a file containing a comment</td>
   </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.
-    <em>Since Ant 1.6.1</em></td>
-    <td>No</td>
+    <td>Throw an exception if the command fails.  <em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
@@ -564,379 +547,373 @@ Task to perform a "rmtype" command to ClearCase.
 
 <pre>
 &lt;ccrmtype typekind="lbtype"
-        typename="VERSION_1"
-        commentfile="acomment.txt"
-        rmall="true"/&gt;
-</pre>
+          typename="VERSION_1"
+          commentfile="acomment.txt"
+          rmall="true"/&gt;</pre>
+
+<p>Does a ClearCase <code>rmtype</code> to remove a label type (<q>lbtype</q>)
+named <samp>VERSION_1</samp>.  Comment text from the file <samp>acomment.txt</samp> is added as a
+comment. All instances of the type are removed, including the type object itself.</p>
 
-<p>Does a ClearCase <i>rmtype</i> to remove a label type (<i>lbtype</i>) named <i>VERSION_1</i>.
-Comment text from the file <i>acomment.txt</i> is added as a comment. All instances of the type
-are removed, including the type object itself.</p>
 <hr/>
+
 <h2 id="cclock">CCLock</h2>
 <h3>Description</h3>
-Task to perform a "cleartool lock" command to ClearCase.
+<p>Task to perform a <code>cleartool lock</code> command to ClearCase.</p>
 <h3>Parameters</h3>
- <table>
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>replace</td>
-      <td>Specifies replacing an existing lock</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nusers</td>
-      <td>Specifies user(s) who can still modify the object</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>obsolete</td>
-      <td>Specifies that the object should be marked obsolete</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>Specifies how to populate comments fields</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>pname</td>
-      <td>Specifies the object pathname to be locked.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>objselect</td>
-      <td><em>Obsolete</em>. Use <i>objsel</i> instead.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>objsel</td>
-      <td>Specifies the object(s) to be locked.<br>
-       <em>Since Ant 1.6.1</em></td>
-      <td>No</td>
-   </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>
- </table>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>replace</td>
+    <td>Specifies replacing an existing lock</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>nusers</td>
+    <td>Specifies user(s) who can still modify the object</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>obsolete</td>
+    <td>Specifies that the object should be marked obsolete</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>comment</td>
+    <td>Specifies how to populate comments fields</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>pname</td>
+    <td>Specifies the object pathname to be locked.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>objselect</td>
+    <td><em>Obsolete</em>. Use <var>objsel</var> instead.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>objsel</td>
+    <td>Specifies the object(s) to be locked.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
 
-<pre>
-&lt;cclock
-    objsel="stream:Application_Integration@\MyProject_PVOB"/&gt;
-</pre>
+<pre>&lt;cclock objsel="stream:Application_Integration@\MyProject_PVOB"/&gt;</pre>
+
+<p>Does a ClearCase <code>lock</code> on the
+object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
+
+<hr/>
 
-<p>Does a ClearCase <i>lock</i> on the object <i>stream:Application_Integration@\MyProject_PVOB</i>.</p>
-<hr>
 <h2 id="ccunlock">CCUnlock</h2>
 <h3>Description</h3>
-Task to perform a "cleartool unlock" command to ClearCase.
+<p>Task to perform a <code>cleartool unlock</code> command to ClearCase.</p>
 <h3>Parameters</h3>
- <table>
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>Specifies how to populate comments fields</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>pname</td>
-      <td>Specifies the object pathname to be unlocked.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>objselect</td>
-      <td><em>Obsolete</em>. Use <i>objsel</i> instead.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>objsel</td>
-      <td>Specifies the object(s) to be unlocked.<br>
-       <em>Since Ant 1.6.1</em></td>
-      <td>No</td>
-   </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>
- </table>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>comment</td>
+    <td>Specifies how to populate comments fields</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>pname</td>
+    <td>Specifies the object pathname to be unlocked.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>objselect</td>
+    <td><em>Obsolete</em>. Use <var>objsel</var> instead.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>objsel</td>
+    <td>Specifies the object(s) to be unlocked.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
 
-<pre>
-&lt;ccunlock
-    objsel="stream:Application_Integration@\MyProject_PVOB"/&gt;
-</pre>
+<pre>&lt;ccunlock objsel="stream:Application_Integration@\MyProject_PVOB"/&gt;</pre>
+
+<p>Does a ClearCase <code>unlock</code> on the
+object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
+
+<hr/>
 
-<p>Does a ClearCase <i>unlock</i> on the object <i>stream:Application_Integration@\MyProject_PVOB</i>.</p>
-<hr>
 <h2 id="ccmkbl">CCMkbl</h2>
 <h3>Description</h3>
-Task to perform a "cleartool mkbl" command to ClearCase.
+<p>Task to perform a <code>cleartool mkbl</code> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table>
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>comment</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</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>baselinerootname</td>
-      <td>Specify the name to be associated with the baseline.</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>nowarn</td>
-      <td>Suppress warning messages</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>identical</td>
-      <td>Allows the baseline to be created even if it is identical to the
-       previous baseline.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>full</td>
-      <td>Creates a full baseline.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nlabel</td>
-      <td>Allows the baseline to be created without a label.</td>
-      <td>No</td>
-   </tr>
+<table class="attr">
   <tr>
-    <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
-       <em>Since Ant 1.6.1</em></td>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>comment</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 class="left">Specify a file containing a comment</td>
+  </tr>
+  <tr>
+    <td>baselinerootname</td>
+    <td>Specify the name to be associated with the baseline.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>nowarn</td>
+    <td>Suppress warning messages</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>identical</td>
+    <td>Allows the baseline to be created even if it is identical to the previous baseline.</td>
     <td>No</td>
   </tr>
- </table>
+  <tr>
+    <td>full</td>
+    <td>Creates a full baseline.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>nlabel</td>
+    <td>Allows the baseline to be created without a label.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
 
 <pre>
-&lt;ccmkbl
-    baselinerootname="Application_Baseline_AUTO"
-    identical="yes"
-    full="no"
-    viewpath="v:\ApplicationCC"/&gt;
-</pre>
+&lt;ccmkbl baselinerootname="Application_Baseline_AUTO"
+        identical="yes"
+        full="no"
+        viewpath="v:\ApplicationCC"/&gt;</pre>
+
+<p>Does a ClearCase <code>mkbl</code> on the Integration view at <samp>v:\ApplicationCC</samp> even
+if it is <em>identical</em> to a previous baseline. The new baseline with be incremental and
+named <samp>Application_Baseline_AUTO</samp>.</p>
+
+<hr/>
 
-<p>Does a ClearCase <i>mkbl</i> on the Integration view at <i>v:\ApplicationCC</i>
-even if it is <i>identical</i> to a previous baseline. The new baseline with be
-incremental and named "Application_Baseline_AUTO".</p>
-<hr>
 <h2 id="ccmkattr">CCMkattr</h2>
 <h3>Description</h3>
-Task to perform a &quot;cleartool mkattr&quot; command to ClearCase.<br>
-<em>Since Ant 1.6.1</em>
+<p>Task to perform a <code>cleartool mkattr</code> command to ClearCase.<br/><em>Since Ant
+1.6.1</em></p>
 <h3>Parameters</h3>
-<table>
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view file or directory that the command will operate on</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>replace</td>
-      <td>Replace the value of the attribute if it already exists</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>recurse</td>
-      <td>Process each subdirectory under viewpath</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>version</td>
-      <td>Identify a specific version to attach the attribute to</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>typename</td>
-      <td>Name of the attribute type</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>typevalue</td>
-      <td>Value to attach to the attribute type</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>comment</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</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>failonerr</td>
-      <td>Throw an exception if the command fails. Default is true</td>
-      <td>No</td>
-   </tr>
- </table>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>viewpath</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>replace</td>
+    <td>Replace the value of the attribute if it already exists</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>recurse</td>
+    <td>Process each subdirectory under <var>viewpath</var></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>version</td>
+    <td>Identify a specific version to attach the attribute to</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>typename</td>
+    <td>Name of the attribute type</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>typevalue</td>
+    <td>Value to attach to the attribute type</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>comment</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 class="left">Specify a file containing a comment</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
 
 <pre>
 &lt;ccmkattr viewpath=&quot;c:/views/viewdir/afile&quot;
-    typename=&quot;BugFix&quot;
-    typevalue=&quot;34445&quot;/&gt;
+          typename=&quot;BugFix&quot;
+          typevalue=&quot;34445&quot;/&gt;
 </pre>
 
-<p>Does a ClearCase <i>mkattr</i> on the file <i>c:/views/viewdir/afile</i> and
-attaches the attribute <i>BugFix</i> with a value of <i>34445</i> to it.</p>
+<p>Does a ClearCase <code>mkattr</code> on the file <samp>c:/views/viewdir/afile</samp> and attaches
+the attribute <samp>BugFix</samp> with a value of <samp>34445</samp> to it.</p>
+
 <hr/>
+
 <h2 id="ccmkdir">CCMkdir</h2>
 <h3>Description</h3>
-Task to perform a &quot;cleartool mkdir&quot; command to ClearCase.<br>
-<em>Since Ant 1.6.1</em>
+<p>Task to perform a <code>cleartool mkdir</code> command to ClearCase.<br/><em>Since Ant
+1.6.1</em></p>
 <h3>Parameters</h3>
-<table>
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view directory that the command will operate on</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>comment</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</td>
-   </tr>
-   <tr>
-      <td>nocheckout</td>
-      <td>Do not checkout after element creation</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>failonerr</td>
-      <td>Throw an exception if the command fails. Default is true</td>
-      <td>No</td>
-   </tr>
- </table>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>viewpath</td>
+    <td>Path to the ClearCase view directory that the command will operate on</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>comment</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 class="left">Specify a file containing a comment</td>
+  </tr>
+  <tr>
+    <td>nocheckout</td>
+    <td>Do not checkout after element creation</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
 
 <pre>
 &lt;ccmkdir viewpath=&quot;c:/views/viewdir/adir&quot;
-        nocheckout=&quot;true&quot;
-        comment=&quot;Some comment text&quot;/&gt;
-</pre>
+         nocheckout=&quot;true&quot;
+         comment=&quot;Some comment text&quot;/&gt;</pre>
+
+<p>Does a ClearCase <code>mkdir</code> on the dir <samp>c:/views/viewdir/adir</samp> and does not
+automatically check it out.</p>
 
-<p>Does a ClearCase <i>mkdir</i> on the dir <i>c:/views/viewdir/adir</i> and
-does not automatically check it out.</p>
 <hr/>
+
 <h2 id="ccmkelem">CCMkelem</h2>
 <h3>Description</h3>
-Task to perform a &quot;cleartool mkelem&quot; command to ClearCase.<br>
+Task to perform a <code>cleartool mkelem</code> command to ClearCase.<br>
 <em>Since Ant 1.6.1</em>
 <h3>Parameters</h3>
-<table>
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view file or directory that the command will operate on</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>comment</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</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nowarn</td>
-      <td>Suppress warning messages</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nocheckout</td>
-      <td>Do not checkout after element creation</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>checkin</td>
-      <td>Checkin element after creation</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>preservetime</td>
-      <td>Preserve the modification time (for checkin)</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>master</td>
-      <td>Assign mastership of the main branch to the current site</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>eltype</td>
-      <td>Element type to use during element creation</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>failonerr</td>
-      <td>Throw an exception if the command fails. Default is true</td>
-      <td>No</td>
-   </tr>
- </table>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>viewpath</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>comment</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 class="left">Specify a file containing a comment</td>
+  </tr>
+  <tr>
+    <td>nowarn</td>
+    <td>Suppress warning messages</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>nocheckout</td>
+    <td>Do not checkout after element creation</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>checkin</td>
+    <td>Checkin element after creation</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>preservetime</td>
+    <td>Preserve the modification time (for checkin)</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>master</td>
+    <td>Assign mastership of the main branch to the current site</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>eltype</td>
+    <td>Element type to use during element creation</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
 
 <pre>
 &lt;ccmkelem viewpath=&quot;c:/views/viewdir/afile&quot;
-        eltype=&quot;text_file&quot;
-        checkin=&quot;true&quot;
-        comment=&quot;Some comment text&quot;/&gt;
-</pre>
+          eltype=&quot;text_file&quot;
+          checkin=&quot;true&quot;
+          comment=&quot;Some comment text&quot;/&gt;</pre>
 
-<p>Does a ClearCase <i>mkelem</i> on the file <i>c:/views/viewdir/afile</i> with
-element type <i>text_file</i>. It also checks in the file after creation.</p>
+<p>Does a ClearCase <code>mkelem</code> on the file <samp>c:/views/viewdir/afile</samp> with element
+type <samp>text_file</samp>. It also checks in the file after creation.</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/common.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/common.html b/manual/Tasks/common.html
index d1c37ae..c71d844 100644
--- a/manual/Tasks/common.html
+++ b/manual/Tasks/common.html
@@ -27,28 +27,28 @@
 <h2 id="javac">Common Attributes of all Tasks</h2>
 <p>All tasks share the following attributes:</p>
 
-<table>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">id</td>
-    <td valign="top">Unique identifier for this task instance, can be
+    <td>id</td>
+    <td>Unique identifier for this task instance, can be
        used to reference this task in scripts.</td>
-    <td valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">taskname</td>
-    <td valign="top">A different name for this task instance - will
+    <td>taskname</td>
+    <td>A different name for this task instance&mdash;will
       show up in the logging output.</td>
-    <td valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">description</td>
-    <td valign="top">Room for your comments</td>
-    <td valign="top">No</td>
+    <td>description</td>
+    <td>Room for your comments</td>
+    <td>No</td>
   </tr>
 </table>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/componentdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/componentdef.html b/manual/Tasks/componentdef.html
index 7c2fe6d..63d2493 100644
--- a/manual/Tasks/componentdef.html
+++ b/manual/Tasks/componentdef.html
@@ -26,36 +26,25 @@
 
 <h2 id="componentdef">componentdef</h2>
 <h3>Description</h3>
-  <p>
-    Adds a component definition to the current project.
-    A component definition is the same as a
-    <a href="typedef.html">typedef</a> except:
-  </p>
-    <ol>
-      <li>
-        that it can only be used in other types or tasks that
-        accept components (by having an <i>add()</i> method).
-      </li>
-      <li>
-        multiple components may have the same name, provided they
-        implement different interfaces.
-      </li>
-    </ol>
-  <p>
-    The purpose of this is to allow internal Apache Ant definitions to be
-    made for tags like "and" or "or".
-  </p>
+<p>Adds a component definition to the current project.  A component definition is the same as
+a <a href="typedef.html">typedef</a> except:</p>
+<ol>
+  <li>that it can only be used in other types or tasks that accept components (by having
+    an <code>add()</code> method).</li>
+  <li>multiple components may have the same name, provided they implement different interfaces.</li>
+</ol>
+<p>The purpose of this is to allow internal Apache Ant definitions to be made for tags
+like <samp>and</samp> or <samp>or</samp>.</p>
 
-  <h3>Examples</h3>
+<h3>Examples</h3>
 
-<pre> &lt;componentdef name="or" onerror="ignore"
-    classname="com.apache.tools.ant.taskdefs.conditions.Or"/&gt;
-  &lt;componentdef name="or" onerror="ignore"
-    classname="com.apache.tools.ant.types.resources.selectors.Or"/&gt;</pre>
-  <p>
-    defines two components with the same name "or"; one is a condition
-    (see <a href="conditions.html">conditions</a>) and one is
-    a selector (see <a href="../Types/selectors.html">selectors</a>).
-  </p>
+<pre>
+&lt;componentdef name="or" onerror="ignore"
+              classname="com.apache.tools.ant.taskdefs.conditions.Or"/&gt;
+&lt;componentdef name="or" onerror="ignore"
+              classname="com.apache.tools.ant.types.resources.selectors.Or"/&gt;</pre>
+<p>defines two components with the same name <samp>or</samp>; one is a condition
+(see <a href="conditions.html">conditions</a>) and one is a selector
+(see <a href="../Types/selectors.html">selectors</a>).</p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/concat.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/concat.html b/manual/Tasks/concat.html
index 1bdbd5a..6909d02 100644
--- a/manual/Tasks/concat.html
+++ b/manual/Tasks/concat.html
@@ -16,319 +16,240 @@
 -->
 <html>
 
-    <head>
-      <meta http-equiv="Content-Language" content="en-us">
-      <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-      <title>Concat</title>
-    </head>
-
-    <body>
-
-      <h2 id="concat">Concat</h2>
-
-      <h3>Description</h3>
-
-      <p>
-        Concatenates one or more
-        <a href="../Types/resources.html">resource</a>s
-        to a single file or to the console. The destination
-        file will be created if it does not exist unless the resource
-        list is empty and ignoreempty is true.
-      </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 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 which resources are to be concatenated. There is no
-        singular attribute to specify a single resource to cat.
-      </p>
-
-      <h3>Parameters</h3>
-
-      <table>
-
-        <tr>
-          <td valign="top"><b>Attribute</b></td>
-          <td valign="top"><b>Description</b></td>
-          <td align="center" valign="top"><b>Required</b></td>
-        </tr>
-
-        <tr>
-          <td valign="top">destfile</td>
-          <td valign="top">
-            The destination file for the concatenated stream.
-        If not specified the console will be used instead.
-          </td>
-          <td valign="top" align="center">
-            No
-          </td>
-        </tr>
-
-        <tr>
-          <td valign="top">append</td>
-          <td valign="top">
-            Specifies whether or not the file specified by 'destfile'
-            should be appended. Defaults to &quot;no&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">force</td>
-          <td valign="top">
-            Specifies whether or not the file specified by 'destfile'
-            should be written to even if it is newer than all source files.
-            <strong>deprecated, use the overwrite attribute instead</strong>
-            Defaults to &quot;yes&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">overwrite</td>
-          <td valign="top">
-            Specifies whether or not the file specified by 'destfile'
-            should be written to even if it is newer than all source files.
-            <em>Since Ant 1.8.2</em>.
-            Defaults to &quot;yes&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-
-        <tr>
-          <td valign="top">forceReadOnly</td>
-          <td valign="top">Overwrite read-only destination
-            files.  <em>Since Ant 1.8.2</em></td>
-          <td valign="top" align="center">No; defaults to false.</td>
-        </tr>
-
-        <tr>
-          <td valign="top">encoding</td>
-          <td valign="top">
-            Specifies the encoding for the input files. Please see <a
-            href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">
-            Supported Encodings</a>
-            for a list of possible values. Defaults to the platform's
-            default character encoding.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">outputencoding</td>
-          <td valign="top">
-            The encoding to use when writing the output file.
-            <em>Since Ant 1.6</em>.
-            Defaults to the value of the encoding attribute
-            if given or the default JVM encoding otherwise.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">fixlastline</td>
-          <td valign="top">
-                 Specifies whether or not to check if
-            each file concatenated is terminated by
-            a new line. If this attribute is &quot;yes&quot;
-            a new line will be appended to the stream if
-            the file did not end in a new line.
-            <em>Since Ant 1.6</em>.
-            Defaults to &quot;no&quot;.
-            This attribute does not apply to embedded text.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">eol</td>
-          <td valign="top">
-            Specifies what the end of line character are
-            for use by the fixlastline attribute.
-            <em>Since Ant 1.6</em>
-            Valid values for this property are:
-            <ul>
-              <li>cr: a single CR</li>
-              <li>lf: a single LF</li>
-              <li>crlf: the pair CRLF</li>
-              <li>mac: a single CR</li>
-              <li>unix: a single LF</li>
-              <li>dos: the pair CRLF</li>
-            </ul>
-            The default is platform dependent.
-            For Unix platforms, the default is &quot;lf&quot;.
-            For DOS based systems (including Windows),
-            the default is &quot;crlf&quot;.
-            For Mac OS, the default is &quot;cr&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">binary</td>
-          <td valign="top">
-            <em>Since Ant 1.6.2</em>
-            If this attribute is set to true, the task concatenates the files
-            in a byte by byte fashion. If this attribute is false, concat will
-            not normally work for binary files due to character encoding
-            issues.
-            If this option is set to true, the destfile attribute must be
-            set, and the task cannot used nested text.
-            Also the attributes encoding, outputencoding, filelastline
-            cannot be used.
-            The default is &quot;false&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">ignoreempty</td>
-          <td valign="top">
-          <em>Since Ant 1.8.0</em>
-            Specifies whether or not the file specified by 'destfile'
-            should be created if the source resource list is
-            empty. Defaults to &quot;true&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">resourcename</td>
-          <td valign="top">
-          <em>Since Ant 1.8.3</em>
-            Specifies the name reported if this task is exposed
-            as a <a href="../Types/resources.html">resource</a>.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-
-      </table>
-
-      <h3>Parameters specified as nested elements</h3>
-        <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 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>
-
-      <h4>header, footer</h4>
-        <p><em>since Ant 1.6</em>.</p>
-      <p>Used to prepend or postpend text into the concatenated stream.</p>
-      <p>The text may be in-line or be in a file.</p>
-      <table>
-        <tr>
-          <td valign="top"><b>Attribute</b></td>
-          <td valign="top"><b>Description</b></td>
-          <td align="center" valign="top"><b>Required</b></td>
-        </tr>
-        <tr>
-          <td valign="top">filtering</td>
-          <td valign="top">
-            Whether to filter the text provided by this sub element,
-            default is "yes".
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">file</td>
-          <td valign="top">A file to place at the head or tail of the
-                           concatenated text.
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">trim</td>
-          <td valign="top">Whether to trim the value, default is "no"</td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">trimleading</td>
-          <td valign="top">
-            Whether to trim leading white space on each line, default is "no"
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-      </table>
-
-      <h3>Examples</h3>
-
-      <p><b>Concatenate a string to a file:</b></p>
-
-      <pre>
-  &lt;concat destfile=&quot;README&quot;&gt;Hello, World!&lt;/concat&gt;
-      </pre>
-
-      <p><b>Concatenate a series of files to the console:</b></p>
-
-      <pre>
-  &lt;concat&gt;
-    &lt;fileset dir=&quot;messages&quot; includes=&quot;*important*&quot;/&gt;
-  &lt;/concat&gt;
-      </pre>
-
-      <p><b>Concatenate a single file, appending if the destination file exists:</b></p>
-
-      <pre>
-  &lt;concat destfile=&quot;NOTES&quot; append=&quot;true&quot;&gt;
-    &lt;filelist dir=&quot;notes&quot; files=&quot;note.txt&quot;/&gt;
-  &lt;/concat&gt;
-      </pre>
-
-      <p><b>Concatenate a series of files, update the destination
-      file only if is older that all the source files:</b></p>
-
-      <pre>
-  &lt;concat destfile=&quot;${docbook.dir}/all-sections.xml&quot;
-          force=&quot;no&quot;&gt;
-    &lt;filelist dir=&quot;${docbook.dir}/sections&quot;
-         files=&quot;introduction.xml,overview.xml&quot;/&gt;
-    &lt;fileset dir=&quot;${docbook.dir}&quot;
-         includes=&quot;sections/*.xml&quot;
-         excludes=&quot;introduction.xml,overview.xml&quot;/&gt;
-  &lt;/concat&gt;
-      </pre>
-
-      <p><b>Concatenate a series of files, expanding Ant properties</b></p>
-        <pre>
-   &lt;concat destfile="${build.dir}/subs"&gt;
-      &lt;path&gt;
-        &lt;fileset dir="${src.dir}" includes="*.xml"/&gt;
-        &lt;pathelement location="build.xml"/&gt;
-      &lt;/path&gt;
-      &lt;filterchain&gt;
-        &lt;expandproperties/&gt;
-      &lt;/filterchain&gt;
-   &lt;/concat&gt;
-        </pre>
-
-      <p><b>Filter the lines containing project from build.xml and output
-           them to report.output, prepending with a header</b></p>
-        <pre>
-   &lt;concat destfile="${build.dir}/report.output"&gt;
-      &lt;header filtering="no" trimleading="yes"&gt;
-          Lines that contain project
-          ==========================
-      &lt;/header&gt;
-      &lt;path path="build.xml"/&gt;
-      &lt;filterchain&gt;
-         &lt;linecontains&gt;
-           &lt;contains value="project"/&gt;
-         &lt;/linecontains&gt;
-      &lt;/filterchain&gt;
-   &lt;/concat&gt;
-        </pre>
-
-      <p><b>Concatenate a number of binary files.</b></p>
-        <pre>
-   &lt;concat destfile="${build.dir}/dist.bin" binary="yes"&gt;
-     &lt;fileset file="${src.dir}/scripts/dist.sh" /&gt;
-     &lt;fileset file="${build.dir}/dist.tar.bz2" /&gt;
-   &lt;/concat&gt;
-        </pre>
-
-    </body>
+  <head>
+    <meta http-equiv="Content-Language" content="en-us">
+    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+    <title>Concat</title>
+  </head>
+
+  <body>
+
+    <h2 id="concat">Concat</h2>
+
+    <h3>Description</h3>
+
+    <p>Concatenates one or more <a href="../Types/resources.html">resource</a>s to a single file or
+      to the console. The destination file will be created if it does not exist unless the resource
+      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
+      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
+      which resources are to be concatenated. There is no singular attribute to specify a single
+      resource to <code>cat</code>.</p>
+
+    <h3>Parameters</h3>
+
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+      </tr>
+      <tr>
+        <td>destfile</td>
+        <td>The destination file for the concatenated stream.  If not specified the console will be
+          used instead.</td>
+        <td>No</td>
+      </tr>
+      <tr>
+        <td>append</td>
+        <td>Specifies whether or not the file specified by <var>destfile</var> should be
+          appended.</td>
+        <td>No; defaults to <q>no</q></td>
+      </tr>
+      <tr>
+        <td>force</td>
+        <td>Specifies whether or not the file specified by <var>destfile</var> should be written to
+          even if it is newer than all source files. <em><u>Deprecated</u>, use
+          the <var>overwrite</var> attribute instead.</em></td>
+        <td>No; defaults to <q>yes</q></td>
+      </tr>
+      <tr>
+        <td>overwrite</td>
+        <td>Specifies whether or not the file specified by <var>destfile</var> should be written to
+          even if it is newer than all source files.  <em>Since Ant 1.8.2</em>.</td>
+        <td>No; defaults to <q>yes</q></td>
+      </tr>
+      <tr>
+        <td>forceReadOnly</td>
+        <td>Overwrite read-only destination files.  <em>Since Ant 1.8.2</em></td>
+        <td>No; defaults to <q>false</q></td>
+      </tr>
+      <tr>
+        <td>encoding</td>
+        <td>Specifies the encoding for the input files. Please
+          see <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html">Supported
+          Encodings</a> for a list of possible values.</td>
+        <td>No; defaults to default JVM character encoding</td>
+      </tr>
+      <tr>
+        <td>outputencoding</td>
+        <td>The encoding to use when writing the output file.  <em>Since Ant 1.6</em>.</td>
+        <td>No; defaults to <var>encoding</var> if set or default JVM character encoding
+          otherwise</td>
+      </tr>
+      <tr>
+        <td>fixlastline</td>
+        <td>Specifies whether or not to check if each file concatenated is terminated by a new
+          line. If this attribute is <q>yes</q> a new line will be appended to the stream if the
+          file did not end in a new line.  <em>Since Ant 1.6</em>.  This attribute does not apply to
+          embedded text.</td>
+        <td>No; defaults to <q>no</q></td>
+      </tr>
+      <tr>
+        <td>eol</td>
+        <td>Specifies what the end of line character are for use by the fixlastline
+          attribute.  <em>Since Ant 1.6</em> Valid values for this property are:
+          <ul>
+            <li><q>cr</q>: a single CR</li>
+            <li><q>lf</q>: a single LF</li>
+            <li><q>crlf</q>: the pair CRLF</li>
+            <li><q>mac</q>: a single CR</li>
+            <li><q>unix</q>: a single LF</li>
+            <li><q>dos</q>: the pair CRLF</li>
+          </ul></td>
+        <td>No; default is platform dependent: <q>lf</q> for Unix, <q>crlf</q> for DOS family
+        (including Windows), <q>cr</q> for Mac OS 9 or earlier</td></tr>
+      <tr>
+        <td>binary</td>
+        <td><em>Since Ant 1.6.2</em> If this attribute is set to <q>true</q>, the task concatenates
+          the files in a byte by byte fashion. If this attribute is <q>false</q>, concat will not
+          normally work for binary files due to character encoding issues.  If this option is set
+          to <q>true</q>, the <var>destfile</var> attribute must be set, and the task cannot used
+          nested text.  Also the
+          attributes <var>encoding</var>, <var>outputencoding</var>, <var>filelastline</var> cannot
+          be used.</td>
+        <td>No; default is <q>false</q></td>
+      </tr>
+      <tr>
+        <td>ignoreempty</td>
+        <td><em>Since Ant 1.8.0</em> Specifies whether or not the file specified
+          by <var>destfile</var> should be created if the source resource list is empty.
+        </td>
+        <td>No; defaults to <q>true</q></td>
+      </tr>
+      <tr>
+        <td>resourcename</td>
+        <td><em>Since Ant 1.8.3</em> Specifies the name reported if this task is exposed as
+          a <a href="../Types/resources.html">resource</a>.
+        </td>
+        <td>No</td>
+      </tr>
+    </table>
+
+    <h3>Parameters specified as nested elements</h3>
+    <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
+      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>
+
+    <h4>header, footer</h4>
+    <p><em>since Ant 1.6</em>.</p>
+    <p>Used to prepend or postpend text into the concatenated stream.</p>
+    <p>The text may be in-line or be in a file.</p>
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+      </tr>
+      <tr>
+        <td>filtering</td>
+        <td>Whether to filter the text provided by this sub element.</td>
+        <td>No; default is <q>yes</q></td>
+      </tr>
+      <tr>
+        <td>file</td>
+        <td>A file to place at the head or tail of the concatenated text.</td>
+        <td>No</td>
+      </tr>
+      <tr>
+        <td>trim</td>
+        <td>Whether to trim the value.</td>
+        <td>No; default is <q>no</q></td>
+      </tr>
+      <tr>
+        <td>trimleading</td>
+        <td>Whether to trim leading white space on each line.</td>
+        <td>No; default is <q>no</q></td>
+      </tr>
+    </table>
+
+    <h3>Examples</h3>
+
+    <p><strong>Concatenate a string to a file:</strong></p>
+
+    <pre>&lt;concat destfile=&quot;README&quot;&gt;Hello, World!&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a series of files to the console:</strong></p>
+
+    <pre>
+&lt;concat&gt;
+  &lt;fileset dir=&quot;messages&quot; includes=&quot;*important*&quot;/&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a single file, appending if the destination file exists:</strong></p>
+
+    <pre>
+&lt;concat destfile=&quot;NOTES&quot; append=&quot;true&quot;&gt;
+  &lt;filelist dir=&quot;notes&quot; files=&quot;note.txt&quot;/&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a series of files, update the destination file only if is older that all
+      the source files:</strong></p>
+
+    <pre>
+&lt;concat destfile=&quot;${docbook.dir}/all-sections.xml&quot;
+        force=&quot;no&quot;&gt;
+  &lt;filelist dir=&quot;${docbook.dir}/sections&quot;
+            files=&quot;introduction.xml,overview.xml&quot;/&gt;
+  &lt;fileset dir=&quot;${docbook.dir}&quot;
+           includes=&quot;sections/*.xml&quot;
+           excludes=&quot;introduction.xml,overview.xml&quot;/&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a series of files, expanding Ant properties</strong></p>
+    <pre>
+&lt;concat destfile="${build.dir}/subs"&gt;
+  &lt;path&gt;
+    &lt;fileset dir="${src.dir}" includes="*.xml"/&gt;
+    &lt;pathelement location="build.xml"/&gt;
+  &lt;/path&gt;
+  &lt;filterchain&gt;
+    &lt;expandproperties/&gt;
+  &lt;/filterchain&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Filter the lines containing project from build.xml and output them to report.output,
+      prepending with a header</strong></p>
+    <pre>
+&lt;concat destfile="${build.dir}/report.output"&gt;
+  &lt;header filtering="no" trimleading="yes"&gt;
+      Lines that contain project
+      ==========================
+  &lt;/header&gt;
+  &lt;path path="build.xml"/&gt;
+  &lt;filterchain&gt;
+    &lt;linecontains&gt;
+      &lt;contains value="project"/&gt;
+    &lt;/linecontains&gt;
+  &lt;/filterchain&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a number of binary files.</strong></p>
+    <pre>
+&lt;concat destfile="${build.dir}/dist.bin" binary="yes"&gt;
+  &lt;fileset file="${src.dir}/scripts/dist.sh"/&gt;
+  &lt;fileset file="${build.dir}/dist.tar.bz2"/&gt;
+&lt;/concat&gt;</pre>
+
+  </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/condition.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/condition.html b/manual/Tasks/condition.html
index 8505b81..7c12da4 100644
--- a/manual/Tasks/condition.html
+++ b/manual/Tasks/condition.html
@@ -26,80 +26,71 @@
 
 <h2 id="condition">Condition</h2>
 <h3>Description</h3>
-<p>Sets a property if a certain condition holds true - this is a
-generalization of <a href="available.html">Available</a> and <a
-href="uptodate.html">Uptodate</a>.</p>
-<p>If the condition holds true, the property value is set to true by
-default; otherwise, the property is not set. You can set the value to
-something other than the default by specifying the <code>value</code>
-attribute.</p>
-<p>Conditions are specified as <a href="#nested">nested elements</a>,
-you must specify exactly one condition.</p>
+<p>Sets a property if a certain condition holds true&mdash;this is a generalization
+of <a href="available.html">Available</a> and <a href="uptodate.html">Uptodate</a>.</p>
+<p>If the condition holds true, the property value is set to <q>true</q> by default; otherwise, the
+property is not set. You can set the value to something other than the default by specifying
+the <var>value</var> attribute.</p>
+<p>Conditions are specified as <a href="#nested">nested elements</a>, you must specify exactly one
+condition.</p>
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property to set.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>The name of the property to set.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The value to set the property to. Defaults to
-      &quot;true&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>value</td>
+    <td>The value to set the property to.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">else</td>
-    <td valign="top">The value to set the property to if the condition
-      evaluates to <i>false</i>. By default the property will remain unset.
-      <em>Since Apache Ant 1.6.3</em>
+    <td>else</td>
+    <td>The value to set the property to if the condition evaluates to <q>false</q>. <em>Since
+      Apache Ant 1.6.3</em>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; by default the property will remain unset</td>
   </tr>
 </table>
 <h3 id="nested">Parameters specified as nested elements</h3>
-<p>All conditions to test are specified as nested elements, for a
-complete list see <a href="conditions.html">here</a>.</p>
+<p>All conditions to test are specified as nested elements, for a complete list
+see <a href="conditions.html">here</a>.</p>
 
 <h3>Examples</h3>
 <pre>
-  &lt;condition property=&quot;javamail.complete&quot;&gt;
-    &lt;and&gt;
-      &lt;available classname=&quot;javax.activation.DataHandler&quot;/&gt;
-      &lt;available classname=&quot;javax.mail.Transport&quot;/&gt;
-    &lt;/and&gt;
-  &lt;/condition&gt;
-</pre>
-<p>sets the property <code>javamail.complete</code> if both the
-JavaBeans Activation Framework and JavaMail are available in the
-classpath.</p>
+&lt;condition property=&quot;javamail.complete&quot;&gt;
+  &lt;and&gt;
+    &lt;available classname=&quot;javax.activation.DataHandler&quot;/&gt;
+    &lt;available classname=&quot;javax.mail.Transport&quot;/&gt;
+  &lt;/and&gt;
+&lt;/condition&gt;</pre>
+<p>sets the property <code>javamail.complete</code> if both the JavaBeans Activation Framework and
+JavaMail are available in the classpath.</p>
 
 <pre>
-  &lt;condition property=&quot;isMacOsButNotMacOsX&quot;&gt;
-    &lt;and&gt;
-      &lt;os family=&quot;mac&quot;/&gt;
-      &lt;not&gt;
-        &lt;os family=&quot;unix&quot;/&gt;
-      &lt;/not&gt;
-    &lt;/and&gt;
-  &lt;/condition&gt;
-</pre>
-<p>sets the property <code>isMacOsButNotMacOsX</code> if the current
-operating system is MacOS, but not MacOS X - which Ant considers to be
-in the Unix family as well.</p>
+&lt;condition property=&quot;isMacOsButNotMacOsX&quot;&gt;
+  &lt;and&gt;
+    &lt;os family=&quot;mac&quot;/&gt;
+    &lt;not&gt;
+      &lt;os family=&quot;unix&quot;/&gt;
+    &lt;/not&gt;
+  &lt;/and&gt;
+&lt;/condition&gt;</pre>
+<p>sets the property <code>isMacOsButNotMacOsX</code> if the current operating system is MacOS, but
+not MacOS X/macOS&mdash;which Ant considers to be in the Unix family as well.</p>
 
 <pre>
-  &lt;condition property=&quot;isSunOSonSparc&quot;&gt;
-    &lt;os name=&quot;SunOS&quot; arch=&quot;sparc&quot;/&gt;
-  &lt;/condition&gt;
-</pre>
-<p>sets the property <code>isSunOSonSparc</code> if the current
-operating system is SunOS and if it is running on a sparc architecture.</p>
+&lt;condition property=&quot;isSunOSonSparc&quot;&gt;
+  &lt;os name=&quot;SunOS&quot; arch=&quot;sparc&quot;/&gt;
+&lt;/condition&gt;</pre>
+<p>sets the property <code>isSunOSonSparc</code> if the current operating system is SunOS and if it
+is running on a SPARC architecture.</p>
 
 </body>
 </html>