ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gin...@apache.org
Subject [10/47] ant git commit: Use HTML 5(-ish), fix links
Date Wed, 28 Feb 2018 07:01:25 GMT
http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/dirtasks.html
----------------------------------------------------------------------
diff --git a/manual/dirtasks.html b/manual/dirtasks.html
index a4c3347..aec8a86 100644
--- a/manual/dirtasks.html
+++ b/manual/dirtasks.html
@@ -27,41 +27,43 @@
 <h2 id="directorybasedtasks">Directory-based Tasks</h2>
 <p>Some tasks use directory trees for the actions they perform.
 For example, the <a href="Tasks/javac.html">javac</a> task, which
-compiles a directory tree with <code>.java</code> files into
-<code>.class</code> files, is one of these directory-based tasks. Because
+compiles a directory tree with <samp>.java</samp> files into
+<samp>.class</samp> files, is one of these directory-based tasks. Because
 some of these tasks do so much work with a directory tree, the task itself
 can act as an implicit <a href="Types/fileset.html">FileSet</a>.</p>
+
 <p>Whether the fileset is implicit or not, it can often be very useful to
 work on a subset of the directory tree. This section describes how you can
 select a subset of such a directory tree when using one of these
 directory-based tasks.</p>
-<p>Apache Ant gives you two ways to create a subset of files in a fileset, both of
-which can be used at the same time:</p>
+
+<p>Apache Ant gives you two ways to create a subset of files in a
+fileset, both of which can be used at the same time:</p>
 <ul>
   <li>Only include files and directories that match any
-    <code>include</code> patterns and do not match any
-    <code>exclude</code> patterns in a given
+    <var>include</var> patterns and do not match any
+    <var>exclude</var> patterns in a given
     <a href="Types/patternset.html">PatternSet</a>.</li>
   <li>Select files based on selection criteria defined by a collection of
     <a href="Types/selectors.html">selector</a> nested elements.</li>
 </ul>
 <h3 id="patternset">Patternset</h3>
 
-<p>We said that Directory-based tasks can sometimes act as an implicit
-<a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
-but in addition to that, a FileSet acts as an implicit
-<a href="Types/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
+<p>We said that Directory-based tasks can sometimes act as an
+implicit <a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
+but in addition to that, a FileSet acts as an
+implicit <a href="Types/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
 
 <p>The inclusion and exclusion elements of the implicit PatternSet can be
 specified inside the directory-based task (or explicit fileset) via
 either:</p>
 <ul>
-  <li>the attributes <code>includes</code> and
-    <code>excludes</code>.</li>
+  <li>the attributes <var>includes</var> and
+    <var>excludes</var>.</li>
   <li>nested elements <code>&lt;include&gt;</code> and
     <code>&lt;exclude&gt;</code>.</li>
   <li>external files specified with the attributes
-    <code>includesfile</code> and <code>excludesfile</code>.</li>
+    <var>includesfile</var> and <var>excludesfile</var>.</li>
   <li>external files specified with the nested elements
     <code>&lt;includesfile&gt;</code> and <code>&lt;excludesfile&gt;</code>.
   </li>
@@ -82,108 +84,106 @@ the default excludes).</p>
 <p>As described earlier, patterns are used for the inclusion and exclusion
 of files. These patterns look very much like the patterns used in DOS and
 UNIX:</p>
-<p>'*' matches zero or more characters, '?' matches one character.</p>
+
+<p><q>*</q> matches zero or more characters, <q>?</q> matches one character.</p>
 
 <p>In general, patterns are considered relative paths, relative to a
-task dependent base directory (the dir attribute in the case of
-<code>&lt;fileset&gt;</code>).  Only files found below that base
-directory are considered.  So while a pattern like
-<code>../foo.java</code> is possible, it will not match anything when
-applied since the base directory's parent is never scanned for
-files.</p>
+task dependent base directory (the <var>dir</var> attribute in the
+case of <code>&lt;fileset&gt;</code>).  Only files found below that base
+directory are considered.  So while a pattern
+like <samp>../foo.java</samp> is possible, it will not match
+anything when applied since the base directory's parent is never
+scanned for files.</p>
 
-<h5>Examples:</h5>
+<h5>Examples</h5>
 <p>
