http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/parallel.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/parallel.html b/manual/Tasks/parallel.html
index 82cbe8e..b84cb12 100644
--- a/manual/Tasks/parallel.html
+++ b/manual/Tasks/parallel.html
@@ -99,7 +99,7 @@ complete without waiting for other nested tasks to complete 
in other threads.</p
 is not set, the remaining tasks in other threads will continue to run until 
all threads have
 completed. In this situation, the <code>parallel</code> task will also 
fail.</p>
 
-<p>The <code>parallel</code> task may be combined with the <a 
href="sequential.html"> sequential</a>
+<p>The <code>parallel</code> task may be combined with the <a 
href="sequential.html">sequential</a>
 task to define sequences of tasks to be executed on each thread within the 
parallel block</p>
 
 <p>The <var>threadCount</var> attribute can be used to place a maximum number 
of available threads

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/pathconvert.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/pathconvert.html b/manual/Tasks/pathconvert.html
index 40b4045..b6478fe 100644
--- a/manual/Tasks/pathconvert.html
+++ b/manual/Tasks/pathconvert.html
@@ -118,7 +118,7 @@ any <var>from</var> values are prefixes of other 
<var>from</var> values.</p>
 <p>If the <var>refid</var> attribute is not specified, then one or more
 nested <a href="../Types/resources.html#collection">resource collections</a> 
must be supplied.</p>
 <h4>mapper</h4>
-<p>A single nested <a href="../Types/mapper.html"> 
<code>&lt;mapper&gt;</code></a> element can be
+<p>A single nested <a 
href="../Types/mapper.html"><code>&lt;mapper&gt;</code></a> element can be
 specified to perform any of various filename transformations (<em>since Ant 
1.6.2</em>).</p>
 
 <h3>Examples</h3>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/property.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/property.html b/manual/Tasks/property.html
index 6a74890..0dcc263 100644
--- a/manual/Tasks/property.html
+++ b/manual/Tasks/property.html
@@ -58,8 +58,8 @@ from a property file.</p>
 <p>A list of predefined properties can be
 found <a href="../properties.html#built-in-props">here</a>.</p>
 <p><em>Since Apache Ant 1.8.0</em>, it is possible to load properties defined 
in XML according
-to <a href="http://java.sun.com/dtd/properties.dtd";>Sun DTD</a>, when running 
on Java 5+. For this
-the name of the file, resource or url has to end with <samp>.xml</samp>.</p>
+to <a href="http://java.sun.com/dtd/properties.dtd"; target="_top">Sun DTD</a>, 
when running on Java
+5+. For this the name of the file, resource or url has to end with 
<samp>.xml</samp>.</p>
 
 <h3>Parameters</h3>
 <table class="attr">
