http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/selectors.html
----------------------------------------------------------------------
diff --git a/manual/Types/selectors.html b/manual/Types/selectors.html
index 657bfbc..2c59d59 100644
--- a/manual/Types/selectors.html
+++ b/manual/Types/selectors.html
@@ -24,21 +24,20 @@
   <body>
     <h2>Selectors</h2>
 
-    <p>Selectors are a mechanism whereby the files that make up a 
<code>&lt;fileset&gt;</code>
-    can be selected based on criteria other than filename as provided by
+    <p>Selectors are a mechanism whereby the files that make up a 
<code>&lt;fileset&gt;</code> can
+    be selected based on criteria other than filename as provided by
     the <code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code> tags.</p>
 
     <h3>How to use a Selector</h3>
 
-    <p>A selector is an element of FileSet, and appears within it. It can also 
be defined
-    outside of any target by using the <code>&lt;selector&gt;</code> tag and 
then using it as a
-    reference.</p>
+    <p>A selector is an element of FileSet, and appears within it. It can also 
be defined outside of
+    any target by using the <code>&lt;selector&gt;</code> tag and then using 
it as a reference.</p>
 
-    <p>Different selectors have different attributes. Some selectors can 
contain other
-    selectors, and these are called <a href="#selectcontainers"><code>Selector
-    Containers</code></a>.  There is also a category of selectors that allow 
user-defined
-    extensions, called <a href="#customselect"><code>Custom 
Selectors</code></a>.  The ones
-    built in to Apache Ant are called <a href="#coreselect"><code>Core 
Selectors</code></a>.</p>
+    <p>Different selectors have different attributes. Some selectors can 
contain other selectors,
+    and these are called <a href="#selectcontainers"><code>Selector 
Containers</code></a>.  There is
+    also a category of selectors that allow user-defined extensions,
+    called <a href="#customselect"><code>Custom Selectors</code></a>.  The 
ones built in to Apache
+    Ant are called <a href="#coreselect"><code>Core Selectors</code></a>.</p>
 
     <h3 id="coreselect">Core Selectors</h3>
 
@@ -52,29 +51,29 @@
         contain a particular text string</li>
       <li><a href="#dateselect"><code>&lt;date&gt;</code></a>&mdash;Select 
files that have been
         modified either before or after a particular date and time</li>
-      <li><a href="#dependselect"><code>&lt;depend&gt;</code></a>&mdash;Select 
files that have
-        been modified more recently than equivalent files elsewhere</li>
-      <li><a href="#depthselect"><code>&lt;depth&gt;</code></a>&mdash;Select 
files that appear
-        so many directories down in a directory tree</li>
-      <li><a 
href="#differentselect"><code>&lt;different&gt;</code></a>&mdash;Select files 
that
-        are different from those elsewhere</li>
-      <li><a 
href="#filenameselect"><code>&lt;filename&gt;</code></a>&mdash;Select files 
whose
-        name matches a particular pattern. Equivalent to the include and 
exclude elements of a
+      <li><a href="#dependselect"><code>&lt;depend&gt;</code></a>&mdash;Select 
files that have been
+        modified more recently than equivalent files elsewhere</li>
+      <li><a href="#depthselect"><code>&lt;depth&gt;</code></a>&mdash;Select 
files that appear so
+        many directories down in a directory tree</li>
+      <li><a 
href="#differentselect"><code>&lt;different&gt;</code></a>&mdash;Select files 
that are
+        different from those elsewhere</li>
+      <li><a 
href="#filenameselect"><code>&lt;filename&gt;</code></a>&mdash;Select files 
whose name
+        matches a particular pattern. Equivalent to the include and exclude 
elements of a
         patternset.</li>
-      <li><a 
href="#presentselect"><code>&lt;present&gt;</code></a>&mdash;Select files that
-        either do or do not exist in some other location</li>
-      <li><a 
href="#regexpselect"><code>&lt;containsregexp&gt;</code></a>&mdash;Select files
-        that match a regular expression</li>
-      <li><a href="#sizeselect"><code>&lt;size&gt;</code></a>&mdash;Select 
files that are larger
-        or smaller than a particular number of bytes.</li>
+      <li><a 
href="#presentselect"><code>&lt;present&gt;</code></a>&mdash;Select files that 
either
+        do or do not exist in some other location</li>
+      <li><a 
href="#regexpselect"><code>&lt;containsregexp&gt;</code></a>&mdash;Select files 
that
+        match a regular expression</li>
+      <li><a href="#sizeselect"><code>&lt;size&gt;</code></a>&mdash;Select 
files that are larger or
+        smaller than a particular number of bytes.</li>
       <li><a href="#typeselect"><code>&lt;type&gt;</code></a>&mdash;Select 
files that are either
         regular files or directories.</li>
       <li><a href="#modified"><code>&lt;modified&gt;</code></a>&mdash;Select 
files if the return
         value of the configured algorithm is different from that stored in a 
cache.</li>
-      <li><a 
href="#signedselector"><code>&lt;signedselector&gt;</code></a>&mdash;Select 
files
-        if they are signed, and optionally if they have a signature of a 
certain name.</li>
-      <li><a 
href="#scriptselector"><code>&lt;scriptselector&gt;</code></a>&mdash;Use a BSF 
or
-        JSR 223 scripting language to create your own selector</li>
+      <li><a 
href="#signedselector"><code>&lt;signedselector&gt;</code></a>&mdash;Select 
files if
+        they are signed, and optionally if they have a signature of a certain 
name.</li>
+      <li><a 
href="#scriptselector"><code>&lt;scriptselector&gt;</code></a>&mdash;Use a BSF 
or JSR
+        223 scripting language to create your own selector</li>
       <li><a href="#readable"><code>&lt;readable&gt;</code></a>&mdash;Select 
files if they are
         readable.</li>
       <li><a href="#writable"><code>&lt;writable&gt;</code></a>&mdash;Select 
files if they are
@@ -82,16 +81,15 @@
       <li><a 
href="#executable"><code>&lt;executable&gt;</code></a>&mdash;Select files if 
they
         are executable.</li>
       <li><a href="#symlink"><code>&lt;symlink&gt;</code></a>&mdash;Select 
files if they are
-        symlink.</li>
-      <li><a href="#ownedBy"><code>&lt;ownedBy&gt;</code></a>&mdash;Select 
files if they are
-        owned by a given user.</li>
+        symlinks.</li>
+      <li><a href="#ownedBy"><code>&lt;ownedBy&gt;</code></a>&mdash;Select 
files if they are owned
+        by a given user.</li>
     </ul>
 
     <h4 id="containsselect">Contains Selector</h4>
 
-    <p>The <code>&lt;contains&gt;</code> tag in a FileSet limits the files 
defined by that
-    fileset to only those which contain the string specified by the 
<code>text</code>
-    attribute.</p>
+    <p>The <code>&lt;contains&gt;</code> tag in a FileSet limits the files 
defined by that fileset
+    to only those which contain the string specified by the <code>text</code> 
attribute.</p>
     <p>The <code>&lt;contains&gt;</code> selector can be used as a 
ResourceSelector (see
     the <a href="resources.html#restrict">&lt;restrict&gt;</a> 
ResourceCollection).</p>
 
@@ -115,8 +113,8 @@
       </tr>
       <tr>
         <td>ignorewhitespace</td>
-        <td>Whether to eliminate whitespace before checking for the string in
-          the <var>text</var> attribute.</td>
+        <td>Whether to eliminate whitespace before checking for the string in 
the <var>text</var>
+          attribute.</td>
         <td>No; default is <q>false</q></td>
       </tr>
       <tr>
@@ -139,9 +137,9 @@
 
     <h4 id="dateselect">Date Selector</h4>
 
-    <p>The <code>&lt;date&gt;</code> tag in a FileSet will put a limit on the 
files specified by
-    the include tag, so that tags whose last modified date does not meet the 
date limits
-    specified by the selector will not end up being selected.</p>
+    <p>The <code>&lt;date&gt;</code> tag in a FileSet will put a limit on the 
files specified by the
+    include tag, so that tags whose last modified date does not meet the date 
limits specified by
+    the selector will not end up being selected.</p>
 
     <table class="attr">
       <tr>
@@ -151,9 +149,9 @@
       </tr>
       <tr>
         <td>datetime</td>
-        <td>Specifies the date and time to test for.  Should be in the format 
<q>MM/dd/yyyy
-          hh:mm a</q> using the US locale, or an alternative pattern specified 
via
-          the <var>pattern</var> attribute.
+        <td>Specifies the date and time to test for.  Should be in the format 
<q>MM/dd/yyyy hh:mm
+          a</q> using the US locale, or an alternative pattern specified via 
the <var>pattern</var>
+          attribute.
         </td>
         <td rowspan="2">At least one of the two</td>
       </tr>
@@ -169,17 +167,19 @@
           whose last modified times should be before, after, or equal to the 
specified
           value. Acceptable values for this attribute are:
           <ul>
