Second reading: h5 and h6 must be styled;

uniform style of notes and new feature markers

manual/Tasks/ant.html

@@ -59,7 +59,7 @@ parameterize your subprojects.</p>
 
 <p>Properties defined on the command line cannot be overridden by
   nested <code>&lt;property&gt;</code> elements.  <em>Since Ant
-  1.8.0.</em> the same is true for nested structures
+  1.8.0</em> the same is true for nested structures
   of <code>&lt;ant&gt;</code> tasks: if a build file <em>A</em>
   invokes <em>B</em> via an <code>&lt;ant&gt;</code> task setting a
   property with a nested <code>&lt;property&gt;</code> element

manual/Tasks/antlr.html

@@ -42,7 +42,7 @@
   supergrammar specified by the glib attribute) is newer than the
   generated files.
 </p>
-<p><strong>Note:</strong> This task depends on external libraries not
+<p><strong>Note</strong>: This task depends on external libraries not
 included in the Apache Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a>
 for more information.</p>
 <p>Antlr 2.7.1 Note:

manual/Tasks/antversion.html

@@ -29,7 +29,7 @@
 <p>
 Stores the Apache Ant version (when used as task) or checks for a specific Ant version
 (when used as condition).
-<b>Since Ant 1.7.0</b>
+<em>Since Ant 1.7.0</em>
 </p>
 
 <table>

manual/Tasks/apply.html

@@ -95,7 +95,7 @@ to send input to it is via the input and inputstring attributes.</p>
     <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/>
-      <strong>Note:</strong> the default used when dir has not been
+      <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
       the current working directory, otherwise it uses the project's basedir.
@@ -233,7 +233,7 @@ to send input to it is via the input and inputstring attributes.</p>
       <i>both</i>. If set to <i>file</i>, only the names of plain
       files will be sent to the command. If set to <i>dir</i>, only
       the names of directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
+      <strong>Note</strong>: The type attribute does not apply to
       nested <i>dirset</i>s - <i>dirset</i>s always implicitly
       assume type to be <i>dir</i>.</td>
     <td align="center" valign="top">No, default is <i>file</i></td>
@@ -272,31 +272,31 @@ to send input to it is via the input and inputstring attributes.</p>
     <td valign="top">maxparallel</td>
     <td valign="top">Limit the amount of parallelism by passing at
       most this many sourcefiles at once.  Set it to &lt;= 0 for
-      unlimited. <em>Since&nbsp;Ant&nbsp;1.6.</em></td>
+      unlimited. <em>Since&nbsp;Ant&nbsp;1.6</em>.</td>
     <td align="center" valign="top">No, unlimited by default</td>
   </tr>
   <tr>
     <td valign="top">addsourcefile</td>
     <td valign="top">Whether source file names should be added to the
-      command automatically. <em>Since&nbsp;Ant&nbsp;1.6.</em></td>
+      command automatically. <em>Since&nbsp;Ant&nbsp;1.6</em>.</td>
     <td align="center" valign="top">No, default is <i>true</i></td>
   </tr>
   <tr>
     <td valign="top">verbose</td>
     <td valign="top">Whether to print a summary after execution or not.
-      <em>Since&nbsp;Ant&nbsp;1.6.</em></td>
+      <em>Since&nbsp;Ant&nbsp;1.6</em>.</td>
     <td align="center" valign="top">No, default <i>false</i></td>
   </tr>
   <tr>
     <td valign="top">ignoremissing</td>
     <td valign="top">Whether to ignore nonexistent files specified
-      via filelists.  <em>Since&nbsp;Ant&nbsp;1.6.2.</em></td>
+      via filelists.  <em>Since&nbsp;Ant&nbsp;1.6.2</em>.</td>
     <td align="center" valign="top">No, default is <i>true</i></td>
   </tr>
   <tr>
     <td valign="top">force</td>
     <td valign="top">Whether to bypass timestamp comparisons
-      for target files.  <em>Since&nbsp;Ant&nbsp;1.6.3.</em></td>
+      for target files.  <em>Since&nbsp;Ant&nbsp;1.6.3</em>.</td>
     <td align="center" valign="top">No, default is <i>false</i></td>
   </tr>
 </table>
@@ -386,7 +386,7 @@ specified if you also define a nested mapper.</p>
 system command via nested <code>&lt;env&gt;</code> elements. See the
 description in the section about <a href="exec.html#env">exec</a></p>
 <h4>redirector</h4>
-<i><b>Since&nbsp;Ant&nbsp;1.6.2</b></i>
+<em>Since&nbsp;Ant&nbsp;1.6.2</em>
 <p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
 can be specified.  &lt;apply&gt;'s behavior is like that of
 <a href="exec.html#redirector">exec</a> with regard to

manual/Tasks/attrib.html

@@ -25,7 +25,7 @@
 <body>
 
 <h2 id="attrib">Attrib</h2>
-<p><em>Since Apache Ant 1.6.</em></p>
+<p><em>Since Apache Ant 1.6</em>.</p>
 <h3>Description</h3>
 
 <p>Changes the attributes of a file or all files inside specified
@@ -39,7 +39,7 @@ href="../Types/filelist.html">FileList</a>s can be specified using
 nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and
 <code>&lt;filelist&gt;</code> elements.</p>
 
-<p>Starting with Ant 1.7, this task supports arbitrary <a
+<p><em>Since Ant 1.7</em>, this task supports arbitrary <a
 href="../Types/resources.html#collection">Resource Collection</a>s
 as nested elements.</p>
 
@@ -96,7 +96,7 @@ directory tree), so you'll have to experiment a little.</p-->
     <td valign="top">One of <i>file</i>, <i>dir</i> or <i>both</i>. If set to
       <i>file</i>, only the permissions of plain files are going to be changed.
       If set to <i>dir</i>, only the directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
+      <strong>Note</strong>: The type attribute does not apply to
       nested <i>dirset</i>s - <i>dirset</i>s always implicitly
       assume type to be <i>dir</i>.</td>
     <td align="center" valign="top">No, default is <i>file</i></td>
@@ -117,7 +117,7 @@ directory tree), so you'll have to experiment a little.</p-->
     <td valign="top">maxparallel</td>
     <td valign="top">Limit the amount of parallelism by passing at
       most this many sourcefiles at once.  Set it to &lt;= 0 for
-      unlimited.  Defaults to unlimited.  <em>Since Ant 1.6.</em></td>
+      unlimited.  Defaults to unlimited.  <em>Since Ant 1.6</em>.</td>
     <td align="center" valign="top">No</td>
   </tr-->
   <tr>

manual/Tasks/augment.html

@@ -32,7 +32,7 @@ mapped as XML attributes. This is an unusual task that makes use of Ant's intern
 processing mechanisms to reload a previously declared reference by means of the 'id'
 attribute, then treats the declared <code>augment</code> element as though it were the
 original element.
-<b>Since Apache Ant 1.8.1</b></p>
+<em>Since Apache Ant 1.8.1</em></p>
 
 <h3>Parameters</h3>
 <table>

manual/Tasks/bindtargets.html

@@ -40,7 +40,7 @@ on some other project which import them. This task helps then to modify the
 target dependencies but only in your context.
 </p>
 
-<p>Note: this task is quite equivalent to the definition of an intermediate
+<p><strong>Note</strong>: this task is quite equivalent to the definition of an intermediate
 target which will be the bridge between the target to bind and the extension
 point. For instance:
 </p>
@@ -55,7 +55,7 @@ This task basically avoid the creation of a target.
 it may not be used in a target. This is making the target dependency graph static
 and predictable as soon as every build file is loaded.</p>
 
-<p><b>Since Apache Ant 1.8.2</b></p>
+<p><em>Since Apache Ant 1.8.2</em></p>
 
 <h3>Parameters</h3>
 <table>

manual/Tasks/changelog.html

@@ -59,7 +59,7 @@ operation may fail when using such an incompatible client.
   </tr>
   <tr>
     <td valign="top">package</td>
-    <td valign="top">the package/module to check out.  <b>Note:</b>
+    <td valign="top">the package/module to check out.  <strong>Note</strong>:
       multiple attributes can be split using spaces.  Use a nested
       &lt;module&gt; element if you want to specify a module with
       spaces in its name.</td>

manual/Tasks/chgrp.html

@@ -25,7 +25,7 @@
 <body>
 
 <h2 id="chgrp">Chgrp</h2>
-<p><em>Since Apache Ant 1.6.</em></p>
+<p><em>Since Apache Ant 1.6</em>.</p>
 <h3>Description</h3>
 
 <p>Changes the group of a file or all files inside specified
@@ -92,7 +92,7 @@ could use as initial value for these experiments.</p>
       <i>both</i>. If set to <i>file</i>, only the group of
       plain files are going to be changed. If set to <i>dir</i>, only
       the directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
+      <strong>Note</strong>: The type attribute does not apply to
       nested <i>dirset</i>s - <i>dirset</i>s always implicitly
       assume type to be <i>dir</i>.</td>
     <td align="center" valign="top">No, default is <i>file</i></td>

manual/Tasks/chmod.html

@@ -39,10 +39,10 @@ FileSet's attributes and nested elements directly. More sets can be
 specified using nested <code>&lt;fileset&gt;</code> or
 <code>&lt;dirset&gt;</code> (<em>since Apache Ant 1.6</em>) elements.</p>
 
-<p>Starting with Ant 1.6, this task also supports nested <a
+<p><em>Since Ant 1.6</em>, this task also supports nested <a
 href="../Types/filelist.html">filelist</a>s.</p>
 
-<p>Starting with Ant 1.7, this task supports arbitrary <a
+<p><em>Since Ant 1.7</em>, this task supports arbitrary <a
 href="../Types/resources.html#collection">Resource Collection</a>s
 as nested elements.</p>
 
@@ -83,7 +83,7 @@ could use as initial value for these experiments.</p>
     <td valign="top">dir</td>
     <td valign="top">the directory which holds the files whose permissions
       must be changed.<br/>
-      <b>Note:</b> for backwards compatibility
+      <strong>Note</strong>: for backwards compatibility
       reasons <code>&lt;chmod&nbsp;dir="some-dir"/&gt;</code> will
       only change the permissions on "some-dir" but not recurse into
       it, unless you also specify any patterns.</td>
@@ -123,7 +123,7 @@ could use as initial value for these experiments.</p>
       <i>both</i>. If set to <i>file</i>, only the permissions of
       plain files are going to be changed. If set to <i>dir</i>, only
       the directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
+      <strong>Note</strong>: The type attribute does not apply to
       nested <i>dirset</i>s - <i>dirset</i>s always implicitly
       assume type to be <i>dir</i>.</td>
     <td align="center" valign="top">No, default is <i>file</i></td>
@@ -132,13 +132,13 @@ could use as initial value for these experiments.</p>
     <td valign="top">maxparallel</td>
     <td valign="top">Limit the amount of parallelism by passing at
       most this many sourcefiles at once.  Set it to &lt;= 0 for
-      unlimited.  Defaults to unlimited.  <em>Since Ant 1.6.</em></td>
+      unlimited.  Defaults to unlimited.  <em>Since Ant 1.6</em>.</td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
     <td valign="top">verbose</td>
     <td valign="top">Whether to print a summary after execution or not.
-      Defaults to <code>false</code>.  <em>Since Ant 1.6.</em></td>
+      Defaults to <code>false</code>.  <em>Since Ant 1.6</em>.</td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>

manual/Tasks/chown.html

@@ -25,7 +25,7 @@
 <body>
 
 <h2 id="chown">Chown</h2>
-<p><em>Since Apache Ant 1.6.</em></p>
+<p><em>Since Apache Ant 1.6</em>.</p>
 <h3>Description</h3>
 
 <p>Changes the owner of a file or all files inside specified
@@ -91,7 +91,7 @@ could use as initial value for these experiments.</p>
       <i>both</i>. If set to <i>file</i>, only the owner of
       plain files are going to be changed. If set to <i>dir</i>, only
       the directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
+      <strong>Note</strong>: The type attribute does not apply to
       nested <i>dirset</i>s - <i>dirset</i>s always implicitly
       assume type to be <i>dir</i>.</td>
     <td align="center" valign="top">No, default is <i>file</i></td>

manual/Tasks/conditions.html

@@ -264,7 +264,7 @@ TCP/IP listener at the specified host and port.</p>
 <p>Test two files for matching. Nonexistence of one file results in "false",
 although if neither exists they are considered equal in terms of content.
 This test does a byte for byte comparison, so test time scales with
-byte size. NB: if the files are different sizes, one of them is missing
+byte size. <strong>Note</strong>: if the files are different sizes, one of them is missing
 or the filenames match the answer is so obvious the detailed test is omitted.
 
 </p>
@@ -288,7 +288,7 @@ or the filenames match the answer is so obvious the detailed test is omitted.
     <td valign="top">textfile</td>
     <td valign="top">Whether to ignore line endings when comparing
         files; defaults to <i>false</i> which triggers a binary
-        comparison. <i>Since Ant 1.7</i>
+        comparison. <em>Since Ant 1.7</em>
     </td>
     <td align="center">No</td>
   </tr>
@@ -395,7 +395,7 @@ that is "true","yes", or "on"</p>
     signature validation; it only looks for the presence of a signature.
   </p>
   <p>
-    This condition was added in Apache Ant 1.7.
+    <em>Since Apache Ant 1.7</em>.
   </p>
   <table>
   <tr>
@@ -424,7 +424,7 @@ that is "true","yes", or "on"</p>
     <a href="../Types/selectors.html">selector</a>.
   </p>
   <p>
-    This condition was added in Apache Ant 1.6.3.
+    <em>Since Apache Ant 1.6.3</em>.
   </p>
   <table>
   <tr>