@@ -166,8 +166,8 @@ local definition is available (the table priority order 
being PROCESS, JOB, GROU
 <p><em>Since Ant 1.8.2</em>, if Ant detects it is running on a Java 5 or 
newer, Ant will
 use <code>System.getenv()</code> rather than its own OS dependent native 
implementation.  For some
 OSes this causes minor differences when compared to older versions of Ant.  
For a full list
-see <a 
href="https://issues.apache.org/bugzilla/show_bug.cgi?id=49366";>Bugzilla Issue 
49366</a>.  In
-particular:</p>
+see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=49366"; 
target="_top">Bugzilla Issue
+49366</a>.  In particular:</p>
 <ul>
   <li>On Windows, Ant will now return additional "environment variables" that 
correspond to the
     drive specific current working directories when Ant is run from the 
command line.  The keys of
@@ -244,7 +244,8 @@ on a classpath. Here are some interesting facts about this 
feature</p>
   <li>If the file is not there, nothing is printed except at 
<code>-verbose</code> log level. This
     lets you have optional configuration files for every project, that team 
members can customize.
   <li>The rules for this format
-    match <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html#load-java.io.InputStream-";>java.util.Properties</a>.</li>
+    match <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html#load-java.io.InputStream-";
+    target="_top">java.util.Properties</a>.</li>
   <li>Trailing spaces are not stripped. It may have been what you wanted.</li>
   <li>Want unusual characters? Escape them <code>\u0456</code> or 
<code>\&quot;</code> style.</li>
   <li>Ant Properties are expanded in the file</li>
@@ -265,8 +266,8 @@ deploy.url=http://${deploy.server}:${deploy.port}/</pre>
 variables. So it starts a command in a new process which prints the 
environment variables, analyzes
 the output and creates the properties.<br/>  There are commands for the 
following operating systems
 implemented
-in <a 
href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=blob;f=src/main/org/apache/tools/ant/taskdefs/Execute.java;hb=refs/heads/master";>Execute.java</a>
-(method <code>getProcEnvCommand()</code>):
+in <a 
href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=blob;f=src/main/org/apache/tools/ant/taskdefs/Execute.java;hb=refs/heads/master";
+target="_top">Execute.java</a> (method <code>getProcEnvCommand()</code>):
 </p>
   <table>
     <tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/pvcstask.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/pvcstask.html b/manual/Tasks/pvcstask.html
index 84db7d0..fb45b36 100644
--- a/manual/Tasks/pvcstask.html
+++ b/manual/Tasks/pvcstask.html
@@ -54,7 +54,7 @@ an <var>updateonly</var> argument introduced.</p>
 <h2 id="introduction">Introduction</h2>
 <p>The <code>pvcs</code> task allows the user of Ant to extract the latest 
edition of the source
 code from a PVCS repository. PVCS is a version control system developed
-by <a href="http://www.serena.com/products/pvcs";>Merant</a>.</p>
+by <a href="http://www.serena.com/products/pvcs"; target="_top">Merant</a>.</p>
 <p>This version has been tested against PVCS version 6.5 and 6.6 under Windows 
and Solaris.</p>
 
 <hr/>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/rmic.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/rmic.html b/manual/Tasks/rmic.html
index 1516538..8e82cc3 100644
--- a/manual/Tasks/rmic.html
+++ b/manual/Tasks/rmic.html
@@ -66,16 +66,16 @@ are the choices:</p>
     platform is chosen. If <code>build.rmic</code> is set to this, you get the 
default.</li>
 </ul>
 
-<p>The <a 
href="https://web.archive.org/web/20131225023602/http://dione.zcu.cz/~toman40/miniRMI/";>miniRMI</a>
-project contains a compiler implementation for this task as well, please 
consult miniRMI's
-documentation to learn how to use it.</p>
+<p>The <a 
href="https://web.archive.org/web/20131225023602/http://dione.zcu.cz/~toman40/miniRMI/";
+target="_top">miniRMI</a> project contains a compiler implementation for this 
task as well, please
+consult miniRMI's documentation to learn how to use it.</p>
 
 <h4>CORBA support</h4>
 
-<p>Java 11 removes the CORBA and JavaEE packages and <code>rmic</code> no 
longer supports
-either <code>iiop</code> nor <code>idl</code>. Starting with Ant 1.10.3, the 
<code>rmic</code> task
-will fail when using either while running Java 11+ unless you fork the task 
and explicitly specify an
-executable.</p>
+<p>Java 11 <a href="http://openjdk.java.net/jeps/320"; 
target="_top">removes</a> the Java EE and
+CORBA packages and <code>rmic</code> no longer supports either 
<code>iiop</code>
+or <code>idl</code>. Starting with Ant 1.10.3, the <code>rmic</code> task will 
fail when using
+either while running Java 11+ unless you fork the task and explicitly specify 
an executable.</p>
 
 <h3>Parameters</h3>
 <table class="attr">

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/schemavalidate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/schemavalidate.html b/manual/Tasks/schemavalidate.html
index 628dc14..8b1964d 100644
--- a/manual/Tasks/schemavalidate.html
+++ b/manual/Tasks/schemavalidate.html
@@ -49,12 +49,13 @@ their URL equivalents.</p>
   <li><code>&lt;dtd&gt;</code> elements which are used to resolve DTDs and 
entities.</li>
   <li><code>&lt;attribute&gt;</code> elements which are used to set features 
on the parser.  These
     can be any number
-    of <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";><code>http://xml.org/sax/features/</code></a>
-    or other features that your parser may support.</li>
+    of <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";
+    target="_top"><code>http://xml.org/sax/features/</code></a> or other 
features that your parser
+    may support.</li>
   <li><code>&lt;property&gt;</code> elements, containing string properties</li>
 </ul>
 
-<p>The task only supports SAX2 or later parsers: it is an error to specify a 
esSAX1 parser.</p>
+<p>The task only supports SAX2 or later parsers: it is an error to specify a 
SAX1 parser.</p>
 
 <h3>Parameters</h3>
 <table class="attr">
@@ -168,10 +169,10 @@ their URL equivalents.</p>
 perform entity resolution.</p>
 <h4>attribute</h4>
 <p>The <code>&lt;attribute&gt;</code> element is used to set parser 
features.<br/>Features usable
-with the xerces parser are defined
-here: <a href="https://xml.apache.org/xerces-j/features.html";>Setting 
features</a><br/>SAX features
-are defined
-here: <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";><code>http://xml.org/sax/features/</code></a></p>
+with the xerces parser are defined here: <a 
href="https://xml.apache.org/xerces-j/features.html";
+target="_top">Setting features</a><br/>SAX features are defined
+here: <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";
+target="_top"><code>http://xml.org/sax/features/</code></a></p>
 <table class="attr">
   <tr>
   <th>Attribute</th>
@@ -193,8 +194,8 @@ here: <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html
 <h4>property</h4>
 <p>The <code>&lt;property&gt;</code> element is used to set properties.  These 
properties are
 defined here for the Xerces XML parser
-implementation: <a href="https://xml.apache.org/xerces-j/properties.html";>XML 
Parser properties</a>
-Properties can be used to set the schema used to validate the XML file.
+implementation: <a href="https://xml.apache.org/xerces-j/properties.html"; 
target="_top">XML Parser
+properties</a>. Properties can be used to set the schema used to validate the 
XML file.
 </p>
 <table class="attr">
 <tr>
@@ -237,7 +238,7 @@ is why the <var>noNamespaceFile</var> is needed.</p>
 documents against the relevant specifications.  To validate XSD documents, you 
also
 need <samp>XMLSchema.dtd</samp> and <samp>datatypes.dtd</samp> in the same 
directory
 as <samp>XMLSchema.xsd</samp>, or pointed to via the catalog. All these files 
can be fetched
-from <a href="https://www.w3.org/2001/XMLSchema";>W3C</a>.</p>
+from <a href="https://www.w3.org/2001/XMLSchema"; target="_top">W3C</a>.</p>
 <pre>&lt;validate-soap file="xml/test.xsd"/&gt;</pre>
 <p>Use the preset task defined above to validate an XML Schema document.</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/script.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/script.html b/manual/Tasks/script.html
index 3c48c55..a53870f 100644
--- a/manual/Tasks/script.html
+++ b/manual/Tasks/script.html
@@ -27,8 +27,8 @@
 <h2 id="script">Script</h2>
 <h3>Description</h3>
 <p>Execute a script in a <a href="https://jakarta.apache.org/bsf"; 
target="_top">Apache BSF</a>
-or <a 
href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html";>JSR
-223</a> supported language.
+or <a 
href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html";
+target="_top">JSR 223</a> supported language.
 </p>
 <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
@@ -46,15 +46,16 @@ Java API, see the <a href="../api/index.html">JavaDoc</a> 
(especially
 for <a href="../api/org/apache/tools/ant/Project.html">Project</a>
 and <a 
href="../api/org/apache/tools/ant/taskdefs/optional/Script.html">Script</a>) 
for more
 information.</p>
-<p>If you are using JavaScript under BSF, a good resource is <a target="_blank"
-href="https://www.mozilla.org/rhino/doc.html";>https://www.mozilla.org/rhino/doc.html</a>
 as we are
-using their JavaScript interpreter.</p>
+<p>If you are using JavaScript under BSF, a good resource
+is <a href="https://www.mozilla.org/rhino/doc.html";
+target="_top">https://www.mozilla.org/rhino/doc.html</a> as we are using their 
JavaScript
+interpreter.</p>
 <p>Scripts can do almost anything a task written in Java could do.</p>
 <p>Rhino provides a special construct&mdash;the <code>JavaAdapter</code>. With 
that you can create
 an object which implements several interfaces, extends classes and for which 
you can overwrite
 methods. Because this is an undocumented feature (yet), here is the link to an
-explanation: <a 
href="https://groups.google.com/forum/#!msg/netscape.public.mozilla.jseng/YlRQE0OvM8c/F8Mvq-XkpxcJ";>Google
-Groups: "Rhino, enum.js, JavaAdapter?"</a>  by Norris Boyd in the
+explanation: <a 
href="https://groups.google.com/forum/#!msg/netscape.public.mozilla.jseng/YlRQE0OvM8c/F8Mvq-XkpxcJ";
+target="_top">Google Groups: "Rhino, enum.js, JavaAdapter?"</a>  by Norris 
Boyd in the
 newsgroup <em>netscape.public.mozilla.jseng</em>.</p>
 
 <p>If you are creating Targets programmatically, make sure you set the 
Location to a useful value.
@@ -273,9 +274,9 @@ with 
<code>importClass(<strong>Packages</strong>.org.apache.tools.ant.util.FileU
 The <code>&lt;script&gt;</code> task populates the Project instance under the
 name <code>project</code>, so we can use that reference. Another way is to use 
its given name or
 getting its reference from the task itself.<br/>  The Project provides methods 
for accessing and
-setting properties, creating DataTypes and Tasks and much more.<br/>  After 
creating a FileSet object
-we initialize that by calling its set-methods. Then we can use that object 
like a normal Ant task
-(<code>&lt;copy&gt;</code> for example).<br/>  For getting the size of a file 
we instantiate
+setting properties, creating DataTypes and Tasks and much more.<br/>  After 
creating a FileSet
+object we initialize that by calling its set-methods. Then we can use that 
object like a normal Ant
+task (<code>&lt;copy&gt;</code> for example).<br/>  For getting the size of a 
file we instantiate
 a <code>java.io.File</code>. So we are using normal Java API here.<br/>  
Finally we use
 the <code>&lt;echo&gt;</code> task for producing the output. The task is not 
executed by
 its <code>execute()</code> method, because the <code>perform()</code> method 
(implemented in Task
@@ -312,8 +313,8 @@ paths to a referenced path. If the path does not exist, it 
will be created.</p>
     project.addTaskDefinition("addtopath", AddToPath.class);
 &lt;/script&gt;</pre>
 <p>An example of using this task to create a path from a list of directories 
(using
-antcontrib's <a 
href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html";> &lt;for&gt;</a>
-task) follows:</p>
+ant-contrib's <a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html";
+target="_top">&lt;for&gt;</a> task) follows:</p>
 <pre>
 &lt;path id="main.path"&gt;
   &lt;fileset dir="build/classes"/&gt;

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/scriptdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html
index 0029ee9..8b497ff 100644
--- a/manual/Tasks/scriptdef.html
+++ b/manual/Tasks/scriptdef.html
@@ -28,14 +28,13 @@
 <h3>Description</h3>
 <p><code>Scriptdef</code> can be used to define an Apache Ant task using a 
scripting language. Ant
 scripting languages supported by <a href="https://jakarta.apache.org/bsf"; 
target="_top">Apache
-BSF</a>
-or <a 
href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html";>JSR
-223</a> may be used to define the script. <code>Scriptdef</code> provides a 
mechanism to encapsulate
-control logic from a build within an Ant task minimizing the need for 
providing control style tasks
-in Ant itself. Complex logic can be made available while retaining the simple 
structure of an Ant
-build file. <code>Scriptdef</code> is also useful for prototyping new custom 
tasks. Certainly as the
-complexity of the script increases it would be better to migrate the task 
definition into a Java
-based custom task.</p>
+BSF</a> or <a 
href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html";
+target="_top">JSR 223</a> may be used to define the script. 
<code>Scriptdef</code> provides a
+mechanism to encapsulate control logic from a build within an Ant task 
minimizing the need for
+providing control style tasks in Ant itself. Complex logic can be made 
available while retaining the
+simple structure of an Ant build file. <code>Scriptdef</code> is also useful 
for prototyping new
+custom tasks. Certainly as the complexity of the script increases it would be 
better to migrate the
+task definition into a Java based custom task.</p>
 
 <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
@@ -282,9 +281,9 @@ beanshell jar.</p>
 
 <h3>Testing scripts</h3>
 
-<p>The easiest way to test scripts is to use
-the <a href="https://ant.apache.org/antlibs/antunit/";>AntUnit</a> Ant library. 
 This will run all
-targets in a script that begin with <q>test</q> (and their dependencies).</p>
+<p>The easiest way to test scripts is to use the <a 
href="https://ant.apache.org/antlibs/antunit/";
+target="_top">AntUnit</a> Ant library.  This will run all targets in a script 
that begin
+with <q>test</q> (and their dependencies).</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/setpermissions.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/setpermissions.html b/manual/Tasks/setpermissions.html
index b9c6a1b..74c099e 100644
--- a/manual/Tasks/setpermissions.html
+++ b/manual/Tasks/setpermissions.html
@@ -49,8 +49,8 @@ different sets of permissions to apply to either type of 
resource.</p>
   <tr>
     <td>permissions</td>
     <td>The permissions to set as comma separated list of names
-      of <a 
href="https://docs.oracle.com/javase/8/docs/api/java/nio/file/attribute/PosixFilePermission.html";>PosixFilePermission</a>
-      values.</td>
+      of <a 
href="https://docs.oracle.com/javase/8/docs/api/java/nio/file/attribute/PosixFilePermission.html";
+      target="_top">PosixFilePermission</a> values.</td>
     <td>No</td>
   </tr>
   <tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/signjar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/signjar.html b/manual/Tasks/signjar.html
index d4d3c5c..2dde124 100644
--- a/manual/Tasks/signjar.html
+++ b/manual/Tasks/signjar.html
@@ -27,12 +27,13 @@
 <h2 id="signjar">SignJar</h2>
 <h3>Description</h3>
 <p>Signing a jar allows users to authenticate the publisher.</p>
-<p>Signs JAR files with the <a target="_blank"
-href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jarsigner.html";><code>jarsigner</code>
-command line tool</a>.  It will take a named file in the <var>jar</var> 
attribute, and an
-optional <var>destDir</var> or <var>signedJar</var> attribute. Nested paths 
are also supported; here
-only an (optional) <var>destDir</var> is allowed. If a destination directory 
or explicit JAR file
-name is not provided, JARs are signed in place.</p>
+<p>Signs JAR files with
+the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jarsigner.html";
+target="_top"><code>jarsigner</code> command line tool</a>.  It will take a 
named file in
+the <var>jar</var> attribute, and an optional <var>destDir</var> or 
<var>signedJar</var>
+attribute. Nested paths are also supported; here only an (optional) 
<var>destDir</var> is
+allowed. If a destination directory or explicit JAR file name is not provided, 
JARs are signed in
+place.</p>
 <p>Dependency rules</p>
 <ul>
   <li>Nonexistent destination JARs are created/signed</li>
@@ -207,9 +208,9 @@ name is not provided, JARs are signed in place.</p>
  </table>
 
 <h3>Examples</h3>
-<p>For instructions on generating a code signing certificate, see the <a 
target="_blank"
-href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/keytool.html";>keytool
-documentation</a> and/or instructions from your certificate authority.</p>
+<p>For instructions on generating a code signing certificate, see
+the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/keytool.html";
+target="_top">keytool documentation</a> and/or instructions from your 
certificate authority.</p>
 <pre>
 &lt;signjar jar=&quot;${dist}/lib/ant.jar&quot;
          alias=&quot;apache-group&quot; storepass=&quot;secret&quot;/&gt;</pre>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/sos.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sos.html b/manual/Tasks/sos.html
index 9b40ded..4d242a3 100644
--- a/manual/Tasks/sos.html
+++ b/manual/Tasks/sos.html
@@ -40,8 +40,8 @@
 
 <p>These tasks provide an interface to
 the <a href="https://msdn.microsoft.com/en-us/library/3h0544kx(v=vs.80).aspx"
-target="_top">Microsoft Visual SourceSafe</a> SCM
-via <a href="https://sourcegear.com";>SourceGear's</a> <a 
href="https://sourcegear.com/sos/";>SourceOffSite</a>
+target="_top">Microsoft Visual SourceSafe</a> SCM via <a 
href="https://sourcegear.com";
+target="_top">SourceGear's</a> <a href="https://sourcegear.com/sos/"; 
target="_top">SourceOffSite</a>
 product. SourceOffSite is an add-on to Microsoft's VSS, that allows remote 
development teams and
 tele-commuters that need fast and secure read/write access to a centralized 
SourceSafe database via
 any TCP/IP connection. SOS provides Linux, Solaris &amp; Windows

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/sql.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sql.html b/manual/Tasks/sql.html
index 22c94b2..764eaea 100644
--- a/manual/Tasks/sql.html
+++ b/manual/Tasks/sql.html
@@ -173,8 +173,8 @@ disabled with <code>-noproxy</code> option.</p>
   <tr>
     <td>escapeprocessing</td>
     <td>Control whether the Java statement object will perform escape 
substitution.<br/>
-      See <a 
href="https://docs.oracle.com/javase/8/docs/api/java/sql/Statement.html#setEscapeProcessing-boolean-";>Statement's
-      API docs</a> for details.  <em>Since Ant 1.6</em>.
+      See <a 
href="https://docs.oracle.com/javase/8/docs/api/java/sql/Statement.html#setEscapeProcessing-boolean-";
+      target="_top">Statement's API docs</a> for details.  <em>Since Ant 
1.6</em>.
     <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/style.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html
index 267d524..f8de21a 100644
--- a/manual/Tasks/style.html
+++ b/manual/Tasks/style.html
@@ -319,7 +319,7 @@ for primitive types).</p>
 
 <h4>outputproperty (<var>trax</var> processors only)</h4>
 <p>Used to specify how you wish the result tree to be output as specified in
-the <a href="https://www.w3.org/TR/xslt#output";> XSLT specifications</a>.
+the <a href="https://www.w3.org/TR/xslt#output"; target="_top">XSLT 
specifications</a>.
 
 <h5>Parameters</h5>
 <table class="attr">

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/tar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/tar.html b/manual/Tasks/tar.html
index 8a7cf26..98518ce 100644
--- a/manual/Tasks/tar.html
+++ b/manual/Tasks/tar.html
@@ -131,8 +131,8 @@ to <q>gzip</q>, <q>bzip2</q>, or <q>xz</q>.</p>
     <td>encoding</td>
     <td>The character encoding to use for filenames inside the tar file.  For 
a list of possible
       values see
-      the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html";>Supported
-      Encodings</a>.<br/><em>Since Ant 1.9.5</em>
+      the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html";
+      target="_top">Supported Encodings</a>.<br/><em>Since Ant 1.9.5</em>
     <td>No; defaults to default JVM character encoding</td>
   </tr>
 </table>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/touch.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/touch.html b/manual/Tasks/touch.html
index 08c76c0..d4ed96b 100644
--- a/manual/Tasks/touch.html
+++ b/manual/Tasks/touch.html
@@ -98,7 +98,7 @@ a <var>type</var> selector to suppress this.  This only 
applies to filesets nest
 directly, not to filesets nested into a path or any other resource 
collection.</p>
 
 <h4>mapper</h4>
-<p><em>Since Ant 1.6.3</em>, a nested <a href="../Types/mapper.html"> 
mapper</a> can be specified.
+<p><em>Since Ant 1.6.3</em>, a nested <a 
href="../Types/mapper.html">mapper</a> can be specified.
 Files specified via nested <code>fileset</code>s, <code>filelist</code>s, or 
the <code>file</code>
 attribute are mapped using the specified mapper.  For each file mapped, the 
resulting files are
 touched. If no time has been specified and the original file exists its 
timestamp will be used.  If

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/tstamp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/tstamp.html b/manual/Tasks/tstamp.html
index e2086d1..ad175d3 100644
--- a/manual/Tasks/tstamp.html
+++ b/manual/Tasks/tstamp.html
@@ -59,12 +59,11 @@ ignored.</p>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<p>The task supports a <code>&lt;format&gt;</code> nested element that allows a
-property to be set to the current date and time in a given format.  The 
date/time patterns are as
-defined in the
-Java <a 
href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html";>SimpleDateFormat</a>
-class.  The format element also allows offsets to be applied to the time to 
generate different time
-values.</p>
+<p>The task supports a <code>&lt;format&gt;</code> nested element that allows 
a property to be set
+to the current date and time in a given format.  The date/time patterns are as 
defined in the
+Java <a 
href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html";
+target="_top">SimpleDateFormat</a> class.  The format element also allows 
offsets to be applied to
+the time to generate different time values.</p>
 <table class="attr">
   <tr>
     <th>Attribute</th>
@@ -85,8 +84,8 @@ values.</p>
   <tr>
     <td>timezone</td>
     <td>The timezone to use for displaying time. The values are as defined by 
the
-      Java <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html";>TimeZone</a>
-      class.</td>
+      Java <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html";
+      target="_top">TimeZone</a> class.</td>
     <td>No</td>
   </tr>
   <tr>
@@ -115,8 +114,8 @@ values.</p>
     <td>The locale used to create date/time string. The general form is 
<q>language[, country[,
       variant]]</q> (either <q>variant</q> or both <q>variant</q> and 
<q>country</q> may be
       omitted). For more information please refer to documentation for
-      the <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/Locale.html";>Locale</a>
-      class.</td>
+      the <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/Locale.html";
+      target="_top">Locale</a> class.</td>
     <td>No</td>
   </tr>
 </table>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/typedef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/typedef.html b/manual/Tasks/typedef.html
index a756cc0..3908447 100644
--- a/manual/Tasks/typedef.html
+++ b/manual/Tasks/typedef.html
@@ -45,17 +45,18 @@ attributes point to files in the format of Java property 
files or an xml format.
 <p>If you are defining tasks or types that share the same classpath with
 multiple <code>taskdef</code> or <code>typedef</code> tasks, the corresponding 
classes will be
 loaded by different
-Java <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/ClassLoader.html";>ClassLoaders</a>.
-Two classes with the same name loaded via different ClassLoaders are not the 
same class from the
-point of view of JVM, they don't share static variables and instances of these 
classes can't access
-private methods or attributes of instances defined by "the other class" of the 
same name.  They
-don't even belong to the same Java package and can't access package private 
code, either.</p>
+Java <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/ClassLoader.html";
+target="_top">ClassLoaders</a>.  Two classes with the same name loaded via 
different ClassLoaders
+are not the same class from the point of view of JVM, they don't share static 
variables and
+instances of these classes can't access private methods or attributes of 
instances defined by "the
+other class" of the same name.  They don't even belong to the same Java 
package and can't access
+package private code, either.</p>
 
 <p>The best way to load several tasks/types that are supposed to cooperate 
with each other via
 shared Java code is to use the <var>resource</var> attribute and an 
<code>antlib</code> descriptor.
 If this is not possible, the second best option is to use the 
<var>loaderref</var> attribute and
-specify the same name for each and every 
<code>typedef</code>/<code>taskdef</code> -- this way the
-classes will share the same <code>ClassLoader</code>.  Note that
+specify the same name for each and every 
<code>typedef</code>/<code>taskdef</code>&mdash;this way
+the classes will share the same <code>ClassLoader</code>.  Note that
 the <code>typedef</code>/<code>taskdef</code> tasks must use identical 
classpath definitions (this
 includes the order of path components) for the <var>loaderref</var> attribute 
to work.</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/unzip.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/unzip.html b/manual/Tasks/unzip.html
index 3306127..d624366 100644
--- a/manual/Tasks/unzip.html
+++ b/manual/Tasks/unzip.html
@@ -90,10 +90,10 @@ extract an Ant generated ZIP archive.</p>
     <td>encoding</td>
     <td>The character encoding that has been used for filenames inside the zip 
file.  For a list of
       possible values see
-      the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html";>Supported
-      Encodings</a>.<br/>  Use the magic value <q>native-encoding</q> for 
default JVM character
-      encoding.<br/>  See also the <a href="zip.html#encoding">discussion in 
the zip task
-      page</a></td>
+      the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html";
+      target="_top">Supported Encodings</a>.<br/>  Use the magic value 
<q>native-encoding</q> for
+      default JVM character encoding.<br/>  See also the <a 
href="zip.html#encoding">discussion in
+      the zip task page</a></td>
     <td>No; defaults to <q>UTF8</q> for <code>unzip</code> and default JVM 
character encoding
       for <code>untar</code> task</td>
   </tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/xmlvalidate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/xmlvalidate.html b/manual/Tasks/xmlvalidate.html
index 236401f..fe3572b 100644
--- a/manual/Tasks/xmlvalidate.html
+++ b/manual/Tasks/xmlvalidate.html
@@ -36,8 +36,9 @@ one can specify any SAX1/2 parser if needed.</p>
   <li><code>&lt;dtd&gt;</code> elements which are used to resolve DTDs and 
entities</li>
   <li><code>&lt;attribute&gt;</code> elements which are used to set features 
on the parser.  These
     can be any number
-    of <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";><code>http://xml.org/sax/features/</code></a>
-    or other features that your parser may support.</li>
+    of <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";
+    target="_top"><code>http://xml.org/sax/features/</code></a> or other 
features that your parser
+    may support.</li>
   <li><code>&lt;property&gt;</code> elements, containing string properties</li>
 </ul>
 
@@ -117,9 +118,10 @@ perform entity resolution.</p>
 <h4>attribute</h4>
 <p>The <code>&lt;attribute&gt;</code> element is used to set parser 
features.</p>
 <p>Features usable with the Xerces parser are defined
-here: <a href="https://xml.apache.org/xerces-j/features.html";>Setting 
features</a></p>
+here: <a href="https://xml.apache.org/xerces-j/features.html"; 
target="_top">Setting features</a></p>
 <p>SAX features are defined
-here: <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";><code>http://xml.org/sax/features/</code></a></p>
+here: <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";
+target="_top"><code>http://xml.org/sax/features/</code></a></p>
 <table class="attr">
   <tr>
     <th>Attribute</th>
@@ -141,8 +143,8 @@ here: <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html
 <h4>property</h4>
 <p>The <code>&lt;property&gt;</code> element is used to set properties.  These 
properties are
 defined here for the Xerces XML parser
-implementation: <a href="https://xml.apache.org/xerces-j/properties.html";>XML 
Parser properties</a>
-Properties can be used to set the schema used to validate the XML file.</p>
+implementation: <a href="https://xml.apache.org/xerces-j/properties.html"; 
target="_top">XML Parser
+properties</a>. Properties can be used to set the schema used to validate the 
XML file.</p>
 <table class="attr">
   <tr>
     <th>Attribute</th>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Tasks/zip.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html
index a3de99f..28fc209 100644
--- a/manual/Tasks/zip.html
+++ b/manual/Tasks/zip.html
@@ -81,10 +81,10 @@ see <a href="#encoding">below</a></p>
 <p><em>Since Ant 1.5.2</em>, <code>&lt;zip&gt;</code> can store Unix 
permissions inside the archive
 (see description of the <var>filemode</var> and <var>dirmode</var> attributes
 for <a href="../Types/zipfileset.html">&lt;zipfileset&gt;</a>).  Unfortunately 
there is no portable
-way to store these permissions.  Ant uses the algorithm used
-by <a href="http://www.info-zip.org";>Info-Zip's</a> implementation of the 
<code>zip</code>
-and <code>unzip</code> commands&mdash;these are the default versions of 
<code>zip</code>
-and <code>unzip</code> for many Unix(-like) systems.</p>
+way to store these permissions.  Ant uses the algorithm used by <a 
href="http://www.info-zip.org";
+target="_top">Info-Zip's</a> implementation of the <code>zip</code> and 
<code>unzip</code>
+commands&mdash;these are the default versions of <code>zip</code> and 
<code>unzip</code> for many
+Unix(-like) systems.</p>
 
 <p><strong>Please note that the zip format allows multiple files of the same 
fully-qualified name to
 exist within a single archive.  This has been documented as causing various 
problems for
@@ -143,8 +143,8 @@ extract an Ant generated ZIP archive.</p>
     <td>encoding</td>
     <td>The character encoding to use for filenames inside the zip file.  For 
a list of possible
       values see
-      the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html";>Supported
-      Encodings</a>.</td>
+      the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html";
+      target="_top">Supported Encodings</a>.</td>
     <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/assertions.html
----------------------------------------------------------------------
diff --git a/manual/Types/assertions.html b/manual/Types/assertions.html
index a24d83a..ed91a7d 100644
--- a/manual/Types/assertions.html
+++ b/manual/Types/assertions.html
@@ -29,32 +29,31 @@
 The <code>assertions</code> type enables or disables the Java 1.4 assertions 
feature, on a whole
 Java program, or components of a program. It can be used
 in <a href="../Tasks/java.html"><code>&lt;java&gt;</code></a>
-and <a href="../Tasks/junit.html"><code>&lt;junit&gt;</code></a> to add extra 
validation to
-code.
+and <a href="../Tasks/junit.html"><code>&lt;junit&gt;</code></a> to add extra 
validation to code.
 
 <p>
 Assertions are covered in
-the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/language/assert.html";>Java
-SE documentation</a>, and
-the <a 
href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-14.html#jls-14.10";>Java
-Language Specification</a>.
+the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/language/assert.html";
+target="_top">Java SE documentation</a>, and
+the <a 
href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-14.html#jls-14.10";
+target="_top">Java Language Specification</a>.
 
 <p>
-The key points to note are that a <code>java.lang.AssertionError</code> is 
thrown when an
-assertion fails, and that the facility is only available on Java 1.4 and 
later. To enable
-assertions one must set <var>source</var>=<q>1.4</q> (or later) in 
<code>&lt;javac&gt;</code>
-when the source is being compiled, and that the code must contain 
<code>assert</code> statements
-to be tested. The result of such an action is code that neither compiles or 
runs on earlier
-versions of Java. For this reason Apache Ant itself currently contains no 
assertions.
+The key points to note are that a <code>java.lang.AssertionError</code> is 
thrown when an assertion
+fails, and that the facility is only available on Java 1.4 and later. To 
enable assertions one must
+set <var>source</var>=<q>1.4</q> (or later) in <code>&lt;javac&gt;</code> when 
the source is being
+compiled, and that the code must contain <code>assert</code> statements to be 
tested. The result of
+such an action is code that neither compiles or runs on earlier versions of 
Java. For this reason
+Apache Ant itself currently contains no assertions.
 <p>
 
-When assertions are enabled (or disabled) in a task through nested assertions 
elements, the
-class loader or command line is modified with the appropriate options. This 
means that the JVM
-executed must be of version 1.4 or later, even if there are no assertions in 
the
-code. Attempting to enable assertions on earlier JVMs will result in an 
"Unrecognized option"
-error and the JVM will not start.
-
 <p>
+When assertions are enabled (or disabled) in a task through nested assertions 
elements, the class
+loader or command line is modified with the appropriate options. This means 
that the JVM executed
+must be of version 1.4 or later, even if there are no assertions in the code. 
Attempting to enable
+assertions on earlier JVMs will result in an "Unrecognized option" error and 
the JVM will not start.
+</p>
+
 <h4>Attributes</h4>
 <table class="attr">
   <tr>
@@ -70,18 +69,19 @@ error and the JVM will not start.
 </table>
 <p>
 When system assertions have been neither enabled nor disabled, then the JVM is 
not given any
-assertion information&mdash;the default action of the current JVMs is to 
disable system
-assertions.
+assertion information&mdash;the default action of the current JVMs is to 
disable system assertions.
+</p>
 <p>
 Note also that there is no apparent documentation for what parts of the JRE 
come with useful
 assertions.
+</p>
 
 <h3>Nested elements</h3>
 
 <h4>enable</h4>
 <p>
-Enable assertions in portions of code.  If neither a package nor class is 
specified, assertions
-are turned on in <em>all</em> (user) code.
+Enable assertions in portions of code.  If neither a package nor class is 
specified, assertions are
+turned on in <em>all</em> (user) code.
 </p>
 <table class="attr">
   <tr>
@@ -96,10 +96,8 @@ are turned on in <em>all</em> (user) code.
   </tr>
   <tr>
     <td>package</td>
-    <td>
-    The name of a package in which to enable assertions on all classes. 
(Includes subpackages.)
-    Use <q>...</q> for the anonymous package.
-    </td>
+    <td>The name of a package in which to enable assertions on all classes. 
(Includes subpackages.)
+      Use <q>...</q> for the anonymous package.</td>
     <td>No</td>
   </tr>
 </table>
@@ -121,10 +119,8 @@ Disable assertions in portions of code.
   </tr>
   <tr>
     <td>package</td>
-    <td>
-    The name of a package in which to disable assertions on all classes. 
(Includes subpackages.)
-    Use <q>...</q> for the anonymous package.
-    </td>
+    <td>The name of a package in which to disable assertions on all classes. 
(Includes subpackages.)
+      Use <q>...</q> for the anonymous package.</td>
     <td>No</td>
   </tr>
 </table>
@@ -136,63 +132,57 @@ have been enabled in a parent package.
 
 <h5>Example: enable assertions in all user classes</h5>
 
-All classes not in the JRE (i.e. all non-system classes) will have assertions 
turned on.
+<p>All classes not in the JRE (i.e. all non-system classes) will have 
assertions turned on.</p>
 <pre>
 &lt;assertions&gt;
   &lt;enable/&gt;
-&lt;/assertions&gt;
-</pre>
+&lt;/assertions&gt;</pre>
 
 <h5>Example: enable a single class</h5>
 
-Enable assertions in a class called Test
+<p>Enable assertions in a class called Test</p>
 <pre>
 &lt;assertions&gt;
   &lt;enable class="Test"/&gt;
-&lt;/assertions&gt;
-</pre>
+&lt;/assertions&gt;</pre>
 
 <h5>Example: enable a package</h5>
 
-Enable assertions in the <code>org.apache</code> package and all packages 
starting with
-the <code>org.apache.</code> prefix
+<p>Enable assertions in the <code>org.apache</code> package and all packages 
starting with
+the <code>org.apache.</code> prefix</p>
 <pre>
 &lt;assertions&gt;
   &lt;enable package="org.apache"/&gt;
-&lt;/assertions&gt;
-</pre>
+&lt;/assertions&gt;</pre>
 
 <h5>Example: System assertions</h5>
 
-Enable system assertions and assertions in all <code>org.apache</code> 
packages except for Ant
-(but including <code>org.apache.tools.ant.Main</code>)
+<p>Enable system assertions and assertions in all <code>org.apache</code> 
packages except for Ant
+(but including <code>org.apache.tools.ant.Main</code>)</p>
 <pre>
 &lt;assertions enableSystemAssertions="true"&gt;
   &lt;enable package="org.apache"/&gt;
   &lt;disable package="org.apache.tools.ant"/&gt;
   &lt;enable class="org.apache.tools.ant.Main"/&gt;
-&lt;/assertions&gt;
-</pre>
+&lt;/assertions&gt;</pre>
 
 <h5>Example: disabled and anonymous package assertions</h5>
 
-Disable system assertions; enable those in the anonymous package
+<p>Disable system assertions; enable those in the anonymous package</p>
 <pre>
 &lt;assertions enableSystemAssertions="false"&gt;
   &lt;enable package="..."/&gt;
-&lt;/assertions&gt;
-</pre>
+&lt;/assertions&gt;</pre>
 
 <h5>Example: referenced assertions</h5>
 
-This type is a datatype, so you can declare assertions and use them later
+<p>This type is a datatype, so you can declare assertions and use them 
later</p>
 <pre>
 &lt;assertions id="project.assertions"&gt;
   &lt;enable package="org.apache.test"/&gt;
 &lt;/assertions&gt;
 
-&lt;assertions refid="project.assertions"/&gt;
-</pre>
+&lt;assertions refid="project.assertions"/&gt;</pre>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/extension.html
----------------------------------------------------------------------
diff --git a/manual/Types/extension.html b/manual/Types/extension.html
index 5cf94f7..5c033ef 100644
--- a/manual/Types/extension.html
+++ b/manual/Types/extension.html
@@ -23,15 +23,15 @@
 
 <body>
 <h2 id="fileset">Extension</h2>
-<p>Utility type that represents either an available "Optional Package" 
(formerly known as
- "Standard Extension") as described in the manifest of a JAR file, or the 
requirement for such
- an optional package.</p>
+<p>Utility type that represents either an available "Optional Package" 
(formerly known as "Standard
+Extension") as described in the manifest of a JAR file, or the requirement for 
such an optional
+package.</p>
 <p>Note that this type works with extensions as defined by the "Optional 
Package" specification.
-For more information about optional packages, see the document <em>Optional 
Package
-Versioning</em> in the documentation bundle for your Java Standard Edition 
package, in
+For more information about optional packages, see the document <em>Optional 
Package Versioning</em>
+in the documentation bundle for your Java Standard Edition package, in
 file <samp>guide/extensions/versioning.html</samp> or the
-online <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90779";>Package
-Versioning documentation.</a></p>
+online <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90779";
+target="_top">Package Versioning documentation.</a></p>
 
 <h3>Attributes</h3>
 <p>The extension type supports the following attributes:</p>
@@ -50,7 +50,7 @@ Versioning documentation.</a></p>
   <tr>
     <td>specificationVersion</td>
     <td>The version of extension specification (must be in dewey decimal aka 
dotted decimal
-    notation, eg <q>3.2.4</q>)</td>
+      notation, eg <q>3.2.4</q>)</td>
     <td>no</td>
   </tr>
   <tr>
@@ -61,7 +61,7 @@ Versioning documentation.</a></p>
   <tr>
     <td>implementationVersion</td>
     <td>The version of extension implementation (must be in dewey decimal aka 
dotted decimal
-    notation, eg <q>3.2.4</q>)</td>
+      notation, eg <q>3.2.4</q>)</td>
     <td>no</td>
   </tr>
   <tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/extensionset.html
