ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gin...@apache.org
Subject [5/7] ant git commit: Reviewed documentation: - stripped trailing whitespace; - corrected the tag soup; - corrected Java versions (1.4 followed by 5); - stripped inline styling (use CSS for uniformity).
Date Tue, 23 Jan 2018 18:02:33 GMT
http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/ejb.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html
index f554498..5eb6c3f 100644
--- a/manual/Tasks/ejb.html
+++ b/manual/Tasks/ejb.html
@@ -39,25 +39,25 @@
   <li>Rob van Oostrum(<a href="mailto:rob@springwellfarms.ca">rob@springwellfarms.ca</a>)</li>
 </ul>
 
-<hr>
+<hr/>
 <h2>Table of Contents</h2>
 <ul>
   <li><a href="#introduction">Introduction</a></li>
   <li><a href="#ejbtasks">EJB Tasks</a></li>
 </ul>
 
-<hr>
-<h2><a name="introduction">Introduction</a></h2>
+<hr/>
+<h2 id="introduction">Introduction</h2>
 <p>Ant provides a number of optional tasks for developing 1.x and 2.x
 <a href="http://www.oracle.com/technetwork/java/index-jsp-140203.html" target="_top">Enterprise Java Beans (EJBs)</a>.
 In general these tasks are specific to the particular vendor's EJB Server.</p>
 
-<p> The tasks support:<br>
+<p>The tasks support:</p>
 
 <ul>
-  <li><a href="http://www.borland.com">Borland </a>
+  <li><a href="http://www.borland.com">Borland</a>
   Application Server 4.5</li>
-  <li><a href="http://www.iplanet.com">iPlanet </a>
+  <li><a href="http://www.iplanet.com">iPlanet</a>
   Application Server 6.0</li>
   <li><a href="http://www.jboss.org/" target="_top">
   JBoss 2.1</a> and above EJB servers</li>
@@ -69,6 +69,7 @@ In general these tasks are specific to the particular vendor's EJB Server.</p>
    2.4.x and 2.5 Open Source EJB server</li>
   <li><a href="http://www.ibm.com/websphere">IBM WebSphere</a> 4.0</li>
 </ul>
+<p>
     Vendors such as BEA and IBM now provide custom Ant tasks to work with their
     particular products. More importantly, EJB3.0 renders this whole process obsolete.
     Accordingly, development of these tasks is effectively frozen. Bug reports
@@ -77,9 +78,9 @@ In general these tasks are specific to the particular vendor's EJB Server.</p>
     and definitely not new EJB2.x servers.
 </p>
 
-<hr>
-<h2><a name="ejbtasks">EJB Tasks</a></h2>
-<table border="1" cellpadding="5">
+<hr/>
+<h2 id="ejbtasks">EJB Tasks</h2>
+<table>
  <tr><td>Task</td><td colspan="2">Application Servers</td></tr>
  <tr><td><a href="BorlandGenerateClient.html">blgenclient</a></td><td colspan="2">Borland Application Server 4.5 and 5.x</td></tr>
  <tr><td><a href="#iplanet-ejbc">iplanet-ejbc</a></td><td colspan="2">iPlanet Application Server 6.0</td></tr>
@@ -94,8 +95,8 @@ In general these tasks are specific to the particular vendor's EJB Server.</p>
 
 </table>
 
-<hr>
-<h2><a name="ddcreator">ddcreator</a></h2>
+<hr/>
+<h2 id="ddcreator">ddcreator</h2>
 <h3><b>Description:</b></h3>
 <p>ddcreator will compile a set of Weblogic text-based deployment descriptors into a serialized
 EJB deployment descriptor. The selection of which of the text-based descriptors are to be compiled
@@ -103,7 +104,7 @@ is based on the standard Ant include and exclude selection mechanisms.
 </p>
 
 <h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -135,8 +136,8 @@ is based on the standard Ant include and exclude selection mechanisms.
 &lt;/ddcreator&gt;
 </pre>
 
-<hr>
-<h2><a name="ejbc">ejbc</a></h2>
+<hr/>
+<h2 id="ejbc">ejbc</h2>
 <h3><b>Description:</b></h3>
 <p>The ejbc task will run Weblogic's ejbc tool. This tool will take a serialized deployment descriptor,
 examine the various EJB interfaces and bean classes and then generate the required support classes
@@ -144,9 +145,9 @@ necessary to deploy the bean in a Weblogic EJB container. This will include the
 as well as the classes which implement the bean's home and remote interfaces.</p>
 <p>
 The ant task which runs this tool is able to compile several beans in a single operation. The beans to be
-compiled are selected by including their serialized deployment descriptors. The standard ant
+compiled are selected by including their serialized deployment descriptors. The standard Ant
 <code>include</code> and <code>exclude</code> constructs can be used to select the deployment descriptors
-to be included. </p>
+to be included.</p>
 <p>
 Each descriptor is examined to determine whether the generated classes are out of date and need to be
 regenerated. The deployment descriptor is de-serialized to discover the home, remote and
@@ -155,7 +156,7 @@ modification times. These times and the modification time of the serialized desc
 compared with the modification time of the generated classes. If the generated classes are not present
 or are out of date, the ejbc tool is run to generate new versions.</p>
 <h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -208,9 +209,8 @@ or are out of date, the ejbc tool is run to generate new versions.</p>
 &lt;/ejbc&gt;
 </pre>
 
-<hr>
-<h2>
-<a NAME="iplanet-ejbc"></a>iplanet-ejbc</h2>
+<hr/>
+<h2 id="iplanet-ejbc">iplanet-ejbc</h2>
 
 <h3>
 <b>Description:</b></h3>
@@ -231,7 +231,7 @@ and skeletons.</p>
 <h3>
 Parameters:</h3>
 
-<table border="1" cellspacing="0" cellpadding="2">
+<table>
 <tr>
 <td valign="top"><b>Attribute</b></td>
 
@@ -281,7 +281,7 @@ Nested "classpath" elements may also be used.</td>
 
 <td valign="top">Indicates whether or not the Java source files which are
 generated by ejbc will be saved or automatically deleted. If "yes", the
-source files will be retained. If omitted, it defaults to "no". </td>
+source files will be retained. If omitted, it defaults to "no".</td>
 
 <td align="center" valign="top">No</td>
 </tr>
@@ -291,7 +291,7 @@ source files will be retained. If omitted, it defaults to "no". </td>
 
 <td>Indicates whether or not the ejbc utility should log additional debugging
 statements to the standard output. If "yes", the additional debugging statements
-will be generated.  If omitted, it defaults to "no". </td>
+will be generated.  If omitted, it defaults to "no".</td>
 
 <td align="center" valign="top">
 <center>No</center>
@@ -304,7 +304,7 @@ will be generated.  If omitted, it defaults to "no". </td>
 <td>May be used to specify the "home" directory for this iAS installation.
 This is used to find the ejbc utility if it isn't included in the user's
 system path. If specified, it should refer to the "[install-location]/iplanet/ias6/ias"
-directory. If omitted, the ejbc utility must be on the user's system path. </td>
+directory. If omitted, the ejbc utility must be on the user's system path.</td>
 
 <td align="center" valign="top">No</td>
 </tr>
@@ -331,21 +331,19 @@ Examples</h3>
                   &lt;pathelement path="${build.classpath}"/&gt;
               &lt;/classpath&gt;
 &lt;/iplanet-ejbc&gt;
-
-
 </pre>
 
-<hr>
-<h2><a name="wlrun">wlrun</a></h2>
+<hr/>
+<h2 id="wlrun">wlrun</h2>
 <h3><b>Description:</b></h3>
 
 <p>The <code>wlrun</code> task is used to start a weblogic server. The task runs
 a weblogic instance in a separate Java Virtual Machine. A number of parameters
 are used to control the operation of the weblogic instance. Note that the task,
-and hence ant, will not complete until the weblogic instance is stopped.</p>
+and hence Ant, will not complete until the weblogic instance is stopped.</p>
 
 <h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -476,21 +474,21 @@ Weblogic 6.0</p>
            beahome=&quot;${bea.home}&quot;/&gt;
 </pre>
 
-<hr>
-<h2><a name="wlstop">wlstop</a></h2>
+<hr/>
+<h2 id="wlstop">wlstop</h2>
 <h3><b>Description:</b></h3>
 
 <p>The <code>wlstop</code> task is used to stop a weblogic instance which is
 currently running. To shut down an instance you must supply both a username and
 a password. These will be stored in the clear in the build script used to stop
 the instance. For security reasons, this task is therefore only appropriate in a
-development environment. </p>
+development environment.</p>
 
 <p>This task works for most version of Weblogic, including 6.0. You need to
 specify the BEA Home to have this task work correctly under 6.0</p>
 
 <h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -547,16 +545,15 @@ specify the BEA Home to have this task work correctly under 6.0</p>
             beahome=&quot;${bea.home}&quot;/&gt;
 </pre>
 
-<hr>
-
-<h2><a name="ejbjar">ejbjar</a></h2>
+<hr/>
+<h2 id="ejbjar">ejbjar</h2>
 <h3><b>Description:</b></h3>
 
 <p>This task is designed to support building of EJB jar files (EJB 1.1 &amp; 2.0).
 Support is currently provided for 'vanilla' EJB jar files - i.e. those containing only
 the user generated class files and the standard deployment descriptor. Nested
 elements provide support for vendor specific deployment tools. These currently
-include: </p>
+include:</p>
 <ul>
   <li>Borland Application Server 4.5</li>
   <li>iPlanet Application Server 6.0</li>
@@ -584,7 +581,7 @@ interfaces. These will be added to the generated jar.</p>
 simply generate a generic EJB jar. Such jars are typically used as the input to
 vendor-specific deployment tools. For each nested deployment element, a vendor
 specific deployment tool is run to generate a jar file ready for deployment in
-that vendor's EJB container. </p>
+that vendor's EJB container.</p>
 
 <p>The jar files are only built if they are out of date.  Each deployment tool
 element will examine its target jar file and determine if it is out of date with
@@ -606,10 +603,10 @@ Ejbjar handles the processing of multiple beans, and it uses a set of naming
 conventions to determine the name of the generated EJB jars. The naming convention
 that is used is controlled by the &quot;naming&quot; attribute. It supports the
 following values
-<ul>
+<dl>
 