@@ -461,7 +461,7 @@ that is "true","yes", or "on"</p>
 its implementation class can be loaded. Types include
 tasks, datatypes, scriptdefs, macrodefs and presetdefs.</p>
 
-<p>This condition was added in Apache Ant 1.7.</p>
+<p><em>Since Apache Ant 1.7</em>.</p>
 
 <table>
   <tr>
@@ -504,7 +504,7 @@ See the <a href="../Tasks/script.html">Script</a> task for
 an explanation of scripts and dependencies.
 </p>
 
-<p>This condition was added in Apache Ant 1.7.</p>
+<p><em>Since Apache Ant 1.7</em>.</p>
 
 <table>
   <tr>
@@ -538,7 +538,7 @@ an explanation of scripts and dependencies.
   </tr>
   <tr>
     <td valign="top">encoding</td>
-    <td valign="top">The encoding of the script source. <em>since Ant 1.10.2.</em></td>
+    <td valign="top">The encoding of the script source. <em>Since Ant 1.10.2</em>.</td>
     <td valign="top" align="center">No - defaults to default JVM encoding</td>
   </tr>
   <tr>
@@ -594,7 +594,7 @@ sets the value to false. This condition always evaluates to "false"
 feature or property, as per the SAX/JAXP specifications, by
 attempting to set the appropriate property/feature/</p>
 
-<p>This condition was added in Apache Ant 1.7.</p>
+<p><em>Since Apache Ant 1.7</em>.</p>
 
 <table>
   <tr>
@@ -668,9 +668,7 @@ using a protocol such as HTTP, while the lower level ICMP packets get dropped
 on the floor. Similarly, a host may detected as reachable with ICMP, but
 not reachable on other ports (i.e. port 80), because of firewalls.
 </p>
-<p>
-
-This condition was added in Apache Ant 1.7.</p>
+<p><em>Since Apache Ant 1.7</em>.</p>
 
 <table>
   <tr>
@@ -718,7 +716,7 @@ Probe for the maven repository being reachable using the hostname, ten second ti
 <h4 id="length">length</h4>
 <p>This condition is a facet of the <a href="length.html">Length</a> task.
   It is used to test the length of a string or one or more files.
-  <i>Since Ant 1.6.3</i>
+  <em>Since Ant 1.6.3</em>
 </p>
 
 <blockquote><pre>
@@ -734,7 +732,7 @@ Probe for the maven repository being reachable using the hostname, ten second ti
 <h4 id="isfailure">isfailure</h4>
 
 <p>Test the return code of an executable (see the
-<a href="exec.html">Exec</a> task) for failure. <i>Since Ant 1.7</i></p>
+<a href="exec.html">Exec</a> task) for failure. <em>Since Ant 1.7</em></p>
 
 <table>
   <tr>
@@ -754,7 +752,7 @@ Probe for the maven repository being reachable using the hostname, ten second ti
   <a href="resourcecount.html">ResourceCount</a> task.
   It is used to test the size of a
   <a href="../Types/resources.html#collection">resource collection</a>.
-  <i>Since Ant 1.7</i>
+  <em>Since Ant 1.7</em>
 </p>
 
 <blockquote><pre>
@@ -766,12 +764,12 @@ Probe for the maven repository being reachable using the hostname, ten second ti
 <p>Test resources for matching. Nonexistence of one or more resources results in
 "false", although if none exists they are considered equal in terms of content.
 By default this test does a byte for byte comparison, so test time scales with
-byte size. NB: if the files are different sizes, one of them is missing
+byte size. <strong>Note</strong>: if the files are different sizes, one of them is missing
 or the filenames match the answer is so obvious the detailed test is omitted.
 The resources to check are specified as nested
 <a href="../Types/resources.html#collection">resource collections</a>,
 meaning that more than two resources can be checked; in this case all resources
-must match. <i>Since Ant 1.7</i>
+must match. <em>Since Ant 1.7</em>
 </p>
 <table>
   <tr>
@@ -792,7 +790,7 @@ must match. <i>Since Ant 1.7</i>
 <h4 id="resourcecontains">resourcecontains</h4>
 <p>Tests whether a resource contains a given (sub)string.</p>
 <p>The resources to check are specified via references or - in the
-  case of file resources via the resource attribute.  <i>Since Ant 1.7.1</i>
+  case of file resources via the resource attribute.  <em>Since Ant 1.7.1</em>
 </p>
 <table>
   <tr>
@@ -829,7 +827,7 @@ must match. <i>Since Ant 1.7</i>
     Tests for a class having a method or field. If the class is not found
     or fails to load, the build fails.
 
-    <i>Since Ant 1.7</i>
+    <em>Since Ant 1.7</em>
 </p>
 
 <table>
@@ -886,7 +884,7 @@ must match. <i>Since Ant 1.7</i>
 <p>
   Test if the specified string matches the specified regular
   expression pattern.
-  <i>Since Ant 1.7</i></p>
+  <em>Since Ant 1.7</em></p>
 
 <table>
   <tr>
@@ -997,7 +995,7 @@ is redundant and will be ignored.</p>
 
 <p>
   Tests a partition to see if there is enough space.
-  <i>Since Ant 1.7.0</i></p>
+  <em>Since Ant 1.7.0</em></p>
   <p>Needed attribute can be specified using standard computing terms:</p>
     <ul>
       <li>K : Kilobytes (1024 bytes)</li>

manual/Tasks/copy.html

@@ -41,7 +41,7 @@ using a nested mapper (or the flatten attribute) may not be what you
 expect.</p>
 
 <p>
-<strong>Note:</strong> If you employ filters in your copy operation,
+<strong>Note</strong>: If you employ filters in your copy operation,
 you should limit the copy to text files. Binary files will be corrupted
 by the copy operation.
 This applies whether the filters are implicitly defined by the
@@ -103,7 +103,7 @@ operation as <a href="../Types/filterset.html">filtersets</a>.
     <td valign="top">filtering</td>
     <td valign="top">Indicates whether token filtering using the <a href="../using.html#filters">global
         build-file filters</a> should take place during the copy.
-      <em>Note</em>: Nested <code>&lt;filterset&gt;</code> elements will
+      <strong>Note</strong>: Nested <code>&lt;filterset&gt;</code> elements will
       always be used, even if this attribute is not specified, or its value is
       <code>false</code> (<code>no</code>, or <code>off</code>).</td>
     <td valign="top" align="center">No; defaults to false.</td>
@@ -317,7 +317,7 @@ destination directory, flattening the directory structure.</b></p>
 <p>The paragraph following the previous example applies to this
   example as well.</p>
 
-<p><strong>Unix Note:</strong> File permissions are not retained when files
+<p><strong>Unix Note</strong>: File permissions are not retained when files
 are copied; they end up with the default <code>UMASK</code> permissions
 instead. This
 is caused by the lack of any means to query or set file permissions in the
@@ -325,14 +325,14 @@ current Java runtimes. If you need a permission-preserving copy function,
 use <code>&lt;exec executable="cp" ... &gt;</code> instead.
 </p>
 
-<p><strong>Windows Note:</strong> If you copy a file to a directory
+<p><strong>Windows Note</strong>: If you copy a file to a directory
 where that file already exists, but with different casing,
 the copied file takes on the case of the original. The workaround is to
 <a href="delete.html">delete</a>
 the file in the destination directory before you copy it.
 </p>
   <p id="encoding">
-    <strong>Important Encoding Note:</strong>
+    <strong>Important Encoding Note</strong>:
     The reason that binary files when filtered get corrupted is that
     filtering involves reading in the file using a Reader class. This
     has an encoding specifying how files are encoded. There are a number

manual/Tasks/cvs.html

@@ -37,7 +37,7 @@ for certain other cvs clients - like CVSNT for example - and some
 operation may fail when using such an incompatible client.
 </p>
 
-<p><b>CVSNT Note</b>: CVSNT prefers users to store the passwords
+<p><strong>CVSNT Note</strong>: CVSNT prefers users to store the passwords
 inside the registry.  If the <a href="cvspass.html">cvspass task</a>
 and the passfile attribute don't seem to work for you, the most likely
 reason is that CVSNT ignores your .cvspass file completely.  See <a
@@ -90,7 +90,7 @@ report 21657</a> for recommended workarounds.</p>
   </tr>
   <tr>
     <td valign="top">package</td>
-    <td valign="top">the package/module to check out.  <b>Note:</b>
+    <td valign="top">the package/module to check out.  <strong>Note</strong>:
       multiple attributes can be split using spaces.  Use a nested
       &lt;module&gt; element if you want to specify a module with
       spaces in its name.</td>

manual/Tasks/cvspass.html

@@ -28,7 +28,7 @@
 <h3>Description</h3>
 <p>Adds entries to a .cvspass file. Adding entries to this file has the same affect as a cvs login command.</p>
 
-<p><b>CVSNT Note</b>: CVSNT prefers users to store the passwords
+<p><strong>CVSNT Note</strong>: CVSNT prefers users to store the passwords
 inside the registry.  If the task doesn't seem to work for you, the
 most likely reason is that CVSNT ignores your .cvspass file
 completely.  See <a

manual/Tasks/cvsversion.html

@@ -28,7 +28,7 @@
 <h3>Description</h3>
 <p>
 This task allows to retrieve a CVS client and server version.
-  <i>Since Apache Ant 1.6.1.</i>
+  <em>Since Apache Ant 1.6.1</em>.
 </p>
 <h3>Parameters</h3>
 <table>

manual/Tasks/delete.html

@@ -71,10 +71,10 @@ in <strong>Directory-based Tasks</strong>, and see the
     <td valign="top">dir</td>
     <td valign="top">The directory to delete, including all its files and
      subdirectories.<br>
-     <b>Note:</b> <code>dir</code> is <em>not</em> used
+     <strong>Note</strong>: <code>dir</code> is <em>not</em> used
      to specify a directory name for <code>file</code>; <code>file</code>
      and <code>dir</code> are independent of each other.<br>
-     <b>WARNING:</b> Do <b>not</b> set <code>dir</code> to
+     <strong>Warning</strong>: Do <b>not</b> set <code>dir</code> to
      <code>&quot;.&quot;</code>, <code>&quot;${basedir}&quot;</code>,
      or the full-pathname equivalent unless you truly <em>intend</em> to
      recursively remove the entire contents of the current base directory
@@ -116,7 +116,7 @@ in <strong>Directory-based Tasks</strong>, and see the
   </tr>
   <tr>
     <td valign="top">includes</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
+    <td valign="top"><em>Deprecated</em>.  Use resource collections.
       Comma- or space-separated list of patterns of
       files that must be deleted. All files are relative to the directory
       specified in <code>dir</code>.</td>
@@ -124,14 +124,14 @@ in <strong>Directory-based Tasks</strong>, and see the
   </tr>
   <tr>
     <td valign="top">includesfile</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
+    <td valign="top"><em>Deprecated</em>.  Use resource collections.
       The name of a file. Each line of
       this file is taken to be an include pattern.</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
     <td valign="top">excludes</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
+    <td valign="top"><em>Deprecated</em>.  Use resource collections.
       Comma- or space-separated list of patterns of
       files that must be excluded from the deletion list.
       All files are relative to the directory specified in <code>dir</code>.
@@ -140,14 +140,14 @@ in <strong>Directory-based Tasks</strong>, and see the
   </tr>
   <tr>
     <td valign="top">excludesfile</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
+    <td valign="top"><em>Deprecated</em>.  Use resource collections.
       The name of a file. Each line of
       this file is taken to be an exclude pattern</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
     <td valign="top">defaultexcludes</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
+    <td valign="top"><em>Deprecated</em>.  Use resource collections.
       Whether to use <a href="../dirtasks.html#defaultexcludes">
       default excludes.</a></td>
     <td align="center" valign="top">No, default &quot;true&quot;</td>

manual/Tasks/dependset.html

@@ -79,7 +79,7 @@ well as other stylesheets imported by the main stylesheet.
 
 <p>The <code>&lt;sources&gt;</code> element is a
 <a href="../Types/resources.html#union">Union</a> into which
-arbitrary resource collections can be nested. <b>Since Apache Ant 1.7</b>
+arbitrary resource collections can be nested. <em>Since Apache Ant 1.7</em>
 </p>
 
 <h4>srcfileset</h4>
@@ -106,7 +106,7 @@ filelists.  Multiple <code>&lt;srcfilelist&gt;</code> filelists may be specified
 
 <p>The <code>&lt;targets&gt;</code> element is a
 <a href="../using.html#path">Path</a> and thus can
-include any filesystem-based resource. <b>Since Ant 1.7</b>
+include any filesystem-based resource. <em>Since Ant 1.7</em>
 </p>
 
 <h4>targetfileset</h4>

manual/Tasks/diagnostics.html

@@ -29,7 +29,7 @@
 <p>
 Runs Apache Ant's <code>-diagnostics</code> code inside Ant itself. This is good for
 debugging Ant's configuration under an IDE.
-<b>Since Ant 1.7.0</b>
+<em>Since Ant 1.7.0</em>
 </p>
 
 <h3>Examples</h3>

manual/Tasks/dirname.html

@@ -37,7 +37,7 @@ filename, the filename will be dropped. If the specified file is just
 a filename, the directory will be the current directory.
 </p>
   <p>
-    <em>Note:</em> This is not the same as the UNIX dirname command, which is
+    <strong>Note</strong>: This is not the same as the UNIX dirname command, which is
     defined as "strip non-directory suffix from filename". &lt;dirname&gt;
     determines the full directory path of the specified file.
   </p>

manual/Tasks/ear.html

@@ -209,7 +209,7 @@ to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
     that the permissions haven't been stored at all rather than real
     permissions and will instead apply its own default values.<br/>
     Set this attribute to true if you really want to preserve the