-<code>*.java</code>&nbsp;&nbsp;matches&nbsp;&nbsp;<code>.java</code>,
-<code>x.java</code> and <code>FooBar.java</code>, but
-not <code>FooBar.xml</code> (does not end with <code>.java</code>).</p>
-<p>
-<code>?.java</code>&nbsp;&nbsp;matches&nbsp;&nbsp;<code>x.java</code>,
-<code>A.java</code>, but not <code>.java</code> or <code>xyz.java</code>
-(both don't have one character before <code>.java</code>).</p>
+<samp>*.java</samp>&nbsp;&nbsp;matches&nbsp;&nbsp;<samp>.java</samp>,
+<samp>x.java</samp> and <samp>FooBar.java</samp>, but
+not <samp>FooBar.xml</samp> (does not end with <samp>.java</samp>).</p>
+
 <p>
-Combinations of <code>*</code>'s and <code>?</code>'s are allowed.</p>
+<samp>?.java</samp>&nbsp;&nbsp;matches&nbsp;&nbsp;<samp>x.java</samp>,
+<samp>A.java</samp>, but not <samp>.java</samp> or <samp>xyz.java</samp>
+(both don't have one character before <samp>.java</samp>).</p>
+
+<p>Combinations of <q>*</q>'s and <q>?</q>'s are allowed.</p>
+
 <p>Matching is done per-directory. This means that first the first directory in
 the pattern is matched against the first directory in the path to match. Then
-the second directory is matched, and so on. For example, when we have the pattern
-<code>/?abc/*/*.java</code>
-and the path <code>/xabc/foobar/test.java</code>,
-the first <code>?abc</code> is matched with <code>xabc</code>,
-then <code>*</code> is matched with <code>foobar</code>,
-and finally <code>*.java</code> is matched with <code>test.java</code>.
+the second directory is matched, and so on. For example, when we have
+the pattern <samp>/?abc/*/*.java</samp>
+and the path <samp>/xabc/foobar/test.java</samp>,
+the first <samp>?abc</samp> is matched with <samp>xabc</samp>,
+then <samp>*</samp> is matched with <samp>foobar</samp>,
+and finally <samp>*.java</samp> is matched with <samp>test.java</samp>.
 They all match, so the path matches the pattern.</p>
+
 <p>To make things a bit more flexible, we add one extra feature, which makes it
 possible to match multiple directory levels. This can be used to match a
 complete directory tree, or a file anywhere in the directory tree.
-To do this, <code>**</code>
-must be used as the name of a directory.
-When <code>**</code> is used as the name of a
-directory in the pattern, it matches zero or more directories.
-For example:
-<code>/test/**</code> matches all files/directories under <code>/test/</code>,
-such as <code>/test/x.java</code>,
-or <code>/test/foo/bar/xyz.html</code>, but not <code>/xyz.xml</code>.</p>
-<p>There is one &quot;shorthand&quot;: if a pattern ends
-with <code>/</code>
-or <code>\</code>, then <code>**</code>
-is appended.
-For example, <code>mypackage/test/</code> is interpreted as if it were
-<code>mypackage/test/**</code>.</p>
-<h5>Example patterns:</h5>
+To do this, <q>**</q> must be used as the name of a
+directory. When <samp>**</samp> is used as the name of a directory in
+the pattern, it matches zero or more directories. For
+example: <samp>/test/**</samp> matches all files/directories
+under <samp>/test/</samp>, such as <samp>/test/x.java</samp>,
+or <samp>/test/foo/bar/xyz.html</samp>, but not <samp>/xyz.xml</samp>.</p>
+
+<p>There is one &quot;shorthand&quot;: if a pattern ends with <q>/</q>
+or <q>\</q>, then <q>**</q> is appended. For
+example, <samp>mypackage/test/</samp> is interpreted as if it
+were <samp>mypackage/test/**</samp>.</p>
+
+<h5>Example patterns</h5>
 <table>
   <tr>
-    <td valign="top"><code>**/CVS/*</code></td>
-    <td valign="top">Matches all files in <code>CVS</code>
+    <td>Example</td>
+    <td>Explanation</td>
+  </tr>
+  <tr>
+    <td><samp>**/CVS/*</samp></td>
+    <td>Matches all files in <samp>CVS</samp>
       directories that can be located
       anywhere in the directory tree.<br>
       Matches:
-      <pre>
-      CVS/Repository
-      org/apache/CVS/Entries
-      org/apache/jakarta/tools/ant/CVS/Entries
-      </pre>
-      But not:
-      <pre>
-      org/apache/CVS/foo/bar/Entries (<code>foo/bar/</code>
-      part does not match)
-      </pre>
+<pre>
+CVS/Repository
+org/apache/CVS/Entries
+org/apache/jakarta/tools/ant/CVS/Entries</pre>
+But not:
+<pre>org/apache/CVS/foo/bar/Entries</pre>
+(<samp>foo/bar/</samp> part does not match)
     </td>
   </tr>
   <tr>
-    <td valign="top"><code>org/apache/jakarta/**</code></td>
-    <td valign="top">Matches all files in the <code>org/apache/jakarta</code>
+    <td><samp>org/apache/jakarta/**</samp></td>
+    <td>Matches all files in the <samp>org/apache/jakarta</samp>
       directory tree.<br>
       Matches:
-      <pre>
-      org/apache/jakarta/tools/ant/docs/index.html
-      org/apache/jakarta/test.xml
-      </pre>
-      But not:
-      <pre>
-      org/apache/xyz.java
-      </pre>
-      (<code>jakarta/</code> part is missing).</td>
+<pre>
+org/apache/jakarta/tools/ant/docs/index.html
+org/apache/jakarta/test.xml
+</pre>
+But not:
+<pre>org/apache/xyz.java</pre>
+(<code>jakarta/</code> part is missing).</td>
   </tr>
   <tr>
-    <td valign="top"><code>org/apache/**/CVS/*</code></td>
-    <td valign="top">Matches all files in <code>CVS</code> directories
+    <td><samp>org/apache/**/CVS/*</samp></td>
+    <td>Matches all files in <samp>CVS</samp> directories
       that are located anywhere in the directory tree under
-      <code>org/apache</code>.<br>
+      <samp>org/apache</samp>.<br>
       Matches:
-      <pre>
-      org/apache/CVS/Entries
-      org/apache/jakarta/tools/ant/CVS/Entries
-      </pre>
-      But not:
-      <pre>
-      org/apache/CVS/foo/bar/Entries
-      </pre>
-      (<code>foo/bar/</code> part does not match)</td>
+<pre>
+org/apache/CVS/Entries
+org/apache/jakarta/tools/ant/CVS/Entries</pre>
+But not:
+<pre>org/apache/CVS/foo/bar/Entries</pre>
+(<samp>foo/bar/</samp> part does not match)</td>
   </tr>
   <tr>
-    <td valign="top"><code>**/test/**</code></td>
-    <td valign="top">Matches all files that have a <code>test</code>
-        element in their path, including <code>test</code> as a filename.</td>
+    <td><samp>**/test/**</samp></td>
+    <td>Matches all files that have a <samp>test</samp>
+        element in their path, including <samp>test</samp> as a filename.</td>
   </tr>
 </table>
 <p>When these patterns are used in inclusion and exclusion, you have a powerful
@@ -191,28 +191,27 @@ way to select just the files you want.</p>
 
 <h3 id="selectors">Selectors</h3>
 <p>The <a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
-whether implicit or explicit in the
-directory-based task, also acts as an
-<a href="Types/selectors.html#andselect"><code>&lt;and&gt;</code></a>
+whether implicit or explicit in the directory-based task, also acts as
+an <a href="Types/selectors.html#andselect"><code>&lt;and&gt;</code></a>
 selector container. This can be used to create arbitrarily complicated
-selection criteria for the files the task should work with. See the
-<a href="Types/selectors.html">Selector</a> documentation for more
-information.</p>
+selection criteria for the files the task should work with. See
+the <a href="Types/selectors.html">Selector</a> documentation for
+more information.</p>
 
 <h3 id="tasklist">Standard Tasks/Filesets</h3>
 <p>Many of the standard tasks in ant take one or more filesets which follow
 the rules given here. This list, a subset of those, is a list of standard ant
 tasks that can act as an implicit fileset:</p>
 <ul>
-      <li><a href="Tasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
-  <li><a href="Tasks/copydir.html"><code>&lt;copydir&gt;</code></a> (deprecated)</li>
+  <li><a href="Tasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
+  <li><a href="Tasks/copydir.html"><code>&lt;copydir&gt;</code></a> (<em>deprecated</em>)</li>
   <li><a href="Tasks/delete.html"><code>&lt;delete&gt;</code></a></li>
   <li><a href="Tasks/dependset.html"><code>&lt;dependset&gt;</code></a></li>
   <li><a href="Tasks/fixcrlf.html"><code>&lt;fixcrlf&gt;</code></a></li>
   <li><a href="Tasks/javac.html"><code>&lt;javac&gt;</code></a></li>
   <li><a href="Tasks/replace.html"><code>&lt;replace&gt;</code></a></li>
   <li><a href="Tasks/rmic.html"><code>&lt;rmic&gt;</code></a></li>
-  <li><a href="Tasks/style.html"><code>&lt;style&gt;</code> (aka <code>&lt;xslt&gt;</code>)</a></li>
+  <li><a href="Tasks/style.html"><code>&lt;xslt&gt;</code> (aka <code>&lt;style&gt;</code>)</a></li>
   <li><a href="Tasks/tar.html"><code>&lt;tar&gt;</code></a></li>
   <li><a href="Tasks/zip.html"><code>&lt;zip&gt;</code></a></li>
   <li><a href="Tasks/ejb.html#ddcreator"><code>&lt;ddcreator&gt;</code></a></li>
@@ -221,14 +220,12 @@ tasks that can act as an implicit fileset:</p>
   <li><a href="Tasks/cab.html"><code>&lt;cab&gt;</code></a></li>
   <li><a href="Tasks/native2ascii.html"><code>&lt;native2ascii&gt;</code></a></li>
   <li><a href="Tasks/netrexxc.html"><code>&lt;netrexxc&gt;</code></a></li>
-  <li>
-    <a href="Tasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a>
-  </li>
+  <li><a href="Tasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a></li>
   <li><a href="Tasks/depend.html"><code>&lt;depend&gt;</code></a></li>
   <li><a href="Tasks/translate.html"><code>&lt;translate&gt;</code></a></li>
   <li><a href="Tasks/image.html"><code>&lt;image&gt;</code></a></li>
-  <li><a href="Tasks/jlink.html"><code>&lt;jlink&gt;</code></a> (deprecated)</li>
-  <li><a href="Tasks/jspc.html"><code>&lt;jspc&gt;</code></a></li>
+  <li><a href="Tasks/jlink.html"><code>&lt;jlink&gt;</code></a> (<em>deprecated</em>)</li>
+  <li><a href="Tasks/jspc.html"><code>&lt;jspc&gt;</code></a> (<em>deprecated</em>)</li>
   <li><a href="Tasks/wljspc.html"><code>&lt;wljspc&gt;</code></a></li>
 </ul>
 
@@ -237,22 +234,20 @@ tasks that can act as an implicit fileset:</p>
 &lt;copy todir=&quot;${dist}&quot;&gt;
   &lt;fileset dir=&quot;${src}&quot;
            includes=&quot;**/images/*&quot;
-           excludes=&quot;**/*.gif&quot;
-  /&gt;
+           excludes=&quot;**/*.gif&quot;/&gt;
 &lt;/copy&gt;</pre>
-<p>This copies all files in directories called <code>images</code> that are
-located in the directory tree defined by <code>${src}</code> to the
-destination directory defined by <code>${dist}</code>,
-but excludes all <code>*.gif</code> files from the copy.</p>
+<p>This copies all files in directories called <samp>images</samp> that are
+located in the directory tree defined by <samp>${src}</samp> to the
+destination directory defined by <samp>${dist}</samp>,
+but excludes all <samp>*.gif</samp> files from the copy.</p>
 <pre>
 &lt;copy todir=&quot;${dist}&quot;&gt;
   &lt;fileset dir=&quot;${src}&quot;&gt;
     &lt;include name=&quot;**/images/*&quot;/&gt;
     &lt;exclude name=&quot;**/*.gif&quot;/&gt;
   &lt;/fileset&gt;
-&lt;/copy&gt;
-</pre>
-<p> The same as the example above, but expressed using nested elements.</p>
+&lt;/copy&gt;</pre>
+<p>The same as the example above, but expressed using nested elements.</p>
 
 <pre>
 &lt;delete dir=&quot;${dist}&quot;&gt;
@@ -265,47 +260,44 @@ as an implicit fileset.</p>
 
 <h3 id="defaultexcludes">Default Excludes</h3>
 <p>There are a set of definitions that are excluded by default from all
-    directory-based tasks. <em>Since Ant 1.8.1</em> they are:</p>
+directory-based tasks. <em>Since Ant 1.8.1</em> they are:</p>
 <pre>
-     **/*~
-     **/#*#
-     **/.#*
-     **/%*%
-     **/._*
-     **/CVS
-     **/CVS/**
-     **/.cvsignore
-     **/SCCS
-     **/SCCS/**
-     **/vssver.scc
-     **/.svn
-     **/.svn/**
-     **/.DS_Store
-</pre>
+**/*~
+**/#*#
+**/.#*
+**/%*%
+**/._*
+**/CVS
+**/CVS/**
+**/.cvsignore
+**/SCCS
+**/SCCS/**
+**/vssver.scc
+**/.svn
+**/.svn/**
+**/.DS_Store</pre>
 <p><em>Since Ant 1.8.2</em>, additional default excludes are:</p>
 <pre>
-     **/.git
-     **/.git/**
-     **/.gitattributes
-     **/.gitignore
-     **/.gitmodules
-     **/.hg
-     **/.hg/**
-     **/.hgignore
-     **/.hgsub
-     **/.hgsubstate
-     **/.hgtags
-     **/.bzr
-     **/.bzr/**
-     **/.bzrignore
-</pre>
+**/.git
+**/.git/**
+**/.gitattributes
+**/.gitignore
+**/.gitmodules
+**/.hg
+**/.hg/**
+**/.hgignore
+**/.hgsub
+**/.hgsubstate
+**/.hgtags
+**/.bzr
+**/.bzr/**
+**/.bzrignore</pre>
 <p>If you do not want these default excludes applied, you may disable
-them with the <code>defaultexcludes=&quot;no&quot;</code>
-attribute.</p>
+them with the <var>defaultexcludes</var>=<q>no</q> attribute.</p>
 
 <p>This is the default list; note that you can modify the list of
-default excludes by using the <a
-href="Tasks/defaultexcludes.html">defaultexcludes</a> task.</p>
+default excludes by using
+the <a href="Tasks/defaultexcludes.html">defaultexcludes</a> task.</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/feedback.html
----------------------------------------------------------------------
diff --git a/manual/feedback.html b/manual/feedback.html
index 3baa19b..f92ef0c 100644
--- a/manual/feedback.html
+++ b/manual/feedback.html
@@ -19,52 +19,51 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant User Manual - Feedback</title>
+<title>Apache Ant User Manual&mdash;Feedback</title>
 </head>
 
 <body>
 
 <h1 id="feedback">Feedback and Troubleshooting</h1>
-<p>If things do not work, especially simple things like <tt>ant -version</tt>,
+<p>If things do not work, especially simple things like <code>ant -version</code>,
   then something is wrong with your configuration. Before filing bug reports and
   emailing all the Apache Ant mailing lists</p>
 <ol>
-  <li>Check your environment variables. Are ANT_HOME and JAVA_HOME correct? If
+  <li>Check your environment variables. Are <code>ANT_HOME</code> and <code>JAVA_HOME</code> correct? If
     they have quotes or trailing slashes, remove them.</li>
-  <li>Unset CLASSPATH; if that is wrong things go horribly wrong. Ant does not
-    need the CLASSPATH variable defined to anything to work.</li>
-  <li>Make sure there are no versions of crimson.jar or other XML parsers in JRE/ext</li>
-  <li>Is your path correct? is Ant on it? What about JDK/bin? have you tested
-    this? If you are using Jikes, is it on the path? A createProcess error (especially
-    with ID=2 on windows) usually means executable not found on the path.</li>
+  <li>Unset <code>CLASSPATH</code>; if that is wrong things go horribly wrong. Ant does not
+    need the <code>CLASSPATH</code> variable defined to anything to work.</li>
+  <li>Make sure there are no versions of <samp>crimson.jar</samp> or other XML parsers in <samp>JAVA_HOME/jre/lib/ext</samp></li>
+  <li>Is your path correct? is Ant on it? What about <samp>JAVA_HOME/bin</samp>? have you tested
+    this? If you are using Jikes, is it on the path? A CreateProcess error (especially
+    with <code>error=2</code>) on Windows usually means executable not found on the path.</li>
   <li>Which version of ant are you running? Other applications distribute a copy
     -it may be being picked up by accident.</li>
-  <li>If a task is failing to run is optional.jar in ANT_HOME/lib? Are there any
+  <li>If a task failing to run is from <samp>optional.jar</samp> in <samp>ANT_HOME/lib</samp>? Are there any
     libraries which it depends on missing?</li>
-  <li>If a task doesn't do what you expect, run <tt>ant -verbose</tt> or <tt>ant
-    -debug</tt> to see what is happening</li>
+  <li>If a task doesn't do what you expect, run <code>ant -verbose</code> or <code>ant
+    -debug</code> to see what is happening</li>
 </ol>
-<p>If you can't fix your problem, start with the <a href="http://ant.apache.org/mail.html" target="_top">Ant
-  User Mailing List</a> . These are other ant users who will help you learn to
+<p>If you can't fix your problem, start with the <a href="https://ant.apache.org/mail.html" target="_top">Ant
+  User Mailing List</a>. These are other ant users who will help you learn to
   use ant. If they cannot fix it then someone may suggest filing a bug report,
   which will escalate the issue. Remember of course, that support, like all open
   source development tasks, is voluntary. If you haven't invested time in helping
   yourself by following the steps above, it is unlikely that anyone will invest
-  the time in helping you. </p>
-<p>Also, if you don't understand something, the <a href="http://ant.apache.org/mail.html" target="_top">Ant
+  the time in helping you.</p>
+<p>Also, if you don't understand something, the <a href="https://ant.apache.org/mail.html" target="_top">Ant
   User Mailing List</a> is the place to ask questions. Not the developer list,
   nor the individuals whose names appears in the source and documentation. If
-  they answered all such emails, nobody would have any time to improve ant. </p>
-<p>To provide feedback on this software, please subscribe to the <a href="http://ant.apache.org/mail.html" target="_top">Ant
-  User Mailing List</a> </p>
-
+  they answered all such emails, nobody would have any time to improve Ant.</p>
+<p>To provide feedback on this software, please subscribe to the <a href="https://ant.apache.org/mail.html" target="_top">Ant
+  User Mailing List</a></p>
 <p>If you want to contribute to Ant or stay current with the latest
-development, join the
-<a href="http://ant.apache.org/mail.html" target="_top">Ant Development Mailing List</a>
-</p>
-<p>A searchable archive can be found at <a
-href="http://marc.theaimsgroup.com" target="_top">http://marc.theaimsgroup.com</a>.
-Other archives will be documented online at  <a href="http://ant.apache.org/mail.html#Archives" target="_top">Mailing Lists Archives</a> </p>
+  development, join
+  the <a href="https://ant.apache.org/mail.html" target="_top">Ant Development Mailing List</a></p>
+<p>A searchable archive can be found
+  at <a href="https://marc.info" target="_top">https://marc.info</a>. Other
+  archives will be documented online
+  at <a href="https://ant.apache.org/mail.html#Archives" target="_top">Mailing Lists Archives</a></p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/ide.html
----------------------------------------------------------------------
diff --git a/manual/ide.html b/manual/ide.html
index e3d6bae..940d126 100644
--- a/manual/ide.html
+++ b/manual/ide.html
@@ -34,68 +34,38 @@ All the modern Java IDEs support Apache Ant almost out of the box.
 
 <ul>
   <li>
-    <a href="http://antrunner.sourceforge.net/">
-      AntRunner For JBuilder (unbundled)
-    </a>
+    <a href="Integration/jext-plugin.html">AntWork Plugin for the Jext Java Text Editor (unbundled)</a>
   </li>
   <li>
-    <a href="Integration/jext-plugin.html">
-      AntWork Plugin for the Jext Java Text Editor (unbundled)
-    </a>
-  </li>
-  <li>
-    <a href="http://jdee.sunsite.dk/">
-      JDEE (Java Development Environment for Emacs)
-    </a> has built-in text ANT integration: selection of target through text
+    <a href="http://jdee.sourceforge.net/">JDEE (Java Development Environment for Emacs)</a>
+    has built-in text Ant integration: selection of target through text
     field, execution, hyperlink to compilation errors. Installation: built-in
     JDEE 2.2.8 or later. Configuration: through customize menu
     "Jde Build Function"
   </li>
   <li>
-    <a href="http://www.intellij.com/idea/">
-      IDEA
-    </a> has built-in GUI ANT integration: GUI selection of targets, execution,
-    hyperlink to compilation errors
-  </li>
-  <li>
-    <a href="http://ant.netbeans.org/">
-      NetBeans
-    </a>
-    NetBeans IDE uses Ant as the basis for its project system starting with the 4.0 release.
+    <a href="https://www.jetbrains.com/idea/">IDEA</a> has built-in
+    GUI ANT integration: GUI selection of targets, execution, hyperlink to compilation errors
   </li>
   <li>
-    <a href="http://jedit.org/">
-      jEdit
-    </a>
-    jEdit is an open source java IDE with some great plugins for Java dev, a
-    good XML editor and the Antfarm plugin to execute targets in a build
-    file.
+    <a href="http://ant.netbeans.org/">NetBeans</a>
+    IDE uses Ant as the basis for its project system starting with the 4.0 release
   </li>
   <li>
-    <a href="http://eclipse.org/">
-      Eclipse
-    </a>
-    Eclipse is IBM's counterpoint to NetBeans; an open source IDE with
-    Java and Ant support.
+    <a href="http://jedit.org/">jEdit</a>
+    is an open source Java IDE with some great plugins for Java dev, a
+    good XML editor and the Antfarm plugin to execute targets in a build file
   </li>
   <li>
-    <a href="http://www.placidsystems.com/virtualant/">
-      Virtual Ant</a> GUI allows you to work on a Virtual File System without dealing with the XML. Plugs into Eclipse, Netbeans &amp; Intellij.
+    <a href="https://eclipse.org/">Eclipse</a>
+    is IBM's counterpoint to NetBeans; an open source IDE with Java and Ant support
   </li>
   <li>
-    <a href="http://www7b.software.ibm.com/wsdd/library/techarticles/0203_searle/searle1.html">
-      WebSphere Studio Application Developer
-    </a>
+    <a href="http://www.placidsystems.com/virtualant/">Virtual Ant</a>
+    GUI allows you to work on a Virtual File System without dealing with the XML; plugs into Eclipse, Netbeans &amp; IntelliJ
   </li>
   <li>
-    <a href="http://www.borland.com/jbuilder/pdf/jb9_feamatrix.pdf">
-      JBuilder 9 Personal
-    </a>
-    JBuilder supports Ant with the following features. Add Ant nodes to
-    projects and execute Ant targets from within JBuilder. Add custom Ant-based
-    build tasks with custom Ant libraries to run Ant from within JBuilder.
-    Rapid navigation from Ant build error messages to source files.
-    Customize build menu and toolbar with custom build targets.
+    <a href="https://www.ibm.com/developerworks/offers/wsad2.html">WebSphere Studio Application Developer</a>
   </li>
 </ul>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/ifunless.html
----------------------------------------------------------------------
diff --git a/manual/ifunless.html b/manual/ifunless.html
index 03e970c..cba9b4a 100644
--- a/manual/ifunless.html
+++ b/manual/ifunless.html
@@ -25,25 +25,23 @@
 <body>
   <h1 id="if_and_unless">If And Unless</h1>
 
-  <p><em>Since Ant 1.9.1</em>, it is possible to add if and unless attributes on all tasks and nested elements using special namespaces.</p>
+  <p><em>Since Ant 1.9.1</em>, it is possible to add <var>if</var> and <var>unless</var> attributes on all tasks and nested elements using special namespaces.</p>
 
   <p>In order to use this feature you need to add the following namespace declarations</p>
   <pre>
-    xmlns:if=&quot;ant:if&quot;
-    xmlns:unless=&quot;ant:unless&quot;
-    </pre>
-
-  <p>The if and unless namespaces support the following 3 conditions:</p>
-  <ul>
-    <li>true</li>true if the value of the attribute evaluates to true
-    <li>blank</li>true if the value of the attribute is null or empty
-    <li>set</li>true if the specified property is set
-  </ul>
-<pre>
+xmlns:if=&quot;ant:if&quot;
+xmlns:unless=&quot;ant:unless&quot;</pre>
+
+  <p>The <code>if</code> and <code>unless</code> namespaces support the following 3 conditions:</p>
+  <dl>
+      <dt><q>true</q></dt><dd>true if the value of the attribute evaluates to true</dd>
+      <dt><q>blank</q></dt><dd>true if the value of the attribute is null or empty</dd>
+      <dt><q>set</q></dt><dd>true if the specified property is set</dd>
+  </dl>
+  <pre>
 &lt;project name=&quot;tryit&quot;
  xmlns:if=&quot;ant:if&quot;
- xmlns:unless=&quot;ant:unless&quot;
-&gt;
+ xmlns:unless=&quot;ant:unless&quot;&gt;
  &lt;exec executable=&quot;java&quot;&gt;
    &lt;arg line=&quot;-X&quot; if:true=&quot;${showextendedparams}&quot;/&gt;
    &lt;arg line=&quot;-version&quot; unless:true=&quot;${showextendedparams}&quot;/&gt;
@@ -53,8 +51,7 @@
  &lt;/condition&gt;
  &lt;echo if:set=&quot;onmac&quot;&gt;running on MacOS&lt;/echo&gt;
  &lt;echo unless:set=&quot;onmac&quot;&gt;not running on MacOS&lt;/echo&gt;
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/index.html
----------------------------------------------------------------------
diff --git a/manual/index.html b/manual/index.html
index 9df48a0..faf6111 100644
--- a/manual/index.html
+++ b/manual/index.html
@@ -27,7 +27,7 @@
 <frame src="cover.html" name="mainFrame">
 </frameset>
 <noframes>
-<H2>Apache Ant&trade; User Manual</H2>
+<h2>Apache Ant&trade; User Manual</h2>
 
 <a href="toc.html">Apache Ant User Manual</a></noframes>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/inputhandler.html
----------------------------------------------------------------------
diff --git a/manual/inputhandler.html b/manual/inputhandler.html
index 67235df..e68b8fd 100644
--- a/manual/inputhandler.html
+++ b/manual/inputhandler.html
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="Content-Language" content="en-us">
@@ -34,7 +33,7 @@ embed Apache Ant in an IDE.  Instead it asks an implementation of the
 prompt the user and hand the user input back to the task.</p>
 
 <p>To do this, the task creates an <code>InputRequest</code> object
-and passes it to the <code>InputHandler</code> Such an
+and passes it to the <code>InputHandler</code>. Such an
 <code>InputRequest</code> may know whether a given user input is valid
 and the <code>InputHandler</code> is supposed to reject all invalid
 input.</p>
@@ -49,34 +48,33 @@ every Ant process, users can specify the implementation using the
 method</p>
 
 <pre>
-    void handleInput(InputRequest request)
-        throws org.apache.tools.ant.BuildException;
-</pre>
+void handleInput(InputRequest request)
+   throws org.apache.tools.ant.BuildException;</pre>
 
 <p>with some pre- and postconditions.  The main postcondition is that
 this method must not return unless the <code>request</code> considers
-the user input valid, it is allowed to throw an exception in this
+the user input valid; it is allowed to throw an exception in this
 situation.</p>
 
 <p>Ant comes with three built-in implementations of this interface:</p>
 
 <h3 id="defaulthandler">DefaultInputHandler</h3>
 
-<p>This is the implementation you get, when you don't use the
-<code>-inputhandler</code> command line switch at all.  This
-implementation will print the prompt encapsulated in the
-<code>request</code> object to Ant's logging system and re-prompt for
-input until the user enters something that is considered valid input
-by the <code>request</code> object.  Input will be read from the
-console and the user will need to press the Return key.</p>
+<p>This is the implementation you get, when you don't use
+the <code>-inputhandler</code> command line switch at all.  This
+implementation will print the prompt encapsulated in
+the <code>request</code> object to Ant's logging system and
+re-prompt for input until the user enters something that is considered
+valid input by the <code>request</code> object.  Input will be read
+from the console and the user will need to press the Return key.</p>
 
 <h3>PropertyFileInputHandler</h3>
 
 <p>This implementation is useful if you want to run unattended build
 processes.  It reads all input from a properties file and makes the
 build fail if it cannot find valid input in this file.  The name of
-the properties file must be specified in the Java system property
-<code>ant.input.properties</code>.</p>
+the properties file must be specified in the Java system
+property <code>ant.input.properties</code>.</p>
 
 <p>The prompt encapsulated in a <code>request</code> will be used as
 the key when looking up the input inside the properties file.  If no
@@ -91,13 +89,13 @@ define it inside the <code>ANT_OPTS</code> environment variable.</p>
 <h3>GreedyInputHandler</h3>
 
 <p>Like the default implementation, this InputHandler reads from standard
-input. However, it consumes <i>all</i> available input. This behavior is
+input. However, it consumes <em>all</em> available input. This behavior is
 useful for sending Ant input via an OS pipe. <em>Since Ant 1.7</em></p>
 
 <h3>SecureInputHandler</h3>
 
 <p>This InputHandler calls <code>System.console().readPassword()</code>,
-available since Java 1.6.  On earlier platforms it falls back to the
+available since Java 6.  On earlier platforms it falls back to the
 behavior of DefaultInputHandler. <em>Since Ant 1.7.1</em></p>
 
 <h2>InputRequest</h2>
@@ -107,8 +105,8 @@ encapsulate the information necessary to ask a user for input and
 validate this input.</p>
 
 <p>The instances of <code>InputRequest</code> itself will accept any
-input, but subclasses may use stricter validations.
-<code>org.apache.tools.ant.input.MultipleChoiceInputRequest</code>
+input, but subclasses may use stricter
+validations. <code>org.apache.tools.ant.input.MultipleChoiceInputRequest</code>
 should be used if the user input must be part of a predefined set of
 choices.</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/install.html
----------------------------------------------------------------------
diff --git a/manual/install.html b/manual/install.html
index 9c0c034..b100d8a 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -36,13 +36,13 @@ details.</li>
 <li>Download Ant. See <a href="#getBinary">Binary Distribution</a> for details.</li>
 <li>Uncompress the downloaded file into a directory.</li>
 <li>Set environmental variables <code>JAVA_HOME</code> to your Java environment, <code>ANT_HOME</code> to the directory
-you uncompressed Ant to, and add <code>${ANT_HOME}/bin</code> (Unix) or <code>%ANT_HOME%/bin</code> (Windows) to
+you uncompressed Ant to, and add <samp>${ANT_HOME}/bin</samp> (Unix) or <samp>%ANT_HOME%/bin</samp> (Windows) to
 your <code>PATH</code>. See <a href="#setup">Setup</a> for details.</li>
 <li>Optionally, from the <code>ANT_HOME</code> directory run <code>ant -f fetch.xml -Ddest=system</code> to get the
 library dependencies of most of the Ant tasks that require them. If you don't do this, many of the dependent Ant tasks
 will not be available. See <a href="#optionalTasks">Optional Tasks</a> for details and other options for
 the <code>-Ddest</code> parameter.</li>
-<li>Optionally, add any desired Antlibs. See <a href="http://ant.apache.org/antlibs/proper.html" target="_top">Ant
+<li>Optionally, add any desired Antlibs. See <a href="https://ant.apache.org/antlibs/proper.html" target="_top">Ant
 Libraries</a> for a list.</li>
 </ol>
 <p>
@@ -63,17 +63,17 @@ For the full story, continue reading.
 <h3 id="getBinary">Binary Distribution</h3>
 
 <p>
-The latest stable version of Ant is available from the Ant web page <a href="http://ant.apache.org/"
-target="_top">http://ant.apache.org/</a>
+The latest stable version of Ant is available from the Ant web page <a href="https://ant.apache.org/"
+target="_top">https://ant.apache.org/</a>
 </p>
 <p>
 The binary distribution of Ant is available as 3 different archives
 </p>
 <ol>
-<li><b>.zip</b> - Recommended compression format for Windows, can also be used on other platforms. Supported by many
+<li><samp>.zip</samp>&mdash;Recommended compression format for Windows, can also be used on other platforms. Supported by many
 programs and some operating systems natively.</li>
-<li><b>.tar.gz</b> - Using the tar program to gather files together, and gzip to compress and uncompress.</li>
-<li><b>.tar.bz2</b> - Using the tar program to gather files together, and bzip2 to compress and uncompress.</li>
+<li><samp>.tar.gz</samp>&mdash;Using the tar program to gather files together, and gzip to compress and uncompress.</li>
+<li><samp>.tar.bz2</samp>&mdash;Using the tar program to gather files together, and bzip2 to compress and uncompress.</li>
 </ol>
 <p>
 Choose the format that is best supported for your platform.
@@ -103,20 +103,21 @@ eliminate inconsistencies between command-line and IDE Ant.
 Many Java applications, most particularly application servers, ship with a version of Ant. These are primarily for
 internal use by the application, using the Java APIs to delegate tasks such as JSP page compilation to the Ant
 runtime. Such distributions are usually unsupported by everyone. Particularly troublesome are those products that not
-only ship with their own Ant release, they add their own version of ANT.BAT or ant.sh to the <code>PATH</code>. If Ant
-starts behaving weirdly after installing something, try the <a href="#diagnostics">diagnostics</a> advice.
+only ship with their own Ant release, they add their own version of <samp>ANT.BAT</samp> or <samp>ant.sh</samp> to
+the <code>PATH</code>. If Ant starts behaving weirdly after installing something, try
+the <a href="#diagnostics">diagnostics</a> advice.
 </p>
 
 <h3 id="sourceEdition">Source Distribution</h3>
 
 <p>
 If you prefer the source distribution, you can download the source for the latest Ant release from
-<a href="http://ant.apache.org/srcdownload.cgi" target="_top">http://ant.apache.org/srcdownload.cgi</a>.
+<a href="https://ant.apache.org/srcdownload.cgi" target="_top">https://ant.apache.org/srcdownload.cgi</a>.
 </p>
 <p>
 If you prefer the leading-edge code, you can access the code as it is being developed via Git. The Ant website has
-details on <a href="http://ant.apache.org/git.html" target="_top">accessing Git</a>. All bug fixes will go in against
-the HEAD of the source tree, and the first response to many bugreps will be "have you tried the latest version". Don't
+details on <a href="https://ant.apache.org/git.html" target="_top">accessing Git</a>. All bug fixes will go in against
+the HEAD of the source tree, and the first response to many bug reports will be "have you tried the latest version". Don't
 be afraid to download and build a prerelease distribution, as everything other than new features are usually stable.
 </p>
 <p>
@@ -127,8 +128,8 @@ the <a href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=summary" target
 <h3 id="archives">Archive Download Area Layout</h3>
 
 <p>
-Older versions of Ant are available in the archives at <a href="http://archive.apache.org/dist/ant/"
-target="_top">http://archive.apache.org/dist/ant/</a>. The files are organized as follows.
+Older versions of Ant are available in the archives at <a href="https://archive.apache.org/dist/ant/"
+target="_top">https://archive.apache.org/dist/ant/</a>. The files are organized as follows.
 </p>
 <table>
 <tr>
@@ -136,18 +137,18 @@ target="_top">http://archive.apache.org/dist/ant/</a>. The files are organized a
   <th>Description</th>
 </tr>
 <tr>
-  <td>KEYS</td>
+  <td><samp>KEYS</samp></td>
   <td>PGP keyfile. It contains the PGP keys of Ant developers so you can 'trust' the distribution.</td>
 </tr>
 <tr>
-  <td>RELEASE-NOTES-{version}.html</td>
+  <td><samp>RELEASE-NOTES-{version}.html</samp></td>
   <td>
     Release notes of the given version in HTML format. When upgrading your Ant installation you
-    should have a look at the <i>Changes that could break older environments</i> section.
+    should have a look at the <em>Changes that could break older environments</em> section.
   </td>
 </tr>
 <tr>
-  <td>ant-current-bin.zip</td>
+  <td><samp>ant-current-bin.zip</samp></td>
   <td>
     ZIP archive containing the compiled version of Ant in the last released version. It is recommended that
     you do not download the latest version this way, as the standard way of downloading described above will
@@ -156,44 +157,44 @@ target="_top">http://archive.apache.org/dist/ant/</a>. The files are organized a
   </td>
 </tr>
 <tr>
-  <td>ant-current-src.zip</td>
+  <td><samp>ant-current-src.zip</samp></td>
   <td>
     ZIP archive containing the sources of Ant. If you have this you can compile Ant. If you do not have the
-    <i>required</i> dependencies, the classes depending on them are just not built. Again, it is preferred to use the
+    <em>required</em> dependencies, the classes depending on them are just not built. Again, it is preferred to use the
     standard way of getting the source package described above to make your download quicker and to reduce the load on
     Apache servers.
   </td>
 </tr>
 <tr>
-  <td>ant-current-*.asc</td>
+  <td><samp>ant-current-*.asc</samp></td>
   <td>
     Security file for checking the correctness of the zip file. This one is the
-    <a href="http://en.wikipedia.org/wiki/Pretty_Good_Privacy" target="_blank">PGP</a> signature.
+    <a href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy" target="_blank">PGP</a> signature.
   </td>
 </tr>
 <tr>
-  <td>ant-current-*.md5</td>
+  <td><samp>ant-current-*.md5</samp></td>
   <td>
     Security file for checking the correctness of the zip file. This one is the
-    <a href="http://en.wikipedia.org/wiki/Md5" target="_blank">MD5</a> checksum.
+    <a href="https://en.wikipedia.org/wiki/Md5" target="_blank">MD5</a> checksum.
   </td>
 </tr>
 <tr>
-  <td>ant-current-*.sha1</td>
+  <td><samp>ant-current-*.sha1</samp></td>
   <td>
     Security file for checking the correctness of the zip file. This one is the
-    <a href="http://en.wikipedia.org/wiki/SHA-1" target="_blank">SHA1</a> checksum.
+    <a href="https://en.wikipedia.org/wiki/SHA-1" target="_blank">SHA1</a> checksum.
   </td>
 </tr>
 <tr>
-  <td>antlibs/</td>
+  <td><samp>antlibs/</samp></td>
   <td>
     This directory holds the Antlibs that are made of available by the Apache Ant project. Antlibs are bundles of Ant
     tasks that are not delivered as part of the Ant core but are available as optional downloads.
   </td>
 </tr>
 <tr>
-  <td>binaries/</td>
+  <td><samp>binaries/</samp></td>
   <td>
     The binaries directory holds specific Ant releases bundled in both ZIP and tar.gz archive formats. The named
     releases are in contrast to the ant-current-bin.zip file in the parent directory, which is always guaranteed to be
@@ -201,14 +202,14 @@ target="_top">http://archive.apache.org/dist/ant/</a>. The files are organized a
   </td>
 </tr>
 <tr>
-  <td>common/</td>
+  <td><samp>common/</samp></td>
   <td>
     The common directory holds various files, such as the Apache License file that Ant is licensed under, that people
     may wish to examine without having to download the whole Ant distribution.
   </td>
 </tr>
 <tr>
-  <td>source/</td>
+  <td><samp>source/</samp></td>
   <td>
     The source directory holds the source code for specific Ant releases bundled in both ZIP and tar.gz archive
     formats. The named releases are in contrast to the ant-current-src.zip file in the parent directory, which is always
@@ -223,18 +224,18 @@ target="_top">http://archive.apache.org/dist/ant/</a>. The files are organized a
 Ant has been used successfully on many platforms, including Linux, commercial flavours of Unix such as Solaris and
 HP-UX, macOS, Windows NT descendants, OS/2 Warp, Novell Netware 6, OpenVMS. The platforms used most for development
 are, in no particular order, Linux, macOS, Microsoft Windows and Unix; these are therefore that platforms that tend to
-  work best. <em>Since Ant 1.7</em>, Windows 9x is no longer supported.
+work best. <em>Since Ant 1.7</em>, Windows 9x is no longer supported.
 </p>
 <p>
 For the current version of Ant (1.10), you will also need a JDK installed on your system, version 8 or later required.
 The more up-to-date the version of Java, the more Ant tasks you get.
 </p>
 <p>
-<strong>Note:</strong> If a JDK is not present, only the runtime (JRE), then many tasks will not work.
+<strong>Note</strong>: If a JDK is not present, only the runtime (JRE), then many tasks will not work.
 </p>
 <p>
-  <strong>Note:</strong>
-    Ant 1.9.* works with JDK 1.5, Ant 1.8.* works with JDK 1.4 and higher, Ant 1.7.* works with JDK 1.3 and higher,
+  <strong>Note</strong>:
+    Ant 1.9.* works with JDK 1.5 and higher, Ant 1.8.* works with JDK 1.4 and higher, Ant 1.7.* works with JDK 1.3 and higher,
     Ant 1.6.* works with JDK 1.2 and higher, Ant 1.2 to Ant 1.5.* work with JDK 1.1 and higher.
 </p>
 
@@ -265,32 +266,29 @@ other open source Java runtimes, and so strives to have a product that works wel
    +--- etc // contains xsl goodies to:
             //   - create an enhanced report from xml output of various tasks.
             //   - migrate your build files and get rid of 'deprecated' warning
-            //   - ... and more ;-)
-</pre>
+            //   - ... and more ;-)</pre>
 <p>
-Only the <code>bin</code> and <code>lib</code> directories are required to run Ant.
+Only the <samp>bin</samp> and <samp>lib</samp> directories are required to run Ant.
 </p>
 <p>
 To install Ant, choose a directory and copy the distribution files there. This directory will be known as
 <code>ANT_HOME</code>.
 </p>
 
-<h3>Windows 95, Windows 98 &amp; Windows ME Note:</h3>
+<h3>Windows 95, Windows 98 &amp; Windows ME Note</h3>
   <p>
-    <i>Note that current releases of Ant no longer support these systems. If you are using an older version of Ant,
+    <em>Note that current releases of Ant no longer support these systems. If you are using an older version of Ant,
     however, the script used to launch Ant will have problems if <code>ANT_HOME</code> is a long filename (i.e. a
     filename which is not of the format known as &quot;8.3&quot;). This is due to limitations in the OS's handling of
     the <code>&quot;for&quot;</code> batch file statement. It is recommended, therefore, that Ant be installed in a
-    <b>short</b>, 8.3 path, such as <code>C:\Ant</code>.</i>
+    <strong>short</strong>, 8.3 path, such as <samp>C:\Ant</samp>.</em>
   </p>
   <p>
     On these systems you will also need to configure more environment space to cater for the environment variables used
     in the Ant launch script. To do this, you will need to add or update the following line in the
-    <code>config.sys</code> file
-  </p>
-  <p>
-    <code>shell=c:\command.com c:\ /p /e:32768</code>
+    <samp>config.sys</samp> file
   </p>
+  <pre>shell=c:\command.com c:\ /p /e:32768</pre>
 
 <h3 id="setup">Setup</h3>
 <p>
@@ -298,7 +296,7 @@ Before you can run Ant there is some additional setup you will need to do unless
 <a href="#jpackage">RPM version from jpackage.org</a>:
 </p>
 <ul>
-<li>Add the <code>bin</code> directory to your path.</li>
+<li>Add the <samp>bin</samp> directory to your path.</li>
 <li>Set the <code>ANT_HOME</code> environment variable to the directory where you installed Ant. On some operating
 systems, Ant's startup scripts can guess <code>ANT_HOME</code> (Unix dialects and Windows NT descendants), but it is
 better to not rely on this behavior.</li>
@@ -311,17 +309,17 @@ Operating System-specific instructions for doing this from the command line are
 method, the settings will only be valid for the command line session you run them in.
 </p>
 <p>
-<strong>Note:</strong> Do not install Ant's <code>ant.jar</code> file into the <code>lib/ext</code> directory of the
+<strong>Note</strong>: Do not install Ant's <samp>ant.jar</samp> file into the <samp>lib/ext</samp> directory of the
 JDK/JRE. Ant is an application, whilst the extension directory is intended for JDK extensions. In particular there are
 security restrictions on the classes which may be loaded by an extension.
 </p>
 
-<h3>Windows Note:</h3>
+<h3>Windows Note</h3>
 <p>
-    The <code>ant.bat</code> script makes use of three environment variables - <code>ANT_HOME</code>,
-    <code>CLASSPATH</code> and <code>JAVA_HOME</code>. <b>Ensure</b> that <code>ANT_HOME</code> and
-    <code>JAVA_HOME</code> variables are set, and that they do <b><u>not</u></b> have quotes (either ' or &quot;) and
-    they do <b><u>not</u></b> end with \ or with /. <code>CLASSPATH</code> should be unset or empty.
+    The <samp>ant.bat</samp> script makes use of three environment variables&mdash;<code>ANT_HOME</code>,
+    <code>CLASSPATH</code> and <code>JAVA_HOME</code>. <strong>Ensure</strong> that <code>ANT_HOME</code> and
+    <code>JAVA_HOME</code> variables are set, and that they do <strong>not</strong> have quotes (either ' or &quot;) and
+    they do <strong>not</strong> end with \ or with /. <code>CLASSPATH</code> should be unset or empty.
 </p>
 
 <h3 id="checkInstallation">Check Installation</h3>
@@ -349,11 +347,11 @@ If this does not work, ensure your environment variables are set right. E.g., on
   <li>required: <code>%PATH%=...<i>maybe-other-entries</i>...;%ANT_HOME%\bin;...<i>maybe-other-entries</i>...</code></li>
 </ul>
 <p>
-<b>ANT_HOME</b> is used by the launcher script for finding the libraries.
-<b>JAVA_HOME</b> is used by the launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks require the
+<code>ANT_HOME</code> is used by the launcher script for finding the libraries.
+<code>JAVA_HOME</code> is used by the launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks require the
 Java tools.) If not set, the launcher tries to find one via the <code>%PATH%</code> environment variable.
-<b>PATH</b> is set for user convenience. With that set you can just start <i>ant</i> instead of always typing
-<i>the/complete/path/to/your/ant/installation/bin/ant</i>.
+<code>PATH</code> is set for user convenience. With that set you can just start <code>ant</code> instead of always typing
+<samp>the/complete/path/to/your/ant/installation/bin/ant</samp>.
 </p>
 
 <h3 id="optionalTasks">Optional Tasks</h3>
@@ -375,7 +373,7 @@ In <code><i>ANT_HOME</i>/lib</code>. This makes the JAR files available to all A
 
 <li>
 <p>
-  In <code>${user.home}/.ant/lib</code> (<em>since Ant 1.6</em>). This allows different users to add new libraries to Ant. All JAR
+In <code>${user.home}/.ant/lib</code> (<em>since Ant 1.6</em>). This allows different users to add new libraries to Ant. All JAR
 files added to this directory are available to command-line Ant.
 </p>
 </li>
@@ -388,15 +386,15 @@ On the command line with a <code>-lib</code> parameter. This lets you add new JA
 
 <li>
 <p>
-In the <code>CLASSPATH</code> environment variable. Avoid this; it makes the JAR files visible to <i>all</i> Java
+In the <code>CLASSPATH</code> environment variable. Avoid this; it makes the JAR files visible to <em>all</em> Java
 applications, and causes no end of support calls. See <a href="#classpath">below</a> for details.
 </p>
 </li>
 
 <li>
 <p>
-  In some <code>&lt;classpath&gt;</code> accepted by the task itself. <em>Since Ant 1.7.0</em>, you can run
-the <code>&lt;junit&gt;</code> task without <code>junit.jar</code> in Ant's own classpath, so long as it is included
+In some <code>&lt;classpath&gt;</code> accepted by the task itself. <em>Since Ant 1.7.0</em>, you can run
+the <code>&lt;junit&gt;</code> task without <samp>junit.jar</samp> in Ant's own classpath, so long as it is included
 (along with your program and tests) in the classpath passed when running the task.
 </p>
 <p>
@@ -410,7 +408,7 @@ according to Ant properties, environment variables, Ivy downloads, whatever you
 <p>
 If you are using the binary distribution of Ant, or if you are working from source code, you can easily gather most of
 the dependencies and install them for use with your Ant tasks. In your <code>ANT_HOME</code> directory you should see a
-file called <code>fetch.xml</code>. This is an Ant script that you can run to install almost all the dependencies that
+file called <samp>fetch.xml</samp>. This is an Ant script that you can run to install almost all the dependencies that
 the optional Ant tasks need.
 </p>
 
@@ -418,15 +416,15 @@ the optional Ant tasks need.
 To do so, change to the <code>ANT_HOME</code> directory and execute the command:
 </p>
 
-<pre>ant -f fetch.xml -Ddest=<i>[option]</i></pre>
+<pre>ant -f fetch.xml -Ddest=<em>[option]</em></pre>
 
 <p>
 where option is one of the following, as described above:
 </p>
 <ul>
-<li><code>system</code> - store in Ant's lib directory <i>(Recommended)</i></li>
-<li><code>user</code> - store in the user's home directory</li>
-<li><code>optional</code> - store in Ant's source code <code>lib/optional</code> directory, used when building Ant
+<li><code>system</code>&mdash;store in Ant's lib directory (<em>Recommended</em>)</li>
+<li><code>user</code>&mdash;store in the user's home directory</li>
+<li><code>optional</code>&mdash;store in Ant's source code <samp>lib/optional</samp> directory, used when building Ant
 source code</li>
 </ul>
 
@@ -435,18 +433,18 @@ You may also need to set proxy settings. See the <a href="#proxy">Proxy Settings
 </p>
 
 <p>
-Note that not all dependencies are gathered using <code>fetch.xml</code>. Tasks that depend on commercial software, in
+Note that not all dependencies are gathered using <samp>fetch.xml</samp>. Tasks that depend on commercial software, in
 particular, will require you to have the commercial software installed in order to be used.
 </p>
 
 <p>
 The Apache Ant Project also provides additional tasks and types that are available as separately downloaded Ant
-Libraries. You can see the the list of available Antlibs at the <a href="http://ant.apache.org/antlibs/proper.html"
+Libraries. You can see the the list of available Antlibs at the <a href="https://ant.apache.org/antlibs/proper.html"
 target="_top">Ant Libraries</a> page.
 </p>
 
 <p>
-You can also find tasks and types provided by third-party projects at the <a href="http://ant.apache.org/external.html"
+You can also find tasks and types provided by third-party projects at the <a href="https://ant.apache.org/external.html"
 target="_top">External Tools and Tasks</a> page.
 </p>
 
@@ -477,7 +475,7 @@ option on the command line. This is an easy way to test for classpath-related pr
 </ol>
 
 <p>
-The usual symptom of <code>CLASSPATH</code> problems is that ant will not run with some error about not being able to
+The usual symptom of <code>CLASSPATH</code> problems is that Ant will not run with some error about not being able to
 find <code>org.apache.tools.ant.launch.Launcher</code>, or, if you have got the quotes/backslashes wrong, some very
 weird Java startup error. To see if this is the case, run <code>ant -noclasspath</code> or unset
 the <code>CLASSPATH</code> environment variable.
@@ -508,16 +506,16 @@ this.
 </p>
 
 <ul>
-<li><b>With Java 5 or above</b><br/>
+<li><strong>With Java 5 or above</strong><br/>
 <p>
 When you run Ant on Java 5 or above, you could try to use the automatic proxy setup mechanism
 with <code>-autoproxy</code>.
 </p>
 </li>
 
-<li><b>With explicit JVM properties.</b><br/>
+<li><strong>With explicit JVM properties.</strong><br/>
 <p>
-These are documented in <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/net/properties.html"
+These are documented in <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html"
 target="_top">Java's Networking Properties</a>, and control the proxy behaviour of the entire JVM. To set them in Ant,
 declare them in the <code>ANT_OPTS</code> environment variable. This is the best option for a non-mobile system. For a
 laptop, you have to change these settings as you roam. To set <code>ANT_OPTS</code>:
@@ -538,11 +536,11 @@ For Windows, set the environment variable in the appropriate dialog box and open
 </blockquote>
 </li>
 
-<li><b>In the build file itself</b><br/>
+<li><strong>In the build file itself</strong><br/>
 <p>
 If you are writing a build file that is always to be used behind the firewall,
 the <a href="Tasks/setproxy.html">setproxy</a> task lets you configure the proxy (which it does by setting the JVM
-properties). If you do this, we strongly recommend using ant properties to define the proxy host, port, etc, so that
+properties). If you do this, we strongly recommend using Ant properties to define the proxy host, port, etc, so that
 individuals can override the defaults.
 </p>
 </li>
@@ -551,7 +549,7 @@ individuals can override the defaults.
 <p>
 The Ant team acknowledges that this is unsatisfactory. Until the JVM automatic proxy setup works properly everywhere,
 explicit JVM options via <code>ANT_ARGS</code> are probably the best solution. Setting properties on Ant's command line
-do not work, because those are <i>Ant properties</i> being set, not JVM options. This means the following does not set
+do not work, because those are <em>Ant properties</em> being set, not JVM options. This means the following does not set
 up the command line:
 </p>
 
@@ -568,14 +566,14 @@ have to spend much time configuring the JVM properties until they are happy.
 </p>
 
 <h3 id="windows">Windows and OS/2</h3>
-<p>Assume Ant is installed in <code>c:\ant\</code>. The following sets up the
+<p>Assume Ant is installed in <samp>c:\ant\</samp>. The following sets up the
 environment:</p>
 <pre>set ANT_HOME=c:\ant
 set JAVA_HOME=c:\jdk1.7.0_51
 set PATH=%PATH%;%ANT_HOME%\bin</pre>
 
 <h3 id="bash">Linux/Unix (bash)</h3>
-<p>Assume Ant is installed in <code>/usr/local/ant</code>. The following sets up
+<p>Assume Ant is installed in <samp>/usr/local/ant</samp>. The following sets up
 the environment:</p>
 <pre>export ANT_HOME=/usr/local/ant
 export JAVA_HOME=/usr/local/jdk1.7.0_51
@@ -592,18 +590,18 @@ Having a symbolic link set up to point to the JVM/JDK version makes updates more
 <h3 id="jpackage">RPM version from jpackage.org</h3>
 <p>
 The <a href="http://www.jpackage.org" target="_top">JPackage project</a> distributes an RPM version of Ant. With this
-version, it is not necessary to set <code> JAVA_HOME</code> or <code>ANT_HOME</code> environment variables and the RPM
+version, it is not necessary to set <code>JAVA_HOME</code> or <code>ANT_HOME</code> environment variables and the RPM
 installer will correctly place the Ant executable on your path.
 </p>
 <p>
-<b>Note</b>: <em>Since Ant 1.7.0</em>, if the <code>ANT_HOME</code> environment variable is set, the JPackage
+<strong>Note</strong>: <em>Since Ant 1.7.0</em>, if the <code>ANT_HOME</code> environment variable is set, the JPackage
 distribution will be ignored.
 </p>
 <p>
 Optional JARs for the JPackage version are handled in two ways. The easiest, and best way is to get these external
 libraries from JPackage if JPackage has them available. (Note: for each such library, you will have to get both the
-external package itself (e.g. <code>oro-2.0.8-2jpp.noarch.rpm</code>) and the small library that links Ant and the
-external package (e.g. <code>ant-apache-oro-1.6.2-3jpp.noarch.rpm</code>).
+external package itself (e.g. <samp>oro-2.0.8-2jpp.noarch.rpm</samp>) and the small library that links Ant and the
+external package (e.g. <samp>ant-apache-oro-1.6.2-3jpp.noarch.rpm</samp>).
 </p>
 <p>
 However, JPackage does not package proprietary software, and since some of the optional packages depend on proprietary
@@ -613,14 +611,14 @@ proprietary packages. For example, suppose you want to install support for NetRe
 
 <ol>
 <li>Decide where you want to deploy the extra JARs. One option is in <code>$ANT_HOME/lib</code>, which, for JPackage is
-usually <code>/usr/share/ant/lib</code>. Another, less messy option is to create an <code>.ant/lib</code> subdirectory
+usually <samp>/usr/share/ant/lib</samp>. Another, less messy option is to create an <samp>.ant/lib</samp> subdirectory
 of your home directory and place your non-JPackage Ant JARs there, thereby avoiding mixing JPackage libraries with
 non-JPackage stuff in the same folder. More information on where Ant finds its libraries is
-available <a href="http://ant.apache.org/manual/running.html#libs">here</a></li>
-<li>Download a non-JPackage binary distribution from the regular <a href="http://ant.apache.org/bindownload.cgi"
+available <a href="https://ant.apache.org/manual/running.html#libs">here</a></li>
+<li>Download a non-JPackage binary distribution from the regular <a href="https://ant.apache.org/bindownload.cgi"
 target="_top">Apache Ant site</a></li>
 <li>Unzip or untar the distribution into a temporary directory</li>
-<li>Copy the linking JAR, in this case <code>ant-jai.jar</code>, into the library directory you chose in step 1
+<li>Copy the linking JAR, in this case <samp>ant-jai.jar</samp>, into the library directory you chose in step 1
 above.</li>
 <li>Copy the proprietary JAR itself into the same directory.</li>
 </ol>
@@ -634,11 +632,11 @@ path), you should use Ant's <code>--noconfig</code> command-line switch to avoid
 <p>There are many different ways to run Ant. What you need is at least the following:</p>
 
 <ul>
-<li>The classpath for Ant must contain <code>ant.jar</code> and any JARs/classes needed for your chosen JAXP-compliant
+<li>The classpath for Ant must contain <samp>ant.jar</samp> and any JARs/classes needed for your chosen JAXP-compliant
 XML parser.</li>
 <li>When you need JDK functionality (such as for the <a href="Tasks/javac.html">javac</a> task or
-the <a href="Tasks/rmic.html">rmic</a> task), then <code>tools.jar</code> must be added. The scripts supplied with Ant,
-in the <code>bin</code> directory, will add the required JDK classes automatically, if the <code>JAVA_HOME</code>
+the <a href="Tasks/rmic.html">rmic</a> task), then <samp>tools.jar</samp> must be added. The scripts supplied with Ant,
+in the <samp>bin</samp> directory, will add the required JDK classes automatically, if the <code>JAVA_HOME</code>
 environment variable is set.</li>
 <li>When you are executing platform-specific applications, such as the <a href="Tasks/exec.html">exec</a> task or
 the <a href="Tasks/cvs.html">cvs</a> task, the property <code>ant.home</code> must be set to the directory containing
@@ -666,13 +664,13 @@ installed. See <a href="#installing">Installing Ant</a> for examples on how to d
 </p>
 
 <p>
-<b>Note</b>: The bootstrap process of Ant requires a greedy compiler like OpenJDK or Oracle's javac. It does not work
+<strong>Note</strong>: The bootstrap process of Ant requires a greedy compiler like OpenJDK or Oracle's javac. It does not work
 with gcj or kjc.
 </p>
 
 <p>
 Make sure you have downloaded any auxiliary JARs required to build tasks you are interested in. These should be added to
-the <code>lib/optional</code> directory of the source tree. See <a href="#librarydependencies">Library Dependencies</a>
+the <samp>lib/optional</samp> directory of the source tree. See <a href="#librarydependencies">Library Dependencies</a>
 for a list of JAR requirements for various features. Note that this will make the auxiliary JAR available for the
 building of Ant only. For running Ant you will still need to make the JARs available as described
 under <a href="#installing">Installing Ant</a>.
@@ -680,22 +678,22 @@ under <a href="#installing">Installing Ant</a>.
 
 <p>
 You can also get most of the auxiliary JAR files (i.e. the JAR files that various optional Ant tasks depend on) by
-running Ant on the <code>fetch.xml</code> build file. See <a href="#optionalTasks">Optional Tasks</a> for instructions
+running Ant on the <samp>fetch.xml</samp> build file. See <a href="#optionalTasks">Optional Tasks</a> for instructions
 on how to do this.
 </p>
 
 <p>
-  <em>Since Ant 1.7.0</em>, Ant has a hard dependency on JUnit. The <code>fetch.xml</code> build script will download JUnit
-automatically, but if you don't use this you must install it manually into <code>lib/optional</code> (download it
-from <a href="http://junit.org/" target="_top">JUnit.org</a>) if you are using a source distribution of Ant.
+<em>Since Ant 1.7.0</em>, Ant has a hard dependency on JUnit. The <samp>fetch.xml</samp> build script will download JUnit
+automatically, but if you don't use this you must install it manually into <samp>lib/optional</samp> (download it
+from <a href="https://junit.org/" target="_top">JUnit.org</a>) if you are using a source distribution of Ant.
 </p>
 
 <p>
 Your are now ready to build Ant:
 </p>
 <blockquote>