-<li>descriptor</li>
-<p>This is the default naming scheme. The name of the generated bean is derived from the
+<dt>descriptor</dt>
+<dd><p>This is the default naming scheme. The name of the generated bean is derived from the
 name of the deployment descriptor.  For an Account bean, for example, the deployment
 descriptor would be named <code>Account-ejb-jar.xml</code>. Vendor specific descriptors are
 located using the same naming convention. The weblogic bean, for example, would be named
@@ -619,29 +616,29 @@ is deployed in separate beans.
 </p>
 
 <p>This scheme is useful when you are using one bean per EJB jar and where you may be
-deploying the same bean classes in different beans, with different deployment characteristics.
+    deploying the same bean classes in different beans, with different deployment characteristics.</p></dd>
 
-<li>ejb-name</li>
-<p> This naming scheme uses the <code>&lt;ejb-name&gt;</code> element from the deployment descriptor to
+<dt>ejb-name</dt>
+<dd><p>This naming scheme uses the <code>&lt;ejb-name&gt;</code> element from the deployment descriptor to
 determine the bean name. In this situation, the descriptors normally use the generic
 descriptor names, such as <code>ejb-jar.xml</code> along with any associated vendor specific descriptor
 names. For example, If the value of the <code>&lt;ejb-name&gt;</code> were to be given in the deployment descriptor
-as follows:
-<pre>
-&lt;ejb-jar&gt;
+as follows:</p>
+<pre>&lt;ejb-jar&gt;
     &lt;enterprise-beans&gt;
         &lt;entity&gt;
             &lt;ejb-name&gt;Sample&lt;/ejb-name&gt;
             &lt;home&gt;org.apache.ant.ejbsample.SampleHome&lt;/home&gt;
 </pre>
-
+<p>
 then the name of the generated bean would be <code>Sample.jar</code>
 </p>
-<p> This scheme is useful where you want to use the standard deployment descriptor names, which may be more
-compatible with other EJB tools. This scheme must have one bean per jar.
-</p>
-<li>directory</li>
 <p>
+This scheme is useful where you want to use the standard deployment descriptor names, which may be more
+compatible with other EJB tools. This scheme must have one bean per jar.
+</p></dd>
+<dt>directory</dt>
+<dd><p>
 In this mode, the name of the generated bean jar is derived from the directory
 containing the deployment descriptors. Again the deployment descriptors typically use
 the standard filenames. For example, if the path to the deployment descriptor is
@@ -652,10 +649,10 @@ bean will be named <code>sample.jar</code>
 This scheme is also useful when you want to use standard style descriptor names. It is often
 most useful when the  descriptors are located in the same directory as the bean source code,
 although that is not mandatory. This scheme can handle multiple beans per jar.
-</p>
+</p></dd>
 
-<li>basejarname</li>
-<p>
+<dt>basejarname</dt>
+<dd><p>
 The final scheme supported by the <code>&lt;ejbjar&gt;</code> task is used when you want to specify the generated
 bean jar name directly. In this case the name of the generated jar is specified by the
 &quot;basejarname&quot; attribute. Since all generated beans will have the same name, this task should
@@ -666,11 +663,11 @@ be only used when each descriptor is in its own directory.
 This scheme is most appropriate when you are using multiple beans per jar and only process a single
 deployment descriptor. You typically want to specify the name of the jar and not derive it from the
 beans in the jar.
-</p>
+</p></dd>
 
-</ul>
+</dl>
 
-<a name="ejbjar_deps"><h3>Dependencies</h3></a>
+<h3 id="ejbjar_deps">Dependencies</h3>
 <p>In addition to the bean classes, ejbjar is able to ad additional classes to the generated
 ejbjar. These classes are typically the support classes which are used by the bean's classes or as
 parameters to the bean's methods.</p>
@@ -681,7 +678,7 @@ classes had to be loaded into Ant's JVM. This was not always possible due to cla
 </p>
 
 <p>The ejbjar task in Ant releases 1.5 and later uses the
-<a href="http://commons.apache.org/bcel/"> BCEL </a> library
+<a href="http://commons.apache.org/bcel/">BCEL</a> library
 to analyze the bean's class
 files directly, rather than loading them into the JVM. This also allows ejbjar to add all
 of the required support classes for a bean and not just super classes.
@@ -699,12 +696,12 @@ behaviour where super classes and super interfaces are added to the jar</li>
 are added to the jar</li>
 </ul>
 <p>The <code>super</code> and <code>full</code> values require the
-<a href="http://commons.apache.org/bcel/"> BCEL </a> library
+<a href="http://commons.apache.org/bcel/">BCEL</a> library
 to be available. If it is not, ejbjar will drop back to the behaviour corresponding to
 the value <code>none</code>.</p>
 
 <h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -819,7 +816,7 @@ the value <code>none</code>.</p>
 <h3>Nested Elements</h3>
 
 <p>In addition to the vendor specific nested elements, the ejbjar task provides
-three nested elements. </p>
+three nested elements.</p>
 
 <h4>Classpath</h4>
 
@@ -827,7 +824,7 @@ three nested elements. </p>
 to be set. It is useful when setting the classpath from a reference path. In all
 other respects the behaviour is the same as the classpath attribute.</p>
 
-<a name="ejbjar-dtd"><h4>dtd</h4></a>
+<h4 id="ejbjar-dtd">dtd</h4>
 
 <p>The <code>&lt;dtd&gt;</code> element is used to specify the local location of DTDs to be
 used when parsing the EJB deployment descriptor. Using a local DTD is much
@@ -840,7 +837,7 @@ available in the classpath when Ant is started. If your want to run Ant without
 requiring the vendor classes in the classpath, you would need to use a
 <code>&lt;dtd&gt;</code> element.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -877,24 +874,23 @@ specific to that vendor's EJB container. The parameters for each supported
 deployment element are detailed here.
 
 
-<h3><a name="ejbjar_jboss">Jboss element</a></h3>
+<h3 id="ejbjar_jboss">Jboss element</h3>
 
 <p>The jboss element searches for the JBoss specific deployment descriptors and adds them
-to the final ejb jar file. JBoss has two deployment descriptors:
+to the final ejb jar file. JBoss has two deployment descriptors:</p>
 <ul><li>jboss.xml</li>
 <li>for container manager persistence:<br>
-<table border="1">
+<table>
 <tr><td><b>CMP version</b></td><td><b>File name</b></td></tr>
 <tr><td>CMP 1.0</td><td>jaws.xml</td></tr>
 <tr><td>CMP 2.0</td><td>jbosscmp-jdbc.xml</td></tr>
 </table>
 </li>
 </ul>
-<br>
-. The JBoss server uses hot deployment and does
+<p>The JBoss server uses hot deployment and does
 not require compilation of additional stubs and skeletons.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -905,7 +901,7 @@ not require compilation of additional stubs and skeletons.</p>
     <td valign="top">The base directory into which the generated weblogic ready
                      jar files are deposited. Jar files are deposited in
                      directories corresponding to their location within the
-                     descriptordir namespace. </td>
+                     descriptordir namespace.</td>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
@@ -934,7 +930,7 @@ not require compilation of additional stubs and skeletons.</p>
 </table>
 
 
-<h3><a name="ejbjar_weblogic">Weblogic element</a></h3>
+<h3 id="ejbjar_weblogic">Weblogic element</h3>
 
 <p>The weblogic element is used to control the weblogic.ejbc compiler for
 generating weblogic EJB jars. Prior to Ant 1.3, the method of locating CMP
@@ -957,7 +953,7 @@ determining CMP descriptors, you will need to update your weblogic deployment
 descriptor's <code>&lt;type-storage&gt;</code> element. In the above example, you would
 define this as META-INF/Customer-weblogic-cmp-rdbms-jar.xml.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -968,7 +964,7 @@ define this as META-INF/Customer-weblogic-cmp-rdbms-jar.xml.</p>
     <td valign="top">The base directory into which the generated weblogic ready
                      jar files are deposited. Jar files are deposited in
                      directories corresponding to their location within the
-                     descriptordir namespace. </td>
+                     descriptordir namespace.</td>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
@@ -1153,7 +1149,7 @@ weblogic element, as long as the newCMP attribute is set to &quot;true&quot;
 is derived from the standard weblogic element so it supports the same set of attributes plus these
 additional attributes</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -1279,11 +1275,11 @@ This will create only one TOPLink-enabled ejb jar file - 'Address.jar'.</p>
 </pre>
 
 
-<h3><a name="ejbjar_websphere">WebSphere element</a></h3>
+<h3 id="ejbjar_websphere">WebSphere element</h3>
 
 <p>The websphere element searches for the websphere specific deployment descriptors and
 adds them to the final ejb jar file. Websphere has two specific descriptors for session
-beans:
+beans:</p>
 <ul>
    <li>ibm-ejb-jar-bnd.xmi</li>
    <li>ibm-ejb-jar-ext.xmi</li>
@@ -1293,11 +1289,12 @@ and another two for container managed entity beans:
    <li>Map.mapxmi</li>
    <li>Schema.dbxmi</li>
 </ul>
+<p>
 In terms of WebSphere, the generation of container code and stubs is called <code>deployment</code>.
 This step can be performed by the websphere element as part of the jar generation process. If the
 switch <code>ejbdeploy</code> is on, the ejbdeploy tool from the websphere toolset is called for
 every ejb-jar. Unfortunately, this step only works, if you use the ibm jdk. Otherwise, the rmic
-(called by ejbdeploy) throws a ClassFormatError. Be sure to switch ejbdeploy off, if run ant with
+(called by ejbdeploy) throws a ClassFormatError. Be sure to switch ejbdeploy off, if Ant runs with
 Oracle JDK or OpenJDK.
 </p>
 