-      original permission field.<em>since Ant 1.8.0</em>
+      original permission field. <em>since Ant 1.8.0</em>
     </td>
     <td valign="top" align="center">No, default is false</td>
   </tr>

manual/Tasks/echo.html

@@ -57,7 +57,7 @@ ignored</p>
     <td valign="top">output</td>
     <td valign="top">the <a href="../Types/resources.html">Resource</a>
       to write the message to (see <a href="../develop.html#set-magic">note</a>).
-      <b>Since Apache Ant 1.8</b></td>
+      <em>Since Apache Ant 1.8</em></td>
   </tr>
   <tr>
     <td valign="top">append</td>

manual/Tasks/echoxml.html

@@ -26,7 +26,7 @@
 
 <h2>EchoXML</h2>
 <h3>Description</h3>
-<p>Echo nested XML to the console or a file. <b>Since Apache Ant 1.7</b></p>
+<p>Echo nested XML to the console or a file. <em>Since Apache Ant 1.7</em></p>
 <h3>Parameters</h3>
 <table>
   <tr>

manual/Tasks/exec.html

@@ -32,7 +32,7 @@ systems.</p>
 
 <p>Note that you cannot interact with the forked program, the only way
 to send input to it is via the input and inputstring attributes. Also note that
-since Ant 1.6, any attempt to read input in the forked program will receive an
+<em>since Ant 1.6</em>, any attempt to read input in the forked program will receive an
 EOF (-1). This is a change from Ant 1.5, where such an attempt would block.</p>
 
 <p>If you want to execute an executable using a path relative to the
@@ -169,7 +169,7 @@ start with something like:</p>
     <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/>
-      <strong>Note:</strong> the default used when dir has not been
+      <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
       the current working directory, otherwise it uses the project's basedir.
@@ -343,7 +343,7 @@ system command via nested <code>&lt;env&gt;</code> elements.</p>
     <td valign="top">
       The name of the environment variable.
       <br/>
-      <em>Note: since Ant 1.7</em>,
+      <strong>Note</strong>: <em>since Ant 1.7</em>,
       for Windows, the name is case-insensitive.
     </td>
     <td align="center" valign="top">Yes</td>
@@ -366,7 +366,7 @@ system command via nested <code>&lt;env&gt;</code> elements.</p>
   </tr>
 </table>
 <h4 id="redirector">redirector</h4>
-<i>Since Ant 1.6.2</i>
+<em>Since Ant 1.6.2</em>
 <p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
 can be specified.  In general, the attributes of the redirector behave
 as the corresponding attributes available at the task level.  The most
@@ -446,7 +446,7 @@ Output is sent to the file &quot;redirector.out&quot; and stored
 in a property of the same name.  Similarly, error output is sent to
 a file and a property, both named &quot;redirector.err&quot;.
 
-<p><b>Note:</b> do not try to specify arguments using
+<p><strong>Note</strong>: do not try to specify arguments using
 a simple arg-element and separate them by spaces. This results in
 only a single argument containing the entire string.</p>
 <p>

manual/Tasks/fail.html

@@ -69,7 +69,7 @@ or character data nested into the element.</p>
   conditional failure can be achieved using a single nested
   <code>&lt;condition&gt;</code> element, which should contain exactly one
   core or custom condition.  For information about conditions, see
-  <a href="conditions.html">here</a>.<br><i>Since Ant 1.6.2</i>
+  <a href="conditions.html">here</a>.<br><em>Since Ant 1.6.2</em>
 </p>
 
 <h3>Examples</h3>

manual/Tasks/fixcrlf.html

@@ -62,7 +62,7 @@
   </p>
 
   <p>
-    Since <i>Apache Ant 1.7</i>, this task can be used in a
+    <em>Since Apache Ant 1.7</em>, this task can be used in a
     <a href="../Types/filterchain.html">filterchain</a>.
   </p>
 
@@ -85,7 +85,7 @@
   </tr>
   <tr>
     <td valign="top">file</td>
-    <td valign="top">Name of a single file to fix. <i>Since Ant 1.7</i></td>
+    <td valign="top">Name of a single file to fix. <em>Since Ant 1.7</em></td>
     <td>&nbsp;</td>
   </tr>
   <tr>
@@ -140,14 +140,14 @@
   <tr>
     <td valign="top">outputencoding</td>
     <td valign="top">The encoding to use when writing the files.
-                     <i>Since Ant 1.7</i></td>
+                     <em>Since Ant 1.7</em></td>
     <td align="center">No; defaults to the value of the encoding attribute.</td>
     <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">preservelastmodified</td>
     <td valign="top">Whether to preserve the last modified
-                     date of source files. <i>Since Ant 1.6.3</i></td>
+                     date of source files. <em>Since Ant 1.6.3</em></td>
     <td align="center">No; default is <i>false</i></td>
     <td>&nbsp;</td>
   </tr>
@@ -280,7 +280,7 @@
   <tr>
     <td valign="top">fixlast</td>
     <td valign="top">Whether to add a missing EOL to the last line
-                     of a processed file.<br/>Ignored if EOL is asis.<br/><i>Since Ant 1.6.1</i></td>
+                     of a processed file.<br/>Ignored if EOL is asis.<br/><em>Since Ant 1.6.1</em></td>
     <td align="center" colspan="2">No; default is <i>true</i></td>
   </tr>
 </table>

manual/Tasks/ftp.html

@@ -29,7 +29,7 @@
 <p>The ftp task implements a basic FTP client that can send, receive,
 list, delete files, and create directories.  See below for descriptions and examples of how
 to perform each task.</p>
-<p><b>Note:</b> This task depends on external libraries not included in the Apache Ant distribution.
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant distribution.
 See <a href="../install.html#commons-net">Library Dependencies</a> for more information.
 <i>Get the latest version of this library, for the best support in Ant</i>
 
@@ -50,7 +50,7 @@ This task does not currently use the proxy information set by the
 <a href="setproxy.html"><code>&lt;setproxy&gt;</code></a> task, and cannot go through
 a firewall via socks.
 <p>
-<b>Warning:</b> there have been problems reported concerning the ftp get with the <code>newer</code> attribute.
+<strong>Warning:</strong> there have been problems reported concerning the ftp get with the <code>newer</code> attribute.
 Problems might be due to format of <code>ls -l</code> differing from what is expected by commons-net,
 for instance due to specificities of language used by the ftp server in the directory listing.
 If you encounter such a problem, please send an email including a sample directory listing
@@ -219,13 +219,13 @@ try to set up a new connection.</p>
     <td valign="top">preservelastmodified</td>
     <td valign="top">Give the copied files the same last modified
       time as the original source files (applies to getting files only).
-      (<em>Note</em>: Ignored on Java 1.1)</td>
+      (<strong>Note</strong>: Ignored on Java 1.1)</td>
     <td valign="top" align="center">No; defaults to false.</td>
   </tr>
   <tr>
     <td valign="top">retriesAllowed</td>
     <td valign="top">Set the number of retries allowed on an file-transfer operation.
-    If a number > 0 specified, each file transfer can fail up to that
+    If a number &gt; 0 specified, each file transfer can fail up to that
     many times before the operation is failed.  If -1 or "forever" specified, the
     operation will keep trying until it succeeds.</td>
     <td valign="top" align="center">No; defaults to 0</td>

manual/Tasks/get.html

@@ -33,13 +33,13 @@ the runtime is valid here, including http:, ftp: and jar:;
 The <i>usetimestamp</i> option enables you to control downloads so that the remote file is
 only fetched if newer than the local copy. If there is no local copy, the download always takes
 place. When a file is downloaded, the timestamp of the downloaded file is set to the remote timestamp.
-NB: This timestamp facility only works on downloads using the HTTP protocol.
+<strong>Note</strong>: This timestamp facility only works on downloads using the HTTP protocol.
 <p>
 A username and password can be specified, in which case basic 'slightly encoded
 plain text' authentication is used. This is only secure over an HTTPS link.
 </p>
 
-<p><b>Proxies</b>. Since Apache Ant 1.7.0, Ant running on Java 5 or later can
+<p><b>Proxies</b>. <em>Since Apache Ant 1.7.0</em>, Ant running on Java 5 or later can
   <a href="../proxy.html">use the proxy settings of the operating
     system</a> if enabled with the
   <code>-autoproxy</code> option. There is also the
@@ -124,7 +124,7 @@ plain text' authentication is used. This is only secure over an HTTPS link.
     <td valign="top">httpusecaches</td>
     <td valign="top">HTTP only - if true, allow caching at the
       HttpUrlConnection level.  if false, turn caching off.<br/>
-      <b>Note</b> this is only a hint to the underlying UrlConnection
+      <strong>Note</strong> this is only a hint to the underlying UrlConnection
       class, implementations and proxies are free to ignore the
       setting.</td>
     <td align="center" valign="top">No; default "true"</td>

manual/Tasks/import.html

@@ -35,7 +35,7 @@
   </p>
 
   <p>
-    <b>Note</b> as seen above, this task heavily relies on the ProjectHelper
+    <strong>Note</strong> as seen above, this task heavily relies on the ProjectHelper
     implementation and doesn't really perform any work of its own.  If
     you have configured Apache Ant to use a ProjectHelper other than Ant's
     default, this task may or may not work.
@@ -176,7 +176,7 @@ project).</p>
       </td>
       <td valign="top">
         The file to import. If this is a relative file name, the file name will be resolved
-        relative to the <i>importing</i> file. <b>Note</b>, this is unlike most other
+        relative to the <i>importing</i> file. <strong>Note</strong>: this is unlike most other
         Ant file attributes, where relative files are resolved relative to ${basedir}.
       </td>
       <td valign="top" align="center">Yes or a nested resource collection</td>

manual/Tasks/include.html

@@ -30,7 +30,7 @@
   <p><em>since Apache Ant 1.8.0</em></p>
 
   <p>
-    <b>Note</b> this task heavily relies on the ProjectHelper
+    <strong>Note</strong> this task heavily relies on the ProjectHelper
     implementation and doesn't really perform any work of its own.  If
     you have configured Ant to use a ProjectHelper other than Ant's
     default, this task may or may not work.
@@ -171,7 +171,7 @@ project).</p>
       </td>
       <td valign="top">
         The file to include. If this is a relative file name, the file name will be resolved
-        relative to the <i>including</i> file. <b>Note</b>, this is unlike most other
+        relative to the <i>including</i> file. <strong>Note</strong>, this is unlike most other
         ant file attributes, where relative files are resolved relative to ${basedir}.
       </td>
       <td valign="top" align="center">Yes or a nested resource collection</td>

manual/Tasks/input.html

@@ -99,7 +99,7 @@ file and load in before the input task.</p>
 </table>
 <h3>Parameters Specified as Nested Elements</h3>
 <h4>Handler</h4>
-<p>Since <b>Ant 1.7</b>, a nested &lt;handler&gt; element can be used to
+<p><em>Since Ant 1.7</em>, a nested &lt;handler&gt; element can be used to
 specify an InputHandler, so that different InputHandlers may be used
 among different Input tasks.</p>
 
@@ -111,7 +111,7 @@ among different Input tasks.</p>
   </tr>
   <tr id="handler.type">
     <td valign="top">type</td>
-    <td valign="top">one of "default","propertyfile", "greedy", or "secure" (since Ant 1.8).
+    <td valign="top">one of "default","propertyfile", "greedy", or "secure" (<em>since Ant 1.8</em>).
     </td>
     <td align="center" valign="top" rowspan="3">One of these</td>
   </tr>

manual/Tasks/jar.html

@@ -90,9 +90,9 @@ to a value other than its default, <code>"add"</code>.</b></p>
 
 <p>To cryptographically sign your JAR file, use the <a href="signjar.html">SignJar task</a> on the JAR that you create from this task.</p>
 
-<p>For creating a simple version of a <a target="_blank" href="http://openjdk.java.net/jeps/238">JEP-238 multi release jar</a>,
+<p>For creating a simple version of a <a target="_blank" href="http://openjdk.java.net/jeps/238">JEP 238 multi-release jar</a>,
 you don't need any special tools. Just set the required manifest entry and place the files where required, as you could see
-in the <a href="#jep238-example">JEP238-example</a>. If you want to tune this kind of jar, e.g. decreasing the size by deleting
+in the <a href="#jep238-example">JEP 238 example</a>. If you want to tune this kind of jar, e.g. decreasing the size by deleting
 'same' classes from the versions-branches, you have to do more ...</p>
 
 <h3>Parameters</h3>
@@ -273,7 +273,7 @@ in the <a href="#jep238-example">JEP238-example</a>. If you want to tune this ki
     that the permissions haven't been stored at all rather than real
     permissions and will instead apply its own default values.<br/>
     Set this attribute to true if you really want to preserve the
-      original permission field.<em>since Ant 1.8.0</em>
+      original permission field. <em>since Ant 1.8.0</em>
     </td>
     <td valign="top" align="center">No, default is false</td>
   </tr>
@@ -585,10 +585,10 @@ Sealed: false</code></pre></blockquote>
 </pre></blockquote>
 
 
-<h4 id="jep238-example">JEP238 example: a Multi-Release JAR Files</h4>
+<h4 id="jep238-example">JEP 238 example: a Multi-Release JAR Files</h4>
 <p>
   Here we want to create a <i>Multi-Release JAR File</i> according the specification
-  <a target="_blank" href="http://openjdk.java.net/jeps/238">JEP-238</a>.
+  <a target="_blank" href="http://openjdk.java.net/jeps/238">JEP 238</a>.
   It defines on top of a JAR the possibility to place additional or overwriting classes
   in a jar, which are available according to the Java version you run.<br>
   Basically it sais, that you have to set the manifest entry <tt>Multi-Release: true</tt>

manual/Tasks/java.html