-            <li><q>before</q>&mdash;select files whose last modified date is 
before the indicated date</li>
-            <li><q>after</q>&mdash;select files whose last modified date is 
after the indicated date</li>
-            <li><q>equal</q>&mdash;select files  whose last modified date is 
this exact date</li>
+            <li><q>before</q>&mdash;select files whose last modified date is 
before the indicated
+              date</li>
+            <li><q>after</q>&mdash;select files whose last modified date is 
after the indicated
+              date</li>
+            <li><q>equal</q>&mdash;select files whose last modified date is 
this exact date</li>
           </ul></td>
         <td>No; default is <q>equal</q></td>
       </tr>
       <tr>
         <td>granularity</td>
-        <td>The number of milliseconds leeway to use when comparing file 
modification
-          times. This is needed because not every file system supports 
tracking the last
-          modified time to the millisecond level.</td>
+        <td>The number of milliseconds leeway to use when comparing file 
modification times. This is
+          needed because not every file system supports tracking the last 
modified time to the
+          millisecond level.</td>
         <td>No; default is 0 milliseconds, or 2 seconds on DOS systems</td>
       </tr>
       <tr>
@@ -211,9 +211,9 @@
     another, equivalent file in another location.</p>
 
     <p>The <code>&lt;depend&gt;</code> tag supports the use of a
-    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element to 
define the
-    location of the file to be compared against. If no 
<code>&lt;mapper&gt;</code> element is
-    specified, the <code>identity</code> type mapper is used.</p>
+    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element to 
define the location
+    of the file to be compared against. If no <code>&lt;mapper&gt;</code> 
element is specified,
+    the <code>identity</code> type mapper is used.</p>
 
     <p>The <code>&lt;depend&gt;</code> selector is case-sensitive.</p>
 
@@ -226,15 +226,15 @@
       <tr>
         <td>targetdir</td>
         <td>The base directory to look for the files to compare against. The 
precise location
-          depends on a combination of this attribute and the 
<code>&lt;mapper&gt;</code>
-          element, if any.</td>
+          depends on a combination of this attribute and the 
<code>&lt;mapper&gt;</code> element, if
+          any.</td>
         <td>Yes</td>
       </tr>
       <tr>
         <td>granularity</td>
-        <td>The number of milliseconds leeway to give before deciding a file 
is out of
-          date. This is needed because not every file system supports tracking 
the last modified
-          time to the millisecond level.</td>
+        <td>The number of milliseconds leeway to give before deciding a file 
is out of date. This is
+          needed because not every file system supports tracking the last 
modified time to the
+          millisecond level.</td>
         <td>No; default is 0 milliseconds, or 2 seconds on DOS systems</td>
       </tr>
     </table>
@@ -250,8 +250,8 @@
 
     <h4 id="depthselect">Depth Selector</h4>
 
-    <p>The <code>&lt;depth&gt;</code> tag selects files based on how many 
directory levels deep
-    they are in relation to the base directory of the fileset.</p>
+    <p>The <code>&lt;depth&gt;</code> tag selects files based on how many 
directory levels deep they
+    are in relation to the base directory of the fileset.</p>
 
     <table class="attr">
       <tr>
@@ -261,14 +261,14 @@
       </tr>
       <tr>
         <td>min</td>
-        <td>The minimum number of directory levels below the base directory 
that a file must be
-          in order to be selected.</td>
+        <td>The minimum number of directory levels below the base directory 
that a file must be in
+          order to be selected.</td>
         <td rowspan="2">At least one of the two; default is no limit</td>
       </tr>
       <tr>
         <td>max</td>
-        <td class="left">The maximum number of directory levels below the base 
directory that a
-          file can be and still be selected.</td>
+        <td class="left">The maximum number of directory levels below the base 
directory that a file
+          can be and still be selected.</td>
       </tr>
     </table>
 
@@ -279,14 +279,13 @@
     &lt;depth max=&quot;1&quot;/&gt;
 &lt;/fileset&gt;</pre>
 
-    <p>Selects all files in the base directory and one directory below
-    that.</p>
+    <p>Selects all files in the base directory and one directory below 
that.</p>
 
     <h4 id="differentselect">Different Selector</h4>
 
     <p>The <code>&lt;different&gt;</code> selector will select a file if it is 
deemed to be
-    'different' from an equivalent file in another location. The rules for 
determining
-    difference between the two files are as follows:<p>
+    'different' from an equivalent file in another location. The rules for 
determining difference
+    between the two files are as follows:<p>
     <ol>
     <li>If a file is only present in the resource collection you apply the 
selector to but not
       in <var>targetdir</var> (or after applying the mapper) the file is 
selected.</li>
@@ -295,22 +294,21 @@
     <li>Files with different lengths are different.</li>
     <li>If <var>ignoreFileTimes</var> is turned <q>off</q>, then differing 
file timestamps will
       cause files to be regarded as different.</li>
-    <li>Unless <var>ignoreContents</var> is set to <q>true</q>, a 
byte-for-byte check is run
-      against the two files.</li>
+    <li>Unless <var>ignoreContents</var> is set to <q>true</q>, a 
byte-for-byte check is run against
+      the two files.</li>
     </ol>
     <p>This is a useful selector to work with programs and tasks that don't 
handle dependency
-    checking properly; even if a predecessor task always creates its output 
files, followup
-    tasks can be driven off copies made with a different selector, so their 
dependencies are
-    driven on the absolute state of the files, not just a timestamp. For 
example: anything
-    fetched from a web site, or the output of some program. To reduce the 
amount of checking,
-    when using this task inside a <code>&lt;copy&gt;</code> task,
-    set <var>preservelastmodified</var> to <q>true</q> to propagate the 
timestamp from the
-    source file to the destination file.</p>
+    checking properly; even if a predecessor task always creates its output 
files, followup tasks
+    can be driven off copies made with a different selector, so their 
dependencies are driven on the
+    absolute state of the files, not just a timestamp. For example: anything 
fetched from a web
+    site, or the output of some program. To reduce the amount of checking, 
when using this task
+    inside a <code>&lt;copy&gt;</code> task, set 
<var>preservelastmodified</var> to <q>true</q> to
+    propagate the timestamp from the source file to the destination file.</p>
 
     <p>The <code>&lt;different&gt;</code> selector supports the use of a
-    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element to 
define the
-    location of the file to be compared against. If no 
<code>&lt;mapper&gt;</code> element is
-    specified, the <code>identity</code> type mapper is used.</p>
+    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element to 
define the location
+    of the file to be compared against. If no <code>&lt;mapper&gt;</code> 
element is specified,
+    the <code>identity</code> type mapper is used.</p>
 
     <table class="attr">
       <tr>
@@ -321,8 +319,8 @@
       <tr>
         <td>targetdir</td>
         <td>The base directory to look for the files to compare against. The 
precise location
-          depends on a combination of this attribute and the 
<code>&lt;mapper&gt;</code>
-          element, if any.</td>
+          depends on a combination of this attribute and the 
<code>&lt;mapper&gt;</code> element, if
+          any.</td>
         <td>Yes</td>
       </tr>
       <tr>
@@ -338,9 +336,9 @@
       </tr>
       <tr>
         <td>granularity</td>
-        <td>The number of milliseconds leeway to give before deciding a file 
is out of
-          date. This is needed because not every file system supports tracking 
the last modified
-          time to the millisecond level.</td>
+        <td>The number of milliseconds leeway to give before deciding a file 
is out of date. This is
+          needed because not every file system supports tracking the last 
modified time to the
+          millisecond level.</td>
         <td>No; default is 0 milliseconds, or 2 seconds on DOS systems</td>
       </tr>
     </table>
@@ -353,14 +351,14 @@
         ignoreFileTimes="true"/&gt;
 &lt;/fileset&gt;</pre>
 
-    <p>Compares all the Java source files between the 1.4.1 and the 1.5 
release and selects
-    those who are different, disregarding file times.</p>
+    <p>Compares all the Java source files between the 1.4.1 and the 1.5 
release and selects those
+    who are different, disregarding file times.</p>
 
     <h4 id="filenameselect">Filename Selector</h4>
 
     <p>The <code>&lt;filename&gt;</code> tag acts like the 
<code>&lt;include&gt;</code>
-    and <code>&lt;exclude&gt;</code> tags within a fileset. By using a 
selector instead,
-    however, one can combine it with all the other selectors using
+    and <code>&lt;exclude&gt;</code> tags within a fileset. By using a 
selector instead, however,
+    one can combine it with all the other selectors using
     whatever <a href="#selectcontainers">selector container</a> is desired.</p>
 
     <p>The <code>&lt;filename&gt;</code> selector is case-sensitive.</p>
@@ -373,8 +371,8 @@
       </tr>
       <tr>
         <td>name</td>
-        <td>The name of files to select. The name parameter can contain the 
standard Ant
-          wildcard characters.</td>
+        <td>The name of files to select. The name parameter can contain the 
standard Ant wildcard
+          characters.</td>
         <td rowspan="2">Exactly one of the two</td>
       </tr>
       <tr>
@@ -388,8 +386,8 @@
       </tr>
       <tr>
         <td>negate</td>
-        <td>Whether to reverse the effects of this filename selection, 
therefore emulating an
-          <code>exclude</code> rather than <code>include</code> tag.</td>
+        <td>Whether to reverse the effects of this filename selection, 
therefore emulating
+          an <code>exclude</code> rather than <code>include</code> tag.</td>
         <td>No; default is <q>false</q></td>
       </tr>
     </table>
@@ -409,9 +407,9 @@
     another directory tree.</p>
 
     <p>The <code>&lt;present&gt;</code> tag supports the use of a