-  <p><code>build -Ddist.dir=&lt;<i>directory_to_contain_Ant_distribution</i>&gt; dist</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Windows</i>)</p>
-  <p><code>sh build.sh -Ddist.dir=&lt;<i>directory_to_contain_Ant_distribution</i>&gt; dist</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Unix</i>)</p>
+  <p><code>build -Ddist.dir=&lt;<i>directory-to-contain-Ant-distribution</i>&gt; dist</code>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Windows</em>)</p>
+  <p><code>sh build.sh -Ddist.dir=&lt;<i>directory-to-contain-Ant-distribution</i>&gt; dist</code>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Unix</em>)</p>
 </blockquote>
 
 <p>
@@ -709,11 +707,11 @@ The above action does the following:
 <li>If necessary it will bootstrap the Ant code. Bootstrapping involves the manual compilation of enough Ant code to be
 able to run Ant. The bootstrapped Ant is used for the remainder of the build steps.</li>
 <li>Invokes the bootstrapped Ant with the parameters passed to the build script. In this case, these parameters define
-an Ant property value and specify the &quot;dist&quot; target in Ant's own <code>build.xml</code> file.</li>
-<li>Create the <code>ant.jar</code> and <code>ant-launcher.jar</code> JAR files</li>
+an Ant property value and specify the &quot;dist&quot; target in Ant's own <samp>build.xml</samp> file.</li>
+<li>Create the <samp>ant.jar</samp> and <samp>ant-launcher.jar</samp> JAR files</li>
 <li>Create optional JARs for which the build had the relevant libraries. If a particular library is missing