@@ -122,12 +122,12 @@ attributes.</p>
     <td valign="top">module</td>
     <td valign="top">The initial or main module to resolve. To specify
     the module main class use the <a href="#classname">classname</a> attribute.
-    Fork must be set to true if this option is selected.<em>since Ant 1.9.7</em></td>
+    Fork must be set to true if this option is selected. <em>since Ant 1.9.7</em></td>
     <td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
   </tr>
   <tr>
     <td valign="top">modulepath</td>
-    <td valign="top">Specify where to find application modules. A list of directories of modules, module files or exploded modules.<em>since Ant 1.9.7</em></td>
+    <td valign="top">Specify where to find application modules. A list of directories of modules, module files or exploded modules. <em>since Ant 1.9.7</em></td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
@@ -283,7 +283,7 @@ see <a href="../Types/permissions.html">permissions</a></p>
 <p>When the permission RuntimePermission exitVM has not been granted (or has
 been revoked) the System.exit() call will be intercepted
 and treated like indicated in <i>failonerror</i>.</p>
-<p>Note:<br>
+<p><strong>Note</strong>:<br>
 If you do not specify permissions,
 a set of default permissions will be added to your Java invocation to make
 sure that the Ant run will continue or terminated as indicated by
@@ -303,7 +303,7 @@ subelement.</p>
 
 <p>Assertion statements are currently ignored in non-forked mode.</p>
 
-<p><em>since Ant 1.6.</em></p>
+<p><em>since Ant 1.6</em>.</p>
 
 <h4 id="redirector">redirector</h4>
 <em>Since Ant 1.6.2</em>

manual/Tasks/javac.html

@@ -32,7 +32,7 @@ source files to compile. Only Java files that have no corresponding
 <code>.class</code> file
 or where the class file is older than the
 <code>.java</code> file will be compiled.</p>
-<p>Note: Apache Ant uses only the names of the source and class files to find
+<p><strong>Note</strong>: Apache Ant uses only the names of the source and class files to find
 the classes that need a rebuild. It will not scan the source and therefore
 will have no knowledge about nested classes, classes that are named different
 from the source file, and so on. See the
@@ -120,7 +120,7 @@ switch <code>-depend</code> instead of <code>-Xdepend</code>.</p>
 files/directories from the classpath it passes to the compiler.</p>
 <p>The working directory for a forked executable (if any) is the
   project's base directory.</p>
-<p><strong>Windows Note:</strong>When the modern compiler is used
+<p><strong>Windows Note</strong>: When the modern compiler is used
 in unforked mode on Windows, it locks up the files present in the
 classpath of the <code>&lt;javac&gt;</code> task, and does not release them.
 The side effect of this is that you will not be able to delete or move
@@ -224,7 +224,7 @@ invoking the compiler.</p>
   </tr>
   <tr>
     <td valign="top">encoding</td>
-    <td valign="top">Encoding of source files. (Note: gcj doesn't support
+    <td valign="top">Encoding of source files. (<strong>Note</strong>: gcj doesn't support
       this option yet.)</td>
     <td align="center" valign="top">No</td>
   </tr>
@@ -319,7 +319,7 @@ invoking the compiler.</p>
     <td valign="top">Whether to include the default run-time
       libraries from the executing VM in the classpath;
       defaults to <code>no</code>.<br/>
-      <b>Note:</b> In some setups the run-time libraries may be part
+      <strong>Note</strong>: In some setups the run-time libraries may be part
       of the "Ant run-time libraries" so you may need to explicitly
       set includeAntRuntime to false to ensure that the Java
       run-time libraries are not included.</td>
@@ -337,7 +337,7 @@ invoking the compiler.</p>
       executable to use in case of <code>fork=&quot;yes&quot;</code>.
       Defaults to the compiler of the Java version that is currently
       running Ant.  Ignored if <code>fork=&quot;no&quot;</code>.<br>
-      Since Ant 1.6 this attribute can also be used to specify the
+      <em>Since Ant 1.6</em> this attribute can also be used to specify the
       path to the executable when using jikes, jvc, gcj or sj.</td>
     <td align="center" valign="top">No</td>
   </tr>
@@ -461,8 +461,8 @@ invoking the compiler.</p>
       Some package level annotations in <code>package-info.java</code>
       files don't create any <code>package-info.class</code> files so
       Ant would recompile the same file every time.<br/>
-      Starting with Ant 1.8 Ant will create an
-      empty <code>package-info.class</code> for
+      <em>Since Ant 1.8</em>, an
+      empty <code>package-info.class</code> is created for
       each <code>package-info.java</code> if there isn't one created
       by the compiler.<br/>
       In some setups this additional class causes problems and it can
@@ -594,7 +594,7 @@ used.</p>
     <td valign="top">prefix</td>
     <td align="center" rowspan="2">See
     <a href="../using.html#arg">Command-line Arguments</a>.
-    <em>Since Ant 1.8.</em></td>
+    <em>Since Ant 1.8</em>.</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -612,7 +612,7 @@ used.</p>
   </tr>
 </table>
 
-<h4>compilerclasspath <em>since Ant 1.8.0</em></h4>
+<h4>compilerclasspath (<em>since Ant 1.8.0</em>)</h4>
 
 <p>A <a href="../using.html#path">PATH like structure</a> holding the
   classpath to use when loading the compiler implementation if a
@@ -620,7 +620,7 @@ used.</p>
   using one of the built-in compilers.</p>
 
 <h4>Any nested element of a type that implements CompilerAdapter
-  <em>since Ant 1.8.0</em></h4>
+  (<em>since Ant 1.8.0</em>)</h4>
 
 <p>If a defined type implements the <code>CompilerAdapter</code>
   interface a nested element of that type can be used as an
@@ -713,7 +713,7 @@ Java VM of a different version:</p>
          executable=&quot;/opt/java/jdk1.1/bin/javac&quot;
          compiler=&quot;javac1.1&quot;/&gt;</pre>
 
-<p id="srcdirnote"><b>Note:</b>
+<p id="srcdirnote"><strong>Note</strong>:
 If you wish to compile only source files located in certain packages below a
 common root, use the <code>include</code>/<code>exclude</code> attributes
 or <code>&lt;include&gt;</code>/<code>&lt;exclude&gt;</code> nested elements
@@ -748,7 +748,7 @@ could show in the log, that these settings are fix.</p>
          fork=&quot;true&quot;
          taskname=&quot;javac1.4&quot;/&gt;</pre>
 
-<p><b>Note:</b> If you are using Ant on Windows and a new DOS window pops up
+<p><strong>Note</strong>: If you are using Ant on Windows and a new DOS window pops up
 for every use of an external compiler, this may be a problem of the JDK you are
 using.  This problem may occur with all JDKs &lt; 1.2.</p>
 
@@ -887,8 +887,8 @@ while all others are <code>false</code>.</p>
   The Sun javac compiler has a <em>bootclasspath</em> command
   line option - this corresponds to the "bootclasspath" attribute/element
   of the &lt;javac&gt; task. The Sun compiler also allows more
-  control over the boot classpath using the -X and -J-X attributes.
-  One can set these by using the &lt;compilerarg&gt;. Since Ant 1.6.0,
+  control over the boot classpath using the <code>-X</code> and <code>-J-X</code> attributes.
+  One can set these by using the &lt;compilerarg&gt;. <em>Since Ant 1.6.0</em>,
   there is a shortcut to convert path references to strings that
   can by used in an OS independent fashion (see
   <a href="../using.html#pathshortcut">pathshortcut</a>). For example:
@@ -934,7 +934,7 @@ while all others are <code>false</code>.</p>
     <code>package-info.java</code> files were introduced in Java 5 to
     allow package level annotations. On compilation, if the java file
     does not contain runtime annotations, there will be no .class file
-    for the java file. Up to <b>Ant 1.7.1</b>, when the &lt;javac&gt;
+    for the java file. Prior to Ant 1.7.1, when the &lt;javac&gt;
     task is run again, the
     task will try to compile the package-info java files again.
   </p>
@@ -942,8 +942,8 @@ while all others are <code>false</code>.</p>
     involved the timestamp of the directory that would normally
     contain the .class file.  This logic turned out to lead to Ant not
     recompiling <code>package-info.java</code> in certain setup.</p>
-  <p>Starting with Ant 1.8.0 Ant will create
-    "empty" <code>package-info.class</code> files if it compiles
+<p><em>Since Ant 1.8.0</em>, an
+    "empty" <code>package-info.class</code> file is created if Ant compiles
     a <code>package-info.java</code> and
     no <code>package-info.class</code> file has been created by the
     compiler itself.</p>

manual/Tasks/javadoc.html

@@ -35,18 +35,18 @@ and management costs over time. This task, however, has no notion of
 &quot;changed&quot; files, unlike the <a href="javac.html">javac</a> task. This means
 all packages will be processed each time this task is run. In general, however,
 this task is used much less frequently.</p>
-<p>NOTE: since javadoc calls System.exit(), javadoc cannot be run inside the
+<p><strong>Note</strong>: since javadoc calls System.exit(), javadoc cannot be run inside the
 same VM as Apache Ant without breaking functionality. For this reason, this task
 always forks the VM. This overhead is not significant since javadoc is normally a heavy
 application and will be called infrequently.</p>
-<p>NOTE: the packagelist attribute allows you to specify the list of packages to
+<p><strong>Note</strong>: the packagelist attribute allows you to specify the list of packages to
 document outside of the Ant file. It's a much better practice to include everything
 inside the <code>build.xml</code> file. This option was added in order to make it easier to
 migrate from regular makefiles, where you would use this option of javadoc.
 The packages listed in packagelist are not checked, so the task performs even
 if some packages are missing or broken. Use this option if you wish to convert from
 an existing makefile. Once things are running you should then switch to the regular
-notation. </p>
+notation.</p>
 
 <p><i><b>DEPRECATION:</b> the javadoc2 task simply points to the javadoc task and it's
 there for back compatibility reasons. Since this task will be removed in future
@@ -59,14 +59,14 @@ any VM of at least version 1.2 is acceptable. JDKs &lt;1.4 are no longer support
 If you specify the <code>executable</code> attribute it is up to you
 to ensure that this command supports the attributes you wish to use.</p>
 
-<p><b>Note:</b><br>When generating the JavaDocs for classes which contains annotations
+<p><strong>Note</strong>:<br>When generating the JavaDocs for classes which contains annotations
 you maybe get a <tt>java.lang.ClassCastException: com.sun.tools.javadoc.ClassDocImpl</tt>.
 This is due <a href="https://bugs.openjdk.java.net/browse/JDK-6442982" target="_blank">bug-6442982</a>. The cause is that JavaDoc cannot find the implementations of used annotations.
 The workaround is providing the jars with these implementations (like JAXBs <tt>@XmlType</tt>, ...)
 to &lt;javadoc&gt; using <tt>classpath</tt>, <tt>classpathref</tt> attributes or nested
 &lt;classpath&gt; element.</p>
 
-<p><b>Note:</b> many problems with running javadoc stem from command
+<p><strong>Note</strong>: many problems with running javadoc stem from command
   lines that have become too long - even though the error message
   doesn't give the slightest hint this may be the problem.  If you
   encounter problems with the task, try to set
@@ -208,9 +208,9 @@ to &lt;javadoc&gt; using <tt>classpath</tt>, <tt>classpathref</tt> attributes or
     <td valign="top">Old</td>
     <td valign="top">Generate output using JDK 1.1 emulating
       doclet.<br>
-      <b>Note:</b> as of Ant 1.8.0 this attribute doesn't have any
-      effect since the javadoc of Java 1.4 (required by Ant 1.8.0)
-      doesn't support the -1.1 switch anymore.</td>
+      <strong>Note</strong>: <em>Since Ant 1.8.0</em> this attribute has no
+      effect since javadoc of Java 1.4 and later
+      does not support the -1.1 switch anymore.</td>
     <td align="center" valign="top">1.2</td>
     <td align="center" valign="top">No</td>
   </tr>
@@ -791,12 +791,12 @@ not set the description attribute for those tags.</p>
     <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#javadoctags">Javadoc reference guide</a>:
     <pre>ejb.bean:t:XDoclet EJB Tag
 todo:a:To Do</pre>
-      <b>Note:</b> The  Javadoc reference quide has double quotes around
+      <strong>Note</strong>: The Javadoc reference quide has double quotes around
 the description part of the definition. This will not work when used in
 a file, as the definition is quoted again when given to
 the javadoc program.
     <br/>
-      <b>Note:</b> If this attribute is specified, all the other attributes in this
+      <strong>Note</strong>: If this attribute is specified, all the other attributes in this
     element will be ignored.
     </td>
     <td align="center" valign="top">No</td>

manual/Tasks/javah.html

@@ -38,7 +38,7 @@ systems are used.</p>
   attribute instead which allows you to compile the classes and
   generate the native header files with a single step.</p>
 
-<p><b>Note</b> the <code>javah</code> has been deprecated as of Java 9
+<p><strong>Note</strong>: <code>javah</code> has been deprecated as of Java 9
   and removed as of Java 10. Trying to use it with Java 10 will
   fail.</p>
 
@@ -48,17 +48,17 @@ attribute or a nested element. Here are the choices of the
 attribute:</p>
 <ul>
   <li>default - the default compiler for the platform.</li>
-  <li>sun (the standard compiler of the JDK)</li>
-  <li>kaffeh (the native standard compiler of <a href="http://www.kaffe.org" target="_top">Kaffe</a>)</li>
-  <li>gcjh (the native standard compiler
+  <li>sun - the standard compiler of the JDK.</li>
+  <li>kaffeh - the native standard compiler of <a href="http://www.kaffe.org" target="_top">Kaffe</a>.</li>
+  <li>gcjh - the native standard compiler
   of <a href="http://gcc.gnu.org/java/"
-        target="_top">gcj and gij</a>) <em>since Apache Ant 1.8.2</em></li>
+        target="_top">gcj and gij</a>. <em>Since Apache Ant 1.8.2</em></li>
   <li>forking - runs the javah executable via its command line
     interface in a separate process. Default when not running on
-    Kaffee or gcj/gij <em>since Ant 1.9.8</em></li>
+    Kaffee or gcj/gij. <em>Since Ant 1.9.8</em></li>
 </ul>
 
-<p><b>Note:</b> if you are using this task to work on multiple files
+<p><strong>Note</strong>: if you are using this task to work on multiple files
   the command line may become too long on some operating systems.
   Unfortunately the javah command doesn't support command argument
   files the way javac (for example) does, so all that can be done is
@@ -169,7 +169,7 @@ only if a given compiler implementation will be used.</p>
     <td valign="top">prefix</td>
     <td align="center" rowspan="2">See
     <a href="../using.html#arg">Command-line Arguments</a>.
-    <em>Since Ant 1.8.</em></td>
+    <em>Since Ant 1.8</em>.</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -186,7 +186,7 @@ only if a given compiler implementation will be used.</p>
   </tr>
 </table>
 
-<h4>implementationclasspath <em>since Ant 1.8.0</em></h4>
+<h4>implementationclasspath (<em>since Ant 1.8.0</em>)</h4>
 
 <p>A <a href="../using.html#path">PATH like structure</a> holding the
   classpath to use when loading the compiler implementation if a
@@ -194,7 +194,7 @@ only if a given compiler implementation will be used.</p>
   using one of the built-in compilers.</p>
 
 <h4>Any nested element of a type that implements JavahAdapter
-  <em>since Ant 1.8.0</em></h4>
+  (<em>since Ant 1.8.0</em>)</h4>
 
 <p>If a defined type implements the <code>JavahAdapter</code>
   interface a nested element of that type can be used as an

manual/Tasks/jdepend.html

@@ -88,7 +88,7 @@ href="#nested">nested elements</a>.</p>
   <tr>
     <td valign="top">includeruntime</td>
     <td valign="top">Implicitly add the classes required to run jdepend
-    in forked mode. (Ignored if fork is disabled). Since Apache Ant 1.6.</td>
+      in forked mode. (Ignored if fork is disabled). <em>Since Apache Ant 1.6</em>.</td>
     <td align="center" valign="top">No, default is "no".</td>
   </tr>
   <tr>

manual/Tasks/junit.html

@@ -30,7 +30,7 @@ version of the framework can be found at
 This task has been tested with JUnit 3.0 up to JUnit 3.8.2; it won't
 work with versions prior to JUnit 3.0. It also works with JUnit 4.0, including
 "pure" JUnit 4 tests using only annotations and no <code>JUnit4TestAdapter</code>.</p>
-<p><strong>Note:</strong> This task depends on external libraries not included
+<p><strong>Note</strong>: This task depends on external libraries not included
 in the Apache Ant distribution.  See <a href="../install.html#librarydependencies">
 Library Dependencies</a> for more information.
 </p>
@@ -58,7 +58,7 @@ a <code>&lt;classpath&gt;</code> element in a <code>&lt;taskdef&gt;</code> in th
 <li>
 Leave <code>ant-junit.jar</code> in its default location in <code>ANT_HOME/lib</code>
 but include <code>junit.jar</code> in the <code>&lt;classpath&gt;</code> passed
-to <code>&lt;junit&gt;</code>. <em>(since Ant 1.7)</em>
+to <code>&lt;junit&gt;</code>. <em>Since Ant 1.7</em>
 </li>
 </ol>
 <p>
@@ -108,7 +108,7 @@ elements</a>).</p>
     <code>failureproperty</code> can share a VM, so even if you set
     <code>forkmode</code> to &quot;once&quot;, Ant may have to create
     more than a single Java VM.  This attribute is ignored for tests