-    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element to 
define the
-    location of the file to be tested against. If no 
<code>&lt;mapper&gt;</code> element is
-    specified, the <code>identity</code> type mapper is used.</p>
+    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element to 
define the location
+    of the file to be tested against. If no <code>&lt;mapper&gt;</code> 
element is specified,
+    the <code>identity</code> type mapper is used.</p>
 
     <p>The <code>&lt;present&gt;</code> selector is case-sensitive.</p>
 
@@ -424,19 +422,19 @@
       <tr>
         <td>targetdir</td>
         <td>The base directory to look for the files to compare against. The 
precise location
-          depends on a combination of this attribute and the 
<code>&lt;mapper&gt;</code>
-          element, if any.</td>
+          depends on a combination of this attribute and the 
<code>&lt;mapper&gt;</code> element, if
+          any.</td>
         <td>Yes</td>
       </tr>
       <tr>
         <td>present</td>
-        <td>Whether we are requiring that a file is present in the source 
directory tree only,
-          or in both the source and the target directory tree. Valid values 
are:
+        <td>Whether we are requiring that a file is present in the source 
directory tree only, or in
+          both the source and the target directory tree. Valid values are:
           <ul>
-            <li><q>srconly</q>&mdash;select files only if they are in the 
source directory tree
-              but not in the target directory tree</li>
-            <li><q>both</q >-- select files only if they are present both in 
the source and
-              target directory trees</li>
+            <li><q>srconly</q>&mdash;select files only if they are in the 
source directory tree but
+              not in the target directory tree</li>
+            <li><q>both</q >-- select files only if they are present both in 
the source and target
+              directory trees</li>
           </ul>
           Setting this attribute to <q>srconly</q> is equivalent to wrapping 
the selector in
           the <code>&lt;not&gt;</code> selector container.</td>
@@ -499,14 +497,14 @@
     &lt;containsregexp expression=&quot;[4-6]\.[0-9]&quot;/&gt;
 &lt;/fileset&gt;</pre>
 
-    <p>Selects all the text files that match the regular expression (have a 4, 
5 or 6 followed
-    by a period and a number from 0 to 9).
+    <p>Selects all the text files that match the regular expression (have a 4, 
5 or 6 followed by a
+    period and a number from 0 to 9).
 
     <h4 id="sizeselect">Size Selector</h4>
 
-    <p>The <code>&lt;size&gt;</code> tag in a FileSet will put a limit on the 
files specified by
-    the include tag, so that tags which do not meet the size limits specified 
by the selector
-    will not end up being selected.</p>
+    <p>The <code>&lt;size&gt;</code> tag in a FileSet will put a limit on the 
files specified by the
+    include tag, so that tags which do not meet the size limits specified by 
the selector will not
+    end up being selected.</p>
 
     <table class="attr">
       <tr>
@@ -522,17 +520,17 @@
       </tr>
       <tr>
         <td>units</td>
-        <td>The units that the <code>value</code> attribute is expressed in. 
When using the
-        standard single letter SI designations, such as <q>k</q>, <q>M</q>, or 
<q>G</q>,
-        multiples of 1000 are used. If you want to use power of 2 units, use 
the IEC
-        standard: <q>Ki</q> for 1024, <q>Mi</q> for 1048576, and so on. The 
default is no units,
-        which means the <var>value</var> attribute expresses the exact number 
of bytes.</td>
+        <td>The units that the <code>value</code> attribute is expressed in. 
When using the standard
+        single letter SI designations, such as <q>k</q>, <q>M</q>, or 
<q>G</q>, multiples of 1000
+        are used. If you want to use power of 2 units, use the IEC standard: 
<q>Ki</q> for
+        1024, <q>Mi</q> for 1048576, and so on. The default is no units, which 
means
+        the <var>value</var> attribute expresses the exact number of 
bytes.</td>
         <td>No</td>
       </tr>
       <tr>
         <td>when</td>
-        <td>Indicates how to interpret the size, whether the files to be 
selected should be
-          larger, smaller, or equal to that value. Acceptable values for this 
attribute are:
+        <td>Indicates how to interpret the size, whether the files to be 
selected should be larger,
+          smaller, or equal to that value. Acceptable values for this 
attribute are:
           <ul>
             <li><q>less</q>&mdash;select files less than the indicated 
size</li>
             <li><q>more</q>&mdash;select files greater than the indicated 
size</li>
@@ -584,8 +582,8 @@
   &lt;type type="dir"/&gt;
 &lt;/fileset&gt;</pre>
 
-    <p>The Type Selector is often used in conjunction with other selectors.  
For example, to
-    select files that also exist in a <samp>template</samp> directory, but 
avoid selecting empty
+    <p>The Type Selector is often used in conjunction with other selectors.  
For example, to select
+    files that also exist in a <samp>template</samp> directory, but avoid 
selecting empty
     directories, use:</p>
 
     <pre>
@@ -597,10 +595,9 @@
 &lt;/fileset&gt;</pre>
 
     <h4 id="modified">Modified Selector</h4>
-    <p>The <code>&lt;modified&gt;</code> selector computes a value for a file, 
compares that to
-    the value stored in a cache and select the file, if these two values 
differ.</p>
-    <p>Because this selector is highly configurable the order in which the 
selection is done
-    is:</p>
+    <p>The <code>&lt;modified&gt;</code> selector computes a value for a file, 
compares that to the
+    value stored in a cache and select the file, if these two values 
differ.</p>
+    <p>Because this selector is highly configurable the order in which the 
selection is done is:</p>
     <ol>
       <li>get the absolute path for the file</li>
       <li>get the cached value from the configured cache (absolute path as 
key)</li>
@@ -609,15 +606,14 @@
       <li>update the cache if needed and requested</li>
       <li>do the selection according to the comparison result</li>
     </ol>
-    <p>The comparison, computing of the hashvalue and the store is done by 
implementation of
-    special interfaces. Therefore they may provide additional parameters.</p>
+    <p>The comparison, computing of the hashvalue and the store is done by 
implementation of special
+    interfaces. Therefore they may provide additional parameters.</p>
 
     <p>The <code>&lt;modified&gt;</code> selector can be used as a 
ResourceSelector (see
-    the <a href="resources.html#restrict">&lt;restrict&gt;</a> 
ResourceCollection).  In that
-    case it maps simple file resources to files and does its job. If the 
resource is from
-    another type, the <code>&lt;modified&gt;</code> selector tries to
-    (<strong>attention!</strong>) copy the content into a local file for 
computing the
-    hashvalue.</p>
+    the <a href="resources.html#restrict">&lt;restrict&gt;</a> 
ResourceCollection).  In that case it
+    maps simple file resources to files and does its job. If the resource is 
from another type,
+    the <code>&lt;modified&gt;</code> selector tries to 
(<strong>attention!</strong>) copy the
+    content into a local file for computing the hashvalue.</p>
 
     <table class="attr">
       <tr>
@@ -688,27 +684,26 @@
       </tr>
       <tr>
         <td>selres</td>
-        <td>Should Resources without an InputStream, and therefore without 
checking, be
-           selected?  (boolean)</td>
+        <td>Should Resources without an InputStream, and therefore without 
checking, be selected?
+          (boolean)</td>
         <td>No; defaults to <q>true</q>. Only relevant when used as 
ResourceSelector.</td>
       </tr>
       <tr>
         <td>delayupdate</td>
-        <td>If set to <q>true</q>, the storage of the cache will be delayed 
until the next
-          finished BuildEvent; task finished, target finished or build 
finished, whichever comes
-          first.  This is provided for increased performance.  If set to 
<q>false</q>, the
-          storage of the cache will happen with each change.  This attribute 
depends upon
-          the <var>update</var> attribute. (boolean)</td>
+        <td>If set to <q>true</q>, the storage of the cache will be delayed 
until the next finished
+          BuildEvent; task finished, target finished or build finished, 
whichever comes first.  This
+          is provided for increased performance.  If set to <q>false</q>, the 
storage of the cache
+          will happen with each change.  This attribute depends upon the 
<var>update</var>
+          attribute. (boolean)</td>
         <td>No; defaults to <q>true</q></td>
       </tr>
     </table>
 
     <h5>Parameters specified as nested elements</h5>
 
-    <p>The <code>&lt;modified&gt;</code> selector supports a
-    nested <code>&lt;classpath&gt;</code> element that represents
-    a <a href="../using.html#path">path-like structure</a> for finding custom 
interface
-    implementations.</p>
+    <p>The <code>&lt;modified&gt;</code> selector supports a nested 
<code>&lt;classpath&gt;</code>
+    element that represents a <a href="../using.html#path">path-like 
structure</a> for finding
+    custom interface implementations.</p>
 
     <p>All attributes of a <code>&lt;modified&gt;</code> selector an be set 
with
     nested <code>&lt;param/&gt;</code> tags. Additional values can be set
@@ -758,8 +753,8 @@
      </tr>
      <tr>
        <td>propertyfile</td>
-       <td>Use the <code>java.util.Properties</code> class and its possibility 
to load and store
-         to file.  This Cache implementation supports the following attributes:
+       <td>Use the <code>java.util.Properties</code> class and its possibility 
to load and store to
+         file.  This Cache implementation supports the following attributes:
          <ul>
            <li><var>cache.cachefile</var> (optional): Name of the properties 