----------------------------------------------------------------------
diff --git a/manual/Types/extensionset.html b/manual/Types/extensionset.html
index ae14d05..8b077a0 100644
--- a/manual/Types/extensionset.html
+++ b/manual/Types/extensionset.html
@@ -25,11 +25,11 @@
 <h2><a>ExtensionSet</a></h2>
 <p>Utility type that represents a set of Extensions.</p>
 <p>Note that this type works with extensions as defined by the "Optional 
Package" specification.
-For more information about optional packages, see the document <em>Optional 
Package
-Versioning</em> in the documentation bundle for your Java Standard Edition 
package, in
+For more information about optional packages, see the document <em>Optional 
Package Versioning</em>
+in the documentation bundle for your Java Standard Edition package, in
 file <samp>guide/extensions/versioning.html</samp> or online
-at <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90779";>Package
-Versioning documentation.</a></p>
+at <a 
href="https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90779";
+target="_top">Package Versioning documentation.</a></p>
 
 <h3>Nested elements</h3>
 
@@ -37,13 +37,12 @@ Versioning documentation.</a></p>
 <p><a href="extension.html">Extension</a> object to add to set.</p>
 
 <h4>fileset</h4>
-<p><a href="fileset.html">FileSet</a>s all files contained contained within 
set that are jars
-and implement an extension are added to extension set.</p>
+<p><a href="fileset.html">FileSet</a>s all files contained contained within 
set that are jars and
+implement an extension are added to extension set.</p>
 
 <h4>libfileset</h4>