-    that don't get forked into a new Java VM.  <em>since Ant 1.6.2</em></td>
+    that don't get forked into a new Java VM.  <em>Since Ant 1.6.2</em></td>
     <td align="center" valign="top">No; default is <code>perTest</code>.</td>
   </tr>
   <tr>
@@ -196,7 +196,7 @@ elements</a>).</p>
   <tr>
     <td valign="top">outputtoformatters</td>
     <td valign="top">
-      <em>Since Ant 1.7.0.</em><br/>
+      <em>Since Ant 1.7.0</em>.<br/>
       Send any output generated by tests to the test formatters.
       This is "true" by default.
     </td>
@@ -369,7 +369,7 @@ subelement.</p>
 
 <p>Assertion statements are currently ignored in non-forked mode.</p>
 
-<p><em>since Ant 1.6.</em></p>
+<p><em>Since Ant 1.6</em>.</p>
 
 <h4>modulepath</h4>
 
@@ -407,7 +407,7 @@ can be specified.</p>
 that your tests have written as some characters are illegal in XML
 documents and will be dropped.</p>
 
-<p>The fourth formatter named <code>failure</code> (since Ant 1.8.0)
+<p>The fourth formatter named <code>failure</code> (<em>since Ant 1.8.0</em>)
 collects all failing <code>testXXX()</code>
 methods and creates a new <code>TestCase</code> which delegates only these
 failing methods. The name and the location can be specified via Java System property or Ant property
@@ -664,7 +664,7 @@ supported.</p>
   test's <code>tearDown</code> method will never be called.  The same
   is true if the forked VM crashes for some other reason.</p>
 
-<p>Starting with Ant 1.8.0, a special formatter is distributed with
+<p><em>Since Ant 1.8.0</em>, a special formatter is distributed with
   Ant that tries to load the testcase that was in the forked VM and
   invoke that class' <code>tearDown</code> method.  This formatter has
   the following limitations:</p>

manual/Tasks/junitreport.html

@@ -28,7 +28,7 @@ Merge the individual XML files generated by the JUnit task and eventually apply
 a stylesheet on the resulting merged document to provide a browsable report of
 the testcases results.
 
-<p><strong>Note:</strong> This task depends on external libraries not
+<p><strong>Note</strong>: This task depends on external libraries not
 included in the Apache Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a>
 for more information.</p>
 
@@ -36,9 +36,9 @@ for more information.</p>
 
 <p>The task needs Apache <a
 href="http://xml.apache.org/xalan-j/">Xalan 2.4.1+ or Xalan XSLTC</a>
-(JDK 1.4 contains a version of Xalan-J 2.x while JDK 1.5 ships with a
-version of XSLTC). Starting from JDK 1.4.2-01 it ships with a bundled
-Xalan-J 2.4.1+, meaning that JDK version prior to 1.4.2-01 won't work
+(JDK 1.4 contains a version of Xalan 2.x, while JDK 1.5 ships with a
+version of XSLTC). Since version 1.4.2-01, JDK ships with a bundled
+Xalan 2.4.1+, meaning that JDK version prior to 1.4.2-01 won't work
 out of the box. The table below summarize the compatibility status.
 </p>
 <table>
@@ -46,13 +46,13 @@ out of the box. The table below summarize the compatibility status.
 <tr><td>2.4.1+</td><td>JDK 1.4.2-01+</td><td>OK</td></tr>
 <tr><td>XSLTC</td><td>JDK 1.5.x</td><td>OK</td></tr>
 <tr><td>2.x</td><td>JDK 1.4.x</td><td>DEPRECATED<br><i>Use ${ant.home}/etc/junit-frames-xalan1.xsl
-<br> Upgrade Xalan using the JDK endorsement mechanism</i></td></tr>
+<br>Upgrade Xalan using the JDK endorsement mechanism</i></td></tr>
 </table>
 
-<p>With Ant 1.6.2 we had to decide between supporting Xalan-J 1/Xalan J 2.4.1-
+<p>In Ant 1.6.2, we had to decide between supporting Xalan 1/Xalan 2.4.1-
 and Xalan 2.4.1+/XSLTC, since there was no way to support both couples at the same
 time.</p>
-<p>With Ant 1.7 we had to drop support Xalan-J 1, since Xalan-J 1 has not
+<p><em>Since Ant 1.7</em>, we dropped support for Xalan 1, since Xalan 1 was not
 available anymore for quite some time.</p>
 
 <h3>Parameters</h3>
@@ -170,12 +170,12 @@ These tags can pass XSL parameters to the stylesheet.
 </table>
 
 <h4>classpath</h4>
-<p><em>Since Ant 1.9.5.</em>
+<p><em>Since Ant 1.9.5</em>.
 Like for the <a href="../CoreTasks/style.html#classpath">XSLT task</a>,
 a nested &lt;classpath&gt; will be used to load the processor.</p>
 
 <h4>factory</h4>
-<p><em>Since Ant 1.9.5.</em>
+<p><em>Since Ant 1.9.5</em>.
 Like for the <a href="../CoreTasks/style.html#factory">XSLT task</a>,
 a nested &lt;factory&gt; can be used to specify factory settings.</p>
 

manual/Tasks/loadfile.html

@@ -68,7 +68,7 @@ the property is not set.</p>
     invoked with the <code>-verbose</code> or <code>-debug</code>
     switches) or modify the exit status to reflect an error. Setting this to
     "true" implies setting failonerror to "false".
-      <em>Since Ant 1.7.0.</em>
+      <em>Since Ant 1.7.0</em>.
     </td>
     <td align="center" valign="top">No, default "false"</td>
   </tr>

manual/Tasks/loadproperties.html

@@ -33,7 +33,7 @@ Also if the file is missing, the build is halted with an error, rather
 than a warning being printed.
 </p>
 
-<p><strong>Note:</strong> the default value of this
+<p><strong>Note</strong>: the default value of this
 task's <code>prefixValues</code> attribute is different from the
 default value of the same attribute in
 the <a href="property.html"><code>&lt;property&gt;</code></a>

manual/Tasks/local.html

@@ -34,7 +34,7 @@ property at a given scope "shadows" properties of the same name at higher scopes
 including the global scope. Note that using the Local task at the global
 level effectively makes the property local to the "anonymous target" in which
 top-level operations are carried out; it will not be defined for other targets
-in the buildfile. <b>Since Ant 1.8</b></p>
+in the buildfile. <em>Since Ant 1.8</em></p>
 
 <p>A property is made local if the <code>&lt;local&gt;</code> task
   precedes its definition.  See the examples section.</p>

manual/Tasks/macrodef.html

@@ -195,7 +195,7 @@
       If this element is not present, then any nested text in the macro invocation
       will be an error. If the text element is present, then the name
       becomes an attribute that gets set to the nested text of the macro invocation.
-      <em>Since ant 1.6.1.</em>
+      <em>Since ant 1.6.1</em>.
     </p>
     <p>
       The case of the text name is ignored.

manual/Tasks/mail.html

@@ -48,7 +48,7 @@
     <code>&lt;attachments&gt;</code> container.
   </p>
   <p>
-    <strong>Note:</strong> This task may depend on external libraries
+    <strong>Note</strong>: This task may depend on external libraries
     that are not included in the Ant distribution.
     See <a href="../install.html#librarydependencies">Library Dependencies</a>
     for more information.
@@ -284,7 +284,7 @@ in the message, whether it is specified as an external file or as text within
 the <code>&lt;message&gt;</code> element.</p>
 
 <h4>header</h4>
-<p><strong>Since Ant 1.7</strong>, arbitrary mail headers can be added by
+<p><em>Since Ant 1.7</em>, arbitrary mail headers can be added by
   specifying these attributes on one or more nested header elements:</p>
 
 <table>
@@ -305,8 +305,7 @@ the <code>&lt;message&gt;</code> element.</p>
   </tr>
 </table>
 
-<p>It is permissible to duplicate the name attribute amongst multiple headers.
-</p>
+<p>It is permissible to duplicate the name attribute amongst multiple headers.</p>
 
 <h3>Examples</h3>
 

manual/Tasks/move.html

@@ -42,7 +42,7 @@ href="../using.html#path">path</a>.  Prior to Apache Ant 1.7 only
 To use a resource collection, the <code>todir</code> attribute must be
 set.</p>
 
-<p><b>Since Ant 1.6.3</b>, the <i>file</i> attribute may be used to move
+<p><em>Since Ant 1.6.3</em>, the <i>file</i> attribute may be used to move
 (rename) an entire directory.  If <i>tofile</i> denotes an existing file, or
 there is a directory by the same name in <i>todir</i>, the action will fail.
 </p>
@@ -63,7 +63,7 @@ there is a directory by the same name in <i>todir</i>, the action will fail.
     <td valign="top">preservelastmodified</td>
     <td valign="top">Give the moved files the same last modified
       time as the original source files.
-      (<em>Note</em>: Ignored on Java 1.1)</td>
+      (<strong>Note</strong>: Ignored on Java 1.1)</td>
     <td valign="top" align="center">No; defaults to false.</td>
   </tr>
   <tr>

manual/Tasks/native2ascii.html

@@ -65,11 +65,11 @@
       element. Here are the choices of the attribute:
     </p>
     <ul>
-      <li>default - the default converter for the platform - kaffee
+      <li>default - the default converter for the platform: kaffee
         when run on Kaffee, builtin otherwise.</li>
-      <li>sun (used to be the standard converter of the JDK < 9)</li>
-      <li>kaffe (the standard converter
-        of <a href="http://www.kaffe.org" target="_top">Kaffe</a>)</li>
+      <li>sun - used to be the standard converter of the JDK &lt; 9</li>
+      <li>kaffe - the standard converter
+        of <a href="http://www.kaffe.org" target="_top">Kaffe</a></li>
       <li>builtin - Ant's internal implementation. <em>Since Ant
           1.9.8</em></li>
     </ul>