file; default
              is <q>cache.properties</q></li>
@@ -808,8 +803,8 @@
     &lt;/fileset&gt;
 &lt;/copy&gt;</pre>
 
-    <p>This is the same example rewritten as CoreSelector with setting the all 
the values (same
-    as defaults are).</p>
+    <p>This is the same example rewritten as CoreSelector with setting the all 
the values (same as
+    defaults are).</p>
 
     <pre>
 &lt;copy todir="dest"&gt;
@@ -842,9 +837,9 @@
 &lt;/target&gt;</pre>
 
     <p>A useful scenario for this selector inside a build environment for 
homepage generation
-    (e.g. with <a href="https://forrest.apache.org/";>Apache Forrest</a>). Here
-    all <strong>changed</strong> files are uploaded to the server. The 
CacheSelector saves
-    therefore much upload time.</p>
+    (e.g. with <a href="https://forrest.apache.org/"; target="_top">Apache 
Forrest</a>). Here
+    all <strong>changed</strong> files are uploaded to the server. The 
CacheSelector saves therefore
+    much upload time.</p>
 
     <pre>
 &lt;modified cacheclassname="com.mycompany.MyCache"&gt;
@@ -857,14 +852,14 @@
     cache implementation</p>
 
     <h4 id="ModSelNote">Note on RuleBasedCollator</h4>
-    <p>The RuleBasedCollator needs a format for its work, but its needed while
-    instantiation. There is a problem in the initialization algorithm for this 
case. Therefore
-    you should not use this (or tell me the workaround :-).</p>
+    <p>The RuleBasedCollator needs a format for its work, but its needed while 
instantiation. There
+    is a problem in the initialization algorithm for this case. Therefore you 
should not use this
+    (or tell me the workaround :-).</p>
 
     <h4 id="signedselector">Signed Selector</h4>
 
-    <p>The <code>&lt;signedselector&gt;</code> tag selects signed files and 
optionally signed
-    with a certain name.</p>
+    <p>The <code>&lt;signedselector&gt;</code> tag selects signed files and 
optionally signed with a
+    certain name.</p>
     <p><em>Since Apache Ant 1.7</em></p>
     <table class="attr">
       <tr>
@@ -881,37 +876,37 @@
 
     <h4 id="readable">Readable Selector</h4>
 
-    <p>The <code>&lt;readable&gt;</code> selector selects only files that are 
readable.  Ant
-    only invokes <code>java.io.File#canRead</code> so if a file is unreadable 
but JVM cannot
-    detect this state, this selector will still select the file.</p>
+    <p>The <code>&lt;readable&gt;</code> selector selects only files that are 
readable.  Ant only
+    invokes <code>java.io.File#canRead</code> so if a file is unreadable but 
JVM cannot detect this
+    state, this selector will still select the file.</p>
 
     <h4 id="writable">Writable Selector</h4>
 
-    <p>The <code>&lt;writable&gt;</code> selector selects only files that are 
writable.  Ant
-    only invokes <code>java.io.File#canWrite</code> so if a file is 
nonwritable but JVM cannot
-    detect this state, this selector will still select the file.</p>
+    <p>The <code>&lt;writable&gt;</code> selector selects only files that are 
writable.  Ant only
+    invokes <code>java.io.File#canWrite</code> so if a file is nonwritable but 
JVM cannot detect
+    this state, this selector will still select the file.</p>
 
     <h4 id="executable">Executable Selector</h4>
 
     <p>The <code>&lt;executable&gt;</code> selector selects only files that 
are executable.  Ant
-    only invokes <code>java.nio.file.Files#isExecutable</code> so if a file is 
not executable
-    but JVM cannot detect this state, this selector will still select the 
file.</p>
+    only invokes <code>java.nio.file.Files#isExecutable</code> so if a file is 
not executable but
+    JVM cannot detect this state, this selector will still select the file.</p>
 
     <p><em>Since Ant 1.10.0</em></p>
 
     <h4 id="symlink">Symlink Selector</h4>
 
-    <p>The <code>&lt;symlink&gt;</code> selector selects only files that are 
symbolic links.
-    Ant only invokes <code>java.nio.file.Files#isSymbolicLink</code> so if a 
file is a symbolic
-    link but JVM cannot detect this state, this selector will not select the 
file.</p>
+    <p>The <code>&lt;symlink&gt;</code> selector selects only files that are 
symbolic links.  Ant
+    only invokes <code>java.nio.file.Files#isSymbolicLink</code> so if a file 
is a symbolic link but
+    JVM cannot detect this state, this selector will not select the file.</p>
 
     <p><em>Since Ant 1.10.0</em></p>
 
     <h4 id="ownedBy">OwnedBy Selector</h4>
 
     <p>The <code>&lt;ownedBy&gt;</code> selector selects only files that are 
owned by the given
-    user.  Ant only invokes <code>java.nio.file.Files#getOwner</code> so if a 
file system
-    doesn't support the operation this selector will not select the file.</p>
+    user.  Ant only invokes <code>java.nio.file.Files#getOwner</code> so if a 
file system doesn't
+    support the operation this selector will not select the file.</p>
 
     <p><em>Since Ant 1.10.0</em></p>
 
@@ -932,9 +927,9 @@
 
     <p>The <code>&lt;scriptselector&gt;</code> element enables you to write a 
complex selection
     algorithm in any <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.  See the <a 
href="../Tasks/script.html">Script</a> task for an
-    explanation of scripts and dependencies.</p>
+    or <a 
href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html";
+    target="_top">JSR 223</a> supported language.  See the <a 
href="../Tasks/script.html">Script</a>
+    task for an explanation of scripts and dependencies.</p>
     <p><em>Since Apache Ant 1.7</em></p>
     <table class="attr">
       <tr>
@@ -985,12 +980,12 @@
     the <a href="../Tasks/script.html">script</a> task on how to use this 
element.</p>
     <p>If no <var>src</var> attribute is supplied, the script must be nested 
inside the selector
     declaration.</p>
-    <p>The embedded script is invoked for every test, with the bean 
<code>self</code> is bound
-    to the selector. It has an attribute <var>selected</var> which can be set
+    <p>The embedded script is invoked for every test, with the bean 
<code>self</code> is bound to
+    the selector. It has an attribute <var>selected</var> which can be set
     using <code>setSelected(boolean)</code> to select a file.</p>
 
-    <p>The following beans are configured for every script, alongside the 
classic set of
-    project, properties, and targets.</p>
+    <p>The following beans are configured for every script, alongside the 
classic set of project,
+    properties, and targets.</p>
 
     <table>
       <tr>
@@ -1065,8 +1060,8 @@
 
     <h3 id="selectcontainers">Selector Containers</h3>
 
-    <p>To create more complex selections, a variety of selectors that contain 
other selectors
-    are available for your use. They combine the selections of their child 
selectors in various
+    <p>To create more complex selections, a variety of selectors that contain 
other selectors are
+    available for your use. They combine the selections of their child 
selectors in various
     ways.</p>
 
     <p>The selector containers are:</p>
@@ -1078,21 +1073,21 @@
         majority of its selectors select it.</li>
       <li><a href="#noneselect"><code>&lt;none&gt;</code></a>&mdash;select a 
file only if none
         of the contained selectors select it.</li>
-      <li><a href="#notselect"><code>&lt;not&gt;</code></a>&mdash;can contain 
only one
-        selector, and reverses what it selects and doesn't select.</li>
+      <li><a href="#notselect"><code>&lt;not&gt;</code></a>&mdash;can contain 
only one selector, and
+        reverses what it selects and doesn't select.</li>
       <li><a href="#orselect"><code>&lt;or&gt;</code></a>&mdash;selects a file 
if any one of the
         contained selectors selects it.</li>
       <li><a 
href="#selectorselect"><code>&lt;selector&gt;</code></a>&mdash;contains only one
         selector and forwards all requests to it without alteration, provided 
that
-        any <code>&quot;if&quot;</code> or <code>&quot;unless&quot;</code> 
conditions are
-        met. This is the selector to use if you want to define a reference. It 
is usable as an
-        element of <code>&lt;project&gt;</code>. It is also the one to use if 
you want selection
-        of files to be dependent on Ant property settings.</li>
+        any <code>&quot;if&quot;</code> or <code>&quot;unless&quot;</code> 
conditions are met. This
+        is the selector to use if you want to define a reference. It is usable 
as an element
+        of <code>&lt;project&gt;</code>. It is also the one to use if you want 
selection of files to
+        be dependent on Ant property settings.</li>
     </ul>
 
     <p>All selector containers can contain any other selector, including other 
containers, as an
-    element. Using containers, the selector tags can be arbitrarily deep. Here 
is a complete
-    list of allowable selector elements within a container:</p>
+    element. Using containers, the selector tags can be arbitrarily deep. Here 
is a complete list of
+    allowable selector elements within a container:</p>
 
     <ul>
       <li><code>&lt;and&gt;</code></li>
@@ -1113,9 +1108,9 @@
 
     <h4 id="andselect">And Selector</h4>
 