-from <code>lib/optional</code>, then the matching ant-library JAR file will not be created. For
-example, <code>ant-junit.jar</code> is only built if there is a <code>junit.jar</code> in the <code>lib/optional</code>
+from <samp>lib/optional</samp>, then the matching ant-library JAR file will not be created. For
+example, <samp>ant-junit.jar</samp> is only built if there is a <samp>junit.jar</samp> in the <samp>lib/optional</samp>
 directory.</li>
 </ul>
 
@@ -727,24 +725,24 @@ of Ant.
 If you wish to install the build into the current <code>ANT_HOME</code>
 directory, you can use:
 <blockquote>
-  <p><code>build install</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Windows</i>)</p>
-  <p><code>sh build.sh install</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Unix</i>)</p>
+  <p><code>build install</code>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Windows</em>)</p>
+  <p><code>sh build.sh install</code>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Unix</em>)</p>
 </blockquote>
 
 You can avoid the lengthy Javadoc step, if desired, with:
 <blockquote>
-  <p><code>build install-lite</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Windows</i>)</p>
-  <p><code>sh build.sh install-lite</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Unix</i>)</p>
+  <p><code>build install-lite</code>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Windows</em>)</p>
+  <p><code>sh build.sh install-lite</code>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Unix</em>)</p>
 </blockquote>