@@ -191,7 +191,7 @@ only if a given converter implementation will be used.</p>
   </tr>
 </table>
 
-<h4>implementationclasspath <em>since Apache Ant 1.8.0</em></h4>
+<h4>implementationclasspath (<em>since Apache Ant 1.8.0</em>)</h4>
 
 <p>A <a href="../using.html#path">PATH like structure</a> holding the
   classpath to use when loading the converter implementation if a
@@ -199,7 +199,7 @@ only if a given converter implementation will be used.</p>
   using one of the built-in converters.</p>
 
 <h4>Any nested element of a type that implements Native2AsciiAdapter
-  <em>since Ant 1.8.0</em></h4>
+  (<em>since Ant 1.8.0</em>)</h4>
 
 <p>If a defined type implements the <code>Native2AsciiAdapter</code>
   interface a nested element of that type can be used as an

manual/Tasks/netrexxc.html

@@ -58,7 +58,7 @@ supports most attributes of <code>&lt;fileset&gt;</code>
 or from the command line as<br>
 <code>ant -Dant.netrexxc.verbose=noverbose ...</code>
 </p>
-<p><strong>Note:</strong> This task depends on external libraries not
+<p><strong>Note</strong>: This task depends on external libraries not
 included in the Apache Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a>
 for more information.</p>
 

manual/Tasks/propertyhelper.html

@@ -32,7 +32,7 @@
 PropertyHelper active on the current Project. This is somewhat advanced Apache Ant usage and
 assumes a working familiarity with the modern Ant APIs. See the description of Ant's
 <a href="../properties.html#propertyHelper">Property Helper</a> for more information.
-<b>Since Ant 1.8.0</b></p>
+<em>Since Ant 1.8.0</em></p>
 
 <h3>Parameters specified as nested elements</h3>
 

manual/Tasks/pvcstask.html

@@ -24,7 +24,7 @@
 
 <h1>Apache Ant Pvcs Task User Manual</h1>
 
-<p><b>Note:</b>
+<p><strong>Note</strong>:
 Before using this task, the user running Ant must have access to the
 commands of PVCS (get and pcli) and must have access to the
 repository. Note that the way to specify the repository is platform

manual/Tasks/replace.html

@@ -123,13 +123,13 @@ have been regenerated by this task.</p>
   <tr>
     <td valign="top">preserveLastModified</td>
     <td valign="top">Keep the file timestamp(s) even if the file(s)
-      is(are) modified.  <em>since Apache Ant 1.8.0.</em></td>
+      is(are) modified.  <em>since Apache Ant 1.8.0</em>.</td>
     <td valign="top" align="center">No, defaults to false</td>
   </tr>
   <tr>
     <td valign="top">failOnNoReplacements</td>
     <td valign="top">Whether to fail the build if the task didn't do
-      anything.  <em>since Ant 1.8.0.</em></td>
+      anything.  <em>since Ant 1.8.0</em>.</td>
     <td valign="top" align="center">No, defaults to false</td>
   </tr>
 </table>
@@ -159,7 +159,7 @@ them.</p>
   <tr>
     <td valign="top">expandProperties</td>
     <td valign="top">Whether to expand properties in the nested text.
-      <em>since Ant 1.8.0.</em></td>
+      <em>since Ant 1.8.0</em>.</td>
     <td align="center">No, defaults to true.</td>
   </tr>
 </table>
@@ -208,7 +208,7 @@ token]]&gt;&lt;/replacevalue&gt;
     <td valign="top">Name of the property whose value is to serve as the replacement value.</td>
   </tr>
 </table>
-<p>Since Ant 1.8.0 token and value can be specified as nested elements
+<p><em>Since Ant 1.8.0</em> token and value can be specified as nested elements
   just like in the task itself.</p>
 <p>If neither <i>value</i> nor <i>property</i> is used, the value provided using the <code>&lt;replace&gt;</code> attribute <i>value</i> and/or the <code>&lt;replacevalue&gt;</code> element is used. If no value was specified using either of these options, the token is replaced with an empty string.
 </p>
@@ -233,9 +233,7 @@ token]]&gt;&lt;/replacevalue&gt;
 &lt;/replace&gt;
 </pre></blockquote>
 <p>In file <code>configure.sh</code>, replace all instances of &quot;@token1@&quot; with &quot;defaultvalue&quot;, all instances of &quot;@token2@&quot; with &quot;value2&quot;, and all instances of &quot;@token3@&quot; with the value of the property &quot;property.key&quot;, as it appears in property file <code>src/name.properties</code>.</p>
-<p><b>Note:</b> It is possible to use either the <i>token</i>/<code>&lt;replacetoken&gt;</code> and <i>value</i>/<code>&lt;replacevalue&gt;</code> attributes/elements, the nested replacefilter elements, or both in the same operation.
-</p>
-
+<p><strong>Note</strong>: It is possible to use either the <i>token</i>/<code>&lt;replacetoken&gt;</code> and <i>value</i>/<code>&lt;replacevalue&gt;</code> attributes/elements, the nested replacefilter elements, or both in the same operation.</p>
 
 </body>
 </html>

manual/Tasks/replaceregexp.html

@@ -90,7 +90,7 @@ See details in the documentation of the <a href="../Types/regexp.html#implementa
   <tr>
     <td valign="top">preserveLastModified</td>
     <td valign="top">Keep the file timestamp(s) even if the file(s)
-      is(are) modified.  <em>since Ant 1.8.0.</em></td>
+      is(are) modified.  <em>since Ant 1.8.0</em>.</td>
     <td valign="top" align="center">No, defaults to false</td>
   </tr>
 </table>

manual/Tasks/resourcecount.html

@@ -29,7 +29,7 @@
 <h3>Description</h3>
 <p>Display or set a property containing the size of a nested
    <a href="../Types/resources.html#collection">Resource Collection</a>.
-   Can also be used as a condition. <b>Since Apache Ant 1.7</b></p>
+   Can also be used as a condition. <em>Since Apache Ant 1.7</em></p>
 <h3>Parameters</h3>
 <table>
   <tr>

manual/Tasks/rexec.html

@@ -30,7 +30,7 @@ Task to automate a remote rexec session. Just like the Telnet task,
 it uses nested <tt>&lt;read&gt;</tt> to indicate strings to wait for, and
 <tt>&lt;write&gt;</tt> tags to specify text to send to the remote process.
 
-<p><b>Note:</b> This task depends on external libraries not included in the Apache Ant distribution.
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant distribution.
 See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p>
 
 <p>You can specify the commands you want to execute as nested elements

manual/Tasks/rmic.html

@@ -52,17 +52,15 @@ with the &quot;build.rmic&quot; property, the <code>compiler</code>
 attribute, or a nested element. Here are the choices:</p>
 <ul>
   <li>default -the default compiler (kaffe, sun or forking) for the platform.
-  <li>sun (the standard compiler of the JDK &lt; JDK 9)</li>
-  <li>kaffe (the standard compiler of <a href="http://www.kaffe.org" target="_top">Kaffe</a>)</li>
+  <li>sun - the standard compiler of the JDK &lt; 9</li>
+  <li>kaffe - the standard compiler of <a href="http://www.kaffe.org" target="_top">Kaffe</a></li>
   <li>weblogic</li>
-  <li>forking - the sun compiler forked into a separate process (since
-    Apache Ant 1.7). Starting with Ant 1.9.8 this is the default when
-    running on JDK 9+.</li>
-  <li>xnew - the sun compiler forked into a separate process,
-      with the -Xnew option (since Ant 1.7).
-    This is the most reliable way to use -Xnew.
-    <br>JDK 9 has removed support for -Xnew and starting with Ant
-    1.9.8 this option will be rejected by Ant when running on JDK 9.</li>
+  <li>forking - (<em>since Apache Ant 1.7</em>) the sun compiler forked into a separate process.
+    <em>Since Ant 1.9.8</em>, this is the default when running on JDK 9+.</li>
+  <li>xnew - (<em>since Ant 1.7</em>) the sun compiler forked into a separate process,
+    with the -Xnew option. This is the most reliable way to use -Xnew.<br>
+    JDK 9 has removed support for -Xnew and <em>since Ant 1.9.8</em>
+    this option will be rejected when running on JDK 9.</li>
   <li> "" (empty string). This has the same behaviour as not setting the compiler attribute.
     First the value of <tt>build.rmic</tt> is used if defined, and if not, the default
     for the platform is chosen. If build.rmic is set to this, you get the default.</li>
@@ -110,7 +108,7 @@ please consult miniRMI's documentation to learn how to use it.</p>
     <td valign="top">stubversion</td>
     <td valign="top">Specify the JDK version for the generated stub code.
  Specify &quot;1.1&quot; to pass the &quot;-v1.1&quot; option to rmic,
- "1.2" for -v12, compat for -vcompat. <br>
+ "1.2" for -v12, compat for -vcompat.<br>
         <em>Since Ant 1.7</em>, if you do not specify a version, and do not ask
         for iiop or idl files, "compat" is selected.
 
@@ -287,7 +285,7 @@ used.</p>
     <td valign="top">prefix</td>
     <td align="center" rowspan="2">See
     <a href="../using.html#arg">Command-line Arguments</a>.
-    <em>Since Ant 1.8.</em></td>
+    <em>Since Ant 1.8</em>.</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -305,7 +303,7 @@ used.</p>
   </tr>
 </table>
 
-<h4>compilerclasspath <em>since Ant 1.8.0</em></h4>
+<h4>compilerclasspath (<em>since Ant 1.8.0</em>)</h4>
 
 <p>A <a href="../using.html#path">PATH like structure</a> holding the
   classpath to use when loading the compiler implementation if a
@@ -313,7 +311,7 @@ used.</p>
   using one of the built-in compilers.</p>
 
 <h4>Any nested element of a type that implements RmicAdapter
-  <em>since Ant 1.8.0</em></h4>
+  (<em>since Ant 1.8.0</em>)</h4>
 
 <p>If a defined type implements the <code>RmicAdapter</code>
   interface a nested element of that type can be used as an

manual/Tasks/scp.html

@@ -33,7 +33,7 @@
 FileSet <i>only</i> works for copying files from the local machine to a
 remote machine.</p>
 
-<p><b>Note:</b> This task depends on external libraries not included
+<p><strong>Note</strong>: This task depends on external libraries not included
 in the Ant distribution.  See <a
 href="../install.html#librarydependencies">Library Dependencies</a>
 for more information.  This task has been tested with jsch-0.1.2 and later.</p>
@@ -121,7 +121,7 @@ for more information.  This task has been tested with jsch-0.1.2 and later.</p>
   <tr>
     <td valign="top">trust</td>
     <td valign="top">This trusts all unknown hosts if set to yes/true.<br>
-      <strong>Note</strong> If you set this to false (the default), the
+      <strong>Note</strong>: If you set this to false (the default), the
       host you connect to must be listed in your knownhosts file, this
       also implies that the file exists.</td>
     <td valign="top" align="center">No, defaults to No.</td>
@@ -291,7 +291,7 @@ authentication.</b></p>
   &lt;/scp&gt;
 </pre>
 
-<p><strong>Security Note:</strong>  Hard coding passwords and/or usernames
+<p><strong>Security Note</strong>: Hardcoding passwords and/or usernames
 in scp task can be a serious security hole.  Consider using variable
 substitution and include the password on the command line.  For example:
 <p>
@@ -309,7 +309,7 @@ system (via the ps command). The best approach is to use the
 .properties file.
 </p>
 
-<p><strong>Unix Note:</strong> File permissions are not retained when files
+<p><strong>Unix Note</strong>: File permissions are not retained when files
 are downloaded; they end up with the default <code>UMASK</code> permissions
 instead. This is caused by the lack of any means to query or set file
 permissions in the current Java runtimes. If you need a permission-

manual/Tasks/script.html

@@ -31,7 +31,7 @@
     or
     <a href="https://scripting.dev.java.net">JSR 223</a>  supported language.
   </p>
-  <p><b>Note:</b>
+  <p><strong>Note</strong>:
     This task depends on external libraries not included in the Apache Ant distribution.
     See <a href="../install.html#librarydependencies">Library Dependencies</a>
     for more information.
@@ -82,7 +82,7 @@ different location values.</p>
   <tr>
     <td valign="top">manager</td>
     <td valign="top">
-      <em>Since: Ant 1.7.</em>
+      <em>Since Ant 1.7</em>.
       The script engine manager to use. This can have
       one of three values ("auto", "bsf" or "javax").
       The default value is "auto".
@@ -104,7 +104,7 @@ different location values.</p>
   </tr>
   <tr>
     <td valign="top">encoding</td>
-    <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
+    <td valign="top">The encoding of the script as a file. <em>Since Ant 1.10.2</em>.</td>
     <td valign="top" align="center">No - defaults to default JVM encoding</td>
   </tr>
   <tr>
@@ -153,7 +153,7 @@ different location values.</p>
     specific jar files.
   </p>
   <p>
-    <b>NB: (Since Ant 1.7.1)</b>
+    <strong>Note</strong>: (<em>since Ant 1.7.1</em>)
     This classpath <em>can</em> be used to
     specify the location of
     the BSF jar file and/or languages

manual/Tasks/scriptdef.html

@@ -41,7 +41,7 @@ of the script increases it would be better to migrate the task definition
 into a Java based custom task.
 </p>
 
-<p><b>Note:</b> This task depends on external libraries not included in the
+<p><strong>Note</strong>: This task depends on external libraries not included in the
 Ant distribution. See
 <a href="../install.html#librarydependencies">Library Dependencies</a>
 for more information.</p>
@@ -58,12 +58,12 @@ element name. This will return a list of all instances of the nested element.
 The instances in this list may be accessed by an integer index.
 </p>
 