-    <p>The <code>&lt;and&gt;</code> tag selects files that are selected by all 
of the elements
-    it contains. It returns as soon as it finds a selector that does not 
select the file, so it
-    is not guaranteed to check every selector.</p>
+    <p>The <code>&lt;and&gt;</code> tag selects files that are selected by all 
of the elements it
+    contains. It returns as soon as it finds a selector that does not select 
the file, so it is not
+    guaranteed to check every selector.</p>
 
     <p>Here is an example of how to use the And Selector:</p>
 
@@ -1132,9 +1127,9 @@
 
     <h4 id="majorityselect">Majority Selector</h4>
 
-    <p>The <code>&lt;majority&gt;</code> tag selects files provided that a 
majority of the
-    contained elements also select it. Ties are dealt with as specified by
-    the <var>allowtie</var> attribute.</p>
+    <p>The <code>&lt;majority&gt;</code> tag selects files provided that a 
majority of the contained
+    elements also select it. Ties are dealt with as specified by the 
<var>allowtie</var>
+    attribute.</p>
 
     <table class="attr">
       <tr>
@@ -1144,8 +1139,8 @@
       </tr>
       <tr>
         <td>allowtie</td>
-        <td>Whether files should be selected if there are an even number of 
selectors selecting
-          them as are not selecting them.</td>
+        <td>Whether files should be selected if there are an even number of 
selectors selecting them
+          as are not selecting them.</td>
         <td>No; default is <q>true</q></td>
       </tr>
     </table>
@@ -1162,14 +1157,14 @@
 &lt;/fileset&gt;</pre>
 
     <p>Selects all the HTML files which contain at least two of the three
-    phrases <q>project</q>, <q>taskdef</q>, and <q>IntrospectionHelper</q> 
(this last phrase
-    must match case exactly).</p>
+    phrases <q>project</q>, <q>taskdef</q>, and <q>IntrospectionHelper</q> 
(this last phrase must
+    match case exactly).</p>
 
     <h4 id="noneselect">None Selector</h4>
 
-    <p>The <code>&lt;none&gt;</code> tag selects files that are not selected 
by any of the
-    elements it contains. It returns as soon as it finds a selector that 
selects the file, so it
-    is not guaranteed to check every selector.</p>
+    <p>The <code>&lt;none&gt;</code> tag selects files that are not selected 
by any of the elements
+    it contains. It returns as soon as it finds a selector that selects the 
file, so it is not
+    guaranteed to check every selector.</p>
 
     <p>Here is an example of how to use the None Selector:</p>
 
@@ -1204,9 +1199,9 @@
 
     <h4 id="orselect">Or Selector</h4>
 
-    <p>The <code>&lt;or&gt;</code> tag selects files that are selected by any 
one of the
-    elements it contains. It returns as soon as it finds a selector that 
selects the file, so it
-    is not guaranteed to check every selector.</p>
+    <p>The <code>&lt;or&gt;</code> tag selects files that are selected by any 
one of the elements it
+    contains. It returns as soon as it finds a selector that selects the file, 
so it is not
+    guaranteed to check every selector.</p>
 
     <p>Here is an example of how to use the Or Selector:</p>
 
@@ -1224,15 +1219,15 @@
 
     <h4 id="selectorselect">Selector Reference</h4>
 
-    <p>The <code>&lt;selector&gt;</code> tag is used to create selectors that 
can be reused
-    through references. It is the only selector which can be used outside of 
any target, as an
-    element of the <code>&lt;project&gt;</code> tag. It can contain only one 
other selector, but
-    of course that selector can be a container.</p>
+    <p>The <code>&lt;selector&gt;</code> tag is used to create selectors that 
can be reused through
+    references. It is the only selector which can be used outside of any 
target, as an element of
+    the <code>&lt;project&gt;</code> tag. It can contain only one other 
selector, but of course that
+    selector can be a container.</p>
 
-    <p>The <code>&lt;selector&gt;</code> tag can also be used to select files 
conditionally
-    based on whether an Ant property exists or not.  This functionality is 
realized using
-    the <var>if</var> and <var>unless</var> attributes in exactly the same way 
they are used on
-    targets or on the <code>&lt;include&gt;</code> and 
<code>&lt;exclude&gt;</code> tags within
+    <p>The <code>&lt;selector&gt;</code> tag can also be used to select files 
conditionally based on
+    whether an Ant property exists or not.  This functionality is realized 
using the <var>if</var>
+    and <var>unless</var> attributes in exactly the same way they are used on 
targets or on
+    the <code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code> tags 
within
     a <code>&lt;patternset&gt;</code>.</p>
 
     <table class="attr">
@@ -1283,8 +1278,8 @@
 
 &lt;/project&gt;</pre>
 
-    <p>Zips up all the java files which have an up-to-date equivalent class 
file and javadoc
-    file associated with them.</p>
+    <p>Zips up all the java files which have an up-to-date equivalent class 
file and javadoc file
+    associated with them.</p>
 
     <p>And an example of selecting files conditionally, based on whether 
properties are set:</p>
 
@@ -1312,14 +1307,14 @@
 
     <h3 id="customselect">Custom Selectors</h3>
 
-    <p>You can write your own selectors and use them within the selector 
containers by
-    specifying them within the <code>&lt;custom&gt;</code> tag.</p>
+    <p>You can write your own selectors and use them within the selector 
containers by specifying
+    them within the <code>&lt;custom&gt;</code> tag.</p>
 
-    <p>First, you have to write your selector class in Java. The only 
requirement it must meet
-    in order to be a selector is that it implements
-    the <code>org.apache.tools.ant.types.selectors.FileSelector</code> 
interface, which contains
-    a single method. See <a href="selectors-program.html">Programming 
Selectors in Ant</a> for
-    more information.</p>
+    <p>First, you have to write your selector class in Java. The only 
requirement it must meet in
+    order to be a selector is that it implements
+    the <code>org.apache.tools.ant.types.selectors.FileSelector</code> 
interface, which contains a
+    single method. See <a href="selectors-program.html">Programming Selectors 
in Ant</a> for more
+    information.</p>
 
     <p>Once that is written, you include it in your build file by using
     the <code>&lt;custom&gt;</code> tag.</p>
@@ -1340,15 +1335,15 @@
       <tr>
         <td>classpath</td>
         <td>The classpath to use in order to load the custom selector class. If
-        neither <var>classpath</var> nor <var>classpathref</var> are 
specified, the class will
-        be loaded from the classpath that Ant uses.</td>
+        neither <var>classpath</var> nor <var>classpathref</var> are 
specified, the class will be
+        loaded from the classpath that Ant uses.</td>
         <td>No</td>
       </tr>
       <tr>
         <td>classpathref</td>
         <td>A reference to a classpath previously defined. If neither 
<var>classpathref</var>
-        nor <var>classpath</var> are specified, the class will be loaded from 
the classpath that
-        Ant uses.</td>
+        nor <var>classpath</var> are specified, the class will be loaded from 
the classpath that Ant
+        uses.</td>
         <td>No</td>
       </tr>
     </table>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/tarfileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/tarfileset.html b/manual/Types/tarfileset.html
index 08b8d34..f80b6ea 100644
--- a/manual/Types/tarfileset.html
+++ b/manual/Types/tarfileset.html
@@ -26,20 +26,19 @@
 <p><code>TarFileSet</code> has been a stand-alone type <em>since Apache Ant 
1.7</em>.</p>
 
 <p>A <code>&lt;tarfileset&gt;</code> is a special form of
-a <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> which can behave in 
2 different
-ways:</p>
+a <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> which can behave in 
2 different ways:</p>
 <ul>
   <li>When the <var>src</var> attribute is used&mdash;or a nested resource 
collection has been
   specified, the tarfileset is populated with tar entries found in the file 
<var>src</var>.</li>
-  <li>When the <var>dir</var> attribute is used, the tarfileset is populated 
with filesystem
-  files found under <var>dir</var>.</li>
+  <li>When the <var>dir</var> attribute is used, the tarfileset is populated 
with filesystem files
+  found under <var>dir</var>.</li>
 </ul>
 <p><code>&lt;tarfileset&gt;</code> supports all attributes
-of <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> in addition to 
those listed below.
-Note that tar archives in general don't contain entries with leading slashes 
so you shouldn't
-use include/exclude patterns that start with slashes either.</p>
-<p><em>Since Ant 1.7</em>, a tarfileset can be defined with the <var>id</var> 
attribute and
-referred to with the <var>refid</var> attribute.</p>
+of <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> in addition to 
those listed below.  Note
+that tar archives in general don't contain entries with leading slashes so you 
shouldn't use
+include/exclude patterns that start with slashes either.</p>
+<p><em>Since Ant 1.7</em>, a tarfileset can be defined with the <var>id</var> 
attribute and referred
+to with the <var>refid</var> attribute.</p>
 <h3>Parameters</h3>
 <table class="attr">
   <tbody>
@@ -55,14 +54,13 @@ referred to with the <var>refid</var> attribute.</p>
     </tr>
     <tr>
       <td>fullpath</td>
-      <td>the file described by the fileset is placed at that exact location 
in the
-        archive.</td>
+      <td>the file described by the fileset is placed at that exact location 
in the archive.</td>
       <td>No</td>
     </tr>
     <tr>
       <td>src</td>
-      <td>may be used in place of the <var>dir</var> attribute to specify a 
tar file whose
-        contents will be extracted and included in the archive.</td>
+      <td>may be used in place of the <var>dir</var> attribute to specify a 
tar file whose contents
+        will be extracted and included in the archive.</td>
       <td>No</td>
     </tr>
     <tr>