@@ -1307,7 +1304,7 @@ classes, that are required to reflect the bean classes. For ejbdeploy to work, y
 the classpath of the ejbdeploy tool and set the <i>websphere.home</i> property (look at the examples below).
 </p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -1318,13 +1315,13 @@ the classpath of the ejbdeploy tool and set the <i>websphere.home</i> property (
     <td valign="top">The base directory into which the generated weblogic ready
                      jar files are deposited. Jar files are deposited in
                      directories corresponding to their location within the
-                     descriptordir namespace. </td>
+                     descriptordir namespace.</td>
     <td valign="top" align="center">Yes</td>
   </tr>
   <tr>
     <td valign="top">ejbdeploy</td>
     <td valign="top">Decides whether ejbdeploy is called. When you set this to true,
-                     be sure, to run ant with the ibm jdk.</td>
+                     be sure, to run Ant with the IBM JDK.</td>
     <td valign="top" align="center">No, defaults to true</td>
   </tr>
   <tr>
@@ -1358,7 +1355,7 @@ the classpath of the ejbdeploy tool and set the <i>websphere.home</i> property (
   </tr>
   <tr>
     <td valign="top">dbVendor</td>
-    <td valign="top">This option is passed to ejbdeploy. 
+    <td valign="top">This option is passed to ejbdeploy.
                    <p>
                    Valid options can be obtained by running the following command:
                    <code>
@@ -1415,7 +1412,7 @@ in the descriptor dir:</p>
     &lt;/ejbjar&gt;
 </pre>
 
-<h3><a name="ejbjar_iplanet">iPlanet Application Server (iAS) element</a></h3>
+<h3 id="ejbjar_iplanet">iPlanet Application Server (iAS) element</h3>
 
 The &lt;iplanet&lt; nested element is used to build iAS-specific stubs and
 
@@ -1436,10 +1433,9 @@ and META-INF/ias-ejb-jar.xml.</p>
 in the ejbjar task (for example, basejarname, basenameterminator, and flatdestdir)
 as well as the iplanet element (for example, suffix).  Refer to the
 appropriate documentation for more details.</p>
-<h3>
-Parameters:</h3>
+<h3>Parameters:</h3>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
 <tr>
 <td valign="top"><b>Attribute</b></td>
 
@@ -1475,7 +1471,7 @@ elements may also be used.</td>
 
 <td valign="top">Indicates whether or not the Java source files which are
 generated by ejbc will be saved or automatically deleted. If "yes", the
-source files will be retained.  If omitted, it defaults to "no". </td>
+source files will be retained.  If omitted, it defaults to "no".</td>
 
 <td align="center" valign="top">No</td>
 </tr>
@@ -1485,7 +1481,7 @@ source files will be retained.  If omitted, it defaults to "no". </td>
 
 <td>Indicates whether or not the ejbc utility should log additional debugging
 statements to the standard output. If "yes", the additional debugging statements
-will be generated.  If omitted, it defaults to "no". </td>
+will be generated.  If omitted, it defaults to "no".</td>
 
 <td align="center" valign="top">No</td>
 </tr>
@@ -1497,7 +1493,7 @@ will be generated.  If omitted, it defaults to "no". </td>
 This is used to find the ejbc utility if it isn't included in the user's
 system path.  If specified, it should refer to the [install-location]/iplanet/ias6/ias
 directory.  If omitted, the ejbc utility must be on the user's system
-path. </td>
+path.</td>
 
 <td align="center" valign="top">No</td>
 </tr>
@@ -1506,7 +1502,7 @@ path. </td>
 <td valign="top">suffix</td>
 
 <td>String value appended to the JAR filename when creating each JAR.
-If omitted, it defaults to ".jar". </td>
+If omitted, it defaults to ".jar".</td>
 
 <td align="center" valign="top">No</td>
 </tr>
@@ -1582,7 +1578,7 @@ local DTDs are found in the [iAS-install-directory]/dtd directory.
                  location="${ias.home}/APPS/IASEjb_jar_1_0.dtd"/&gt;
     &lt;/ejbjar&gt;</pre>
 
-<h3><a name="ejbjar_jonas">JOnAS (Java Open Application Server) element</a></h3>
+<h3 id="ejbjar_jonas">JOnAS (Java Open Application Server) element</h3>
 
 <p>The <code>&lt;jonas&gt;</code> nested element is used to build JOnAS-specific stubs and
 skeletons thanks to the <code>GenIC</code> specific tool, and construct a JAR
@@ -1615,7 +1611,7 @@ documentation for more details.</p>
 
 <h3> Parameters:</h3>
 
-<table border="1" cellspacing="0" cellpadding="2">
+<table>
   <tbody>
     <tr>
       <td valign="Top"><b>Attribute</b></td>
@@ -1708,7 +1704,7 @@ documentation for more details.</p>
     <tr>
       <td valign="Top">jarsuffix</td>
       <td>String value appended to the JAR filename when creating each JAR.  If
-      omitted, it defaults to ".jar". </td>
+      omitted, it defaults to ".jar".</td>
       <td align="Center" valign="Top">No</td>
     </tr>
     <tr>
@@ -1774,14 +1770,14 @@ descriptors to use the naming standard. This will create only one ejb jar file -
 </pre>
 
 
-<h3><a name="ejbjar_orion">Orion element</a></h3>
+<h3 id="ejbjar_orion">Orion element</h3>
 
 <p>The orion element searches for the Orion Application Server specific deployment descriptors and adds them
 to the final ejb jar file. Orion has one deployment descriptor:
 <ul><li>orion-ejb-jar.xml</li>
 </ul>
 <br>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -1792,7 +1788,7 @@ to the final ejb jar file. Orion has one deployment descriptor:
     <td valign="top">The base directory into which the generated
                      jar files are deposited. Jar files are deposited in
                      directories corresponding to their location within the
-                     descriptordir namespace. </td>
+                     descriptordir namespace.</td>
     <td valign="top" align="center">Yes</td>
   </tr>
 </table>
@@ -1812,5 +1808,4 @@ to the final ejb jar file. Orion has one deployment descriptor:
 </pre>
 
 </body>
-
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/exec.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/exec.html b/manual/Tasks/exec.html
index 8dfc6bc..0061335 100644
--- a/manual/Tasks/exec.html
+++ b/manual/Tasks/exec.html
@@ -24,7 +24,7 @@
 
 <body>
 
-<h2><a name="exec">Exec</a></h2>
+<h2 id="exec">Exec</h2>
 <h3>Description</h3>
 <p>Executes a system command. When the <i>os</i> attribute is specified, then
 the command is only executed when Apache Ant is run on one of the specified operating
@@ -40,13 +40,12 @@ EOF (-1). This is a change from Ant 1.5, where such an attempt would block.</p>
   use <code>vmlauncher="false"</code> on some operating systems - but
   even this may fail (Solaris 8/9 has been reported as problematic).
   The <code>resolveexecutable</code> attribute should be more
-  reliable, as would be something like
+  reliable, as would be something like</p>
 <pre>
   &lt;property name="executable-full-path"
             location="../relative/path/to/executable"/&gt;
   &lt;exec executable="${executable-full-path}" ...
 </pre>
-</p>
 
 <h4>Windows Users</h4>
 <p>The <code>&lt;exec&gt;</code> task delegates to <code>Runtime.exec</code> which in turn
@@ -87,7 +86,7 @@ for the executable parameter.  This is because the Java VM in which Ant is
 running is a standard Windows executable and is not aware of the Cygwin
 environment (i.e., doesn't load <code>cygwin1.dll</code>).  The only
 work-around for this is to compile a JVM under Cygwin (at your own risk).
-See for instance 
+See for instance
 <a href="http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html#cygwin">
 OpenJDK build instructions for cygwin</a>.
 </p>
@@ -95,7 +94,7 @@ OpenJDK build instructions for cygwin</a>.
 <h4>OpenVMS Users</h4>
 <p>The command specified using <code>executable</code> and
 <code>&lt;arg&gt;</code> elements is executed exactly as specified
-inside a temporary DCL script.  This has some implications:
+inside a temporary DCL script.  This has some implications:</p>
 <ul>
 <li>paths have to be written in VMS style</li>
 <li>if your <code>executable</code> points to a DCL script remember to
@@ -103,7 +102,7 @@ prefix it with an <code>@</code>-sign
 (e.g. <code>executable="@[FOO]BAR.COM"</code>), just as you would in a
 DCL script</li>
 </ul>
-For <code>&lt;exec&gt;</code> to work in an environment with a Java VM
+<p>For <code>&lt;exec&gt;</code> to work in an environment with a Java VM
 older than version 1.4.1-2 it is also <i>required</i> that the logical
 <code>JAVA$FORK_SUPPORT_CHDIR</code> is set to <code>TRUE</code> in
 the job table (see the <i>JDK Release Notes</i>).</p>
@@ -122,7 +121,7 @@ interpretation of exit codes.</p>
 href="http://listserv.uark.edu/scripts/wa.exe?A1=ind0404&L=vmesa-l#33">reported
 on the VMESA-LISTSERV</a> that shell scripts invoked via the Ant Exec
 task must have their interpreter specified, i.e., the scripts must
-start with something like:
+start with something like:</p>
 
 <blockquote>
 <pre>
@@ -130,7 +129,7 @@ start with something like:
 </pre>
 </blockquote>
 
-or the task will fail as follows:
+<p>or the task will fail as follows:</p>
 
 <blockquote>
 <pre>
@@ -138,10 +137,8 @@ or the task will fail as follows:
 [exec] Result: 255
 </pre>
 </blockquote>
-</p>
 
-<h4><a name="background">Running Ant as a background process on
-    Unix(-like) systems</a></h4>
+<h4 id="background">Running Ant as a background process on Unix(-like) systems</h4>
 
 <p>If you run Ant as a background process (like <code>ant &</code>)
   and use the <code>&lt;exec&gt;</code> task with <code>spawn</code>
@@ -150,7 +147,7 @@ or the task will fail as follows:
   from the standard input.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -197,7 +194,7 @@ or the task will fail as follows:
     <td valign="top">spawn</td>
     <td valign="top">whether or not you want the command to be spawned<br>
     Default is false.<br>
-    If you spawn a command, its output will not be logged by ant.<br>
+    If you spawn a command, its output will not be logged by Ant.<br>
     The input, output, error, and result property settings are not active when spawning a process.<br>
     <em>since Ant 1.6</em>
     </td>
@@ -278,9 +275,10 @@ or the task will fail as follows:
   <tr>
     <td valign="top">failifexecutionfails</td>
     <td valign="top">Stop the build if we can't start the program.
-      Defaults to true. </td>
+      Defaults to true.</td>
     <td align="center" valign="top">No</td>
-  </tr>  <tr>
+  </tr>
+  <tr>
     <td valign="top">newenvironment</td>
     <td valign="top">Do not propagate old environment when new environment
       variables are specified.</td>
@@ -331,10 +329,10 @@ or the task will fail as follows:
 <p>Command line arguments should be specified as nested
 <code>&lt;arg&gt;</code> elements. See <a
 href="../using.html#arg">Command line arguments</a>.</p>
-<h4><a name="env">env</a></h4>
+<h4 id="env">env</h4>
 <p>It is possible to specify environment variables to pass to the
 system command via nested <code>&lt;env&gt;</code> elements.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -345,8 +343,8 @@ system command via nested <code>&lt;env&gt;</code> elements.</p>
     <td valign="top">
       The name of the environment variable.
       <br/>
-      <em>Note: (Since Ant 1.7)</em>
-      For windows, the name is case-insensitive.
+      <em>Note: since Ant 1.7</em>,
+      for Windows, the name is case-insensitive.
     </td>
     <td align="center" valign="top">Yes</td>
   </tr>
@@ -367,14 +365,14 @@ system command via nested <code>&lt;env&gt;</code> elements.</p>
       replaced by the absolute filename of the file by Ant.</td>
   </tr>
 </table>
-<a name="redirector"><h4>redirector</h4></a>
-<i><b>Since Ant 1.6.2</b></i>
+<h4 id="redirector">redirector</h4>
+<i>Since Ant 1.6.2</i>
 <p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
 can be specified.  In general, the attributes of the redirector behave
 as the corresponding attributes available at the task level.  The most
 notable peculiarity stems from the retention of the &lt;exec&gt;
 attributes for backwards compatibility.  Any file mapping is done
-using a <CODE>null</CODE> sourcefile; therefore not all
+using a <code>null</code> sourcefile; therefore not all
 <a href="../Types/mapper.html">Mapper</a> types will return
 results.  When no results are returned, redirection specifications
 will fall back to the task level attributes.  In practice this means that
@@ -448,18 +446,14 @@ Output is sent to the file &quot;redirector.out&quot; and stored
 in a property of the same name.  Similarly, error output is sent to
 a file and a property, both named &quot;redirector.err&quot;.
 
-
 <p><b>Note:</b> do not try to specify arguments using
 a simple arg-element and separate them by spaces. This results in
 only a single argument containing the entire string.</p>
 <p>
-<b>Timeouts: </b> If a timeout is specified, when it is reached the
+<b>Timeouts:</b> If a timeout is specified, when it is reached the
 sub process is killed and a message printed to the log. The return
 value of the execution will be "-1", which will halt the build if
 <tt>failonerror=true</tt>, but be ignored otherwise.
-
-
-
+</p>
 </body>
 </html>
-

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/fail.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/fail.html b/manual/Tasks/fail.html
index eabe30b..07d4322 100644
--- a/manual/Tasks/fail.html
+++ b/manual/Tasks/fail.html
@@ -24,14 +24,14 @@
 
 <body>
 
-<h2><a name="fail">Fail</a></h2>
+<h2 id="fail">Fail</h2>
 <h3>Description</h3>
 <p>Exits the current build (just throwing a BuildException), optionally printing additional information.</p>
 <p>The message of the Exception can be set via the message attribute
 or character data nested into the element.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -69,7 +69,7 @@ or character data nested into the element.</p>
   conditional failure can be achieved using a single nested
   <code>&lt;condition&gt;</code> element, which should contain exactly one
   core or custom condition.  For information about conditions, see
-  <a href="conditions.html">here</a>.<br><b>Since Ant 1.6.2</b>
+  <a href="conditions.html">here</a>.<br><i>Since Ant 1.6.2</i>
 </p>
 
 <h3>Examples</h3>
@@ -140,4 +140,3 @@ will fail.</p>
 
 </body>
 </html>
-

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/filter.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/filter.html b/manual/Tasks/filter.html
index 16ba88c..90e85a9 100644
--- a/manual/Tasks/filter.html
+++ b/manual/Tasks/filter.html
@@ -24,7 +24,7 @@
 
 <body>
 
-<h2><a name="filter">Filter</a></h2>
+<h2 id="filter">Filter</h2>
 <h3>Description</h3>
 <p>Sets a token filter for this project or read multiple token filter from
 an input file and sets these as filters.
@@ -36,7 +36,7 @@ Note 2: Either token and value attributes must be provided, or only the
 filtersfile attribute.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -49,13 +49,13 @@ filtersfile attribute.</p>
   </tr>
   <tr>
     <td valign="top">value</td>
-    <td valign="top">the string that should be put to replace the token when the 
+    <td valign="top">the string that should be put to replace the token when the
       file is copied</td>
     <td align="center" valign="top">Yes*</td>
   </tr>
   <tr>
     <td valign="top">filtersfile</td>
-    <td valign="top">The file from which the filters must be read. This file must be a formatted as a property file. </td>
+    <td valign="top">The file from which the filters must be read. This file must be a formatted as a property file.</td>
     <td align="center" valign="top">Yes*</td>
   </tr>
 </table>
@@ -64,7 +64,7 @@ filtersfile attribute.</p>
 <pre>  &lt;filter token=&quot;year&quot; value=&quot;2000&quot;/&gt;
   &lt;copy todir=&quot;${dest.dir}&quot; filtering=&quot;true&quot;&gt;
     &lt;fileset dir=&quot;${src.dir}&quot;/&gt;
-  &lt;/copy&gt;</pre> 
+  &lt;/copy&gt;</pre>
 <p>will copy recursively all the files from the <i>src.dir</i> directory into
 the <i>dest.dir</i> directory replacing all the occurrences of the string <i>@year@</i>
 with <i>2000.</i></p>
@@ -72,8 +72,5 @@ with <i>2000.</i></p>
 will read all property entries from the <i>deploy_env.properties</i> file
 and set these as filters.
 
-
-
 </body>
 </html>
-

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/fixcrlf.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/fixcrlf.html b/manual/Tasks/fixcrlf.html
index 2637401..5f7ebce 100644
--- a/manual/Tasks/fixcrlf.html
+++ b/manual/Tasks/fixcrlf.html
@@ -24,7 +24,7 @@
 
 <body>
 
-<h2><a name="fixcrlf">FixCRLF</a></h2>
+<h2 id="fixcrlf">FixCRLF</h2>
 <h3>Description</h3>
   <p>
     Adjusts a text file to local conventions.
@@ -62,12 +62,12 @@
   </p>
 
   <p>
-    Since <b>Apache Ant 1.7</b>, this task can be used in a
+    Since <i>Apache Ant 1.7</i>, this task can be used in a
     <a href="../Types/filterchain.html">filterchain</a>.
   </p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="center" rowspan="2"><b>Attribute</b></td>
     <td valign="center" rowspan="2"><b>Description</b></td>
@@ -81,47 +81,47 @@
     <td valign="top">srcDir</td>
     <td valign="top">Where to find the files to be fixed up.</td>
     <td valign="top" align="center" rowspan="2">One of these</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">file</td>
-    <td valign="top">Name of a single file to fix. <b>Since Ant 1.7</b></td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td valign="top">Name of a single file to fix. <i>Since Ant 1.7</i></td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">destDir</td>
     <td valign="top">Where to place the corrected files.  Defaults to
       srcDir (replacing the original file).</td>
     <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">includes</td>
     <td valign="top">comma- or space-separated list of patterns of files that must be
       included. All files are included when omitted.</td>
     <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">includesfile</td>
     <td valign="top">the name of a file. Each line of this file is
       taken to be an include pattern.</td>
     <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">excludes</td>
     <td valign="top">comma- or space-separated list of patterns of files that must be
       excluded. No files (except default excludes) are excluded when omitted.</td>
     <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">excludesfile</td>
     <td valign="top">the name of a file. Each line of this file is
       taken to be an exclude pattern.</td>
     <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">defaultexcludes</td>
@@ -129,27 +129,27 @@
       (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.
     </td>
     <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">encoding</td>
     <td valign="top">The encoding of the files.</td>
     <td align="center">No; defaults to default JVM encoding.</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">outputencoding</td>
     <td valign="top">The encoding to use when writing the files.
-                     <b>Since Ant 1.7</b></td>
+                     <i>Since Ant 1.7</i></td>
     <td align="center">No; defaults to the value of the encoding attribute.</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">preservelastmodified</td>
     <td valign="top">Whether to preserve the last modified
-                     date of source files. <b>Since Ant 1.6.3</b></td>
+                     date of source files. <i>Since Ant 1.6.3</i></td>
     <td align="center">No; default is <i>false</i></td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
   <tr>
     <td valign="top">eol</td>
@@ -280,7 +280,7 @@
   <tr>
     <td valign="top">fixlast</td>
     <td valign="top">Whether to add a missing EOL to the last line
-                     of a processed file.<br/>Ignored if EOL is asis.<br/><b>Since Ant 1.6.1</b></td>
+                     of a processed file.<br/>Ignored if EOL is asis.<br/><i>Since Ant 1.6.1</i></td>
     <td align="center" colspan="2">No; default is <i>true</i></td>
   </tr>
 </table>
@@ -322,6 +322,5 @@
   DOS systems, and are removed if run on Unix systems.
   You never know what editor a user will use to browse READMEs.</p>
 
-
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/ftp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ftp.html b/manual/Tasks/ftp.html
index 83c18e3..494f0d8 100644
--- a/manual/Tasks/ftp.html
+++ b/manual/Tasks/ftp.html
@@ -24,7 +24,7 @@
 
 <body>
 
-<h2><a name="ftp">FTP</a></h2>
+<h2 id="ftp">FTP</h2>
 <h3>Description</h3>
 <p>The ftp task implements a basic FTP client that can send, receive,
 list, delete files, and create directories.  See below for descriptions and examples of how
@@ -48,13 +48,13 @@ write patterns.</p>
 <p>
 This task does not currently use the proxy information set by the
 <a href="setproxy.html"><code>&lt;setproxy&gt;</code></a> task, and cannot go through
-a firewall via socks. 
+a firewall via socks.
 <p>
-<b>Warning: </b> there have been problems reported concerning the ftp get with the <code>newer</code> attribute.
-Problems might be due to format of ls -l differing from what is expected by commons-net,
+<b>Warning:</b> there have been problems reported concerning the ftp get with the <code>newer</code> attribute.
+Problems might be due to format of <code>ls -l</code> differing from what is expected by commons-net,
 for instance due to specificities of language used by the ftp server in the directory listing.
 If you encounter such a problem, please send an email including a sample directory listing
-coming from your ftp server (ls -l on the ftp prompt).
+coming from your ftp server (<code>ls -l</code>code> on the ftp prompt).
 </p>
 <p>
 If you can connect but not upload or download, try setting the <code>passive</code>
@@ -62,7 +62,7 @@ attribute to true to use the existing (open) channel, instead of having the serv
 try to set up a new connection.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top" width="15%"><b>Attribute</b></td>
     <td valign="top" width="65%"><b>Description</b></td>
@@ -92,8 +92,7 @@ try to set up a new connection.</p>
   <tr>
     <td valign="top">account</td>
     <td valign="top">the account to use on the ftp server.
-        <em>since Ant 1.7</em>.
-    </td>
+    <em>since Ant 1.7</em>.</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -129,13 +128,13 @@ try to set up a new connection.</p>
   </tr>
   <tr>
     <td valign="top">verbose</td>
-    <td valign="top">displays information on each file transferred if set 
+    <td valign="top">displays information on each file transferred if set
                      to "yes". Defaults to "no".</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
     <td valign="top">depends</td>
-    <td valign="top">transfers only new or changed files if set to 
+    <td valign="top">transfers only new or changed files if set to
                      "yes". Defaults to "no".</td>
     <td valign="top" align="center">No</td>
   </tr>
@@ -148,37 +147,34 @@ try to set up a new connection.</p>
   <tr>
     <td valign="top">timediffauto</td>
     <td valign="top">set to <code>"true"</code>
-    to make ant calculate the time difference between client and server.<br>
+    to make Ant calculate the time difference between client and server.<br>
     <em>requires write access in the remote directory</em><br>
-    Since ant 1.6</td>
+    <em>Since Ant 1.6</em></td>
     <td valign="top" align="center">No</td>
   </tr>
-  <a name="timestampGranularity"/>
-  <tr>
+  <tr id="timestampGranularity">
     <td valign="top">timestampGranularity</td>
     <td valign="top">Specify either <code>MINUTE</code>, <code>NONE</code>,
      (or you may specify <code>""</code> which is equivalent to not specifying a value,
-     useful for property-file driven scripts).  Allows override of the typical situation 
-     in PUT and GET where local filesystem timestamps are <code>HH:mm:ss</code> 
-     and the typical FTP server's timestamps are <code>HH:mm</code>.  This can throw 
+     useful for property-file driven scripts).  Allows override of the typical situation
+     in PUT and GET where local filesystem timestamps are <code>HH:mm:ss</code>
+     and the typical FTP server's timestamps are <code>HH:mm</code>.  This can throw
      off uptodate calculations.  However, the default values should suffice for most
      applications.<br>
-    Since ant 1.7
-    </td>
+     <em>Since Ant 1.7</em></td>
     <td valign="top" align="center">No.  Only applies in "puts" and "gets" where the
-    default values are <code>MINUTE</code> for PUT and <code>NONE</code> for GET.  
+    default values are <code>MINUTE</code> for PUT and <code>NONE</code> for GET.
     (It is not as necessary in GET because we have the <b>preservelastmodified</b> option.)</td>
   </tr>
   <tr>
     <td valign="top">timediffmillis</td>
-    <td valign="top"><b>Deprecated</b>. Number of milliseconds to add to the time on 
-    the remote machine to get the time on the local machine.  The <b>timestampGranularity</b> 
-    attribute (for which the default values should suffice in most situations), and the 
-    <b>serverTimeZoneConfig</b> option, should make this unnecessary. 
-    <b>serverTimeZoneConfig</b> does the math for you and also knows about 
+    <td valign="top"><b>Deprecated</b>. Number of milliseconds to add to the time on
+    the remote machine to get the time on the local machine.  The <b>timestampGranularity</b>
+    attribute (for which the default values should suffice in most situations), and the
+    <b>serverTimeZoneConfig</b> option, should make this unnecessary.
+    <b>serverTimeZoneConfig</b> does the math for you and also knows about
     Daylight Savings Time.<br>
-    Since ant 1.6
-    </td>
+    <em>Since Ant 1.6</em></td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -218,7 +214,7 @@ try to set up a new connection.</p>
     and get operations to be skipped with a warning and the
     remainder of the files still transferred. Default: false</td>
     <td valign="top" align="center">No</td>
-  </tr>  
+  </tr>
   <tr>
     <td valign="top">preservelastmodified</td>
     <td valign="top">Give the copied files the same last modified
@@ -252,7 +248,7 @@ try to set up a new connection.</p>
     connect to the same host as the control connection.  This is a
     security measure that is enabled by default, but it may be useful
     to disable it in certain firewall scenarios.
-      <em>since Ant 1.8.0</em></td>
+    <em>since Ant 1.8.0</em></td>
     <td valign="top" align="center">No, default is true</td>
   </tr>
 
@@ -262,12 +258,12 @@ try to set up a new connection.</p>
     "http://commons.apache.org/net/download_net.cgi">
     jakarta-commons-net-1.4.0 or greater</a>.</b></p>
     <p>
-    Use these options when the standard options don't work, because
+    Use these options when the standard options don't work, because</p>
     <ul><li>the server is in a different timezone and you need timestamp
     dependency checking</li>
     <li>the default timestamp formatting doesn't match the server display and
     list parsing therefore fails</li></ul>
-    </p><p>
+    <p>
     If none of these is specified, the default mechanism of letting the system
     auto-detect the server OS type based on the FTP SYST command and assuming
     standard formatting for that OS type will be used.
@@ -278,7 +274,7 @@ try to set up a new connection.</p>
     </p><p>
     Please understand that these options are incompatible with the autodetection
     scheme.  If any of these options is specified, (other than with a value of
-    <code>""</code> ) a system type must be chosen and if systemTypeKey is not
+    <code>""</code>) a system type must be chosen and if systemTypeKey is not
     specified, UNIX will be assumed. The philosophy behind this is that these
     options are for setting non-standard formats, and a build-script author who
     knows what system he is dealing with will know what options to need to be
@@ -293,8 +289,7 @@ try to set up a new connection.</p>
       "MVS".</code>  If not specified, (or specified as <code>""</code>) and if
       no other xxxConfig attributes are specified, the autodetection mechanism
       based on the FTP SYST command will be used.<br>
-      Since ant 1.7
-    </td>
+      <em>Since Ant 1.7</em></td>
     <td valign="top" align="center">No, but if any of the following xxxConfig
         attributes is specified, UNIX will be assumed, even if <code>""</code>
         is specified here.
@@ -305,19 +300,18 @@ try to set up a new connection.</p>
     <td valign="top">Specify as a Java
      <a href="http://docs.oracle.com/javase/7/docs/api//java/util/TimeZone.html">
      TimeZone</a> identifier, (e.g. <code>GMT</code>, <code>America/Chicago</code> or
-    <code>Asia/Jakarta</code>) the timezone used by the server for timestamps.  This 
-      enables timestamp dependency checking even when the server is in a different 
-      time zone from the client. Time Zones know, also, about daylight savings time, 
-      and do not require you to calculate milliseconds of difference.  If not specified, 
+    <code>Asia/Jakarta</code>) the timezone used by the server for timestamps.  This
+      enables timestamp dependency checking even when the server is in a different
+      time zone from the client. Time Zones know, also, about daylight savings time,
+      and do not require you to calculate milliseconds of difference.  If not specified,
       (or specified as <code>""</code>), the time zone of the client is assumed.<br>
-      Since ant 1.7
-    </td>
+      <em>Since Ant 1.7</em></td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
-    
+
     <td valign="top">defaultDateFormatConfig</td>
-    <td valign="top">Specify in Java 
+    <td valign="top">Specify in Java
     <a href="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html">
      SimpleDateFormat</a> notation, (e.g.
      <code>yyyy-MM-dd</code>), the date format generally used by the FTP server
@@ -326,23 +320,21 @@ try to set up a new connection.</p>
       older than a year old. (See <b>recentDateFormatConfig</b>).  If not specified,
       (or specified as <code>""</code>), the default date format for the system
       type indicated by the <b>systemTypeKey</b> attribute will be used.<br>
-      Since ant 1.7
-    </td>
+      <em>Since Ant 1.7</em></td>
     <td valign="top" align="center">
     No.
     </td>
   </tr>
   <tr>
     <td valign="top">recentDateFormatConfig</td>
-    <td valign="top">Specify in Java 
+    <td valign="top">Specify in Java
     <a href="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html">
      SimpleDateFormat</a> notation,
       (e.g. <code>MMM dd hh:mm</code>) the date format used by the FTP server
       to parse dates less than a year old.  If not specified (or specified as
       <code>""</code>), and if the system type indicated by the system key uses
       a recent date format, its standard format will be used.<br>
-      Since ant 1.7
-    </td>
+      <em>Since Ant 1.7</em></td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -374,9 +366,7 @@ try to set up a new connection.</p>
       </ul>
       If you require a language other than the above, see also the
       <b>shortMonthNamesConfig</b> attribute.<br>
-      Since ant 1.7
-    </td>
-
+      <em>Since Ant 1.7</em></td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -388,93 +378,70 @@ try to set up a new connection.</p>
       <code>"jan|feb|mar|apr|ma&#xED;|j&#xFA;n|j&#xFA;l|&#xE1;g&#xFA;|sep|okt|n&#xF3;v|des"</code>.
       This attribute exists primarily to support languages not supported by
       the <b>serverLanguageCode</b> attribute.<br>
-      Since ant 1.7
-    </td>
+      <em>Since Ant 1.7</em></td>
     <td valign="top" align="center">No</td>
   </tr>
 </table>
 <h3>Note about remotedir attribute</h3>
-<table  border="1" cellpadding="2" cellspacing="0"
- >
+<table>
   <tbody>
     <tr>
-      <td style="vertical-align: top;" width="20%">Action<br>
-      </td>
-      <td style="vertical-align: top;" width="40%">meaning of <code>remotedir</code><br>
-      </td>
-      <td style="vertical-align: top;">use of nested <code>fileset</code>
-(s)<br>
-      </td>
+      <td style="vertical-align: top;" width="20%">Action</td>
+      <td style="vertical-align: top;" width="40%">meaning of <code>remotedir</code></td>
+      <td style="vertical-align: top;">use of nested <code>fileset</code>(s)</td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">send/put<br>
-      </td>
+      <td style="vertical-align: top;" width="20%">send/put</td>
       <td style="vertical-align: top;" width="40%">base directory to
-which the files are sent<br>
-      </td>
+which the files are sent</td>
       <td style="vertical-align: top;">they are used normally and
-evaluated on the local machine<br>
-      </td>
+evaluated on the local machine</td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">recv/get<br>
-      </td>
+      <td style="vertical-align: top;" width="20%">recv/get</td>
       <td style="vertical-align: top;" width="40%">base directory from
-which the files are retrieved<br>
-      </td>
+which the files are retrieved</td>
       <td style="vertical-align: top;">the remote files located under
-the <code>remotedir </code>matching the include/exclude patterns of
-the <code>fileset&nbsp;</code></td>
+the <code>remotedir</code> matching the include/exclude patterns of
+the <code>fileset</code></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">del/delete<br>
-      </td>
+      <td style="vertical-align: top;" width="20%">del/delete</td>
       <td style="vertical-align: top;" width="40%">base directory from
-which files get deleted<br>
-      </td>
+which files get deleted</td>
       <td style="vertical-align: top;">the remote files located under
-the <code>remotedir </code>matching the include/exclude patterns of
-the <code>fileset <br>
-      </code></td>
+the <code>remotedir</code> matching the include/exclude patterns of
+the <code>fileset</code></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">list<br>
-      </td>
+      <td style="vertical-align: top;" width="20%">list</td>
       <td style="vertical-align: top;" width="40%">base directory from
 which files are listed<br>
       </td>
       <td style="vertical-align: top;">the remote files located under
-the <code>remotedir </code>matching the include/exclude patterns of
-the <code>fileset <br>
-      </code></td>
+the <code>remotedir</code> matching the include/exclude patterns of
+the <code>fileset</code></td>
     </tr>
     <tr>
       <td style="vertical-align: top;" width="20%">mkdir</td>
-      <td style="vertical-align: top;" width="40%">directory to create<br>
-      </td>
-      <td style="vertical-align: top;">not used<br>
-      </td>
+      <td style="vertical-align: top;" width="40%">directory to create</td>
+      <td style="vertical-align: top;">not used</td>
     </tr>
     <tr>
       <td style="vertical-align: top;" width="20%">chmod</td>
       <td style="vertical-align: top;" width="40%">base directory from
-which the mode of files get changed<br>
-      </td>
+which the mode of files get changed</td>
       <td style="vertical-align: top;">the remote files located under
-the <code>remotedir </code>matching the include/exclude patterns of
-the <code>fileset <br>
-      </code></td>
+the <code>remotedir</code> matching the include/exclude patterns of
+the <code>fileset</code></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">rmdir<br>
-      </td>
+      <td style="vertical-align: top;" width="20%">rmdir</td>
       <td style="vertical-align: top;" width="40%">base directory from
-which directories get removed<br>
-      </td>
+which directories get removed</td>
       <td style="vertical-align: top;">the remote directories located
-under the <code>remotedir </code>matching the include/exclude
-patterns of the <code>fileset <br>
-      </code></td>
+under the <code>remotedir</code> matching the include/exclude
+patterns of the <code>fileset</code></td>
     </tr>
   </tbody>
 </table><h3>Parameters specified as nested elements</h3>
@@ -485,8 +452,8 @@ the files to be retrieved, or deleted, or listed, or whose mode you want to chan
 <p>
 The attribute <code>followsymlinks</code> of <code>fileset</code> is supported on
 local (put) as well as remote (get, chmod, delete) filesets.
-<em>Before ant 1.6 there was no support of symbolic links in remote filesets.
-In order to exclude symbolic links (preserve the behavior of ant 1.5.x and older),
+<em>Before Ant 1.6 there was no support of symbolic links in remote filesets.
+In order to exclude symbolic links (preserve the behavior of Ant 1.5.x and older),
 you need to explicitly set <code>followsymlinks</code> to <code>false</code>.</em>
 On remote filesets hidden files are not checked for being symbolic links. Hidden
 files are currently assumed to not be symbolic links.
@@ -501,8 +468,8 @@ files are currently assumed to not be symbolic links.
     &lt;fileset dir="htdocs/manual"/&gt;
   &lt;/ftp&gt;
 </pre>
-<p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and 
-uploads all files in the <code>htdocs/manual</code> directory 
+<p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and
+uploads all files in the <code>htdocs/manual</code> directory
 to the default directory for that user.</p>
 <pre>  &lt;ftp server="ftp.apache.org"
        remotedir="incoming"
@@ -512,7 +479,7 @@ to the default directory for that user.</p>
     &lt;fileset dir="htdocs/manual"/&gt;
   &lt;/ftp&gt;</pre>
 <p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and
-uploads all new or changed files in the <code>htdocs/manual</code> directory 
+uploads all new or changed files in the <code>htdocs/manual</code> directory
 to the <code>incoming</code> directory relative to the default directory
 for <code>anonymous</code>.</p>
 <pre>  &lt;ftp server="ftp.apache.org"
@@ -560,13 +527,13 @@ in text mode.</p>
     &lt;fileset dir="htdocs/manual"&gt;
       &lt;include name="**/*.html"/&gt;
     &lt;/fileset&gt;
-  &lt;/ftp&gt;</pre><p>Logs in to the Windows-based <code>ftp.nt.org</code> as 
-<code>coder</code> with password <code>java1</code> and uploads all 
-HTML files in the <code>htdocs/manual</code> directory to the 
+  &lt;/ftp&gt;</pre><p>Logs in to the Windows-based <code>ftp.nt.org</code> as
+<code>coder</code> with password <code>java1</code> and uploads all
+HTML files in the <code>htdocs/manual</code> directory to the
 <code>c:\uploads</code> directory.  Progress messages are displayed as each
 file is uploaded.</p>
 <h3>Getting Files</h3>
-<p>Getting files from an FTP server works pretty much the same way as 
+<p>Getting files from an FTP server works pretty much the same way as
 sending them does.  The only difference is that the nested filesets
 use the remotedir attribute as the base directory for the files on the
 FTP server, and the dir attribute as the local directory to put the files
@@ -581,8 +548,8 @@ into.  The file structure from the FTP site is preserved on the local machine.</
     &lt;/fileset&gt;
   &lt;/ftp&gt;
 </pre>
-<p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and 
-recursively downloads all .html files from default directory for that user 
+<p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and
+recursively downloads all .html files from default directory for that user
 into the <code>htdocs/manual</code> directory on the local machine.</p>
 <pre>
   &lt;ftp action="get"
@@ -621,8 +588,8 @@ recursively downloads all .html files from default directory for that user
 into the <code>htdocs/manual</code> directory on the local machine.</p>
 
 <h3>Deleting Files</h3>
-As you've probably guessed by now, you use nested fileset elements to 
-select the files to delete from the remote FTP server.  Again, the 
+As you've probably guessed by now, you use nested fileset elements to
+select the files to delete from the remote FTP server.  Again, the
 filesets are relative to the remote directory, not a local directory.  In
 fact, the dir attribute of the fileset is ignored completely.
 
@@ -669,14 +636,14 @@ remotedir attribute.</p>
 directory.  As with all other actions, the directory separator character must be correct
 according to the desires of the FTP server.</p>
 <h3>Removing Directories</h3>
-This action uses nested fileset elements to 
-select the directories to remove from the remote FTP server.  The 
-filesets are relative to the remote directory, not a local directory. 
+This action uses nested fileset elements to
+select the directories to remove from the remote FTP server.  The
+filesets are relative to the remote directory, not a local directory.
 The dir attribute of the fileset is ignored completely.
 The directories to be removed must be empty, or contain only
 other directories that have been also selected to be removed by the filesets
 patterns, otherwise a BuildException will be thrown.
-Also, if you don't have permission to remove a directory, a BuildException is 
+Also, if you don't have permission to remove a directory, a BuildException is
 thrown.
 
 <pre>
@@ -700,25 +667,22 @@ it tries to remove a directory it is sure all the directories under it are
 already removed.
 Obviously all the files in the tree must have been already deleted.
 </p>
-<p>As an example suppose you want to delete everything contained into 
+<p>As an example suppose you want to delete everything contained into
 <code>/somedir</code>, so invoke first the <code>&lt;ftp&gt;</code> task with
 <code>action="delete"</code>, then with
 <code>action="rmdir"</code> specifying in both cases
-<code>remotedir="/somedir"</code> and
-
+<code>remotedir="/somedir"</code> and</p>
 <pre>
     &lt;fileset&gt;
         &lt;include name="**"/&gt;
     &lt;/fileset&gt;
 </pre>
-
+<p>
 The directory specified in the <code>remotedir</code> parameter is never
 selected for remove, so if you need to remove it, specify its parent in
-<code>remotedir</code> parameter and include it in the 
+<code>remotedir</code> parameter and include it in the
 <code>&lt;fileset&gt;</code> pattern, like <code>"somedir/**"</code>.
 </p>
 
-
 </body>
 </html>
-

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/genkey.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/genkey.html b/manual/Tasks/genkey.html
index 96959c2..5010a20 100644
--- a/manual/Tasks/genkey.html
+++ b/manual/Tasks/genkey.html
@@ -24,12 +24,12 @@
 
 <body>
 
-<h2><a name="genkey">GenKey</a></h2>
+<h2 id="genkey">GenKey</h2>
 <h3>Description</h3>
-<p>Generates a key in a keystore. </p>
+<p>Generates a key in a keystore.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -99,11 +99,11 @@ have a name and a value. When using the subelement it is automatically
 encoded properly and commas (&quot;<code>,</code>&quot;) are replaced
 with &quot;<code>\,</code>&quot;.</p>
 
-<p>The following two examples are identical: </p>
+<p>The following two examples are identical:</p>
 
 <h3>Examples</h3>
 <blockquote><pre>
-&lt;genkey alias=&quot;apache-group&quot; storepass=&quot;secret&quot; 
+&lt;genkey alias=&quot;apache-group&quot; storepass=&quot;secret&quot;
   dname=&quot;CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US&quot;/&gt;
 </pre></blockquote>
 
@@ -119,7 +119,5 @@ with &quot;<code>\,</code>&quot;.</p>
 &lt;/genkey&gt;</pre>
 </blockquote>
 
-
 </body>
 </html>
-

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/get.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/get.html b/manual/Tasks/get.html
index e63b59d..eeeecfe 100644
--- a/manual/Tasks/get.html
+++ b/manual/Tasks/get.html
@@ -24,22 +24,22 @@
 
 <body>
 
-<h2><a name="get">Get</a></h2>
+<h2 id="get">Get</h2>
 <h3>Description</h3>
 <p>Gets files from URLs.  When the verbose option is &quot;on&quot;, this task
 displays a '.' for every 100 Kb retrieved. Any URL schema supported by
-the runtime is valid here, including http:, ftp: and jar:; 
+the runtime is valid here, including http:, ftp: and jar:;
 </p>
 The <i>usetimestamp</i> option enables you to control downloads so that the remote file is
-only fetched if newer than the local copy. If there is no local copy, the download always takes 
-place. When a file is downloaded, the timestamp of the downloaded file is set to the remote timestamp. 
-NB: This timestamp facility only works on downloads using the HTTP protocol. 
+only fetched if newer than the local copy. If there is no local copy, the download always takes
+place. When a file is downloaded, the timestamp of the downloaded file is set to the remote timestamp.
+NB: This timestamp facility only works on downloads using the HTTP protocol.
 <p>
 A username and password can be specified, in which case basic 'slightly encoded
 plain text' authentication is used. This is only secure over an HTTPS link.
 </p>
 
-<p><b>Proxies</b>. Since Apache Ant 1.7.0, Ant running on Java1.5 or later can
+<p><b>Proxies</b>. Since Apache Ant 1.7.0, Ant running on Java 5 or later can
   <a href="../proxy.html">use the proxy settings of the operating
     system</a> if enabled with the
   <code>-autoproxy</code> option. There is also the
@@ -47,9 +47,9 @@ plain text' authentication is used. This is only secure over an HTTPS link.
   for earlier Java versions. With proxies turned
   on, <code>&lt;get&gt;</code> requests against localhost may not work
   as expected, if the request is relayed to the proxy.</p>
- 
+
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -91,12 +91,12 @@ plain text' authentication is used. This is only secure over an HTTPS link.
     <td valign="top">username</td>
     <td valign="top">username for 'BASIC' http authentication</td>
     <td align="center" valign="top">if password is set</td>
-  </tr>  
+  </tr>
   <tr>
     <td valign="top">password</td>
-    <td valign="top">password: required </td>
+    <td valign="top">password: required</td>
     <td align="center" valign="top">if username is set</td>
-  </tr>  
+  </tr>
   <tr>
     <td valign="top">maxtime</td>
     <td valign="top">Maximum time in seconds a single download may take,
@@ -104,7 +104,7 @@ plain text' authentication is used. This is only secure over an HTTPS link.
       error.  <em>Since Ant 1.8.0</em></td>
     <td align="center" valign="top">No: default 0 which means no
       maximum time</td>
-  </tr>  
+  </tr>
   <tr>
     <td valign="top">retries</td>
     <td valign="top">The number of attempts to make for opening the URI.<br/>
@@ -172,10 +172,9 @@ plain text' authentication is used. This is only secure over an HTTPS link.
 
 <h4>header</h4>
 <p>Any arbitrary number of HTTP headers can be added to a request.<br/>
-  The attributes of a nested <pre>&lt;header/&gt; </pre> node are as follow:
-<p></p>
+  The attributes of a nested <code>&lt;header/&gt;</code> node are as follows:</p>
 
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -197,18 +196,18 @@ plain text' authentication is used. This is only secure over an HTTPS link.
 <pre>  &lt;get src=&quot;http://ant.apache.org/&quot; dest=&quot;help/index.html&quot;/&gt;</pre>
 <p>Gets the index page of http://ant.apache.org/, and stores it in the file <code>help/index.html</code>.</p>
 
-<pre>  &lt;get src=&quot;http://www.apache.org/dist/ant/KEYS&quot; 
-    dest=&quot;KEYS&quot; 
+<pre>  &lt;get src=&quot;http://www.apache.org/dist/ant/KEYS&quot;
+    dest=&quot;KEYS&quot;
     verbose=&quot;true&quot;
     usetimestamp=&quot;true&quot;/&gt;</pre>
 <p>
 Gets the PGP keys of Ant's (current and past) release managers, if the local copy
-is missing or out of date. Uses the verbose option 
+is missing or out of date. Uses the verbose option
 for progress information.
 </p>
 
-<pre>  &lt;get src=&quot;https://insecure-bank.org/statement/user=1214&quot; 
-    dest=&quot;statement.html&quot; 
+<pre>  &lt;get src=&quot;https://insecure-bank.org/statement/user=1214&quot;
+    dest=&quot;statement.html&quot;
     username="1214";
     password="secret"/&gt;</pre>
 <p>
@@ -253,7 +252,7 @@ the <a href="input.html">input task</a> to query for a password.</p>
 
 <pre>
 &lt;get dest=&quot;downloads&quot;&gt;
-  &lt;url url=&quot;http://ant.apache.org/index.html&quot;/&gt; 
+  &lt;url url=&quot;http://ant.apache.org/index.html&quot;/&gt;
   &lt;url url=&quot;http://ant.apache.org/faq.html&quot;/&gt;
 &lt;/get&gt;
 </pre>
@@ -272,4 +271,3 @@ the <a href="input.html">input task</a> to query for a password.</p>
   necessary.</p>
 </body>
 </html>
-

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/gunzip.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/gunzip.html b/manual/Tasks/gunzip.html
index 32e2cf2..aaf364b 100644
--- a/manual/Tasks/gunzip.html
+++ b/manual/Tasks/gunzip.html
@@ -23,7 +23,6 @@
 </head>
 
 <body>
-This document's new home is <A HREF="unpack.html">here</A>
+This document's new home is <a href="unpack.html">here</a>
 </body>
 </html>
-

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/gzip.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/gzip.html b/manual/Tasks/gzip.html
index 6054d31..8e3d0dd 100644
--- a/manual/Tasks/gzip.html
+++ b/manual/Tasks/gzip.html
@@ -23,7 +23,6 @@
 </head>
 
 <body>
-This document's new home is <A HREF="pack.html">here</A>
+This document's new home is <a href="pack.html">here</a>
 </body>
 </html>
-

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/hostinfo.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/hostinfo.html b/manual/Tasks/hostinfo.html
index 851b403..8986ebd 100644
--- a/manual/Tasks/hostinfo.html
+++ b/manual/Tasks/hostinfo.html
@@ -24,7 +24,7 @@
 
 <body>
 
-<h2><a name="hostinfo">HostInfo</a></h2>
+<h2 id="hostinfo">HostInfo</h2>
 
 <h3>Description</h3>
 <p>Sets the <code>NAME</code>, <code>DOMAIN</code>, <code>ADDR4</code>, and <code>ADDR6</code>
@@ -38,10 +38,10 @@ The <code>DOMAIN</code> contains the domain part of the canonical name of the ho
  If the host is not found, the domain will contain the domain as provided to the task,
  or <code>localdomain</code> if no host / domain was provided.<br/>
 The <code>ADDR4</code> contains the IPv4 address of the host with the widest meaning.<br/>
-If no IPv4 address is found and a host has been provided the address <code>0.0.0.0</code> 
+If no IPv4 address is found and a host has been provided the address <code>0.0.0.0</code>
 is returned, when no host was provided the address <code>127.0.0.1</code> is returned.<br/>
-The <code>ADDR6</code> contains the IPv6 address of the host with the widest meaning.<br/> 
-If no IPv6 address is found and a host has been provided the address <code>::</code> 
+The <code>ADDR6</code> contains the IPv6 address of the host with the widest meaning.<br/>
+If no IPv6 address is found and a host has been provided the address <code>::</code>
 is returned, when no host was provided the address <code>::1</code> is returned.<br/>
 </p>
 
@@ -51,7 +51,7 @@ to indicate, for example, the host where the build was performed on.
 The best place for this task is probably in an initialization target.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
@@ -79,18 +79,18 @@ The best place for this task is probably in an initialization target.</p>
 </pre>
 
 <p>
-Sets the <code>NAME</code>, <code>DOMAIN</code>, <code>ADDR4</code>, and 
+Sets the <code>NAME</code>, <code>DOMAIN</code>, <code>ADDR4</code>, and
 <code>ADDR6</code> for the local host, using the most &quot;global&quot; address
 available.</p>
 <pre>
   &lt;hostinfo prefix=&quot;remotehost&quot; host=&quot;www.apache.org&quot;/&gt;
 </pre>
 <p>
-Sets the properties <code>remotehost.NAME</code> to <code>eos</code>, 
-<code>remotehost.DOMAIN</code> to <code>apache.org</code>, 
-<code>remotehost.ADDR4</code> to <code>140.211.11.130</code> and 
+Sets the properties <code>remotehost.NAME</code> to <code>eos</code>,
+<code>remotehost.DOMAIN</code> to <code>apache.org</code>,
+<code>remotehost.ADDR4</code> to <code>140.211.11.130</code> and
 <code>remotehost.ADDR6</code> to <code>::</code>
-for the host with the name www.apache.org (provided the canonical name and ip 
+for the host with the name www.apache.org (provided the canonical name and ip
 addresses do not change).
 </p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/image.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/image.html b/manual/Tasks/image.html
index 077b372..20459d0 100644
--- a/manual/Tasks/image.html
+++ b/manual/Tasks/image.html
@@ -24,7 +24,7 @@
 
 <body>
 
-<h2><a name="image">Image</a></h2>
+<h2 id="image">Image</h2>
 <h3>Description</h3>
 <p>Applies a chain of image operations on a set of files.</p>
 <p>Requires <a href="../install.html#librarydependencies">Java Advanced Image API</a> from Sun.</p>
@@ -33,47 +33,47 @@
 <img src="image-classdiagram.gif" border="0" alt="Class-Diagram">
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
     <td align="center" valign="top"><b>Required</b></td>
   </tr>
   <tr>
-    <td valign="top"> failonerror </td>
-    <td valign="top"> Boolean value. If false, note errors to the output but keep going. </td>
-    <td align="center"> no (defaults to <i>true</i>) </td>
+    <td valign="top">failonerror</td>
+    <td valign="top">Boolean value. If false, note errors to the output but keep going.</td>
+    <td align="center">no (defaults to <i>true</i>)</td>
   </tr>
   <tr>
-    <td valign="top"> srcdir </td>
-    <td valign="top"> Directory containing the images. </td>
-    <td align="center"> yes, unless nested fileset is used </td>
+    <td valign="top">srcdir</td>
+    <td valign="top">Directory containing the images.</td>
+    <td align="center">yes, unless nested fileset is used</td>
   </tr>
   <tr>
-    <td valign="top"> encoding </td>
-    <td valign="top"> Image encoding type. <br>
+    <td valign="top">encoding</td>
+    <td valign="top">Image encoding type.<br>
       Valid (caseinsensitive) are: jpg, jpeg, tif, tiff
     </td>
-    <td align="center"> no (defaults to <i>JPEG</i>) </td>
+    <td align="center">no (defaults to <i>JPEG</i>)</td>
   </tr>
   <tr>
-    <td valign="top"> overwrite </td>
-    <td valign="top"> Boolean value. Sets whether or not to overwrite
+    <td valign="top">overwrite</td>
+    <td valign="top">Boolean value. Sets whether or not to overwrite
       a file if there is naming conflict.
     </td>
-    <td align="center"> no (defaults to <i>false</i>) </td>
+    <td align="center">no (defaults to <i>false</i>)</td>
   </tr>
   <tr>
-    <td valign="top"> gc </td>
-    <td valign="top"> Boolean value. Enables garbage collection after
+    <td valign="top">gc</td>
+    <td valign="top">Boolean value. Enables garbage collection after
       each image processed.
     </td>
-    <td align="center"> no (defaults to <i>false</i>) </td>
+    <td align="center">no (defaults to <i>false</i>)</td>
   </tr>
   <tr>
-    <td valign="top"> destdir </td>
-    <td valign="top"> Directory where the result images are stored. </td>
-    <td align="center"> no (defaults to value of <i>srcdir</i>) </td>
+    <td valign="top">destdir</td>
+    <td valign="top">Directory where the result images are stored.</td>
+    <td align="center">no (defaults to value of <i>srcdir</i>)</td>
   </tr>
   <!-- attributes inherited from MatchingTask -->
   <tr>
@@ -89,7 +89,7 @@
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
-    <td valign="top"> excludes</td>
+    <td valign="top">excludes</td>
     <td valign="top">comma- or space-separated list of patterns of files that must be
       excluded. No files (except default excludes) are excluded when omitted.</td>
     <td valign="top" align="center">No</td>
@@ -107,14 +107,14 @@
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
-    <td valign="top"> caseSensitive </td>
-    <td valign="top"> Boolean value. Sets case sensitivity of the file system. </td>
-    <td align="center"> no (defaults to <i>false</i>) </td>
+    <td valign="top">caseSensitive</td>
+    <td valign="top">Boolean value. Sets case sensitivity of the file system.</td>
+    <td align="center">no (defaults to <i>false</i>)</td>
   </tr>
   <tr>
-    <td valign="top"> followSymlinks </td>
-    <td valign="top"> Boolean value. Sets whether or not symbolic links should be followed. </td>
-    <td align="center"> no (defaults to <i>true</i>) </td>
+    <td valign="top">followSymlinks</td>
+    <td valign="top">Boolean value. Sets whether or not symbolic links should be followed.</td>
+    <td align="center">no (defaults to <i>true</i>)</td>
   </tr>
 </table>
 
@@ -133,48 +133,52 @@ ImageOperation can handle nested Rotate, Draw, Rectangle, Text and Scale objects
 <h4>Rotate</h4>
 <p>Adds a Rotate ImageOperation to chain.</p>
 <h5>Parameters</h5>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
     <td align="center" valign="top"><b>Required</b></td>
   </tr>
   <tr>
-    <td valign="top"> angle </td>
-    <td valign="top"> Float value. Sets the angle of rotation in degrees. </td>
-    <td align="center"> no (defaults to <i>0.0F</i>) </td>
+    <td valign="top">angle</td>
+    <td valign="top">Float value. Sets the angle of rotation in degrees.</td>
+    <td align="center">no (defaults to <i>0.0F</i>)</td>
   </tr>
 </table>
 
 <h4>Scale</h4>
 <p>Adds a Scale ImageOperation to chain.</p>
 <h5>Parameters</h5>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
     <td align="center" valign="top"><b>Required</b></td>
   </tr>
-    <td valign="top"> proportions </td>
-    <td valign="top"> Sets which dimension to control proportions from. Valid values are:<ul>
+  <tr>
+    <td valign="top">proportions</td>
+    <td valign="top">Sets which dimension to control proportions from. Valid values are:
+      <ul>
         <li>&quot;ignore&quot; -  treat the dimensions independently.</li>
         <li>&quot;height&quot; - keep proportions based on the width.</li>
         <li>&quot;width&quot; - keep proportions based on the height.</li>
         <li>&quot;cover&quot; - keep proportions and fit in the supplied dimensions.</li>
         <li>&quot;fit&quot; - keep proportions and cover the supplied dimensions.</li>
-    </ul></td>
-    <td align="center"> no (defaults to <i>ignore</i>) </td>
+      </ul>
+    </td>
+    <td align="center">no (defaults to <i>ignore</i>)</td>
+  </tr>
   <tr>
-    <td valign="top"> width </td>
-    <td valign="top"> Sets the width of the image, either as an integer or a %. </td>
+    <td valign="top">width</td>
+    <td valign="top">Sets the width of the image, either as an integer or a %.</td>
         <!-- todo: if integer, what kind? cm, px, inches, ... -->
-    <td align="center"> no (defaults to <i>100%</i>) </td>
+    <td align="center">no (defaults to <i>100%</i>)</td>
   </tr>
   <tr>
-    <td valign="top"> height </td>
-    <td valign="top"> Sets the height of the image, either as an integer or a %. </td>
+    <td valign="top">height</td>
+    <td valign="top">Sets the height of the image, either as an integer or a %.</td>
         <!-- todo: if integer, what kind? cm, px, inches, ... -->
-    <td align="center"> no (defaults to <i>100%</i>) </td>
+    <td align="center">no (defaults to <i>100%</i>)</td>
   </tr>
 </table>
 
@@ -182,21 +186,21 @@ ImageOperation can handle nested Rotate, Draw, Rectangle, Text and Scale objects
 <p>Adds a Draw ImageOperation to chain. DrawOperation DataType objects can be
 nested inside the Draw object.</p>
 <h5>Parameters</h5>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
     <td align="center" valign="top"><b>Required</b></td>
   </tr>
   <tr>
-    <td valign="top"> xloc </td>
-    <td valign="top"> X-Position where to draw nested image elements. </td>
-    <td align="center"> no (defaults to <i>0</i>) </td>
+    <td valign="top">xloc</td>
+    <td valign="top">X-Position where to draw nested image elements.</td>
+    <td align="center">no (defaults to <i>0</i>)</td>
   </tr>
   <tr>
-    <td valign="top"> yloc </td>
-    <td valign="top"> Y-Position where to draw nested image elements. </td>
-    <td align="center"> no (defaults to <i>0</i>) </td>
+    <td valign="top">yloc</td>
+    <td valign="top">Y-Position where to draw nested image elements.</td>
+    <td align="center">no (defaults to <i>0</i>)</td>
   </tr>
 </table>
 
@@ -250,12 +254,5 @@ and stores the <i>src</i>.</p>
 <p>Same as above but stores the resulting file names will be prefixed
   by "scaled-".</p>
 
-<blockquote><pre>
-</pre></blockquote>
-
-
-
 </body>
 </html>
-
-

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/import.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/import.html b/manual/Tasks/import.html
index 4cf8de0..aaa75d0 100644
--- a/manual/Tasks/import.html
+++ b/manual/Tasks/import.html
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
@@ -22,7 +21,7 @@
   <title>Import Task</title>
 </head>
 <body>
-  <h2><a name="import">Import</a></h2>
+  <h2 id="import">Import</h2>
   <h3>Description</h3>
   <p>
     Imports another build file into the current project.
@@ -44,7 +43,7 @@
 
   <p>
     In the common use case where only Ant's default project helper is
-    used, it basically works like the 
+    used, it basically works like the
     <a href="http://ant.apache.org/faq.html#xml-entity-include">Entity
       Includes as explained in the Ant FAQ</a>, as if the imported file was
     contained in the importing file, minus the top <code>&lt;project&gt;</code>
@@ -57,12 +56,11 @@
   </p>
   <p>
 There are two further functional aspects that pertain to this task and
-that are not possible with entity includes:
+that are not possible with entity includes:</p>
 <ul>
   <li>target overriding</li>
   <li>special properties</li>
 </ul>
-  </p>
 <h4>Target overriding</h4>
 
 <p>If a target in the main file is also present in at least one of the
@@ -165,7 +163,7 @@ project).</p>
 </pre>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tbody>
     <tr>
       <td valign="top"><b>Attribute</b></td>
@@ -179,7 +177,7 @@ project).</p>
       <td valign="top">
         The file to import. If this is a relative file name, the file name will be resolved
         relative to the <i>importing</i> file. <b>Note</b>, this is unlike most other
-        ant file attributes, where relative files are resolved relative to ${basedir}.
+        Ant file attributes, where relative files are resolved relative to ${basedir}.
       </td>
       <td valign="top" align="center">Yes or a nested resource collection</td>
     </tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/a04350e0/manual/Tasks/include.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/include.html b/manual/Tasks/include.html
index e210923..23ab6ba 100644
--- a/manual/Tasks/include.html
+++ b/manual/Tasks/include.html
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
@@ -22,7 +21,7 @@
   <title>Include Task</title>
 </head>
 <body>
-  <h2><a name="include">Include</a></h2>
+  <h2 id="include">Include</h2>
   <h3>Description</h3>
   <p>
     Include another build file into the current project.
@@ -53,12 +52,11 @@
   </p>
   <p>
 There are two further functional aspects that pertain to this task and
-that are not possible with entity includes:
+that are not possible with entity includes:</p>
 <ul>
   <li>target rewriting</li>
   <li>special properties</li>
 </ul>
-  </p>
 <h4>Target rewriting</h4>
 
 <p>Any target in the included file will be renamed
@@ -160,7 +158,7 @@ project).</p>
 </pre>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tbody>
     <tr>
       <td valign="top"><b>Attribute</b></td>


Mime
View raw message