-<p><b>Note:</b> Ant will turn all attribute and element names into all
+<p><strong>Note</strong>: Ant will turn all attribute and element names into all
 lowercase names, so even if you use name="SomeAttribute", you'll have
 to use "someattribute" to retrieve the attribute's value from the
 <code>attributes</code> collection.</p>
 
-<p>The name "self" (<i>since Ant 1.6.3</i>) is a pre-defined reference to the
+<p>The name "self" (<em>since Ant 1.6.3</em>) is a pre-defined reference to the
     script def task instance.
     It can be used for logging, or for integration with the rest of
     Ant. the <code>self.text attribute</code> contains
@@ -117,7 +117,7 @@ more information on writing scripts, please refer to the
   </tr>
   <tr>
     <td valign="top">encoding</td>
-    <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td>
+    <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2</em>.</td>
     <td valign="top" align="center">No - defaults to default JVM encoding</td>
   </tr>
   <tr>
@@ -126,7 +126,7 @@ more information on writing scripts, please refer to the
     evaluation for faster multiple executions, on the condition that the <em>manager</em> is "javax" and the
     target engine implements <code>javax.script.Compilable</code>.
     Note that the <code>bsf</code> manager may automatically compiles the script.
-    <em>since Ant 1.10.2.</em></td>
+    <em>since Ant 1.10.2</em>.</td>
     <td valign="top" align="center">No - defaults to false</td>
   </tr>
   <tr>

manual/Tasks/setpermissions.html

@@ -25,7 +25,7 @@
 <body>
 
 <h2 id="setpermissions">SetPermissions</h2>
-<p><em>Since Ant 1.10.0.</em></p>
+<p><em>Since Ant 1.10.0</em>.</p>
 <h3>Description</h3>
 <p>Changes the file permissions using Java's NIO support for
   permissions.</p>

manual/Tasks/sound.html

@@ -30,7 +30,7 @@
 the build failed or succeeded. You can specify either a specific
 sound-file to play, or, if a directory is specified, the
 <code>&lt;sound&gt;</code> task will randomly select a file to play.
-Note: At this point, the random selection is based on all the files
+<strong>Note</strong>: At this point, the random selection is based on all the files
 in the directory, not just those ending in appropriate suffixes
 for sound-files, so be sure you only have sound-files in the
 directory you specify.</p>

manual/Tasks/sql.html

@@ -124,7 +124,7 @@ and <b>abort</b> execution and transaction and fail task.</p>
 <tr>
   <td width="12%" valign="top">output</td>
   <td width="78%" valign="top">Output file for result sets (defaults to System.out)