@@ -100,18 +98,16 @@ referred to with the <var>refid</var> attribute.</p>
     </tr>
     <tr>
       <td>erroronmissingarchive</td>
-      <td>Specify what happens if the archive does not exist.  If <q>true</q>, 
a build error
-        will happen; if <q>false</q>, the fileset will be ignored/empty.
-        <em>Since Ant 1.8.0</em></td>
+      <td>Specify what happens if the archive does not exist.  If <q>true</q>, 
a build error will
+        happen; if <q>false</q>, the fileset will be ignored/empty.  <em>Since 
Ant 1.8.0</em></td>
       <td>No; defaults to <q>true</q></td>
     </tr>
     <tr>
       <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>.
-      <em>Since Ant 1.9.5</em></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";
+      target="_top">Supported Encodings</a>.  <em>Since Ant 1.9.5</em></td>
       <td>No; defaults to default JVM character encoding</td>
     </tr>
   </tbody>
@@ -119,12 +115,12 @@ referred to with the <var>refid</var> attribute.</p>
 <p>The <var>fullpath</var> attribute can only be set for filesets that 
represent a single
 file. The <var>prefix</var> and <var>fullpath</var> attributes cannot both be 
set on the same
 fileset.</p>
-<p>When using the <var>src</var> attribute, <var>include</var> and 
<var>exclude</var> patterns
-may be used to specify a subset of the archive for inclusion in the archive as 
with
-the <var>dir</var> attribute.</p>
+<p>When using the <var>src</var> attribute, <var>include</var> and 
<var>exclude</var> patterns may
+be used to specify a subset of the archive for inclusion in the archive as 
with the <var>dir</var>
+attribute.</p>
 
-<p>Please note that currently only the <a href="../Tasks/tar.html">tar</a> 
task uses the
-permission and ownership attributes.</p>
+<p>Please note that currently only the <a href="../Tasks/tar.html">tar</a> 
task uses the permission
+and ownership attributes.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
@@ -143,11 +139,10 @@ permission and ownership attributes.</p>
  &lt;/tarfileset&gt;
 &lt;/copy&gt;</pre>
 
-<p>downloads the archive <samp>some-archive.tar.bz2</samp>, uncompresses and 
extracts it on the
-fly, copies the contents of the <samp>lib</samp> directory into 
<samp>some-dir</samp> and
-discards the rest of the archive.  File timestamps will be compared between 
the archive's
-entries and files inside the target directory, no files get overwritten unless 
they are
-out-of-date.</p>
+<p>downloads the archive <samp>some-archive.tar.bz2</samp>, uncompresses and 
extracts it on the fly,
+copies the contents of the <samp>lib</samp> directory into 
<samp>some-dir</samp> and discards the
+rest of the archive.  File timestamps will be compared between the archive's 
entries and files
+inside the target directory, no files get overwritten unless they are 
out-of-date.</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/xmlcatalog.html
----------------------------------------------------------------------
diff --git a/manual/Types/xmlcatalog.html b/manual/Types/xmlcatalog.html
index c0c0e63..371ec07 100644
--- a/manual/Types/xmlcatalog.html
+++ b/manual/Types/xmlcatalog.html
@@ -26,23 +26,22 @@
 
 <h2 id="XMLCatalog">XMLCatalog</h2>
 
-<p>An XMLCatalog is a catalog of public resources such as DTDs or entities 
that are referenced
-in an XML document.  Catalogs are typically used to make web references to 
resources point to a
-locally cached copy of the resource.</p>
+<p>An XMLCatalog is a catalog of public resources such as DTDs or entities 
that are referenced in an
+XML document.  Catalogs are typically used to make web references to resources 
point to a locally
+cached copy of the resource.</p>
 
 <p>This allows the XML Parser, XSLT Processor or other consumer of XML 
documents to efficiently
 allow a local substitution for a resource available on the web.</p>
 <p><strong>Note:</strong> This task <em>uses, but does not depend on</em> 
external libraries not
-included in the Apache Ant distribution.
-See <a href="../install.html#librarydependencies">Library Dependencies</a> for 
more
-information.</p>
+included in the Apache Ant distribution.  See <a 
href="../install.html#librarydependencies">Library
+Dependencies</a> for more information.</p>
 <p>This data type provides a catalog of resource locations based on
-the <a 
href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html";>OASIS
-XML Catalog standard</a>.  The catalog entries are used both for Entity 
resolution and URI
-resolution, in accordance with the <code>org.xml.sax.EntityResolver</code>
+the <a 
href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html";
+target="_top">OASIS XML Catalog standard</a>.  The catalog entries are used 
both for Entity
+resolution and URI resolution, in accordance with the 
<code>org.xml.sax.EntityResolver</code>
 and <code>javax.xml.transform.URIResolver</code> interfaces as defined in
-the <a 
href="https://download.oracle.com/otn-pub/jcp/jaxp-1_6-mrel3-spec/JAXP1_6-FinalSpec.pdf";>Java
-API for XML Processing (JAXP) Specification</a>.</p>
+the <a 
href="https://download.oracle.com/otn-pub/jcp/jaxp-1_6-mrel3-spec/JAXP1_6-FinalSpec.pdf";
+target="_top">Java API for XML Processing (JAXP) Specification</a>.</p>
 <p>For example, in a <code>web.xml</code> file, the DTD is referenced as:</p>
 <pre>
 &lt;!DOCTYPE web-app PUBLIC &quot;-//Sun Microsystems, Inc.//DTD Web 
Application 2.2//EN&quot;
@@ -75,64 +74,62 @@ the system classpath is used for this as well.</p>
 <p>XMLCatalogs can also be nested inside other XMLCatalogs.  For example, a 
"superset"
 XMLCatalog could be made by including several nested XMLCatalogs that referred 
to other,
 previously defined XMLCatalogs.</p>
-<p>Resource locations can be specified either in-line or in external catalog 
file(s), or both.
-In order to use an external catalog file, the xml-commons resolver library
-(<samp>resolver.jar</samp>) must be in your path.  External catalog files may 
be
-either <a 
href="https://oasis-open.org/committees/entity/background/9401.html";>plain text
-format</a> or <a 
href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html";>XML
-format</a>.  If the xml-commons resolver library is not found in the 
classpath, external catalog
-files, specified in <code>catalogpath</code>, will be ignored and a warning 
will be logged.  In
-this case, however, processing of inline entries will proceed normally.</p>
+<p>Resource locations can be specified either in-line or in external catalog 
file(s), or both.  In
+order to use an external catalog file, the xml-commons resolver library 
(<samp>resolver.jar</samp>)
+must be in your path.  External catalog files may be
+either <a href="https://oasis-open.org/committees/entity/background/9401.html"; 
target="_top">plain
+text format</a> or <a 
href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html";
+target="_top">XML format</a>.  If the xml-commons resolver library is not 
found in the classpath,
+external catalog files, specified in <code>catalogpath</code>, will be ignored 
and a warning will be
+logged.  In this case, however, processing of inline entries will proceed 
normally.</p>
 <p>Currently, only <code>&lt;dtd&gt;</code> and <code>&lt;entity&gt;</code> 
elements may be
 specified inline; these roughly correspond to OASIS catalog entry types 
<code>PUBLIC</code>
 and <code>URI</code> respectively.  By contrast, external catalog files may 
use any of the entry
 types defined in
-the <a 
href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html";>OASIS
-specification</a>.</p>
+the <a 
href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html";
+target="_top">OASIS specification</a>.</p>
 <h3 id="ResolverAlgorithm">Entity/DTD/URI resolution algorithm</h3>
-<p>When an entity, DTD, or URI is looked up by the XML processor, the 
XMLCatalog searches its
-list of entries to see if any match.  That is, it attempts to match the 
<var>publicId</var>
-attribute of each entry with the PublicID or URI of the entity to be resolved. 
 Assuming a
-matching entry is found, XMLCatalog then executes the following steps:</p>
+<p>When an entity, DTD, or URI is looked up by the XML processor, the 
XMLCatalog searches its list
+of entries to see if any match.  That is, it attempts to match the 
<var>publicId</var> attribute of
+each entry with the PublicID or URI of the entity to be resolved.  Assuming a 
matching entry is
+found, XMLCatalog then executes the following steps:</p>
 
 <h4>1. Filesystem lookup</h4>
 
-<p>The <var>location</var> is first looked up in the filesystem.  If the 
<var>location</var> is
-a relative path, the Ant project <var>basedir</var> attribute is used as the 
base directory.  If
-the <var>location</var> specifies an absolute path, it is used as is.  Once we 
have an absolute
-path in hand, we check to see if a valid and readable file exists at that 
path.  If so, we are
-done.  If not, we proceed to the next step.</p>
+<p>The <var>location</var> is first looked up in the filesystem.  If the 
<var>location</var> is a
+relative path, the Ant project <var>basedir</var> attribute is used as the 
base directory.  If
+the <var>location</var> specifies an absolute path, it is used as is.  Once we 
have an absolute path
+in hand, we check to see if a valid and readable file exists at that path.  If 
so, we are done.  If
+not, we proceed to the next step.</p>
 
 <h4>2. Classpath lookup</h4>
 
 <p>The <var>location</var> is next looked up in the classpath.  Recall that 