-<p>All files contained contained within set that are jars and implement an 
extension are added
-to extension set. However, the extension information may be modified by 
attributes of
-libfileset.</p>
+<p>All files contained contained within set that are jars and implement an 
extension are added to
+extension set. However, the extension information may be modified by 
attributes of libfileset.</p>
 
 <h4>Examples</h4>
 <pre>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/filterchain.html
----------------------------------------------------------------------
diff --git a/manual/Types/filterchain.html b/manual/Types/filterchain.html
index b4327c2..cf5b090 100644
--- a/manual/Types/filterchain.html
+++ b/manual/Types/filterchain.html
@@ -28,22 +28,22 @@ that contained the string <q>blee</q> from the first 10 
lines of a text file <sa
 (<em>you wouldn't want to filter a binary file</em>) to a file 
<samp>bar</samp>, you would do
 something like:</p>
 <pre>cat foo|head -n10|grep blee &gt; bar</pre>
-<p>Apache Ant was not flexible enough.  There was no way for the 
<code>&lt;copy&gt;</code> task
-to do something similar.  If you wanted the <code>&lt;copy&gt;</code> task to 
get the first 10
-lines, you would have had to create special attributes:</p>
+<p>Apache Ant was not flexible enough.  There was no way for the 
<code>&lt;copy&gt;</code> task to
+do something similar.  If you wanted the <code>&lt;copy&gt;</code> task to get 
the first 10 lines,
+you would have had to create special attributes:</p>
 <pre>&lt;copy file=&quot;foo&quot; tofile=&quot;bar&quot; head=&quot;10&quot; 
contains=&quot;blee&quot;/&gt;</pre>
 <p>The obvious problem thus surfaced: Ant tasks would not be able to 
accommodate such data
 transformation attributes as they would be endless.  The task would also not 
know in which order
 these attributes were to be interpreted.  That is, must the task execute the 
contains attribute
 first and then the head attribute or vice-versa?  What Ant tasks needed was a 
mechanism to allow
-pluggable filter (data transformer) chains.  Ant would provide a few filters 
for which there
-have been repeated requests.  Users with special filtering needs would be able 
to easily write
-their own and plug them in.</p>
+pluggable filter (data transformer) chains.  Ant would provide a few filters 
for which there have
+been repeated requests.  Users with special filtering needs would be able to 
easily write their own
+and plug them in.</p>
 
 <p>The solution was to refactor data transformation oriented tasks to support 
FilterChains.  A
-FilterChain is a group of ordered FilterReaders.  Users can define their own 
FilterReaders by
-just extending the <code>java.io.FilterReader</code> class.  Such custom 
FilterReaders can be
-easily plugged in as nested elements of <code>&lt;filterchain&gt;</code> by
+FilterChain is a group of ordered FilterReaders.  Users can define their own 
FilterReaders by just
+extending the <code>java.io.FilterReader</code> class.  Such custom 
FilterReaders can be easily
+plugged in as nested elements of <code>&lt;filterchain&gt;</code> by
 using <code>&lt;filterreader&gt;</code> elements.</p>
 <p>Example:</p>
 <pre>
@@ -114,14 +114,13 @@ also.</p>
 
 <h3 id="filterreader">FilterReader</h3>
 
-<p>The <code>filterreader</code> element is the generic way to define a 
filter.  User defined
-filter elements are defined in the build file using this.  Please note that 
built in filter
-readers can also be defined using this syntax.</p>
+<p>The <code>filterreader</code> element is the generic way to define a 
filter.  User defined filter
+elements are defined in the build file using this.  Please note that built in 
filter readers can
+also be defined using this syntax.</p>
 
 <p>A FilterReader element must be supplied with a class name as an attribute 
value.  The class
-resolved by this name must extend <code>java.io.FilterReader</code>.  If the 
custom filter
-reader needs to be parameterized, it must
-implement <code>org.apache.tools.type.Parameterizable</code>.</p>
+resolved by this name must extend <code>java.io.FilterReader</code>.  If the 
custom filter reader
+needs to be parameterized, it must implement 
<code>org.apache.tools.type.Parameterizable</code>.</p>
 
 <table class="attr">
   <tr>
@@ -138,23 +137,22 @@ implement 
<code>org.apache.tools.type.Parameterizable</code>.</p>
 
 <h4>Nested elements</h4>
 <p><code>&lt;filterreader&gt;</code> supports <code>&lt;classpath&gt;</code>
-and <code>&lt;param&gt;</code> as nested elements.  Each 
<code>&lt;param&gt;</code> element may
-take in the following attributes&mdash;<var>name</var>, <var>type</var> and 
<var>value</var>.</p>
+and <code>&lt;param&gt;</code> as nested elements.  Each 
<code>&lt;param&gt;</code> element may take
+in the following attributes&mdash;<var>name</var>, <var>type</var> and 
<var>value</var>.</p>
 <p>The following FilterReaders are supplied with the default distribution.</p>
 
 <h3 id="classconstants">ClassConstants</h3>
-<p>This filters basic constants defined in a Java Class, and outputs them in 
lines composed of
-the format <em>name</em>=<em>value</em>.  This filter uses the BCEL library to 
understand the
-Java Class file.  See <a href="../install.html#librarydependencies">Library 
Dependencies</a>.</p>
-<p><strong>Important</strong>: This filter is different from most of the other 
filters.  Most of
-the filters operate on a sequence of characters.  This filter operates on the 
sequence of bytes
-that makes up a class. However the bytes arrive to the filter as a sequence of 
characters. This
-means that one must be careful on the choice of character encoding to use. 
Most encodings lose
-information on conversion from an arbitrary sequence of bytes to characters 
and back again to
-bytes. In particular, the usual default character encodings (CP1252 and UTF-8) 
do.  For this
-reason, <em>since Ant 1.7</em>, the character encoding 
<strong>ISO-8859-1</strong> is used to
-convert from characters back to bytes, so one <strong>has</strong> to use this 
encoding for
-reading the java class file.</p>
+<p>This filters basic constants defined in a Java Class, and outputs them in 
lines composed of the
+format <em>name</em>=<em>value</em>.  This filter uses the BCEL library to 
understand the Java Class
+file.  See <a href="../install.html#librarydependencies">Library 
Dependencies</a>.</p>
+<p><strong>Important</strong>: This filter is different from most of the other 
filters.  Most of the
+filters operate on a sequence of characters.  This filter operates on the 
sequence of bytes that
+makes up a class. However the bytes arrive to the filter as a sequence of 
characters. This means
+that one must be careful on the choice of character encoding to use. Most 
encodings lose information
+on conversion from an arbitrary sequence of bytes to characters and back again 
to bytes. In
+particular, the usual default character encodings (CP1252 and UTF-8) do.  For 
this reason, <em>since
+Ant 1.7</em>, the character encoding <strong>ISO-8859-1</strong> is used to 
convert from characters
+back to bytes, so one <strong>has</strong> to use this encoding for reading 
the Java class file.</p>
 <h4>Example</h4>
 
 <p>This loads the basic constants defined in a Java class as Ant 
properties.</p>
@@ -203,8 +201,8 @@ Unicode escape backslash u plus 4 digits.</p>
 &lt;/loadproperties&gt;</pre>
 
 <h3 id="expandproperties">ExpandProperties</h3>
-<p>If the data contains data that represents Ant properties (of the form 
<code>${...}</code>),
-that is substituted with the property's actual value.</p>
+<p>If the data contains data that represents Ant properties (of the form 
<code>${...}</code>), that
+is substituted with the property's actual value.</p>
 
 <h4>Example</h4>
 
@@ -663,8 +661,8 @@ them.</p>
 
 <h3 id="striplinecomments">StripLineComments</h3>
 
-<p>This filter removes all those lines that begin with strings that represent 
comments as
-specified by the user.</p>
+<p>This filter removes all those lines that begin with strings that represent 
comments as specified
+by the user.</p>
 
 <table class="attr">
   <tr>
@@ -764,8 +762,8 @@ and <q>//</q></p>
 <p>
 
 <h4>Background</h4>
-<p>With HeadFilter and TailFilter you can extract each part of a text file you 
want.  This
-graphic shows the dependencies:</p>
+<p>With HeadFilter and TailFilter you can extract each part of a text file you 
want.  This graphic
+shows the dependencies:</p>
 
 <table>
 <tr>
@@ -1120,15 +1118,14 @@ following are understood: <q>\n</q>, <q>\r</q>, 
<q>\f</q>, <q>\t</q> and <q>\\</
 </p>
 <p>
 Some of the filters may be used directly within a <code>filterchain</code>. In 
this case
-a <code>tokenfilter</code> is created implicitly. An extra attribute 
<var>byline</var> is added
-to the filter to specify whether to use a <code>linetokenizer</code>
-(<var>byline</var>=<q>true</q>) or a <code>filetokenizer</code>
-(<var>byline</var>=<q>false</q>). The default is <q>true</q>.
+a <code>tokenfilter</code> is created implicitly. An extra attribute 
<var>byline</var> is added to
+the filter to specify whether to use a <code>linetokenizer</code> 
(<var>byline</var>=<q>true</q>) or
+a <code>filetokenizer</code> (<var>byline</var>=<q>false</q>). The default is 
<q>true</q>.
 </p>
 
 <h4 id="linetokenizer">LineTokenizer</h4>
-<p>This tokenizer splits the input into lines.  The tokenizer delimits lines
-by <q>\r</q>, <q>\n</q> or <q>\r\n</q>.  This is the default tokenizer.</p>
+<p>This tokenizer splits the input into lines.  The tokenizer delimits lines 
by <q>\r</q>, <q>\n</q>
+or <q>\r\n</q>.  This is the default tokenizer.</p>
 <table class="attr">
   <tr>
     <th>Attribute</th>
@@ -1451,8 +1448,8 @@ the <a href="../Tasks/native2ascii.html">native2ascii</a> 
task.</p>
 <p>
 This is an optional filter that executes a script in a <a 
href="https://jakarta.apache.org/bsf";
 target="_top">Apache BSF</a>
-or <a 
href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html";>JSR
-223</a> supported language.
+or <a 
href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html";
+target="_top">JSR 223</a> supported language.
 </p>
 <p>
 See the <a href="../Tasks/script.html">Script</a> task for an explanation of 
scripts and
@@ -1460,8 +1457,8 @@ dependencies.
 </p>
 <p>
 The script is provided with an object <samp>self</samp> that has 
<code>getToken()</code>
-and <code>setToken(String)</code> methods.  The <code>getToken()</code> method 
returns the
-current token. The <code>setToken(String)</code> method replaces the current 
token.
+and <code>setToken(String)</code> methods.  The <code>getToken()</code> method 
returns the current
+token. The <code>setToken(String)</code> method replaces the current token.
 </p>
 <p>
 This filter may be used directly within a <code>filterchain</code>.
@@ -1474,14 +1471,14 @@ This filter may be used directly within a 
<code>filterchain</code>.
   </tr>
   <tr>
     <td>language</td>
-    <td>Programming language the script is written in.  Must be a supported 
Apache BSF or
-      JSR 223 language</td>
+    <td>Programming language the script is written in.  Must be a supported 
Apache BSF or JSR 223
+      language</td>
     <td>Yes</td>
   </tr>
   <tr>
     <td>manager</td>
-    <td>Script engine manager to use.  See the <a 
href="../Tasks/script.html">script</a>
-      task for using this attribute.</td>
+    <td>Script engine manager to use.  See the <a 
href="../Tasks/script.html">script</a> task for
+      using this attribute.</td>
     <td>No; default is <q>auto</q></td>
   </tr>
   <tr>
@@ -1507,8 +1504,8 @@ This filter may be used directly within a 
<code>filterchain</code>.
   </tr>
   <tr>
     <td>classpathref</td>
-    <td>The classpath to use, given as a <a 
href="../using.html#references">reference</a> to a
-      path defined elsewhere.
+    <td>The classpath to use, given as a <a 
href="../using.html#references">reference</a> to a path
+      defined elsewhere.
     <td>No</td>
   </tr>
 </table>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/mapper.html
----------------------------------------------------------------------
diff --git a/manual/Types/mapper.html b/manual/Types/mapper.html
index 7dfeee1..a4e014b 100644
--- a/manual/Types/mapper.html
+++ b/manual/Types/mapper.html
@@ -26,16 +26,15 @@
 
 <h2 id="mapper">Mapping File Names</h2>
 <p>Some tasks take source files and create target files. Depending on the 
task, it may be quite
-obvious which name a target file will have (using <a 
href="../Tasks/javac.html">javac</a>, you
-know there will be <samp>.class</samp> files for your <samp>.java</samp> 
files)&mdash;in other
-cases you may want to specify the target files, either to help Apache Ant or 
to get an extra bit
-of functionality.</p>
+obvious which name a target file will have (using <a 
href="../Tasks/javac.html">javac</a>, you know
+there will be <samp>.class</samp> files for your <samp>.java</samp> 
files)&mdash;in other cases you
+may want to specify the target files, either to help Apache Ant or to get an 
extra bit of
+functionality.</p>
 <p>While source files are usually specified as <a 
href="fileset.html">fileset</a>s, you don't
 specify target files directly&mdash;instead, you tell Ant how to find the 
target file(s) for one
-source file. An instance of 
<code>org.apache.tools.ant.util.FileNameMapper</code> is responsible
-for this. It constructs target file names based on rules that can be 
parameterized
-with <var>from</var> and <var>to</var> attributes&mdash;the exact meaning of 
which is
-implementation-dependent.</p>
+source file. An instance of 
<code>org.apache.tools.ant.util.FileNameMapper</code> is responsible for
+this. It constructs target file names based on rules that can be parameterized 
with <var>from</var>
+and <var>to</var> attributes&mdash;the exact meaning of which is 
implementation-dependent.</p>
 <p>These instances are defined in <code>&lt;mapper&gt;</code> elements with 
the following
 attributes:</p>
 <table class="attr">
@@ -76,37 +75,37 @@ attributes:</p>
     <td>Depends on implementation</td>
   </tr>
 </table>
-<p>Note that Ant will not automatically convert <q>/</q> or <q>\</q> 
characters in
-the <var>to</var> and <var>from</var> attributes to the correct directory 
separator of your
-current platform.  If you need to specify this separator, use 
<code>${file.separator}</code>
-instead.  For the regexp mapper, <code>${file.separator}</code> will not work, 
as on Windows it
-is the <q>\</q> character, and this is an escape character for regular 
expressions, one should
-use the <code>handledirsep</code> attribute instead.
+<p>Note that Ant will not automatically convert <q>/</q> or <q>\</q> 
characters in the <var>to</var>
+and <var>from</var> attributes to the correct directory separator of your 
current platform.  If you
+need to specify this separator, use <code>${file.separator}</code> instead.  
For the regexp
+mapper, <code>${file.separator}</code> will not work, as on Windows it is the 
<q>\</q> character,
+and this is an escape character for regular expressions, one should use
+the <code>handledirsep</code> attribute instead.
 </p>
 <h3>Parameters specified as nested elements</h3>
-<p>The classpath can be specified via a nested <code>&lt;classpath&gt;</code>, 
as
-well&mdash;that is, a <a href="../using.html#path">path</a>-like structure.</p>
+<p>The classpath can be specified via a nested <code>&lt;classpath&gt;</code>, 
as well&mdash;that
+is, a <a href="../using.html#path">path</a>-like structure.</p>
 <p><em>Since Ant 1.7.0</em>, nested File Mappers can be supplied via
 either <code>&lt;mapper&gt;</code> elements
 or <a href="../Tasks/typedef.html"><code>&lt;typedef&gt;</code></a>'d 
implementations
-of <code>org.apache.tools.ant.util.FileNameMapper</code>.  If nested File 
Mappers are specified
-by either means, the mapper will be implicitly configured as
-a <a href="#composite-mapper">composite mapper</a>.</p>
+of <code>org.apache.tools.ant.util.FileNameMapper</code>.  If nested File 
Mappers are specified by
+either means, the mapper will be implicitly configured as a <a 
href="#composite-mapper">composite
+mapper</a>.</p>
 <h3>The built-in mapper types</h3>
 <p>All built-in mappers are case-sensitive.</p>
-<p><em>Since Ant 1.7.0</em>, each of the built-in mapper implementation types 
is directly
-accessible using a specific tagname. This makes it possible for filename 
mappers to support
-attributes in addition to the generally available <var>to</var> and 
<var>from</var>.<br/>
-The <code>&lt;mapper type|classname=&quot;...&quot;&gt;</code> usage form 
remains valid for
-reasons of backward compatibility.</p>
+<p><em>Since Ant 1.7.0</em>, each of the built-in mapper implementation types 
is directly accessible
+using a specific tagname. This makes it possible for filename mappers to 
support attributes in
+addition to the generally available <var>to</var> and <var>from</var>.<br/>  
The <code>&lt;mapper
+type|classname=&quot;...&quot;&gt;</code> usage form remains valid for reasons 
of backward
+compatibility.</p>
 
     <!--                                        -->
     <!--             Identity Mapper            -->
     <!--                                        -->
 
 <h4 id="identity-mapper">identity</h4>
-<p>The target file name is identical to the source file name. Both 
<var>to</var>
-and <var>from</var> will be ignored.</p>
+<p>The target file name is identical to the source file name. Both 
<var>to</var> and <var>from</var>
+will be ignored.</p>
 <h5>Examples</h5>
 <pre>
 &lt;mapper type=&quot;identity&quot;/&gt;
@@ -139,8 +138,8 @@ and <var>from</var> will be ignored.</p>
     <!--                                        -->
 
 <h4 id="flatten-mapper">flatten</h4>
-<p>The target file name is identical to the source file name, with all leading 
directory
-information stripped off. Both <var>to</var> and <var>from</var> will be 
ignored.</p>
+<p>The target file name is identical to the source file name, with all leading 
directory information
+stripped off. Both <var>to</var> and <var>from</var> will be ignored.</p>
 <h5>Examples</h5>
 <pre>
 &lt;mapper type=&quot;flatten&quot;/&gt;
@@ -173,8 +172,8 @@ information stripped off. Both <var>to</var> and 
<var>from</var> will be ignored
     <!--                                        -->
 
 <h4 id="merge-mapper">merge</h4>
-<p>The target file name will always be the same, as defined
-by <var>to</var>&mdash;<var>from</var> will be ignored.</p>
+<p>The target file name will always be the same, as defined by 
<var>to</var>&mdash;<var>from</var>
+will be ignored.</p>
 <h5>Examples</h5>
 <pre>
 &lt;mapper type=&quot;merge&quot; to=&quot;archive.tar&quot;/&gt;
@@ -207,11 +206,11 @@ by <var>to</var>&mdash;<var>from</var> will be 
ignored.</p>
     <!--                                        -->
 
 <h4 id="glob-mapper">glob</h4>
-<p>Both <var>to</var> and <var>from</var> are required and define patterns 
that may contain at
-most one <q>*</q>. For each source file that matches the <var>from</var> 
pattern, a target file
-name will be constructed from the <var>to</var> pattern by substituting the 
<q>*</q> in
-the <var>to</var> pattern with the text that matches the <q>*</q> in the 
<var>from</var>
-pattern. Source file names that don't match the <var>from</var> pattern will 
be ignored.</p>
+<p>Both <var>to</var> and <var>from</var> are required and define patterns 
that may contain at most
+one <q>*</q>. For each source file that matches the <var>from</var> pattern, a 
target file name will
+be constructed from the <var>to</var> pattern by substituting the <q>*</q> in 
the <var>to</var>
+pattern with the text that matches the <q>*</q> in the <var>from</var> 
pattern. Source file names
+that don't match the <var>from</var> pattern will be ignored.</p>
 <h5>Examples</h5>
 <pre>
 &lt;mapper type=&quot;glob&quot; from=&quot;*.java&quot; 
to=&quot;*.java.bak&quot;/&gt;
@@ -273,9 +272,8 @@ pattern. Source file names that don't match the 
<var>from</var> pattern will be
   <tr>
     <td>casesensitive</td>
     <td>
-      This attribute can be <q>true</q> or <q>false</q>.  If this is 
<q>false</q>, the mapper
-      will ignore case when matching the glob pattern.
-      <em>Since Ant 1.6.3</em>
+      This attribute can be <q>true</q> or <q>false</q>.  If this is 
<q>false</q>, the mapper will
+      ignore case when matching the glob pattern.  <em>Since Ant 1.6.3</em>
     </td>
     <td>No; default is <q>true</q></td>
   </tr>
@@ -284,8 +282,8 @@ pattern. Source file names that don't match the 
<var>from</var> pattern will be
     <td>
       This attribute can be <q>true</q> or <q>false</q>.  If this is 
specified, the mapper will
       ignore the difference between the normal directory separator 
characters&mdash;<q>\</q>
-      and <q>/</q>.  This attribute is useful for cross-platform build files.
-      <em>Since Ant 1.6.3</em>
+      and <q>/</q>.  This attribute is useful for cross-platform build files.  
<em>Since Ant
+      1.6.3</em>
     <td>No; default is <q>false</q></td>
   </tr>
 </table>
@@ -318,14 +316,14 @@ pattern. Source file names that don't match the 
<var>from</var> pattern will be
 
 <h4 id="regexp-mapper">regexp</h4>
 
-<p>Both <var>to</var> and <var>from</var> are required and define regular 
expressions. If the
-source file name (as a whole or in part) matches the <var>from</var> pattern, 
the target file
-name will be constructed from the <var>to</var> pattern, using <code>\0</code>
-to <code>\9</code> as back-references for the full match (<code>\0</code>) or 
the matches of the
-subexpressions in parentheses.  The <var>to</var> pattern determines the 
<strong>whole</strong>
-file name, so if you wanted to replace the extension of a file you should not
-use <code>from="\.old$" to=".new"</code> but rather <code>from="(.*)\.old$" 
to="\1.new"</code>
-(or rather use a glob mapper in this case).</p>
+<p>Both <var>to</var> and <var>from</var> are required and define regular 
expressions. If the source
+file name (as a whole or in part) matches the <var>from</var> pattern, the 
target file name will be
+constructed from the <var>to</var> pattern, using <code>\0</code> to 
<code>\9</code> as
+back-references for the full match (<code>\0</code>) or the matches of the 
subexpressions in
+parentheses.  The <var>to</var> pattern determines the <strong>whole</strong> 
file name, so if you
+wanted to replace the extension of a file you should not use 
<code>from="\.old$" to=".new"</code>
+but rather <code>from="(.*)\.old$" to="\1.new"</code> (or rather use a glob 
mapper in this
+case).</p>
 
 <p>Source files not matching the <var>from</var> pattern will be ignored.</p>
 
@@ -334,30 +332,29 @@ use <code>from="\.old$" to=".new"</code> but rather 
<code>from="(.*)\.old$" to="
 <p>The regexp mapper needs a supporting library and an implementation
 of <code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that hides the 
specifics of the
 library. <em>Since Ant 1.8.0</em>, Java 1.4 or later is required, so the 
implementation based on
-the <code>java.util.regex</code> package is always be available.  You can 
still use the now
-retired Jakarta ORO or Jakarta Regex instead if your provide the corresponding 
jar in
+the <code>java.util.regex</code> package is always be available.  You can 
still use the now retired
+Jakarta ORO or Jakarta Regex instead if your provide the corresponding jar in
 your <code>CLASSPATH</code>.</p>
 
 <p>For information about using <a 
href="https://savannah.gnu.org/projects/gnu-regexp/";
-target="_top">gnu.regexp</a> or <a href="https://github.com/kzn/regex4j/";
-target="_top">gnu.rex</a> with Ant,
-see <a href="https://marc.info/?l=ant-dev&m=97550753813481&w=2"; 
target="_top">this</a>
-article. Please keep in mind that <a 
href="http://tusker.org/regex/regex_benchmark.html";>your
-mileage may vary</a> with different regexp engines.</p>
-
-<p>If you want to use one of the <a 
href="../install.html#librarydependencies">regular
-expression libraries</a> other than <code>java.util.regex</code> you need to 
also use the
-corresponding <code>ant-[apache-oro, apache-regexp].jar</code> from the Ant 
release you are
-using.  Make sure that both will be loaded from the same classpath, that is 
either put them into
+target="_top">gnu.regexp</a> or <a href="https://github.com/kzn/regex4j/"; 
target="_top">gnu.rex</a>
+with Ant, see <a href="https://marc.info/?l=ant-dev&m=97550753813481&w=2"; 
target="_top">this</a>
+article. Please keep in mind that <a 
href="http://tusker.org/regex/regex_benchmark.html";
+target="_top">your mileage may vary</a> with different regexp engines.</p>
+
+<p>If you want to use one of the <a 
href="../install.html#librarydependencies">regular expression
+libraries</a> other than <code>java.util.regex</code> you need to also use the
+corresponding <code>ant-[apache-oro, apache-regexp].jar</code> from the Ant 
release you are using.
+Make sure that both will be loaded from the same classpath, that is either put 
them into
 your <code>CLASSPATH</code>, <samp>ANT_HOME/lib</samp> directory or a
 nested <code>&lt;classpath&gt;</code> element of the mapper&mdash;you cannot
-have <code>ant-[apache-oro, apache-regexp].jar</code> in 
<samp>ANT_HOME/lib</samp> and the
-library in a nested <code>&lt;classpath&gt;</code>.</p>
+have <code>ant-[apache-oro, apache-regexp].jar</code> in 
<samp>ANT_HOME/lib</samp> and the library
+in a nested <code>&lt;classpath&gt;</code>.</p>
 <p>Ant will choose the regular expression library based on the following 
algorithm:</p>
 <ul>
-<li>If the system property <code>ant.regexp.matcherimpl</code> has been set, 
it is taken as the
-name of the class implementing 
<code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that
-should be used.</li>
+<li>If the system property <code>ant.regexp.matcherimpl</code> has been set, 
it is taken as the name
+of the class implementing 
<code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that should be
+used.</li>
 <li>If it has not been set, uses the JDK 1.4 classes.</li>
 </ul>
 
@@ -472,8 +469,8 @@ should be used.</li>
   <tr>
     <td>casesensitive</td>
     <td>
-      This attribute can be <q>true</q> or <q>false</q>.  If this is 
<q>false</q>, the mapper
-      will ignore case when matching the pattern.
+      This attribute can be <q>true</q> or <q>false</q>.  If this is 
<q>false</q>, the mapper will
+      ignore case when matching the pattern.
       <em>Since Ant 1.6.3</em>
     </td>
     <td>No; default is <q>true</q></td>
@@ -514,9 +511,9 @@ should be used.</li>
 
 <h4 id="package-mapper">package</h4>
 <p>Sharing the same syntax as the <a href="#glob-mapper">glob mapper</a>, the 
package mapper
-replaces directory separators found in the matched source pattern with dots in 
the target
-pattern placeholder. This mapper is particularly useful in combination
-with <code>&lt;uptodate&gt;</code> and <code>&lt;junit&gt;</code> output.</p>
+replaces directory separators found in the matched source pattern with dots in 
the target pattern
+placeholder. This mapper is particularly useful in combination with 
<code>&lt;uptodate&gt;</code>
+and <code>&lt;junit&gt;</code> output.</p>
 <p>The <var>to</var> and <var>from</var> attributes are both required.</p>
 <h5>Example</h5>
 <pre>
@@ -543,9 +540,9 @@ with <code>&lt;uptodate&gt;</code> and 
<code>&lt;junit&gt;</code> output.</p>
 
 <h4 id="unpackage-mapper">unpackage</h4>
 <p><em>Since Ant 1.6.0</em></p>
-<p>This mapper is the inverse of the <a href="#package-mapper">package</a> 
mapper.  It replaces
-the dots in a package name with directory separators. This is useful for 
matching XML formatter
-results against their JUnit test test cases. The mapper shares the sample 
syntax as
+<p>This mapper is the inverse of the <a href="#package-mapper">package</a> 
mapper.  It replaces the
+dots in a package name with directory separators. This is useful for matching 
XML formatter results
+against their JUnit test test cases. The mapper shares the sample syntax as
 the <a href="#glob-mapper">glob mapper</a>.</p>
 <p>The <var>to</var> and <var>from</var> attributes are both required.</p>
 <h5>Example</h5>
@@ -572,8 +569,8 @@ the <a href="#glob-mapper">glob mapper</a>.</p>
 <p>This mapper implementation can contain multiple nested mappers.  File 
mapping is performed by
 passing the source filename to each nested <code>&lt;mapper&gt;</code> in 
turn, returning all
 results.  The <var>to</var> and <var>from</var> attributes are ignored.</p>
-<p><em>Since Ant 1.8.0</em>, the order of the mapped results is the same as 
the order of the
-nested mappers; prior to Ant 1.8.0 the order has been undefined.</p>
+<p><em>Since Ant 1.8.0</em>, the order of the mapped results is the same as 
the order of the nested
+mappers; prior to Ant 1.8.0 the order has been undefined.</p>
 <h5>Examples</h5>
 <pre>
 &lt;compositemapper&gt;
@@ -603,9 +600,9 @@ attribute.</p>
 <h4 id="chained-mapper">chained</h4>
 <p><em>Since Ant 1.7.0</em></p>
 <p>This mapper implementation can contain multiple nested mappers.  File 
mapping is performed by
-passing the source filename to the first nested mapper, its results to the 
second, and so on.
-The target filenames generated by the last nested mapper comprise the ultimate 
results of the
-mapping operation.  The <var>to</var> and <var>from</var> attributes are 
ignored.</p>
+passing the source filename to the first nested mapper, its results to the 
second, and so on.  The
+target filenames generated by the last nested mapper comprise the ultimate 
results of the mapping
+operation.  The <var>to</var> and <var>from</var> attributes are ignored.</p>
 <h5>Examples</h5>
 <pre>
 &lt;chainedmapper&gt;
@@ -693,8 +690,8 @@ file name.</p>
 <p><em>Since Ant 1.7</em></p>
 <p>This mapper executes a script written in <a 
href="https://jakarta.apache.org/bsf";
 target="_top">Apache BSF</a>
-or <a 
href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html";>JSR
-223</a> supported language, once per file to map.</p>
+or <a 
href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html";
+target="_top">JSR 223</a> supported language, once per file to map.</p>
 <p>The script can be declared inline or in a specified file.</p>
 <p>See the <a href="../Tasks/script.html">Script</a> task for an explanation 
of scripts and
 dependencies.</p>
@@ -800,9 +797,9 @@ every source file, with the list of mapped names reset 
after every invocation.</
 
 <h4 id="firstmatch-mapper">firstmatchmapper</h4>
 <p><em>Since Ant 1.8.0</em></p>
-<p>This mapper supports an arbitrary number of nested mappers and returns the 
results of the
-first mapper that matches.  This is different from <a 
href="#composite-mapper">composite
-mapper</a> which collects the results of all matching children.</p>
+<p>This mapper supports an arbitrary number of nested mappers and returns the 
results of the first
+mapper that matches.  This is different from <a 
href="#composite-mapper">composite mapper</a> which
+collects the results of all matching children.</p>
 <h5>Examples</h5>
 <pre>
 &lt;firstmatchmapper&gt;
@@ -846,8 +843,7 @@ attribute.</p>
   </tr>
 </table>
 
-<p>The cutdirsmapper has no corresponding <code>&lt;mapper 
<var>type</var>&gt;</code>
-attribute.</p>
+<p>The cutdirsmapper has no corresponding <code>&lt;mapper 
<var>type</var>&gt;</code> attribute.</p>
 
 <table class="attr">
   <tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/regexp.html
----------------------------------------------------------------------
diff --git a/manual/Types/regexp.html b/manual/Types/regexp.html
index 77bbab7..48d3870 100644
--- a/manual/Types/regexp.html
+++ b/manual/Types/regexp.html
@@ -43,25 +43,18 @@ Regexp represents a regular expression.
 
 <h3>Examples</h3>
 <pre>&lt;regexp id="myregexp" pattern="alpha(.+)beta"/&gt;</pre>
-<p>
-Defines a regular expression for later use with <var>id</var> <q>myregexp</q>.
-</p>
+<p>Defines a regular expression for later use with <var>id</var> 
<q>myregexp</q>.</p>
 <pre>&lt;regexp refid="myregexp"/&gt;</pre>
-<p>
-Use the regular expression with <var>id</var> <q>myregexp</q>.
-</p>
+<p>Use the regular expression with <var>id</var> <q>myregexp</q>.</p>
 <h3 id="implementation">Choice of regular expression implementation</h3>
-<p>
-Apache Ant comes with wrappers for
+<p>Apache Ant comes with wrappers for
 the <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/regex/package-summary.html";
 target="_top">java.util.regex
 package</a>, <a href="https://attic.apache.org/projects/jakarta-regexp.html";
-target="_top">jakarta-regexp</a>
-and <a href="https://attic.apache.org/projects/jakarta-oro.html"; 
target="_top">jakarta-ORO</a>,
-see <a href="../install.html#librarydependencies">installation 
dependencies</a> concerning the
-supporting libraries.</p>
-<p>
-The property <code>ant.regexp.regexpimpl</code> governs which regular 
expression implementation
+target="_top">jakarta-regexp</a> and <a 
href="https://attic.apache.org/projects/jakarta-oro.html";
+target="_top">jakarta-ORO</a>, see <a 
href="../install.html#librarydependencies">installation
+dependencies</a> concerning the supporting libraries.</p>
+<p>The property <code>ant.regexp.regexpimpl</code> governs which regular 
expression implementation
 will be chosen.  Possible values for this property are:</p>
 <ul>
 <li><code>org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp</code></li>
@@ -76,27 +69,23 @@ available.</p>
 There are cross-platform issues for matches related to line terminator.  For 
example if you
 use <q>$</q> to anchor your regular expression on the end of a line the 
results might be very
 different depending on both your platform and the regular expression library 
you use. It
-is <em>highly recommended</em> that you test your pattern on both Unix and 
Windows platforms
-before you rely on it.</p>
+is <em>highly recommended</em> that you test your pattern on both Unix and 
Windows platforms before
+you rely on it.</p>
 <ul>
   <li>Jakarta Oro defines a line terminator as <q>\n</q> and is consistent 
with Perl.</li>
   <li>Jakarta RegExp uses a system-dependent line terminator.</li>
   <li>JDK 1.4 uses <q>\n</q>, <q>\r\n</q>, <q>\u0085</q>, <q>\u2028</q>, 
<q>\u2029</q> as a
     default but is configured in the wrapper to use only <q>\n</q> 
(UNIX_LINE)</li>
 </ul>
-<p>
-<em>We used to recommend that you use Jakarta ORO but since its development 
has been retired
-Java's built-in regex package is likely the best choice going forward.</em>
-</p>
+<p><em>We used to recommend that you use Jakarta ORO but since its development 
has been retired
+Java's built-in regex package is likely the best choice going forward.</em></p>
 <h3>Usage</h3> The following tasks and types use the Regexp type:
 <ul>
 <li><a href="../Tasks/replaceregexp.html">ReplaceRegExp task</a></li>
 <li><a href="filterchain.html#linecontainsregexp">LineContainsRegexp 
filter</a></li>
 </ul>
-<p>
-These string filters also use the mechanism of regexp to choose a regular 
expression
-implementation:
-</p>
+<p>These string filters also use the mechanism of regexp to choose a regular 
expression
+implementation:</p>
 <ul>
 <li><a href="filterchain.html#containsregex">ContainsRegex string 
filter</a></li>
 <li><a href="filterchain.html#replaceregex">ReplaceRegex string filter</a></li>

Reply via email to