-This will only install the <code>bin</code> and <code>lib</code> directories.
+This will only install the <samp>bin</samp> and <samp>lib</samp> directories.
 
 <p>
-Both the <code>install</code> and <code>install-lite</code> targets will overwrite the current Ant version
+Both the <var>install</var> and <var>install-lite</var> targets will overwrite the current Ant version
 in <code>ANT_HOME</code>.
 </p>
 
 <p>
-Ant's build script will try to set executable flags for its shell scripts on Unix-like systems. There are various
+Ant's build script will try to set executable flags for its shell scripts on Unix(-like) systems. There are various
 reasons why the <a href="Tasks/chmod.html">chmod</a> task might fail (like when you are running the build script as a
 different user than the one who installed Ant initially). In this case you can set the Ant
 property <code>chmod.fail</code> to false when starting the build like in
@@ -763,14 +761,14 @@ and any error to change permission will not result in a build failure.
 The following libraries are needed in Ant's classpath if you are using the indicated feature. Note that only one of the
 regexp libraries is needed for use with the mappers (and Java includes a regexp implementation which Ant will find
 automatically). You will also need to install the particular Ant optional JAR containing the task definitions to make
-these tasks available. Please refer to the <a href="#optionalTasks"> Installing Ant / Optional Tasks</a> section above.
+these tasks available. Please refer to the <a href="#optionalTasks">Installing Ant / Optional Tasks</a> section above.
 </p>
 
 <table>
   <tr>