jar files are merely
 fancy zip files.  For classpath lookup, the <var>location</var> is used as is 
(no base is
-prepended).  We use a Classloader to attempt to load the resource from the 
classpath.  For
-example, if <samp>hello.jar</samp> is in the classpath and it
-contains <samp>foo/bar/blat.dtd</samp> it will resolve an entity whose 
<var>location</var>
-is <samp>foo/bar/blat.dtd</samp>.  Of course, it will <em>not</em> resolve an 
entity
-whose <var>location</var> is <code>blat.dtd</code>.</p>
+prepended).  We use a Classloader to attempt to load the resource from the 
classpath.  For example,
+if <samp>hello.jar</samp> is in the classpath and it contains 
<samp>foo/bar/blat.dtd</samp> it will
+resolve an entity whose <var>location</var> is <samp>foo/bar/blat.dtd</samp>.  
Of course, it
+will <em>not</em> resolve an entity whose <var>location</var> is 
<code>blat.dtd</code>.</p>
 
 <h4>3a. Apache xml-commons resolver lookup</h4>
 
-<p>What happens next depends on whether the resolver library from xml-commons 
is available on
-the classpath.  If so, we defer all further attempts at resolving to it.  The 
resolver library
-supports extremely sophisticated functionality like URL rewriting and so on, 
which can be
-accessed by making the appropriate entries in external catalog files 
(XMLCatalog does not yet
-provide inline support for all of the entries defined in
-the <a 
href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html";>OASIS
-standard</a>).</p>
+<p>What happens next depends on whether the resolver library from xml-commons 
is available on the
+classpath.  If so, we defer all further attempts at resolving to it.  The 
resolver library supports
+extremely sophisticated functionality like URL rewriting and so on, which can 
be accessed by making
+the appropriate entries in external catalog files (XMLCatalog does not yet 
provide inline support
+for all of the entries defined in
+the <a 
href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html";
+target="_top">OASIS standard</a>).</p>
 
 <h4>3. URL-space lookup</h4>
 
-<p>Finally, we attempt to make a URL out of the <var>location</var>.  At first 
this may seem
-like this would defeat the purpose of XMLCatalogs&mdash;why go back out to the 
internet?  But in
-fact, this can be used to (in a sense) implement HTTP redirects, substituting 
one URL for
-another.  The mapped-to URL might also be served by a local web server.  If 
the URL resolves to
-a valid and readable resource, we are done.  Otherwise, we give up.  In this 
case, the XML
-processor will perform its normal resolution algorithm.  Depending on the 
processor
-configuration, further resolution failures may or may not result in fatal 
(i.e. build-ending)
-errors.</p>
+<p>Finally, we attempt to make a URL out of the <var>location</var>.  At first 
this may seem like
+this would defeat the purpose of XMLCatalogs&mdash;why go back out to the 
internet?  But in fact,
+this can be used to (in a sense) implement HTTP redirects, substituting one 
URL for another.  The
+mapped-to URL might also be served by a local web server.  If the URL resolves 
to a valid and
+readable resource, we are done.  Otherwise, we give up.  In this case, the XML 
processor will
+perform its normal resolution algorithm.  Depending on the processor 
configuration, further
+resolution failures may or may not result in fatal (i.e. build-ending) 
errors.</p>
 
 <h3>XMLCatalog attributes</h3>
 <table class="attr">
@@ -173,26 +170,25 @@ identical in their structure</p>
   </tr>
   <tr>
     <td>location</td>
-    <td>The location of the local replacement to be used for the public 
identifier
-    specified. This may be specified as a file name, resource name found on 
the classpath, or a
-    URL.  Relative paths will be resolved according to the base, which by 
default is the Ant
+    <td>The location of the local replacement to be used for the public 
identifier specified. This
+    may be specified as a file name, resource name found on the classpath, or 
a URL.  Relative paths
+    will be resolved according to the base, which by default is the Ant
     project <var>basedir</var>.</td>
     <td>Yes</td>
   </tr>
 </table>
 <h4>classpath</h4>
 <p>The classpath to use for <a href="#ResolverAlgorithm">entity 
resolution</a>.  The
-nested <code>&lt;classpath&gt;</code> is a <a 
href="../using.html#path">path</a>-like
-structure.</p>
+nested <code>&lt;classpath&gt;</code> is a <a 
href="../using.html#path">path</a>-like structure.</p>
 <h4>catalogpath</h4>
 <p>The nested <code>catalogpath</code> element is a <a 
href="../using.html#path">path</a>-like
-structure listing catalog files to search.  All files in this path are assumed 
to be OASIS
-catalog files, in
-either <a 
href="https://oasis-open.org/committees/entity/background/9401.html";>plain text
-format</a> or <a 
href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html";>XML
+structure listing catalog files to search.  All files in this path are assumed 
to be OASIS catalog
+files, in either <a 
href="https://oasis-open.org/committees/entity/background/9401.html";
+target="_top">plain text format</a>
+or <a href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html"; 
target="_top">XML
 format</a>. Entries specifying nonexistent files will be ignored. If the 
resolver library from
-xml-commons is not available in the classpath, all <code>catalogpath</code>s 
will be ignored and
-a warning will be logged.</p>
+xml-commons is not available in the classpath, all <code>catalogpath</code>s 
will be ignored and a
+warning will be logged.</p>
 <h3>Examples</h3>
 <p>Set up an XMLCatalog with a single DTD referenced locally in a user's home 
directory:</p>
 <pre>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/Types/zipfileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/zipfileset.html b/manual/Types/zipfileset.html
index 6cfd842..2b83840 100644
--- a/manual/Types/zipfileset.html
+++ b/manual/Types/zipfileset.html
@@ -24,22 +24,21 @@
 <h2 id="fileset">ZipFileSet</h2>
 
 <p>A <code>&lt;zipfileset&gt;</code> is a special form of
-a <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> which can behave in 
2 different
-ways:</p>
+a <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> which can behave in 
2 different ways:</p>
 <ul>
   <li>When the <var>src</var> attribute is used&mdash;or a nested resource 
collection has been
-  specified (<em>since Apache Ant 1.7</em>), the zipfileset is populated with 
zip entries found
-  in the file <var>src</var>.</li>
-  <li>When the <var>dir</var> attribute is used, the zipfileset is populated 
with filesystem
-  files found under <var>dir</var>.</li>
+  specified (<em>since Apache Ant 1.7</em>), the zipfileset is populated with 
zip entries found in
+  the file <var>src</var>.</li>
+  <li>When the <var>dir</var> attribute is used, the zipfileset is populated 
with filesystem files
+  found under <var>dir</var>.</li>
 </ul>
 <p><code>&lt;zipfileset&gt;</code> supports all attributes
-of <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> in addition to 
those listed below.
-Note that zip archives in general don't contain entries with leading slashes 
so you shouldn't
+of <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> in addition to 
those listed below.  Note
+that zip archives in general don't contain entries with leading slashes so you 
shouldn't
 use <var>includes</var>/<var>excludes</var> patterns that start with slashes 
either.</p>
 
-<p><em>Since Ant 1.6</em>, a zipfileset can be defined with the <var>id</var> 
attribute and
-referred to with the <var>refid</var> attribute.</p>
+<p><em>Since Ant 1.6</em>, a zipfileset can be defined with the <var>id</var> 
attribute and referred
+to with the <var>refid</var> attribute.</p>
 
 <h3>Parameters</h3>
 <table class="attr">
@@ -61,37 +60,34 @@ referred to with the <var>refid</var> attribute.</p>
     </tr>
     <tr>
       <td>src</td>
-      <td>may be used in place of the <var>dir</var> attribute to specify a 
zip file whose
-      contents will be extracted and included in the archive.</td>
+      <td>may be used in place of the <var>dir</var> attribute to specify a 
zip file whose contents
+       will be extracted and included in the archive.</td>
       <td>No</td>
     </tr>
     <tr>
       <td>filemode</td>
       <td>A 3 digit octal string, specify the user, group and other modes in 
the standard Unix
-      fashion. Only applies to plain files. <em>Since Ant 1.5.2</em></td>
+       fashion. Only applies to plain files. <em>Since Ant 1.5.2</em></td>
       <td>No; default is <q>644</q></td>
     </tr>
     <tr>
       <td>dirmode</td>
       <td>A 3 digit octal string, specify the user, group and other modes in 
the standard Unix
-      fashion. Only applies to directories. <em>Since Ant 1.5.2</em></td>
+       fashion. Only applies to directories. <em>Since Ant 1.5.2</em></td>
       <td>No; default is <q>755</q></td>
     </tr>
     <tr>
       <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 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";
+       target="_top">Supported Encodings</a>.
       <td>No; defaults to default JVM character encoding</td>
     </tr>
     <tr>
       <td>erroronmissingarchive</td>
-      <td>
-        Specify what happens if the archive does not exist.  If <q>true</q>, a 
build error will
-        happen; if <q>false</q>, the fileset will be ignored/empty.
-        <em>Since Ant 1.8.0</em>
-      </td>
+      <td>Specify what happens if the archive does not exist.  If <q>true</q>, 
a build error will
+        happen; if <q>false</q>, the fileset will be ignored/empty.  <em>Since 
Ant 1.8.0</em></td>
       <td>No; defaults to <q>true</q></td>
     </tr>
   </tbody>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/api/index.html