-    <b>Since Ant 1.8</b> can specify any Resource that supports output (see
+    <em>Since Ant 1.8</em> can specify any Resource that supports output (see
     <a href="../develop.html#set-magic">note</a>).
   </td>
   <td width="10%" valign="top">No (print to System.out by default)</td>
@@ -226,7 +226,7 @@ and <b>abort</b> execution and transaction and fail task.</p>
   <td width="12%" valign="top">showWarnings</td>
   <td width="78%" valign="top">If true, SQLWarnings will be logged at
     the WARN level.  <em>Since Ant 1.8.0</em>.<br/>
-    <b>Note:</b> even if the attribute is set to false, warnings that
+    <strong>Note</strong>: even if the attribute is set to false, warnings that
     apply to the connection will be logged at the verbose level.</td>
   <td width="10%" valign="top">No, default <em>false</em></td>
 </tr>
@@ -256,7 +256,7 @@ and <b>abort</b> execution and transaction and fail task.</p>
     quote character itself will be surrounded by the quote character.
     The quote character itself will be doubled if it appears inside of
     the column's value.<br/>
-    <b>Note:</b> BLOB values will never be quoted.
+    <strong>Note</strong>: BLOB values will never be quoted.
     <em>Since Ant 1.8.0</em>.</td>
   <td width="10%" valign="top">No, default is not set (i.e. no quoting
     ever occurs)</td>

manual/Tasks/sshexec.html

@@ -29,10 +29,9 @@
 
 <p><em>since Apache Ant 1.6</em></p>
 
-<p>Runs a command on a remote machine running SSH daemon.
-</p>
+<p>Runs a command on a remote machine running SSH daemon.</p>
 
-<p><b>Note:</b> This task depends on external libraries not included
+<p><strong>Note</strong>: This task depends on external libraries not included
 in the Ant distribution.  See <a
 href="../install.html#librarydependencies">Library Dependencies</a>
 for more information.  This task has been tested with jsch-0.1.29 and above
@@ -78,7 +77,7 @@ and won't work with versions of jsch earlier than
     <td valign="top">trust</td>
 
     <td valign="top">This trusts all unknown hosts if set to yes/true.<br>
-      <strong>Note</strong> If you set this to false (the default), the
+      <strong>Note</strong>: If you set this to false (the default), the
       host you connect to must be listed in your knownhosts file, this
       also implies that the file exists.</td>
     <td valign="top" align="center">No, defaults to No.</td>
@@ -283,7 +282,7 @@ and won't work with versions of jsch earlier than
 	commandResource=&quot;to_run&quot;/&gt;
 </pre>
 
-<p><strong>Security Note:</strong>  Hard coding passwords and/or usernames
+<p><strong>Security Note</strong>:  Hard coding passwords and/or usernames
 in sshexec task can be a serious security hole.  Consider using variable
 substitution and include the password on the command line.  For example:</p>
 <pre>

manual/Tasks/sshsession.html

@@ -35,7 +35,7 @@ remote tunnels over that connection, then executes any nested tasks
 before taking down the connection.
 </p>
 
-<p><b>Note:</b> This task depends on external libraries not included
+<p><strong>Note</strong>: This task depends on external libraries not included
 in the Ant
 distribution. See <a href="../install.html#librarydependencies">Library
 Dependencies</a> for more information.  This task has been tested with
@@ -90,7 +90,7 @@ and <a href="scp.html">scp</a> tasks</p>
     <td valign="top">trust</td>
 
     <td valign="top">This trusts all unknown hosts if set to yes/true.<br>
-      <strong>Note</strong> If you set this to false (the default), the
+      <strong>Note</strong>: If you set this to false (the default), the
       host you connect to must be listed in your knownhosts file, this
       also implies that the file exists.</td>
     <td valign="top" align="center">No, defaults to No.</td>
@@ -253,8 +253,7 @@ accessible, then run a get task using that tunnel.</b></p>
   &lt;/sshsession&gt;
 </pre>
 
-
-<p><strong>Security Note:</strong> Hard coding passwords or
+<p><strong>Security Note</strong>: Hardcoding passwords or
 passphrases and/or usernames in sshsession task can be a serious
 security hole. Consider using variable substitution and include the
 password on the command line. For example:</p>

manual/Tasks/style.html

@@ -30,7 +30,7 @@
 <p>Process a set of documents via XSLT.</p>
 <p>This is useful for building views of XML based documentation,
 or for generating code.</p>
-<p><b>Note:</b> If you are using JDK 1.4 or higher, this task does not require external libraries
+<p><strong>Note</strong>: If you are using JDK 1.4 or higher, this task does not require external libraries
 not supplied in the Apache Ant distribution. However, often the built in XSL engine is not as up
 to date as a fresh download, so an update is still highly recommended
   in particular since the built-in XSLT processors of Java 5 (and to a
@@ -50,7 +50,7 @@ inclusion/exclusion of files works, and how to write patterns.</p>
   as well as the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
   and <code>&lt;patternset&gt;</code> elements.</p>
 
-<p><b>Note</b>: Unlike other similar tasks, this task treats
+<p><strong>Note</strong>: Unlike other similar tasks, this task treats
 directories that have been matched by the include/exclude patterns of
 the implicit fileset in a special way.  It will apply the stylesheets
 to all files contain in them as well.  Since the default include
@@ -296,8 +296,8 @@ element is used to perform Entity and URI resolution.</p>
 
 <h4>param</h4>
 <p>Param is used to pass a parameter to the XSL stylesheet.</p>
-<blockquote>
-<h4>Parameters</h4>
+
+<h5>Parameters</h5>
 <table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
@@ -347,9 +347,7 @@ element is used to perform Entity and URI resolution.</p>
     <td valign="top">The param will not be passed <a href="../properties.html#if+unless">if this property is set</a>.</td>
     <td align="center" valign="top">No</td>
   </tr>
-
 </table>
-</blockquote>
 
   <p>
       The <code>XPATH_*</code> types says that the <code>expression</code> is not just a primitive-type value but an XPath expression.
@@ -367,8 +365,8 @@ element is used to perform Entity and URI resolution.</p>
 <p>Used to specify how you wish the result tree to be output
 as specified in the <a href="http://www.w3.org/TR/xslt#output">
 XSLT specifications</a>.
-<blockquote>
-<h4>Parameters</h4>
+
+<h5>Parameters</h5>
 <table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
@@ -386,12 +384,11 @@ XSLT specifications</a>.
     <td align="center" valign="top">Yes</td>
   </tr>
 </table>
-</blockquote>
 
 <h4 id="factory">factory ('trax' processors only)</h4>
 Used to specify factory settings.
-<blockquote>
-<h4>Parameters</h4>
+
+<h5>Parameters</h5>
 <table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
@@ -409,8 +406,8 @@ Used to specify factory settings.
     <td align="center" valign="top">No. Defaults to the JAXP lookup mechanism.</td>
   </tr>
 </table>
-<h3>Parameters specified as nested elements</h3>
-<h4>attribute</h4>
+<h5>Parameters specified as nested elements</h5>
+<h6>attribute</h6>
 <p>Used to specify settings of the processor factory.
 The attribute names and values are entirely processor specific
 so you must be aware of the implementation to figure them out.
@@ -431,7 +428,7 @@ And in Saxon 7.x:
 <li>...</li>
 </ul>
 <blockquote>
-<h4>Parameters</h4>
+<h6>Parameters</h6>
 <table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
@@ -460,8 +457,9 @@ And in Saxon 7.x:
       with the given id. <em>since Ant 1.9.8</em></td>
   </tr>
 </table>
+</blockquote>
 
-<h4>Examples</h4>
+<h5>Examples</h5>
 
 <pre>
   &lt;path id="extension-path"&gt;
@@ -478,10 +476,10 @@ And in Saxon 7.x:
 </pre>
 <p>Sets the classloader to use when loading extension functions to a
   classloader using the <code>path</code> with the
-  id <code>extension-path</code>.
-</blockquote>
-<h4>feature</h4>
+  id <code>extension-path</code>.</p>
 <p><em>since Ant 1.9.8</em></p>
+
+<h6>feature</h6>
 <p>Used to specify settings of the processor factory.  The feature
 names are mostly processor specific so you must be aware of the
 implementation to figure them out.  Read the documentation of your
@@ -489,7 +487,7 @@ processor. The only feature all implementations are required to
 support
 is <code>http://javax.xml.XMLConstants/feature/secure-processing</code>.
 <blockquote>
-<h4>Parameters</h4>
+<h6>Parameters</h6>
 <table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
@@ -504,12 +502,12 @@ is <code>http://javax.xml.XMLConstants/feature/secure-processing</code>.
   <tr>
     <td valign="top">value</td>
     <td valign="top">value of the feature. A boolean value
-    (i.e. permitted values are true,false,yes,no,on,off).</td>
+    (i.e. permitted values are true, false, yes, no, on, off).</td>
     <td align="center" valign="top">No, defaults to false</td>
   </tr>
 </table>
 </blockquote>
-</blockquote>
+
 <h4>mapper</h4>
 
 <p><em>since Ant 1.6.2</em></p>
@@ -547,7 +545,6 @@ with <a href="../Types/propertyset.html">syspropertyset</a>s.</p>
 <p><em>since Ant 1.8.0</em>.</p>
 
 <h3>Examples</h3>
-<blockquote>
   <pre>
 &lt;xslt basedir=&quot;doc&quot; destdir=&quot;build/doc&quot;
        extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;/&gt;</pre>
@@ -670,8 +667,7 @@ with <a href="../Types/propertyset.html">syspropertyset</a>s.</p>
 &lt;project&gt;
   &lt;xslt style=&quot;printFilename.xsl&quot; destdir=&quot;out&quot; basedir=&quot;in&quot; extension=&quot;.txt&quot;
         filenameparameter=&quot;filename&quot;
-        filedirparameter=&quot;filedir&quot;
-  /&gt;
+        filedirparameter=&quot;filedir&quot;/&gt;
 &lt;/project&gt;
 
 &lt;xsl:stylesheet
@@ -693,11 +689,9 @@ with <a href="../Types/propertyset.html">syspropertyset</a>s.</p>
 <pre>
 &lt;xslt ...&gt;
     &lt;sysproperty key="org.apache.xerces.xni.parser.XMLParserConfiguration"
-                 value="org.apache.xerces.parsers.XIncludeParserConfiguration"
-     /&gt;
+                 value="org.apache.xerces.parsers.XIncludeParserConfiguration"/&gt;
 &lt;xslt&gt;
 </pre>
-</blockquote>
 
 </body>
 </html>

manual/Tasks/symlink.html

@@ -52,7 +52,7 @@ set of links to record, or a set of property files to create links from.
   <tr>
     <td valign="top">link</td>
     <td valign="top">The name of the link to be created or deleted.<br/>
-      <b>Note</b> this attribute is resolved against the current
+      <strong>Note</strong>: this attribute is resolved against the current
       working directory rather than the project's basedir for
       historical reasons.  It is recommended you always use an
       absolute path or a path like <code>${basedir}/some-path</code>
@@ -124,7 +124,7 @@ set of links to record, or a set of property files to create links from.
  &lt;symlink action="delete" link="${dir.top}/foo"/&gt;
  </pre>
 
-  <p><strong>Java 1.2 and earlier:</strong> Due to limitations on executing system
+  <p><strong>Java 1.2 and earlier</strong>: Due to limitations on executing system
   level commands in Java versions earlier than 1.3 this task may have difficulty
   operating with a relative path in ANT_HOME. The typical symptom is an
   IOException where Apache Ant can't find /some/working/directory${ANT_HOME}/bin/antRun
@@ -132,7 +132,7 @@ set of links to record, or a set of property files to create links from.
   variable to an absolute path, which will remove the /some/working/directory portion
   of the above path and allow Ant to find the correct commandline execution script.
 
-  <p><strong>NOTE:</strong> Starting Ant version 1.10.2, this task relies on the symbolic
+<p><strong>Note</strong>: <em>Since Ant 1.10.2</em>, this task relies on the symbolic
     link support introduced in Java 7 through the java.nio.file.Files APIs</p>
 
 </body>

manual/Tasks/sync.html

@@ -58,7 +58,7 @@ dir, it will get removed from the target.</p>
     <td valign="top">includeEmptyDirs</td>
      <td valign="top">Copy any empty directories included in the
        resource collection(s).<br/>
-       <b>Note</b> this attribute also controls the behavior for any
+       <strong>Note</strong> this attribute also controls the behavior for any
        nested &lt;preserveintarget&gt; element.  If this attribute is
        false (the default) empty directories that only exist in the
        target directory will be removed even if they are matched by

manual/Tasks/tar.html

@@ -243,11 +243,11 @@ and the rest are use the default mode (read-write by owner). The first
 fileset selects just the executable files. The second fileset must exclude
 the executable files and include all others.</p>
 
-<p><strong>Note:</strong> The tar task does not ensure that a file is only selected
+<p><strong>Note</strong>: The tar task does not ensure that a file is only selected
 by one resource collection. If the same file is selected by more than one collection, it will be included in the
 tar file twice, with the same path.</p>
 
-<p><strong>Note:</strong> The patterns in the include and exclude
+<p><strong>Note</strong>: The patterns in the include and exclude
 elements are considered to be relative to the corresponding dir
 attribute as with all other filesets.  In the example above,
 <code>${dist.name}</code> is not an absolute path, but a simple name
@@ -265,7 +265,7 @@ Unix file permissions have been stored as part of the ZIP file, they
 will be retained in the resulting tar archive.</p>
 
 
-<p><strong>Note:</strong>
+<p><strong>Note</strong>:
   Please note the tar task creates a tar file, it does not append
   to an existing tar file. The existing tar file is replaced instead.
   As with most tasks in Ant, the task only takes action if the output

manual/Tasks/telnet.html

@@ -32,7 +32,7 @@ nested <tt>&lt;read&gt;</tt> to indicate strings to wait for, and
 
 <p>If you do specify a userid and password, the system will
 assume a common unix prompt to wait on. This behavior can be easily over-ridden.</p>
-<p><b>Note:</b> This task depends on external libraries not included in the Apache Ant distribution.
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant distribution.
 See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p>
 
 <h3>Parameters</h3>

manual/Tasks/touch.html

@@ -32,7 +32,7 @@ at the same time. In addition to working with a single file, this Task
 can also work on <a href="../Types/resources.html">resources</a> and
 resource collections (which also includes directories).  Prior to Apache Ant
 1.7 only FileSet or <a href="../Types/filelist.html">Filelist</a>
-(since Ant 1.6) have been supported.</p>
+(<em>since Ant 1.6</em>) have been supported.</p>
 
 <p>Ant uses the API of <code>java.io.File</code> to set the last
   modification time which has some limitations.  For example the
@@ -99,7 +99,7 @@ resource collections (which also includes directories).  Prior to Apache Ant
 
 <p>You can use any number of nested resource collection elements to
 define the resources for this task and refer to resources defined
-elsewhere.  <b>Note:</b> resources passed to this task must implement
+elsewhere.  <strong>Note</strong>: resources passed to this task must implement
 the <code>org.apache.tools.ant.types.resources.Touchable</code>
 interface, this is true for all filesystem-based resources like those
 returned by path, fileset ot filelist.</p>

manual/Tasks/truncate.html

@@ -88,7 +88,7 @@ a single file, this Task can also work on
 
 <p>You can use any number of nested resource collection elements to
 define the resources for this task and refer to resources defined
-elsewhere.  <b>Note:</b> resources passed to this task are expected
+elsewhere.  <strong>Note</strong>: resources passed to this task are expected
 to be filesystem-based.</p>
 
 <h3>Examples</h3>

manual/Tasks/unzip.html

@@ -91,7 +91,7 @@ archive.</p>
   </tr>
   <tr>
     <td valign="top">compression</td>
-    <td valign="top"><b>Note:</b> This attribute is only available for
+    <td valign="top"><strong>Note</strong>: This attribute is only available for
     the <code>untar</code> task.<br>
     compression method.  Allowable values are &quot;none&quot;,
     &quot;gzip&quot;, &quot;xz&quot; and &quot;bzip2&quot;.  Default is
@@ -130,7 +130,7 @@ archive.</p>
   </tr>
   <tr>
     <td valign="top">scanForUnicodeExtraFields</td>
-    <td valign="top"><b>Note:</b> This attribute is not available for
+    <td valign="top"><strong>Note</strong>: This attribute is not available for
     the <code>untar</code> task.<br>
       If the archive contains uncode extra fields then use them to set
       the file names, ignoring the specified encoding.

manual/Tasks/uptodate.html

@@ -82,7 +82,7 @@ target execution depending on the relative age of the specified files.</p>
 <a href="../Types/fileset.html">fileset</a> and allows you to
 specify a set of files to check against the target file(s).</p>
 
-<p><strong>Note:</strong> You can specify either the <code>srcfile</code>
+<p><strong>Note</strong>: You can specify either the <code>srcfile</code>
 attribute or nested <code>&lt;srcfiles&gt;</code> elements, but not both.
 
 <p>Note that the task will completely ignore any directories that seem

manual/Tasks/war.html

@@ -212,7 +212,7 @@ to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
     that the permissions haven't been stored at all rather than real
     permissions and will instead apply its own default values.<br/>
     Set this attribute to true if you really want to preserve the
-      original permission field.<em>since Ant 1.8.0</em>
+      original permission field. <em>since Ant 1.8.0</em>
     </td>
     <td valign="top" align="center">No, default is false</td>
   </tr>

manual/Tasks/whichresource.html

@@ -75,7 +75,7 @@
           The classpath to use, given as a
           <a href="../using.html#references">reference</a>
           to a path defined elsewhere.
-          <em>Since Apache Ant 1.7.1.</em>
+          <em>Since Apache Ant 1.7.1</em>.
         </td>
         <td align="center" valign="top">No</td>
       </tr>

manual/Tasks/xmlproperty.html

@@ -145,7 +145,7 @@ is roughly equivalent to the following fragments in a build.xml file:
   </tr>
   <tr>
     <td valign="top">delimiter</td>
-    <td valign="top">Delimiter for splitting multiple values.<br><i>since Apache Ant 1.7.1</i></td>
+    <td valign="top">Delimiter for splitting multiple values.<br><em>since Apache Ant 1.7.1</em></td>
     <td valign="top" align="center">No, defaults to comma</td>
   </tr>
 </table>

manual/Tasks/zip.html

@@ -210,7 +210,7 @@ archive.</p>
     <td valign="top">Whether the file modification times will be
     rounded up to the next even number of seconds.<br>
     Zip archives store file modification times with a granularity of
-    two seconds, so the times will either be rounded up or down.  If
+    two seconds, so the times will either be rounded up or down. If
     you round down, the archive will always seem out-of-date when you
     rerun the task, so the default is to round up.  Rounding up may
     lead to a different type of problems like JSPs inside a web
@@ -246,7 +246,7 @@ archive.</p>
   <tr>
     <td valign="top">useLanguageEncodingFlag</td>
     <td valign="top">Whether to set the language encoding flag if the
-      encoding is UTF-8.  This setting doesn't have any effect if the
+      encoding is UTF-8. This setting doesn't have any effect if the
       encoding is not UTF-8.
       <em>Since Ant 1.8.0</em>.<br/>
       See also the <a href="#encoding">discussion below</a></td>
@@ -301,7 +301,7 @@ archive.</p>
 <p>More recent versions of the ZIP specification introduce something
   called the &quot;language encoding flag&quot; which can be used to
   signal that a file name has been encoded using UTF-8. <em>Since
-  Ant 1.8.0</em>, all zip-/jar- and similar archives written by Ant will set
+  Ant 1.8.0</em>, all zip, jar and similar archives written by Ant will set
   this flag, if the encoding has been set to UTF-8.  Our
   interoperability tests with existing archivers didn't show any ill
   effects (in fact, most archivers ignore the flag to date), but you
@@ -345,7 +345,7 @@ archive.</p>
     jars from your CLASSPATH reads and writes UTF-8 names, it doesn't
     set or recognize any flags or unicode extra fields.</li>
 
-  <li>Starting with Java 7 <code>java.util.zip</code> writes UTF-8 by
+  <li>Since Java 7, <code>java.util.zip</code> writes UTF-8 by
     default and uses the language encoding flag.  It is possible to
     specify a different encoding when reading/writing ZIPs via new
     constructors.  The package now recognizes the language encoding
@@ -411,8 +411,8 @@ archive.</p>
   will be written has to be made before writing the entry's
   content.</p>
 
-<p>Starting with Ant 1.9.0 Ant supports Zip64 extensions but didn't
-  provide any control over their usage, starting with Ant 1.9.1 a
+<p>Ant 1.9.0 introduced support for Zip64 extensions but didn't
+  provide any control over their usage. <em>Since Ant 1.9.1</em>, a
   new <em>zip64mode</em> attribute was added to the <code>zip</code>
   family of tasks.  It supports three values:
 
@@ -420,7 +420,7 @@ archive.</p>
   <li><em>never</em> means no Zip64 extra fields will ever be
     written, this is the behavior of Ant 1.8.x and earlier and the
     default behavior of <code>jar</code>, <code>ear</code>
-    and <code>war</code> starting with Ant 1.9.1.</li>
+    and <code>war</code> <em>since Ant 1.9.1</em>.</li>
   <li><em>always</em> means Zip64 extra fields are written for all
     entries.</li>
   <li><em>as-needed</em> means Zip64 extra fields are written for all
@@ -461,29 +461,25 @@ the same way that <i>zipfileset src</i> files are added.</p>
 
 <h3>Examples</h3>
 <pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
-       basedir=&quot;htdocs/manual&quot;
-  /&gt;</pre>
+       basedir=&quot;htdocs/manual&quot;/&gt;</pre>
 <p>zips all files in the <code>htdocs/manual</code> directory into a file called <code>manual.zip</code>
 in the <code>${dist}</code> directory.</p>
 <pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
        basedir=&quot;htdocs/manual&quot;
-       update=&quot;true&quot;
-  /&gt;</pre>
+       update=&quot;true&quot;/&gt;</pre>
 <p>zips all files in the <code>htdocs/manual</code> directory into a file called <code>manual.zip</code>
 in the <code>${dist}</code> directory. If <code>manual.zip</code>
 doesn't exist, it is created; otherwise it is updated with the
 new/changed files.</p>
 <pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
        basedir=&quot;htdocs/manual&quot;
-       excludes=&quot;mydocs/**, **/todo.html&quot;
-  /&gt;</pre>
+       excludes=&quot;mydocs/**, **/todo.html&quot;/&gt;</pre>
 <p>zips all files in the <code>htdocs/manual</code> directory. Files in the directory <code>mydocs</code>,
 or files with the name <code>todo.html</code> are excluded.</p>
 <pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
        basedir=&quot;htdocs/manual&quot;
        includes=&quot;api/**/*.html&quot;
-       excludes=&quot;**/todo.html&quot;
-  /&gt;</pre>
+       excludes=&quot;**/todo.html&quot;/&gt;</pre>
 <p>zips all files in the <code>htdocs/manual</code> directory. Only html files under the directory <code>api</code>
 are zipped, and files with the name <code>todo.html</code> are excluded.</p>
 <pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;

manual/stylesheets/style.css

@@ -17,50 +17,70 @@
  */
 h2 {
   font-size: 200%;
-  background-color: ffffff;
+  background-color: white;
 }
 
 h3 {
   font-size: 130%;
-  color:     #ffffff;
+  color: white;
   background-color: #525D76;
 }
 
 h4 {
-  color:  #ffffff;
+  color: white;
   background-color: #828DA6;
 }
 
+h5 {
+  font-size: 100%;
+  color: white;
+  background-color: #a6adbe;
+  margin-top: .5rem;
+  margin-bottom: .5rem;
+}
+
+h6 {
+  font-size: 100%;
+  color: white;
+  background-color: #c1c5d1;
+  margin-top: .5rem;
+  margin-bottom: .5rem;
+}
+
+h5 + p, h6 + p {
+  margin-top: .5rem;
+  margin-bottom: .5rem;
+}
+
 td {
-   background-color: eeeeee;
-   color:            000000;
+   background-color: #eeeeee;
+   color: black;
 }
 
 /* first row */
 table tr:first-child td {
-   background-color: cccccc;
-   color:            000000;
+   background-color: silver;
+   color: black;
 }
 
 /* or th as first row */
 table th {
-   background-color: cccccc;
-   color:            000000;
+   background-color: silver;
+   color: black;
 }
 
 pre {
-   background-color: efefef;
+   background-color: #efefef;
 }
 
 /* code snippets in examples and tutorials */
 .code { 
    background: #EFEFEF; 
-   margin-top: 
 }
 
 /* highlight console output */
 .output { 
-   color: #FFFFFF; 
+   color: white;
    background: #837A67; 
 }