-    <td><b>JAR Name</b></td>
-    <td><b>Needed For</b></td>
-    <td><b>Available At</b></td>
+    <th>JAR Name</th>
+    <th>Needed For</th>
+    <th>Available At</th>
   </tr>
   <tr>
     <td>jakarta-regexp-1.4.jar</td>
@@ -789,7 +787,7 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
   <tr>
     <td>junit.jar</td>
     <td><a href="Tasks/junit.html">junit</a> task (may be in classpath passed to task rather than Ant's classpath)</td>
-    <td><a href="http://junit.org/" target="_top">http://junit.org/</a></td>
+    <td><a href="https://junit.org/" target="_top">https://junit.org/</a></td>
   </tr>
   <tr>
     <td>xalan.jar</td>
@@ -799,7 +797,7 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
   <tr>
     <td>antlr.jar</td>
     <td><a href="Tasks/antlr.html">antlr</a> task</td>
-    <td><a href="http://www.antlr.org/" target="_top">http://www.antlr.org/</a></td>
+    <td><a href="https://www.antlr.org/" target="_top">https://www.antlr.org/</a></td>
   </tr>
   <tr>
     <td>bsf.jar</td>
@@ -830,7 +828,7 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
     <td>rhino.jar<br/>
     (included in Java 7 runtime, replaced by Nashorn in Java&nbsp;8 and later)</td>
     <td>JavaScript with <a href="Tasks/script.html">script</a> task<br/>
-    <strong>Note:</strong> Apache BSF 2.4.0 works only with Rhino 1.5R4 and later versions.</td>
+    <strong>Note</strong>: Apache BSF 2.4.0 works only with Rhino 1.5R4 and later versions.</td>
     <td><a href="https://www.mozilla.org/rhino/" target="_top">https://www.mozilla.org/rhino/</a></td>
   </tr>
   <tr>
@@ -895,7 +893,7 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
   <tr>
     <td>javax.mail-api.jar</td>
     <td><a href="Tasks/mail.html">mail</a> task with MIME encoding,
-    and <i>deprecated</i> <a href="Tasks/mimemail.html">mimemail</a> task</td>
+    and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
     <td><a href="https://javaee.github.io/javamail/"
         target="_top">https://javaee.github.io/javamail/</a></td>
   </tr>
@@ -903,36 +901,36 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
     <td>activation.jar<br/>
     (included in Java 6 and later runtime)</td>
     <td><a href="Tasks/mail.html">mail</a> task with MIME encoding,
-    and <i>deprecated</i> <a href="Tasks/mimemail.html">mimemail</a> task</td>
-    <td><a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html"
-        target="_top">http://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
+    and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
+    <td><a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html"
+           target="_top">https://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
   </tr>
   <tr>
     <td>jdepend.jar</td>
     <td><a href="Tasks/jdepend.html">jdepend</a> task</td>
     <td><a href="https://github.com/clarkware/jdepend"
-        target="_top">https://github.com/clarkware/jdepend</a></td>
+           target="_top">https://github.com/clarkware/jdepend</a></td>
   </tr>
   <tr>
-    <td>resolver.jar <b>1.1 or later</b></td>
-    <td><a href="Types/xmlcatalog.html">xmlcatalog</a> datatype <i>only if support for external catalog files is
-    desired</i></td>
+    <td>resolver.jar <strong>1.1 or later</strong></td>
+    <td><a href="Types/xmlcatalog.html">xmlcatalog</a> datatype <em>only if support for external catalog files is
+    desired</em></td>
     <td><a href="https://xerces.apache.org/xml-commons/components/resolver/"
-    target="_top">https://xerces.apache.org/xml-commons/components/resolver/</a></td>
+	   target="_top">https://xerces.apache.org/xml-commons/components/resolver/</a></td>
   </tr>
   <tr>
-    <td>jsch.jar <b>0.1.54 or later</b></td>
+    <td>jsch.jar <strong>0.1.54 or later</strong></td>
     <td><a href="Tasks/sshexec.html">sshexec</a> and <a href="Tasks/scp.html">scp</a> tasks</td>
     <td><a href="http://www.jcraft.com/jsch/" target="_top">http://www.jcraft.com/jsch/</a></td>
   </tr>
   <tr>
-    <td>JAI - Java Advanced Imaging</td>
+    <td>JAI&mdash;Java Advanced Imaging</td>
     <td><a href="Tasks/image.html">image</a> task</td>
     <td><a href="https://download.java.net/media/jai/builds/release/1_1_3/INSTALL.html"
-    target="_top">https://download.java.net/media/jai/builds/release/1_1_3/INSTALL.html</a></td>
+	   target="_top">https://download.java.net/media/jai/builds/release/1_1_3/INSTALL.html</a></td>
   </tr>
   <tr>
-    <td>XZ - XZ for Java <b>1.6 or later</b></td>
+    <td>XZ&mdash;XZ for Java <strong>1.6 or later</strong></td>
     <td><a href="Tasks/pack.html">xz</a> and <a href="Tasks/unpack.html">unxz</a>
     tasks, <a href="Types/resources.html#xzresource">xzresource</a>, xz compression
     in <a href="Tasks/tar.html">tar</a>/<a href="Tasks/unzip.html">untar</a> tasks</td>
@@ -945,7 +943,7 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
 <h3 id="diagnostics">Diagnostics</h3>
 
 <p>
-Ant has a built in diagnostics feature. If you run <code>ant -diagnostics</code> ant will look at its internal state and
+Ant has a built in diagnostics feature. If you run <code>ant -diagnostics</code>, Ant will look at its internal state and
 print it out. This code will check and print the following things.
 </p>
 
@@ -953,7 +951,7 @@ print it out. This code will check and print the following things.
 
 <li>Where Ant is running from. Sometimes you can be surprised.</li>
 
-<li>The version of ant.jar and of the ant-*.jar containing the optional tasks - and whether they match</li>
+<li>The version of <samp>ant.jar</samp> and of the <samp>ant-*.jar</samp> containing the optional tasks&mdash;and whether they match</li>
 
 <li>Which JAR files are in <code>ANT_HOME/lib</code></li>
 
@@ -964,8 +962,8 @@ libraries that it depends on are absent.</li>
 
 <li>JVM system properties</li>
 
-<li>The status of the temp directory. If this is not writable, or its clock is horribly wrong (possible if it is on a
-network drive), a lot of tasks will fail with obscure error messages.</li>
+<li>The status of the <samp>temp</samp> directory. If this is not writable, or its timestamp is horribly wrong (possible if it is on a
+network drive), a lot of tasks may fail with obscure error messages.</li>
 
 <li>The current time zone as Java sees it. If this is not what it should be for your location, then dependency logic may
 get confused.</li>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/intro.html
----------------------------------------------------------------------
diff --git a/manual/intro.html b/manual/intro.html
index 1ffd3bf..2f871e7 100644
--- a/manual/intro.html
+++ b/manual/intro.html
@@ -19,19 +19,19 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant User Manual - Introduction</title>
+<title>Apache Ant User Manual&mdash;Introduction</title>
 </head>
 
 <body>
 <h1 id="introduction">Introduction</h1>
 <p>Apache Ant is a Java-based build tool. In theory, it is kind of like
-<i>make</i>, without <i>make</i>'s wrinkles.</p>
+<em>make</em>, without <em>make</em>'s wrinkles.</p>
 <h3>Why?</h3>
 <p>Why another build tool when there is already
-<i>make</i>,
-<i>gnumake</i>,
-<i>nmake</i>,
-<i>jam</i>,
+<em>make</em>,
+<em>gnumake</em>,
+<em>nmake</em>,
+<em>jam</em>,
 and
 others? Because all those tools have limitations that Ant's original author
 couldn't live with when developing software across multiple platforms.
@@ -55,7 +55,7 @@ Task interface.</p>
 <p>Granted, this removes some of the expressive power that is inherent in being
 able to construct a shell command such as
 <code>`find . -name foo -exec rm {}`</code>, but it
-gives you the ability to be cross-platform--to work anywhere and
+gives you the ability to be cross-platform&mdash;to work anywhere and
 everywhere. And
 hey, if you really need to execute a shell command, Ant has an
 <code>&lt;exec&gt;</code> task that

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/javacprops.html
----------------------------------------------------------------------
diff --git a/manual/javacprops.html b/manual/javacprops.html
index 14430cc..5593f22 100644
--- a/manual/javacprops.html
+++ b/manual/javacprops.html
@@ -24,28 +24,29 @@
 
 <body>
 
-<p>The source and target attributes of <code>&lt;javac&gt;</code>
-don't have any default values for historical reasons.  Since the
-underlying javac compiler's default depends on the JDK you use, you
-may encounter build files that don't explicitly set those attributes
-and that will no longer compile using a newer JDK.  If you cannot
-change the build file, Apache Ant provides two properties that help you
-setting default values for these attributes.  If the attributes have
-been set explicitly, the properties listed here will be ignored.</p>
+<p>The <var>source</var> and <var>target</var> attributes
+of <code>&lt;javac&gt;</code> don't have any default values for
+historical reasons.  Since the underlying <code>javac</code>
+compiler defaults depends on the JDK you use, you may encounter
+build files that don't explicitly set those attributes and that will
+no longer compile using a newer JDK.  If you cannot change the build
+file, Apache Ant provides two properties that help you setting
+default values for these attributes.  If the attributes have been
+set explicitly, the properties listed here will be ignored.</p>
 
 <h2 id="source">ant.build.javac.source</h2>
 
 <p><em>Since Ant 1.7</em></p>
 
-<p>Provides a default value for <code>&lt;javac&gt;</code>'s and
-<code>&lt;javadoc&gt;</code>'s source attribute.</p>
+<p>Provides a default value for <code>&lt;javac&gt;</code>'s
+and <code>&lt;javadoc&gt;</code>'s <var>source</var> attribute.</p>
 
 <h2 id="target">ant.build.javac.target</h2>
 
 <p><em>Since Ant 1.7</em></p>
 
-<p>Provides a default value for <code>&lt;javac&gt;</code>'s target
-attribute.</p>
+<p>Provides a default value
+for <code>&lt;javac&gt;</code>'s <var>target</var> attribute.</p>
 
 </body>
 </html>


Mime
View raw message