----------------------------------------------------------------------
diff --git a/manual/api/index.html b/manual/api/index.html
index db62ba2..2e18664 100644
--- a/manual/api/index.html
+++ b/manual/api/index.html
@@ -22,14 +22,13 @@
 <body>
 <h2>Apache Ant API has not been generated</h2>
 
-<p>If you see this page online
-at <a href="https://ant.apache.org/";>ant.apache.org</a>, it is not a bug, but
-on purpose.  We do not provide an online version of the API docs, they
-are included with all our distributions.</p>
+<p>If you see this page online at <a target="_top"
+href="https://ant.apache.org/";>ant.apache.org</a>, it is not a bug, but on 
purpose.  We do not
+provide an online version of the API docs, they are included with all our 
distributions.</p>
 
 <p>Ant's manual and API documentation is part of
-the <a href="https://ant.apache.org/bindownload.cgi";>binary</a>
-distributions or available as a
-separate <a href="https://ant.apache.org/manualdownload.cgi";>archive</a>.</p>
+the <a href="https://ant.apache.org/bindownload.cgi"; target="_top">binary</a> 
distributions or
+available as a separate <a href="https://ant.apache.org/manualdownload.cgi";
+target="_top">archive</a>.</p>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/cover.html
----------------------------------------------------------------------
diff --git a/manual/cover.html b/manual/cover.html
index bf01883..8ba4d6f 100644
--- a/manual/cover.html
+++ b/manual/cover.html
@@ -25,22 +25,20 @@
 <body>
   <h1 class="center"><img src="images/ant_logo_large.gif" width="190" 
height="120"></h1>
   <h1 class="center">Apache Ant&trade; 1.10.3 Manual</h1>
-  <p>This is the manual for version 1.10.3
-    of <a target="_top" href="https://ant.apache.org/";>Apache Ant</a>. If your 
version
-    of Ant (as verified with <code>ant -version</code>) is older or newer
-    than this version then this is not the correct manual set. Please
-    use the documentation appropriate to your current version. Also,
-    if you are using a version older than the most recent release, we
-    recommend an upgrade to fix bugs as well as provide new functionality.</p>
+  <p>This is the manual for version 1.10.3 of <a 
href="https://ant.apache.org/"; target="_top">Apache Ant</a>. If your
+    version of Ant (as verified with <code>ant -version</code>) is older or 
newer than this version then this is not the
+    correct manual set. Please use the documentation appropriate to your 
current version. Also, if you are using a
+    version older than the most recent release, we recommend an upgrade to fix 
bugs as well as provide new
+    functionality.</p>
 
-  <p>Ant's manual and API documentation is part of
-    the <a href="https://ant.apache.org/bindownload.cgi";>binary</a>
-    distributions or available as a
-    separate <a href="https://ant.apache.org/manualdownload.cgi";>archive</a>.
-    Manuals for older releases are available for
-    download <a href="https://ant.apache.org/bindownload.cgi#Old Ant 
Releases">as well</a>.</p>
+  <p>Ant's manual and API documentation is part of the <a 
href="https://ant.apache.org/bindownload.cgi";
+     target="_top">binary</a> distributions or available as a
+     separate <a href="https://ant.apache.org/manualdownload.cgi"; 
target="_top">archive</a>.  Manuals for older releases
+     are available for download <a 
href="https://ant.apache.org/bindownload.cgi#Old Ant Releases" target="_top">as
+     well</a>.</p>
 
-  <p class="center">Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache 
feather logo, and the Apache Ant project logos are trademarks of The Apache 
Software Foundation.</p>
+  <p class="center">Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache 
feather logo, and the Apache Ant project logos
+    are trademarks of The Apache Software Foundation.</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/develop.html
----------------------------------------------------------------------
diff --git a/manual/develop.html b/manual/develop.html
index ab6552b..254e1f8 100644
--- a/manual/develop.html
+++ b/manual/develop.html
@@ -473,13 +473,13 @@ public class MyLogAdapter implements BuildListener {
 positively encouraged.  Both changes to the existing source and new tasks can 
be incorporated back
 into the Ant codebase, which benefits all users and spreads the maintenance 
load around.</p>
 
-<p>Please consult the <a 
href="https://www.apache.org/foundation/getinvolved.html";>Getting
-Involved</a> pages on the Apache web site for details on how to fetch the 
latest source and how to
-submit changes for reincorporation into the source tree.</p>
+<p>Please consult the <a 
href="https://www.apache.org/foundation/getinvolved.html";
+target="_top">Getting Involved</a> pages on the Apache web site for details on 
how to fetch the
+latest source and how to submit changes for reincorporation into the source 
tree.</p>
 
-<p>Ant also has some <a 
href="https://ant.apache.org/ant_task_guidelines.html";>task guidelines</a>
-which provides some advice to people developing and testing tasks. Even if you 
intend to keep your
-tasks to yourself, you should still read this as it should be informative.</p>
+<p>Ant also has some <a href="https://ant.apache.org/ant_task_guidelines.html"; 
target="_top">task
+guidelines</a> which provides some advice to people developing and testing 
tasks. Even if you intend
+to keep your tasks to yourself, you should still read this as it should be 
informative.</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/developlist.html
----------------------------------------------------------------------
diff --git a/manual/developlist.html b/manual/developlist.html
index 444123b..b000692 100644
--- a/manual/developlist.html
+++ b/manual/developlist.html
@@ -30,8 +30,8 @@
 <h3>Developing with Apache Ant</h3>
 
 <ul class="inlinelist">
-<li><a href="https://ant.apache.org/ant_in_anger.html";>Ant in Anger</a> 
<small>(online)</small></li>
-<li><a href="https://ant.apache.org/ant_task_guidelines.html";>Ant Task 
Guidelines</a> <small>(online)</small></li>
+<li><a href="https://ant.apache.org/ant_in_anger.html"; target="_top">Ant in 
Anger</a> <small>(online)</small></li>
+<li><a href="https://ant.apache.org/ant_task_guidelines.html"; 
target="_top">Ant Task Guidelines</a> <small>(online)</small></li>
 <li><a href="develop.html#writingowntask">Writing Your Own Task</a></li>
 <li><a href="base_task_classes.html">Tasks Designed for Extension</a></li>
 <li><a href="develop.html#buildevents">Build Events</a></li>

http://git-wip-us.apache.org/repos/asf/ant/blob/97d81a72/manual/feedback.html
----------------------------------------------------------------------
diff --git a/manual/feedback.html b/manual/feedback.html
index f92ef0c..2ac985e 100644
--- a/manual/feedback.html
+++ b/manual/feedback.html
@@ -25,45 +25,44 @@
 <body>
 
 <h1 id="feedback">Feedback and Troubleshooting</h1>
-<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>
+<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 <code>ANT_HOME</code> and 
<code>JAVA_HOME</code> correct? If
-    they have quotes or trailing slashes, remove them.</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>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 <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 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 <code>ant -verbose</code> or 
<code>ant
-    -debug</code> to see what is happening</li>
+  <li>Which version of ant are you running? Other applications distribute a 
copy&mdash;it may be
+    being picked up by accident.</li>
+  <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 <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="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="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="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
+<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="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="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="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>
+<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/97d81a72/manual/ide.html
----------------------------------------------------------------------
diff --git a/manual/ide.html b/manual/ide.html
index 940d126..63b98a3 100644
--- a/manual/ide.html
+++ b/manual/ide.html
@@ -34,38 +34,40 @@ All the modern Java IDEs support Apache Ant almost out of 
the box.
 
 <ul>
   <li>
-    <a href="Integration/jext-plugin.html">AntWork Plugin for the Jext Java 
Text Editor (unbundled)</a>
+    <a href="Integration/jext-plugin.html">AntWork Plugin for the Jext Java 
Text Editor
+    (unbundled)</a>
   </li>
   <li>
-    <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"
+    <a href="http://jdee.sourceforge.net/"; target="_top">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="https://www.jetbrains.com/idea/";>IDEA</a> has built-in
-    GUI ANT integration: GUI selection of targets, execution, hyperlink to 
compilation errors
+    <a href="https://www.jetbrains.com/idea/"; target="_top">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>
-    IDE uses Ant as the basis for its project system starting with the 4.0 
release
+    <a href="http://ant.netbeans.org/"; target="_top">NetBeans</a> IDE uses Ant 
as the basis for its
+    project system starting with the 4.0 release
   </li>
   <li>
-    <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
+    <a href="http://jedit.org/"; target="_top">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="https://eclipse.org/";>Eclipse</a>
-    is IBM's counterpoint to NetBeans; an open source IDE with Java and Ant 
support
+    <a href="https://eclipse.org/"; target="_top">Eclipse</a> is IBM's 
counterpoint to NetBeans; an
+    open source IDE with Java and Ant support
   </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="http://www.placidsystems.com/virtualant/"; target="_top">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="https://www.ibm.com/developerworks/offers/wsad2.html";>WebSphere 
Studio Application Developer</a>
+    <a href="https://www.ibm.com/developerworks/offers/wsad2.html"; 
target="_top">WebSphere Studio
+    Application Developer</a>
   </li>
 </ul>
 

Reply via email to