ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gin...@apache.org
Subject [26/47] ant git commit: Use HTML 5(-ish), fix links
Date Wed, 28 Feb 2018 07:01:41 GMT
http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/schemavalidate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/schemavalidate.html b/manual/Tasks/schemavalidate.html
index 6a6f1e9..4188519 100644
--- a/manual/Tasks/schemavalidate.html
+++ b/manual/Tasks/schemavalidate.html
@@ -26,252 +26,220 @@
 <h2 id="schemavalidate">SchemaValidate</h2>
 <h3>Description</h3>
 
-<p>This <tt>schemavalidate</tt> task validates XML files described by an XML Schema.
-The task extends the XmlValidate task with XSD-specific features.</p>
+<p>This <code>schemavalidate</code> task validates XML files described by an XML Schema.  The task
+extends the <code>XmlValidate</code> task with XSD-specific features.</p>
 <ol>
-<li>The parser is created validating and namespace aware
-</li>
-<li>Validation is turned on.</li>
-<li>Schema validation is turned on.</li>
-<li>Any no-namespace schema URL or file supplied is used as the no-namespace schema
-<li>All nested schema declarations are turned into the list of namespace-url
-bindings for schema lookup.
+  <li>The parser is created validating and namespace aware.</li>
+  <li>Validation is turned on.</li>
+  <li>Schema validation is turned on.</li>
+  <li>Any no-namespace schema URL or file supplied is used as the no-namespace schema.</li>
+  <li>All nested schema declarations are turned into the list of namespace-url bindings for schema
+    lookup.</li>
 </ol>
 
-Note that nested catalogs are still used for lookup of the URLs given as the
-sources of schema documents, so you can still delegate lookup to a catalog, you
-just need to list all schema URIs and their URL equivalents.
+<p>Note that nested catalogs are still used for lookup of the URLs given as the sources of schema
+documents, so you can still delegate lookup to a catalog, you just need to list all schema URIs and
+their URL equivalents.</p>
 
 <p>This task supports the use of nested</p>
 <ul>
-  <li><a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a> elements</li>
-  <li> <tt>&lt;schema&gt;</tt> elements, that bind a namespace URI to a URL or a
-  local filename.
-  <li><tt>&lt;dtd&gt;</tt> elements which are used to resolve DTDs and entities.</li>
-  <li><tt>&lt;attribute&gt;</tt> elements which are used to set features on the parser.
-      These can be any number of
-      <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"><tt>http://xml.org/sax/features/</tt></a>
-      or other features that your parser may support.</li>
-<li><tt>&lt;property&gt;</tt> elements, containing string properties</li>
+  <li><a href="../Types/xmlcatalog.html"><code>&lt;xmlcatalog&gt;</code></a> elements</li>
+  <li><code>&lt;schema&gt;</code> elements, that bind a namespace URI to a URL or a local
+    filename.</li>
+  <li><code>&lt;dtd&gt;</code> elements which are used to resolve DTDs and entities.</li>
+  <li><code>&lt;attribute&gt;</code> elements which are used to set features on the parser.  These
+    can be any number
+    of <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"><code>http://xml.org/sax/features/</code></a>
+    or other features that your parser may support.</li>
+  <li><code>&lt;property&gt;</code> elements, containing string properties</li>
 </ul>
 
-<p>
-The task only supports SAX2 or later parsers: it is an error to specify a SAX1
-parser.
-</p>
+<p>The task only supports SAX2 or later parsers: it is an error to specify a esSAX1 parser.</p>
 
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">the parser to use.</td>
-    <td align="center" valign="top">No</td>
+    <td>classname</td>
+    <td>the parser to use.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">where to find the parser class.
-    Optionally can use an embedded <tt>&lt;classpath&gt;</tt> element.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>where to find the parser class.  Optionally can use an
+    embedded <code>&lt;classpath&gt;</code> element.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">disableDTD</td>
-    <td valign="top">
-      Flag to disable DTD support. DTD support is needed to
-      validate XSD files themselves, amongst others.
-    </td>
-    <td valign="top" align="center">No - default false</td>
+    <td>disableDTD</td>
+    <td>Flag to disable DTD support. DTD support is needed to validate XSD files themselves, amongst
+      others.</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">fails on a error if set to true (defaults to true).</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>fails on a error if set to <q>true</q> (defaults to <q>true</q>).</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the file(s) you want to check. (optionally can use an embedded fileset)</td>
-    <td valign="top" align="center">No</td>
+    <td>file</td>
+    <td>the file(s) you want to check (optionally use an embedded fileset).</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">fullchecking</td>
-    <td valign="top">
-      enable full schema checking. Slow but strict.
-    </td>
-    <td valign="top" align="center">No - default true</td>
+    <td>fullchecking</td>
+    <td>enable full schema checking. Slow but strict.</td>
+    <td>No; default <q>true</q></td>
   </tr>
-
   <tr>
-    <td valign="top">lenient</td>
-    <td valign="top">
-      if true, only check the XML document is well formed
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>lenient</td>
+    <td>if <q>true</q>, only check the XML document is well formed</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">noNamespaceFile</td>
-    <td valign="top">
-      filename of a no-namespace XSD file to provide the
-      schema for no-namespace XML content.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>noNamespaceFile</td>
+    <td>filename of a no-namespace XSD file to provide the schema for no-namespace XML content</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">noNamespaceURL</td>
-    <td valign="top">
-      URL of a no-namespace XSD file to provide the
-      schema for no-namespace XML content.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>noNamespaceURL</td>
+    <td>URL of a no-namespace XSD file to provide the schema for no-namespace XML content</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">warn</td>
-    <td valign="top">log parser warn events.</td>
-    <td align="center" valign="top">No</td>
+    <td>warn</td>
+    <td>log parser warn events</td>
+    <td>No</td>
   </tr>
 </table>
 
 <h3 id="nested">Nested Elements</h3>
 
 <h4>schema</h4>
-<p>
-Identify the name and location of a schema that may be used in validating
-the document(s).
-</p>
-<table>
+<p>Identify the name and location of a schema that may be used in validating the document(s).</p>
+<table class="attr">
 <tr>
-  <td valign="top"><b>Attribute</b></td>
-  <td valign="top"><b>Description</b></td>
-  <td valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">namespace</td>
-    <td valign="top">URI of the schema namespace</td>
-    <td align="center" valign="top">Yes</td>
+    <td>namespace</td>
+    <td>URI of the schema namespace</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">url</td>
-    <td valign="top">URL of the schema</td>
-    <td align="center" valign="top" rowspan="2">Exactly one of the two</td>
+    <td>url</td>
+    <td>URL of the schema</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">file of the schema</td>
+    <td>file</td>
+    <td class="left">file of the schema</td>
   </tr>
 </table>
 
 <h4>dtd</h4>
-<p>
-<tt>&lt;dtd&gt;</tt> is used to specify different locations for DTD resolution.
-</p>
-<table>
+<p><code>&lt;dtd&gt;</code> is used to specify different locations for DTD resolution.</p>
+<table class="attr">
 <tr>
-  <td valign="top"><b>Attribute</b></td>
-  <td valign="top"><b>Description</b></td>
-  <td valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">publicId</td>
-    <td valign="top">Public ID of the DTD to resolve</td>
-    <td align="center" valign="top">Yes</td>
+    <td>publicId</td>
+    <td>Public ID of the DTD to resolve</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">location</td>
-    <td valign="top">Location of the DTD to use, which can be a file,
+    <td>location</td>
+    <td>Location of the DTD to use, which can be a file,
     a resource, or a URL</td>
-    <td align="center" valign="top">Yes</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h4>xmlcatalog</h4>
-<p>The <a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
-element is used to perform entity resolution.</p>
+<p>The <a href="../Types/xmlcatalog.html"><code>&lt;xmlcatalog&gt;</code></a> element is used to
+perform entity resolution.</p>
 <h4>attribute</h4>
-<p>The <tt>&lt;attribute&gt;</tt> element is used to set parser features.<br>
-Features usable with the xerces parser are defined here :
- <a href="http://xml.apache.org/xerces-j/features.html">Setting features</a><br>
-
-SAX features are defined here:
- <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"><tt>http://xml.org/sax/features/</tt></a><br>
- </p>
-<table>
-<tr>
-  <td valign="top"><b>Attribute</b></td>
-  <td valign="top"><b>Description</b></td>
-  <td valign="top"><b>Required</b></td>
+<p>The <code>&lt;attribute&gt;</code> element is used to set parser features.<br>Features usable
+with the xerces parser are defined
+here: <a href="https://xml.apache.org/xerces-j/features.html">Setting features</a><br>SAX features
+are defined
+here: <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"><code>http://xml.org/sax/features/</code></a></p>
+<table class="attr">
+  <tr>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the feature</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The name of the feature</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The boolean value of the feature</td>
-    <td align="center" valign="top">Yes</td>
+    <td>value</td>
+    <td>The boolean value of the feature</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>property</h4>
-<p>The <tt>&lt;property&gt;</tt> element is used to set properties.
-These properties are defined here for the xerces XML parser implementation :
- <a href="http://xml.apache.org/xerces-j/properties.html">XML Parser properties</a>
+<p>The <code>&lt;property&gt;</code> element is used to set properties.  These properties are
+defined here for the Xerces XML parser
+implementation: <a href="https://xml.apache.org/xerces-j/properties.html">XML Parser properties</a>
 Properties can be used to set the schema used to validate the XML file.
 </p>
-<table>
+<table class="attr">
 <tr>
-  <td valign="top"><b>Attribute</b></td>
-  <td valign="top"><b>Description</b></td>
-  <td valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the feature</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The name of the feature</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The string value of the property</td>
-    <td align="center" valign="top">Yes</td>
+    <td>value</td>
+    <td>The string value of the property</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
 <pre>
-    &lt;schemavalidate
-      noNamespaceFile="document.xsd"
-      file="xml/endpiece.xml"&gt;
-    &lt;/schemavalidate&gt;
-</pre>
-Validate a document against an XML schema. The document does not declare
-any schema itself, which is why the <tt>noNamespaceFile</tt> is needed.
-<pre>
-    &lt;presetdef name="validate-soap"&gt;
-      &lt;schemavalidate&gt;
-        &lt;schema namespace="http://schemas.xmlsoap.org/ws/2003/03/addressing"
-          file="${soap.dir}/ws-addressing.xsd" /&gt;
-        &lt;schema namespace="http://www.w3.org/2003/05/soap-envelope"
-          file="${soap.dir}/soap12.xsd" /&gt;
-        &lt;schema namespace="http://schemas.xmlsoap.org/wsdl/"
-          file="${soap.dir}/wsdl.xsd" /&gt;
-        &lt;schema namespace="http://www.w3.org/2001/XMLSchema"
-          file="${soap.dir}/XMLSchema.xsd" /&gt;
-        &lt;/schemavalidate&gt;
-    &lt;/presetdef&gt;
-</pre>
-Declare a new preset task, <tt>&lt;validate-soap&gt;</tt>, that validates
-XSD and WSDL documents against the relevant specifications.
-To validate XSD documents, you also need XMLSchema.dtd and datatypes.dtd in
-the same directory as XMLSchema.xsd, or pointed to via the catalog. All
-these files can be fetched from <a href="http://www.w3.org/2001/XMLSchema">
-the W3C</a>.
+&lt;schemavalidate noNamespaceFile="document.xsd"
+                file="xml/endpiece.xml"/&gt;</pre>
+<p>Validate a document against an XML schema. The document does not declare any schema itself, which
+is why the <var>noNamespaceFile</var> is needed.</p>
 <pre>
-    &lt;validate-soap file="xml/test.xsd"/&gt;
-</pre>
-Use the preset task defined above to validate an XML Schema document.
-<br>
+&lt;presetdef name="validate-soap"&gt;
+  &lt;schemavalidate&gt;
+    &lt;schema namespace="http://schemas.xmlsoap.org/ws/2003/03/addressing"
+            file="${soap.dir}/ws-addressing.xsd"/&gt;
+    &lt;schema namespace="http://www.w3.org/2003/05/soap-envelope"
+            file="${soap.dir}/soap12.xsd"/&gt;
+    &lt;schema namespace="http://schemas.xmlsoap.org/wsdl/"
+            file="${soap.dir}/wsdl.xsd"/&gt;
+    &lt;schema namespace="http://www.w3.org/2001/XMLSchema"
+            file="${soap.dir}/XMLSchema.xsd"/&gt;
+    &lt;/schemavalidate&gt;
+&lt;/presetdef&gt;</pre>
+<p>Declare a new preset task, <code>&lt;validate-soap&gt;</code>, that validates XSD and WSDL
+documents against the relevant specifications.  To validate XSD documents, you also
+need <samp>XMLSchema.dtd</samp> and <samp>datatypes.dtd</samp> in the same directory
+as <samp>XMLSchema.xsd</samp>, or pointed to via the catalog. All these files can be fetched
+from <a href="https://www.w3.org/2001/XMLSchema">W3C</a>.</p>
+<pre>&lt;validate-soap file="xml/test.xsd"/&gt;</pre>
+<p>Use the preset task defined above to validate an XML Schema document.</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/scp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scp.html b/manual/Tasks/scp.html
index bcd9964..ced38dd 100644
--- a/manual/Tasks/scp.html
+++ b/manual/Tasks/scp.html
@@ -30,292 +30,246 @@
 <p><em>since Apache Ant 1.6</em></p>
 
 <p>Copies a file or FileSet to or from a (remote) machine running an SSH daemon.
-FileSet <i>only</i> works for copying files from the local machine to a
-remote machine.</p>
+FileSet <em>only</em> works for copying files from the local machine to a remote machine.</p>
 
-<p><strong>Note</strong>: This task depends on external libraries not included
-in the Ant distribution.  See <a
-href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.  This task has been tested with jsch-0.1.2 and later.</p>
+<p><strong>Note</strong>: This task depends on external libraries not included in the Ant
+distribution.  See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.  This task has been tested with <code>jsch-0.1.2</code> and later.</p>
 
 <p>See also the <a href="sshexec.html">sshexec task</a></p>
 
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to copy.  This can be a local path or a
-    remote path of the form <i>user[:password]@host:/directory/path</i>.
-    <i>:password</i> can be omitted if you use key based
-    authentication or specify the password attribute.  The way remote
-    path is recognized is whether it contains @ character or not. This
-    will not work if your localPath contains @ character.</td>
-    <td valign="top" align="center">Yes, unless a nested
-    <code>&lt;fileset&gt;</code> element is used.</td>
+    <td>file</td>
+    <td>The file to copy.  This can be a local path or a remote path of the
+      form <samp>user[:password]@host:/directory/path</samp>.  <samp>:password</samp> can be omitted
+      if you use key based authentication or specify the <var>password</var> attribute.  The way
+      remote path is recognized is whether it contains <q>@</q> character or not. This will not work
+      if your <var>localPath</var> contains <q>@</q> character.</td>
+    <td>Yes, unless a nested <code>&lt;fileset&gt;</code> element is used</td>
   </tr>
   <tr>
-    <td valign="top">localFile</td>
-    <td valign="top">This is an alternative to the file attribute. But
-    this must always point to a local file. The reason this was added
-    was that when you give file attribute it is treated as remote if
-    it contains @ character. This character can exist also in local
-    paths.  <em>since Ant 1.6.2</em></td>
-    <td valign="top" align="center">Alternative to file attribute.</td>
+    <td>localFile</td>
+    <td>This is an alternative to the <var>file</var> attribute. But this must always point to a
+      local file. The reason this was added was that when you give file attribute it is treated as
+      remote if it contains <q>@</q> character. This character can exist also in local
+      paths.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>file</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">remoteFile</td>
-    <td valign="top">This is an alternative to the file attribute. But
-    this must always point to a remote file.  <em>since Ant 1.6.2</em></td>
-    <td valign="top" align="center">Alternative to file attribute.</td>
+    <td>remoteFile</td>
+    <td>This is an alternative to the <var>file</var> attribute. But this must always point to a
+      remote file.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>file</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">todir</td>
-    <td valign="top">The directory to copy to.  This can be a local path
-    or a remote path of the form <i>user[:password]@host:/directory/path</i>.
-    <i>:password</i> can be omitted if you use key based
-    authentication or specify the password attribute.  The way remote
-    path is recognized is whether it contains @ character or not. This
-    will not work if your localPath contains @ character.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>todir</td>
+    <td>The directory to copy to.  This can be a local path or a remote path of the
+      form <samp>user[:password]@host:/directory/path</samp>.  <samp>:password</samp> can be omitted
+      if you use key based authentication or specify the <var>password</var> attribute.  The way
+      remote path is recognized is whether it contains <q>@</q> character or not. This will not work
+      if your <var>localPath</var> contains <q>@</q> character.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">localTodir</td>
-    <td valign="top">This is an alternative to the todir
-    attribute. But this must always point to a local directory. The
-    reason this was added was that when you give todir attribute it is
-    treated as remote if it contains @ character. This character can
-    exist also in local paths.  <em>since Ant 1.6.2</em></td>
-    <td valign="top" align="center">Alternative to todir attribute.</td>
+    <td>localTodir</td>
+    <td>This is an alternative to the <var>todir</var> attribute. But this must always point to a
+    local directory. The reason this was added was that when you give <var>todir</var> attribute it
+    is treated as remote if it contains <q>@</q> character. This character can exist also in local
+    paths.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">localTofile</td>
-    <td valign="top">Changes the file name to the given name while
-    receiving it, only useful if receiving a single file.  <em>since
-    Ant 1.6.2</em></td>
-    <td valign="top" align="center">Alternative to todir attribute.</td>
+    <td>localTofile</td>
+    <td>Changes the file name to the given name while receiving it, only useful if receiving a
+      single file.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">remoteTodir</td>
-    <td valign="top">This is an alternative to the todir
-    attribute. But this must always point to a remote directory.
-    <em>since Ant 1.6.2</em></td>
-    <td valign="top" align="center">Alternative to todir attribute.</td>
+    <td>remoteTodir</td>
+    <td>This is an alternative to the <var>todir</var> attribute. But this must always point to a
+      remote directory.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">remoteTofile</td>
-    <td valign="top">Changes the file name to the given name while
-    sending it, only useful if sending a single file.  <em>since
-    Ant 1.6.2</em></td>
-    <td valign="top" align="center">Alternative to todir attribute.</td>
+    <td>remoteTofile</td>
+    <td>Changes the file name to the given name while sending it, only useful if sending a single
+      file.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">The port to connect to on the remote host.</td>
-    <td valign="top" align="center">No, defaults to 22.</td>
+    <td>port</td>
+    <td>The port to connect to on the remote host.</td>
+    <td>No; defaults to <q>22</q></td>
   </tr>
   <tr>
-    <td valign="top">trust</td>
-    <td valign="top">This trusts all unknown hosts if set to yes/true.<br>
-      <strong>Note</strong>: If you set this to false (the default), the
-      host you connect to must be listed in your knownhosts file, this
-      also implies that the file exists.</td>
-    <td valign="top" align="center">No, defaults to No.</td>
+    <td>trust</td>
+    <td>This trusts all unknown hosts if set to <q>yes</q>
+      or <q>true</q>.<br/><strong>Note</strong>: If you set this to <q>false</q> (the default), the
+      host you connect to must be listed in your <var>knownhosts</var> file, this also implies that
+      the file exists.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">knownhosts</td>
-    <td valign="top">This sets the known hosts file to use to validate
-    the identity of the remote host.  This must be a SSH2 format file.
-    SSH1 format is not supported.</td>
-    <td valign="top" align="center">No, defaults to
-    ${user.home}/.ssh/known_hosts.</td>
+    <td>knownhosts</td>
+    <td>This sets the known hosts file to use to validate the identity of the remote host.  This
+      must be a SSH2 format file.  SSH1 format is not supported.</td>
+    <td>No; defaults to <samp>${user.home}/.ssh/known_hosts</samp></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-     <td valign="top">Whether to halt the build if the transfer fails.
-     </td>
-     <td valign="top" align="center">No; defaults to true.</td>
+    <td>failonerror</td>
+    <td>Whether to halt the build if the transfer fails.</td>
+     <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-     <td valign="top">The password.</td>
-     <td valign="top" align="center">Not if you are using key based
-     authentication or the password has been given in the file or
-     todir attribute.</td>
+    <td>password</td>
+    <td>The password.</td>
+    <td>Yes, unless you are using key based authentication or the password has been given in the
+     file or <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">keyfile</td>
-     <td valign="top">Location of the file holding the private key.</td>
-     <td valign="top" align="center">Yes, if you are using key based
-     authentication.</td>
+    <td>keyfile</td>
+    <td>Location of the file holding the private key.</td>
+    <td>Yes, if you are using key based authentication</td>
   </tr>
   <tr>
-    <td valign="top">passphrase</td>
-     <td valign="top">Passphrase for your private key.</td>
-     <td valign="top" align="center">No, defaults to an empty string.</td>
+    <td>passphrase</td>
+    <td>Passphrase for your private key.</td>
+    <td>No; defaults to an empty string</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Determines whether SCP outputs verbosely to the
-    user. Currently this means outputting dots/stars showing the
-    progress of a file transfer.  <em>since Ant 1.6.2</em></td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>verbose</td>
+    <td>Determines whether SCP outputs verbosely to the user. Currently this means outputting
+      dots/stars showing the progress of a file transfer.  <em>since Ant 1.6.2</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">sftp</td>
-    <td valign="top">Determines whether SCP uses the sftp protocol.
-    The sftp protocol is the file transfer protocol of SSH2.  It is
-    recommended that this be set to true if you are copying to/from a
-    server that doesn't support scp1. <em>since Ant 1.7</em></td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>sftp</td>
+    <td>Determines whether SCP uses the sftp protocol.  The sftp protocol is the file transfer
+      protocol of SSH2.  It is recommended that this be set to <q>true</q> if you are copying to/from
+      a server that doesn't support scp1. <em>since Ant 1.7</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">preserveLastModified</td>
-    <td valign="top">Determines whether the last modification
-    timestamp of downloaded files is preserved.  It only works when
-    transferring from a remote to a local system and probably doesn't
-    work with a server that doesn't support SSH2.  <em>since Ant
-    1.8.0</em></td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>preserveLastModified</td>
+    <td>Determines whether the last modification timestamp of downloaded files is preserved.  It
+      only works when transferring from a remote to a local system and probably doesn't work with a
+      server that doesn't support SSH2.  <em>since Ant 1.8.0</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">filemode</td>
-    <td valign="top">A 3 digit octal string, specify the user, group
-      and other modes in the standard Unix fashion.  Only applies to
-      uploaded files.  Note the actual permissions of the remote
-      file will be governed by this setting and the UMASK on the
-      remote server. Default is 644. <em>since Ant 1.9.5</em>.</td>
-    <td align="center" valign="top">No</td>
+    <td>filemode</td>
+    <td>A 3 digit octal string, specify the user, group and other modes in the standard Unix
+      fashion.  Only applies to uploaded files.  Note the actual permissions of the remote file will
+      be governed by this setting and the <code>UMASK</code> on the remote server. <em>since Ant
+      1.9.5</em>.</td>
+    <td>No; default is <q>644</q></td>
   </tr>
   <tr>
-    <td valign="top">dirmode</td>
-    <td valign="top">A 3 digit octal string, specify the user, group
-      and other modes in the standard Unix fashion.  Only applies to
-      uploaded dirs.  Note the actual permissions of the remote
-      dir will be governed by this setting and the UMASK on the
-      remote server. Default is 755. <em>since Ant 1.9.5</em>.</td>
-    <td align="center" valign="top">No</td>
+    <td>dirmode</td>
+    <td>A 3 digit octal string, specify the user, group and other modes in the standard Unix
+      fashion.  Only applies to uploaded dirs.  Note the actual permissions of the remote dir will
+      be governed by this setting and the <code>UMASK</code> on the remote server. <em>since Ant
+      1.9.5</em>.</td>
+    <td>No; default is <q>755</q></td>
   </tr>
   <tr>
-    <td valign="top">serverAliveIntervalSeconds</td>
-    <td valign="top">Sets a timeout interval in seconds after which if no data has
-      been received from the server, the task will send a message through
-      the encrypted channel to request a response from the server.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No, the default is 0, indicating
-      that these messages will not be sent to the server</td>
+    <td>serverAliveIntervalSeconds</td>
+    <td>Sets a timeout interval in seconds after which if no data has been received from the server,
+      the task will send a message through the encrypted channel to request a response from the
+      server.  <em>since Ant 1.9.7</em></td>
+    <td>No, the default is <q>0</q>, indicating that these messages will not be sent to the
+      server</td>
   </tr>
   <tr>
-    <td valign="top">serverAliveCountMax</td>
-    <td valign="top">The number of server alive messages which may be
-      sent without receiving any messages back from the server. Only
-      used if serverAliveIntervalSeconds is not 0.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No, defaults to 3</td>
+    <td>serverAliveCountMax</td>
+    <td>The number of server alive messages which may be sent without receiving any messages back
+      from the server. Only used if <var>serverAliveIntervalSeconds</var> is
+      not <q>0</q>.  <em>since Ant 1.9.7</em></td>
+    <td>No; defaults to <q>3</q></td>
   </tr>
   <tr>
-    <td valign="top">compressed</td>
-    <td valign="top">Whether to enable compression during transfer.
-      <em>since Ant 1.9.8</em></td>
-    <td align="center" valign="top">No, defaults to false</td>
+    <td>compressed</td>
+    <td>Whether to enable compression during transfer.  <em>since Ant 1.9.8</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>fileset or resource collections</h4>
- <p><a href="../Types/fileset.html">FileSet</a>s or <a href="../Types/resources.html#collection">Resource Collection</a>s are used to select
- groups of files to copy. To use a fileset or a resource collection, the <code>todir</code> attribute must be set.</p>
+<p><a href="../Types/fileset.html">FileSet</a>s
+or <a href="../Types/resources.html#collection">Resource Collection</a>s are used to select groups
+of files to copy. To use a fileset or a resource collection, the <var>todir</var> attribute must be
+set.</p>
 
-Prior to Ant 1.9.7 only &lt;fileset&gt; has been supported as a nested element.
+<p>Prior to Ant 1.9.7 only <code>&lt;fileset&gt;</code> has been supported as a nested element.</p>
 
 <h3>Examples</h3>
-<p><b>Copy a single local file to a remote machine</b></p>
-<pre>
-  &lt;scp file=&quot;myfile.txt&quot; todir=&quot;user:password@somehost:/home/chuck&quot;/&gt;
-</pre>
+<p><strong>Copy a single local file to a remote machine</strong></p>
+<pre>&lt;scp file=&quot;myfile.txt&quot; todir=&quot;user:password@somehost:/home/chuck&quot;/&gt;</pre>
 
-<p><b>Copy a single local file to a remote machine with separate
-password attribute</b></p>
-<pre>
-  &lt;scp file=&quot;myfile.txt&quot; todir=&quot;user@somehost:/home/chuck&quot; password=&quot;password&quot;/&gt;
-</pre>
+<p><strong>Copy a single local file to a remote machine with separate <var>password</var>
+attribute</strong></p>
+<pre>&lt;scp file=&quot;myfile.txt&quot; todir=&quot;user@somehost:/home/chuck&quot; password=&quot;password&quot;/&gt;</pre>
 
-<p><b>Copy a single local file to a remote machine using key base
-authentication.</b></p>
+<p><strong>Copy a single local file to a remote machine using key base authentication.</strong></p>
 <pre>
-  &lt;scp file=&quot;myfile.txt&quot;
-       todir=&quot;user@somehost:/home/chuck&quot;
-       keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
-       passphrase=&quot;my extremely secret passphrase&quot;/&gt;
-</pre>
+&lt;scp file=&quot;myfile.txt&quot;
+     todir=&quot;user@somehost:/home/chuck&quot;
+     keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
+     passphrase=&quot;my extremely secret passphrase&quot;/&gt;</pre>
 
-<p><b>Copy a single remote file to a local directory</b></p>
-<pre>
-  &lt;scp file=&quot;user:password@somehost:/home/chuck/myfile.txt&quot; todir=&quot;../some/other/dir&quot;/&gt;
-</pre>
+<p><strong>Copy a single remote file to a local directory</strong></p>
+<pre>&lt;scp file=&quot;user:password@somehost:/home/chuck/myfile.txt&quot; todir=&quot;../some/other/dir&quot;/&gt;</pre>
 
-<p><b>Copy a remote directory to a local directory</b></p>
-<pre>
-  &lt;scp file=&quot;user:password@somehost:/home/chuck/*&quot; todir=&quot;/home/sara&quot;/&gt;
-</pre>
+<p><strong>Copy a remote directory to a local directory</strong></p>
+<pre>&lt;scp file=&quot;user:password@somehost:/home/chuck/*&quot; todir=&quot;/home/sara&quot;/&gt;</pre>
 
-<p><b>Copy a local directory to a remote directory</b></p>
+<p><strong>Copy a local directory to a remote directory</strong></p>
+<pre>
+&lt;scp todir=&quot;user:password@somehost:/home/chuck/&quot;&gt;
+  &lt;fileset dir=&quot;src_dir&quot;/&gt;
+&lt;/scp&gt;</pre>
+<p><strong>Copy a set of files to a directory</strong></p>
 <pre>
-  &lt;scp todir=&quot;user:password@somehost:/home/chuck/&quot;&gt;
-    &lt;fileset dir=&quot;src_dir&quot;/&gt;
-  &lt;/scp&gt;
-</pre>
-<p><b>Copy a set of files to a directory</b></p>
+&lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
+  &lt;fileset dir=&quot;src_dir&quot;&gt;
+    &lt;include name=&quot;**/*.java&quot;/&gt;
+  &lt;/fileset&gt;
+&lt;/scp&gt;</pre>
+<p><strong>Copy a set of files to a remote directory in reverse last-modified order</strong></p>
 <pre>
-  &lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
+&lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
+  &lt;sort&gt;
+    &lt;reverse&gt;
+      &lt;date/&gt;
+    &lt;/reverse&gt;
     &lt;fileset dir=&quot;src_dir&quot;&gt;
-      &lt;include name=&quot;**/*.java&quot;/&gt;
+      &lt;include name=&quot;**/*&quot;/&gt;
     &lt;/fileset&gt;
-  &lt;/scp&gt;
-</pre>
-<p><b>Copy a set of files to a remote directory in reverse last-modified order</b></p>
-<pre>
-  &lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
-    &lt;sort&gt;
-      &lt;reverse&gt;
-        &lt;date /&gt;
-      &lt;/reverse&gt;
-      &lt;fileset dir=&quot;src_dir&quot;&gt;
-        &lt;include name=&quot;**/*&quot; /&gt;
-      &lt;/fileset&gt;
-    &lt;/sort&gt;
-  &lt;/scp&gt;
-</pre>
+  &lt;/sort&gt;
+&lt;/scp&gt;</pre>
 
-<p><strong>Security Note</strong>: Hardcoding passwords and/or usernames
-in scp task can be a serious security hole.  Consider using variable
-substitution and include the password on the command line.  For example:
-<p>
-<pre>
-    &lt;scp todir=&quot;${username}:${password}@host:/dir&quot; ...&gt;
-</pre>
-Invoking Ant with the following command line:
-<pre>
-    ant -Dusername=me -Dpassword=mypassword target1 target2
-</pre>
-<p>
-Is slightly better, but the username/password is exposed to all users on an Unix
-system (via the ps command). The best approach is to use the
-<code>&lt;input&gt;</code> task and/or retrieve the password from a (secured)
-.properties file.
-</p>
+<p><strong>Security Note</strong>: Hardcoding passwords and/or usernames in <code>scp</code> task
+can be a serious security hole.  Consider using variable substitution and include the password on
+the command line.  For example:</p>
+<pre>&lt;scp todir=&quot;${username}:${password}@host:/dir&quot; ...&gt;</pre>
+<p>Invoking Ant with the following command line:</p>
+<pre>ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
+<p>Is slightly better, but the username/password is exposed to all users on an Unix system (via
+the <code>ps</code> command). The best approach is to use the <code>&lt;input&gt;</code> task and/or
+retrieve the password from a (secured) <samp>.properties</samp> file.</p>
 
-<p><strong>Unix Note</strong>: File permissions are not retained when files
-are downloaded; they end up with the default <code>UMASK</code> permissions
-instead. This is caused by the lack of any means to query or set file
-permissions in the current Java runtimes. If you need a permission-
-preserving copy function, use <code>&lt;exec executable="scp" ... &gt;</code>
-instead.
-</p>
+<p><strong>Unix Note</strong>: File permissions are not retained when files are downloaded; they end
+up with the default <code>UMASK</code> permissions instead. This is caused by the lack of any means
+to query or set file permissions in the current Java runtimes. If you need a permission-preserving
+copy function, use <code>&lt;exec executable="scp" ... &gt;</code> instead.</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/script.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/script.html b/manual/Tasks/script.html
index 375c1f9..1566caf 100644
--- a/manual/Tasks/script.html
+++ b/manual/Tasks/script.html
@@ -26,143 +26,116 @@
 
 <h2 id="script">Script</h2>
 <h3>Description</h3>
-  <p>Execute a script in a
-    <a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
-    or
-    <a href="https://scripting.dev.java.net">JSR 223</a>  supported language.
-  </p>
-  <p><strong>Note</strong>:
-    This task depends on external libraries not included in the Apache Ant distribution.
-    See <a href="../install.html#librarydependencies">Library Dependencies</a>
-    for more information.
-  </p>
-  <p>
-    The task may use the BSF scripting manager or the JSR 223 manager that
-    is included in JDK 6 and higher. This is controlled by the <code>manager</code>
-    attribute. The JSR 223 scripting manager is indicated by "javax".
-  </p>
-  <p>All items (tasks, targets, etc) of the running project are
-    accessible from the script, using either their <code>name</code> or
-    <code>id</code> attributes (as long as their names are considered
-    valid Java identifiers, that is).
-    This is controlled by the "setbeans" attribute of the task.
-    The name "project" is a pre-defined reference to the Project, which can be
-    used instead of the project name. The name "self" is a pre-defined reference to the actual
-    <code>&lt;script&gt;</code>-Task instance.<br>From these objects you have access to the Ant Java API, see the
-<a href="../api/index.html">JavaDoc</a> (especially for
-<a href="../api/org/apache/tools/ant/Project.html">Project</a> and
-<a href="../api/org/apache/tools/ant/taskdefs/optional/Script.html">Script</a>) for more information.</p>
-<p>If you are using JavaScript under BSF, a good resource is <a target="_blank" href="http://www.mozilla.org/rhino/doc.html">
-http://www.mozilla.org/rhino/doc.html</a> as we are using their JavaScript interpreter.</p>
+<p>Execute a script in a <a href="https://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
+or <a href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html">JSR
+223</a> supported language.
+</p>
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
+distribution.  See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
+<p>The task may use the BSF scripting manager or the JSR 223 manager that is included in JDK 6 and
+higher. This is controlled by the <var>manager</var> attribute. The JSR 223 scripting manager is
+indicated by <q>javax</q>.</p>
+<p>All items (tasks, targets, etc) of the running project are accessible from the script, using
+either their <var>name</var> or <var>id</var> attributes (as long as their names are considered
+valid Java identifiers, that is).  This is controlled by the <var>setbeans</var> attribute of the
+task.  The name <code>project</code> is a pre-defined reference to the Project, which can be used
+instead of the project name. The name <code>self</code> is a pre-defined reference to the
+actual <code>&lt;script&gt;</code>-Task instance.<br>From these objects you have access to the Ant
+Java API, see the <a href="../api/index.html">JavaDoc</a> (especially
+for <a href="../api/org/apache/tools/ant/Project.html">Project</a>
+and <a href="../api/org/apache/tools/ant/taskdefs/optional/Script.html">Script</a>) for more
+information.</p>
+<p>If you are using JavaScript under BSF, a good resource is <a target="_blank"
+href="https://www.mozilla.org/rhino/doc.html">https://www.mozilla.org/rhino/doc.html</a> as we are
+using their JavaScript interpreter.</p>
 <p>Scripts can do almost anything a task written in Java could do.</p>
-<p>Rhino provides a special construct - the <i>JavaAdapter</i>. With that you can
-create an object which implements several interfaces, extends classes and for which you
-can overwrite methods. Because this is an undocumented feature (yet), here is the link
-to an explanation: <a href="http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&newwindow=1&frame=right&th=610d2db45c0756bd&seekm=391EEC3C.5236D929%40yahoo.com#link2">
-Groups@Google: "Rhino, enum.js, JavaAdapter?"</a> by Norris Boyd in the newsgroup
-<i>netscape.public.mozilla.jseng</i>.</p>
+<p>Rhino provides a special construct&mdash;the <code>JavaAdapter</code>. With that you can create
+an object which implements several interfaces, extends classes and for which you can overwrite
+methods. Because this is an undocumented feature (yet), here is the link to an
+explanation: <a href="https://groups.google.com/forum/#!msg/netscape.public.mozilla.jseng/YlRQE0OvM8c/F8Mvq-XkpxcJ">Google
+Groups: "Rhino, enum.js, JavaAdapter?"</a>  by Norris Boyd in the
+newsgroup <em>netscape.public.mozilla.jseng</em>.</p>
 
-<p>If you are creating Targets programmatically, make sure you set the
-Location to a useful value.  In particular all targets should have
-different location values.</p>
+<p>If you are creating Targets programmatically, make sure you set the Location to a useful value.
+In particular all targets should have different location values.</p>
 
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">language</td>
-    <td valign="top">The programming language the script is written in.
-      Must be a supported Apache BSF or JSR 223 language</td>
-    <td valign="top" align="center">Yes</td>
+    <td>language</td>
+    <td>The programming language the script is written in.  Must be a supported Apache BSF or JSR
+      223 language</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">manager</td>
-    <td valign="top">
-      <em>Since Ant 1.7</em>.
-      The script engine manager to use. This can have
-      one of three values ("auto", "bsf" or "javax").
-      The default value is "auto".
+    <td>manager</td>
+    <td>
+      <em>Since Ant 1.7</em>.  The script engine manager to use. This can have one of three
+      values: <q>auto</q>, <q>bsf</q> or <q>javax</q>.
       <ul>
-        <li>"bsf" use the BSF scripting manager to run
-          the language.</li>
-        <li>"javax" use the <em>javax.scripting</em> manager
-          to run the language. (This will only work for JDK 6 and higher).</li>
-        <li>"auto" use the BSF engine if it exists,
-          otherwise use the <em>javax.scripting</em> manager.</li>
+        <li><q>bsf</q> use the BSF scripting manager to run the language.</li>
+        <li><q>javax</q> use the <code>javax.scripting</code> manager to run the language. (This
+          will only work for JDK 6 and higher).</li>
+        <li><q>auto</q> use the BSF engine if it exists, otherwise use
+          the <code>javax.scripting</code> manager.</li>
       </ul>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; default is <q>auto</q></td>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">The location of the script as a file, if not inline</td>
-    <td valign="top" align="center">No</td>
+    <td>src</td>
+    <td>The location of the script as a file, if not inline</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The encoding of the script as a file. <em>Since Ant 1.10.2</em>.</td>
-    <td valign="top" align="center">No - defaults to default JVM encoding</td>
+    <td>encoding</td>
+    <td>The encoding of the script as a file. <em>Since Ant 1.10.2</em>.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">setbeans</td>
-    <td valign="top">
-      This attribute controls whether to set variables for
-      all properties, references and targets in the running script.
-      If this attribute is false, only the the "project" and "self" variables are set.
-      If this attribute is true all the variables are set. The default value of this
-      attribute is "true".  <em>Since Ant 1.7</em>
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>setbeans</td>
+    <td>This attribute controls whether to set variables for all properties, references and targets
+      in the running script.  If this attribute is <q>false</q>, only the the <code>project</code>
+      and <code>self</code> variables are set.  If this attribute is <q>true</q> all the variables
+      are set. <em>Since Ant 1.7</em></td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">
-      The classpath to pass into the script. <em>Since Ant 1.7</em>
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>The classpath to pass into the script. <em>Since Ant 1.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The classpath to use, given as a
-       <a href="../using.html#references">reference</a> to a path defined elsewhere.
+    <td>classpathref</td>
+    <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a path
+    defined elsewhere.
     <em>Since Ant 1.7</em></td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>classpath</h4>
-  <p><em>Since Ant 1.7</em></p>
-<p>
-  <code>Script</code>'s <code>classpath</code> attribute is a
-  <a href="../using.html#path">path-like structure</a> and can also be set via a nested
-  <code>&lt;classpath&gt;</code> element.
+<p><em>Since Ant 1.7</em></p>
+<p><code>Script</code>'s <var>classpath</var> attribute is a <a href="../using.html#path">path-like
+structure</a> and can also be set via a nestedq <code>&lt;classpath&gt;</code> element.
 </p>
-  <p>
-    If a classpath is set, it will be used as the current thread
-    context classloader, and
-    as the classloader given to the BSF manager.
-    This means that it can be used to specify
-    the classpath containing the language implementation for BSF
-    or for JSR 223 managers.
-    This can be useful if one wants
-    to keep ${user.home}/.ant/lib free of lots of scripting language
-    specific jar files.
-  </p>
-  <p>
-    <strong>Note</strong>: (<em>since Ant 1.7.1</em>)
-    This classpath <em>can</em> be used to
-    specify the location of
-    the BSF jar file and/or languages
-    that have engines in the BSF jar file. This includes the
-    javascript, jython, netrexx and jacl languages.
-  </p>
+<p>If a classpath is set, it will be used as the current thread context classloader, and as the
+classloader given to the BSF manager.  This means that it can be used to specify the classpath
+containing the language implementation for BSF or for JSR 223 managers.  This can be useful if one
+wants to keep <samp>${user.home}/.ant/lib</samp> free of lots of scripting language specific jar
+files.</p>
+<p><strong>Note</strong>: (<em>since Ant 1.7.1</em>) This classpath <em>can</em> be used to specify
+the location of the BSF jar file and/or languages that have engines in the BSF jar file. This
+includes the <q>javascript</q>, <q>jython</q>, <q>netrexx</q> and <q>jacl</q> languages.</p>
 <h3>Examples</h3>
-The following snippet shows use of five different languages:
-  <pre>
+<p>The following snippet shows use of five different languages:</p>
+<pre>
     &lt;property name="message" value="Hello world"/&gt;
 
     &lt;script language="groovy"&gt;
@@ -183,68 +156,48 @@ The following snippet shows use of five different languages:
 
     &lt;script language="jython"&gt;
 print "message is %s" % message
-    &lt;/script&gt;
-</pre>
-  <p>
-  Note that for the <i>jython</i> example, the script contents <b>must</b>
-  start on the first column.
-  </p>
-  <p>
-    Note also that for the <i>ruby</i> example, the names of the set variables are prefixed
-    by a '$'.
-  <p>
-    The following script shows a little more complicated jruby example:
-  </p>
-  <pre>
+    &lt;/script&gt;</pre>
+<p>Note that for the <q>jython</q> example, the script contents <strong>must</strong> start on the
+first column.</p>
+<p>Note also that for the <q>ruby</q> example, the names of the set variables are prefixed by
+a <q>$</q>.</p>
+<p>The following script shows a little more complicated JRuby example:</p>
+<pre>
 &lt;script language="ruby"&gt;
   xmlfiles = Dir.new(".").entries.delete_if { |i| ! (i =~ /\.xml$/) }
   xmlfiles.sort.each { |i| $self.log(i) }
-&lt;/script&gt;
-</pre>
-  <p>
-    The same example in groovy is:
-  </p>
-  <pre>
+&lt;/script&gt;</pre>
+<p>The same example in Groovy is:</p>
+<pre>
 &lt;script language="groovy"&gt;
   xmlfiles = new java.io.File(".").listFiles().findAll{ it =~ "\.xml$"}
-  xmlfiles.sort().each { self.log(it.toString())}
-&lt;/script&gt;
-</pre>
-  <p>
-    The following example shows the use of classpath to specify the location
-    of the beanshell jar file.
-  </p>
-  <pre>
+  xmlfiles.sort().each { self.log(it.toString()) }
+&lt;/script&gt;</pre>
+<p>The following example shows the use of classpath to specify the location of the beanshell jar
+file.</p>
+<pre>
 &lt;script language="beanshell" setbeans="true"&gt;
   &lt;classpath&gt;
-    &lt;fileset dir="${user.home}/lang/beanshell" includes="*.jar" /&gt;
+    &lt;fileset dir="${user.home}/lang/beanshell" includes="*.jar"/&gt;
   &lt;/classpath&gt;
   System.out.println("Hello world");
-&lt;/script&gt;
-</pre>
+&lt;/script&gt;</pre>
   <p>
-    The following script uses javascript to create a number of
-    echo tasks and execute them.
+    The following script uses JavaScript to create a number of
+    <code>echo</code> tasks and execute them.
   </p>
 <pre>
 &lt;project name=&quot;squares&quot; default=&quot;main&quot; basedir=&quot;.&quot;&gt;
-
   &lt;target name=&quot;main&quot;&gt;
-
     &lt;script language=&quot;javascript&quot;&gt; &lt;![CDATA[
-
-      for (i=1; i&lt;=10; i++) {
+      for (i = 1; i &lt;= 10; i++) {
         echo = squares.createTask(&quot;echo&quot;);
         echo.setMessage(i*i);
         echo.perform();
       }
-
     ]]&gt; &lt;/script&gt;
-
   &lt;/target&gt;
-
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 <p>generates</p>
 <pre>
 main:
@@ -259,15 +212,13 @@ main:
 81
 100
 
-BUILD SUCCESSFUL
-</pre>
+BUILD SUCCESSFUL</pre>
 
-<p>Now a more complex example using the Java API and the Ant API. The goal is to list the
-filesizes of all files a <code>&lt;fileset/&gt;</code> caught.</p>
+<p>Now a more complex example using the Java API and the Ant API. The goal is to list the file sizes
+of all files a <code>&lt;fileset/&gt;</code> caught.</p>
 <pre>
-
-&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;project name="<font color=blue>MyProject</font>" basedir="." default="main"&gt;
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;project name="<span style="color:blue">MyProject</span>" basedir="." default="main"&gt;
 
   &lt;property name="fs.dir" value="src"/&gt;
   &lt;property name="fs.includes" value="**/*.txt"/&gt;
@@ -275,20 +226,19 @@ filesizes of all files a <code>&lt;fileset/&gt;</code> caught.</p>
 
   &lt;target name="main"&gt;
     &lt;script language="javascript"&gt; &lt;![CDATA[
-
       // import statements
-      <font color=blue>// importPackage(java.io)</font>;
-      <font color=blue>importClass(java.io.File)</font>;
+      <span style="color:blue">// importPackage(java.io)</span>;
+      <span style="color:blue">importClass(java.io.File)</span>;
 
       // Access to Ant-Properties by their names
-      dir      = <font color=blue>project</font>.getProperty("fs.dir");
-      includes = <font color=blue>MyProject</font>.getProperty("fs.includes");
-      excludes = <font color=blue>self.getProject()</font>.<font color=blue>getProperty("fs.excludes")</font>;
+      dir      = <span style="color:blue">project</span>.getProperty("fs.dir");
+      includes = <span style="color:blue">MyProject</span>.getProperty("fs.includes");
+      excludes = <span style="color:blue">self.getProject()</span>.<span style="color:blue">getProperty("fs.excludes")</span>;
 
       // Create a &lt;fileset dir="" includes=""/&gt;
-      fs = project.<font color=blue>createDataType("fileset")</font>;
-      fs.setDir( new File(dir) );
-      <font color=blue>fs.setIncludes(includes)</font>;
+      fs = project.<span style="color:blue">createDataType("fileset")</span>;
+      fs.setDir(new File(dir));
+      <span style="color:blue">fs.setIncludes(includes)</span>;
       fs.setExcludes(excludes);
 
       // Get the files (array) of that fileset
@@ -296,49 +246,42 @@ filesizes of all files a <code>&lt;fileset/&gt;</code> caught.</p>
       srcFiles = ds.getIncludedFiles();
 
       // iterate over that array
-      for (i=0; i&lt;srcFiles.length; i++) {
+      for (i = 0; i &lt; srcFiles.length; i++) {
 
         // get the values via Java API
         var basedir  = fs.getDir(project);
         var filename = srcFiles[i];
-        var file = <font color=blue>new File(basedir, filename)</font>;
+        var file = <span style="color:blue">new File(basedir, filename)</span>;
         var size = file.length();
 
         // create and use a Task via Ant API
-        echo = MyProject.<font color=blue>createTask("echo")</font>;
+        echo = MyProject.<span style="color:blue">createTask("echo")</span>;
         echo.setMessage(filename + ": " + size + " byte");
-        echo.<font color=blue>perform()</font>;
+        echo.<span style="color:blue">perform()</span>;
       }
     ]]&gt;&lt;/script&gt;
   &lt;/target&gt;
-&lt;/project&gt;
-</pre>
-<p>We want to use the Java API. Because we don't want always typing the package signature
-we do an import. Rhino knows two different methods for import statements: one for packages
-and one for a single class. By default only the <i>java</i> packages are available, so
-<i>java.lang.System</i> can be directly imported with <code>importClass/importPackage</code>.
-For other packages you have to prefix the full classified name with <i>Packages</i>.
-For example Ant's <i>FileUtils</i> class can be imported with
-<code>importClass(<b>Packages</b>.org.apache.tools.ant.util.FileUtils)</code>
-<br>
-The <code>&lt;script&gt;</code> task populates the Project instance under
-the name <i>project</i>, so we can use that reference. Another way is to use its given name
-or getting its reference from the task itself.<br>
-The Project provides methods for accessing and setting properties, creating DataTypes and
-Tasks and much more.<br>
-After creating a FileSet object we initialize that by calling its set-methods. Then we can
-use that object like a normal Ant task (<code>&lt;copy&gt;</code> for example).<br>
-For getting the size of a file we instantiate a <code>java.io.File</code>. So we are using
-normal Java API here.<br>
-Finally we use the <code>&lt;echo&gt;</code> task for producing the output. The task is not executed by
-its execute() method, because the perform() method (implemented in Task itself) does the
-appropriate logging before and after invoking execute().
-</p>
-<p>
-  Here is an example of using beanshell to create an ant
-  task. This task will add filesets and paths to a referenced
-  path. If the path does not exist, it will be created.
-</p>
+&lt;/project&gt;</pre>
+<p>We want to use the Java API. Because we don't want always typing the package signature we do an
+import. Rhino knows two different methods for import statements: one for packages and one for a
+single class. By default only the <code>java</code> packages are available,
+so <code>java.lang.System</code> can be directly imported
+with <code>importClass/importPackage</code>.  For other packages you have to prefix the full
+classified name with <strong>Packages</strong>.  For example Ant's <code>FileUtils</code> class can
+be imported
+with <code>importClass(<strong>Packages</strong>.org.apache.tools.ant.util.FileUtils)</code><br/>
+The <code>&lt;script&gt;</code> task populates the Project instance under the
+name <code>project</code>, so we can use that reference. Another way is to use its given name or
+getting its reference from the task itself.<br>  The Project provides methods for accessing and
+setting properties, creating DataTypes and Tasks and much more.<br>  After creating a FileSet object
+we initialize that by calling its set-methods. Then we can use that object like a normal Ant task
+(<code>&lt;copy&gt;</code> for example).<br>  For getting the size of a file we instantiate
+a <code>java.io.File</code>. So we are using normal Java API here.<br>  Finally we use
+the <code>&lt;echo&gt;</code> task for producing the output. The task is not executed by
+its <code>execute()</code> method, because the <code>perform()</code> method (implemented in Task
+itself) does the appropriate logging before and after invoking <code>execute()</code>.</p>
+<p>Here is an example of using beanshell to create an Ant task. This task will add filesets and
+paths to a referenced path. If the path does not exist, it will be created.</p>
 <pre>
 &lt;!--
        Define addtopath task
@@ -367,14 +310,10 @@ appropriate logging before and after invoking execute().
         }
     }
     project.addTaskDefinition("addtopath", AddToPath.class);
-&lt;/script&gt;
-</pre>
-  <p>
-    An example of using this task to create a path
-    from a list of directories (using antcontrib's
-    <a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html">
-      &lt;for&gt;</a> task) follows:
-  </p>
+&lt;/script&gt;</pre>
+<p>An example of using this task to create a path from a list of directories (using
+antcontrib's <a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html"> &lt;for&gt;</a>
+task) follows:</p>
 <pre>
 &lt;path id="main.path"&gt;
   &lt;fileset dir="build/classes"/&gt;
@@ -387,8 +326,7 @@ appropriate logging before and after invoking execute().
                includes="**/*.jar"/&gt;
     &lt;/addtopath&gt;
   &lt;/sequential&gt;
-&lt;/ac:for&gt;
-</pre>
+&lt;/ac:for&gt;</pre>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/scriptdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html
index 554e04e..0f8292d 100644
--- a/manual/Tasks/scriptdef.html
+++ b/manual/Tasks/scriptdef.html
@@ -26,318 +26,267 @@
 
 <h2 id="script">Scriptdef</h2>
 <h3>Description</h3>
-<p>Scriptdef can be used to define an Apache Ant task using a scripting language. Ant
-scripting languages supported by
-<a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
-or
-  <a href="https://scripting.dev.java.net">JSR 223</a>
-may be
-used to define the script. Scriptdef provides a mechanism to encapsulate
-control logic from a build within an Ant task minimizing the need for
-providing control style tasks in Ant itself. Complex logic can be made
-available while retaining the simple structure of an Ant build file. Scriptdef
-is also useful for prototyping new custom tasks. Certainly as the complexity
-of the script increases it would be better to migrate the task definition
-into a Java based custom task.
-</p>
-
-<p><strong>Note</strong>: This task depends on external libraries not included in the
-Ant distribution. See
-<a href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.</p>
-
-
+<p><code>Scriptdef</code> can be used to define an Apache Ant task using a scripting language. Ant
+scripting languages supported by <a href="https://jakarta.apache.org/bsf" target="_top">Apache
+BSF</a>
+or <a href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html">JSR
+223</a> may be used to define the script. <code>Scriptdef</code> provides a mechanism to encapsulate
+control logic from a build within an Ant task minimizing the need for providing control style tasks
+in Ant itself. Complex logic can be made available while retaining the simple structure of an Ant
+build file. <code>Scriptdef</code> is also useful for prototyping new custom tasks. Certainly as the
+complexity of the script increases it would be better to migrate the task definition into a Java
+based custom task.</p>
+
+<p><strong>Note</strong>: This task depends on external libraries not included in the Ant
+distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
 
 <p>The attributes and nested elements supported by the task may be defined
 using <code>&lt;attribute&gt;</code> and <code>&lt;element&gt;</code> nested elements. These are
-available to the script that implements the task as two collection style
-script variables <code>attributes</code> and <code>elements</code>. The
-elements in the <code>attributes</code> collection may be accessed by the
-attribute name. The <code>elements</code> collection is accessed by the nested
-element name. This will return a list of all instances of the nested element.
-The instances in this list may be accessed by an integer index.
-</p>
-
-<p><strong>Note</strong>: Ant will turn all attribute and element names into all
-lowercase names, so even if you use name="SomeAttribute", you'll have
-to use "someattribute" to retrieve the attribute's value from the
-<code>attributes</code> collection.</p>
-
-<p>The name "self" (<em>since Ant 1.6.3</em>) is a pre-defined reference to the
-    script def task instance.
-    It can be used for logging, or for integration with the rest of
-    Ant. the <code>self.text attribute</code> contains
-    any nested text passed to the script</p>
-
-<p>If an attribute or element is not passed in,
-then <code>attributes.get()</code> or <code>elements.get()</code> will
-return null. It is up to the script to perform any checks and validation.
-<code>self.fail(String message)</code>can be used to raise a
-<code>BuildException</code>.
-</p>
-
-
-<p>The name "project" is a pre-defined reference to the Ant Project. For
-more information on writing scripts, please refer to the
-<a href="script.html"><code>&lt;script&gt;</code></a> task
-</p>
-
+available to the script that implements the task as two collection style script
+variables <code>attributes</code> and <code>elements</code>. The elements in
+the <code>attributes</code> collection may be accessed by the attribute
+name. The <code>elements</code> collection is accessed by the nested element name. This will return
+a list of all instances of the nested element.  The instances in this list may be accessed by an
+integer index.</p>
+
+<p><strong>Note</strong>: Ant will turn all attribute and element names into all lowercase names, so
+even if you use <var>name</var>=<q>SomeAttribute</q>, you'll have to use <q>someattribute</q> to
+retrieve the attribute's value from the <code>attributes</code> collection.</p>
+
+<p>The name <code>self</code> (<em>since Ant 1.6.3</em>) is a pre-defined reference to
+the <code>scriptdef</code> task instance.  It can be used for logging, or for integration with the
+rest of Ant. the <code>self.text attribute</code> contains any nested text passed to the script</p>
+
+<p>If an attribute or element is not passed in, then <code>attributes.get()</code>
+or <code>elements.get()</code> will return null. It is up to the script to perform any checks and
+validation. <code>self.fail(String message)</code>can be used to raise
+a <code>BuildException</code>.</p>
+
+<p>The name <code>project</code> is a pre-defined reference to the Ant Project. For more information
+on writing scripts, please refer to the <a href="script.html"><code>&lt;script&gt;</code></a>
+task.</p>
 
 <h3>Parameters</h3>
-<table>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the task to be created using the script</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>the name of the task to be created using the script</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">language</td>
-    <td valign="top">The programming language the script is written in.
-      Must be a supported Apache BSF or JSR 223 language</td>
-    <td valign="top" align="center">Yes</td>
+    <td>language</td>
+    <td>The programming language the script is written in.  Must be a supported Apache BSF or JSR
+      223 language</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">manager</td>
-    <td valign="top">
-      The script engine manager to use.
-      See the <a href="../Tasks/script.html">script</a> task
-      for using this attribute.
-    </td>
-    <td valign="top" align="center">No - default is "auto"</td>
+    <td>manager</td>
+    <td>The script engine manager to use.  See the <a href="../Tasks/script.html">script</a> task
+      for using this attribute.</td>
+    <td>No; default is <q>auto</q></td>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">The location of the script as a file, if not inline</td>
-    <td valign="top" align="center">No</td>
+    <td>src</td>
+    <td>The location of the script as a file, if not inline</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2</em>.</td>
-    <td valign="top" align="center">No - defaults to default JVM encoding</td>
+    <td>encoding</td>
+    <td>The encoding of the script as a file. <em>since Ant 1.10.2</em>.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">compiled</td>
-    <td valign="top">If true, the script is compiled before the first
-    evaluation for faster multiple executions, on the condition that the <em>manager</em> is "javax" and the
-    target engine implements <code>javax.script.Compilable</code>.
-    Note that the <code>bsf</code> manager may automatically compiles the script.
-    <em>since Ant 1.10.2</em>.</td>
-    <td valign="top" align="center">No - defaults to false</td>
+    <td>compiled</td>
+    <td>If true, the script is compiled before the first evaluation for faster multiple executions,
+      on the condition that the <var>manager</var> is <q>javax</q> and the target engine
+      implements <code>javax.script.Compilable</code>.  Note that the <q>bsf</q> manager may
+      automatically compile the script. <em>since Ant 1.10.2</em>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">uri</td>
-    <td valign="top">
-      The XML namespace uri that this definition should live in.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>uri</td>
+    <td>The XML namespace uri that this definition should live in.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">
-      The classpath to pass into the script.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>The classpath to pass into the script.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>classpathref</td>
+    <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a path
+      defined elsewhere.
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The classpath to use, given as a
-      <a href="../using.html#references">reference</a> to a path defined elsewhere.
-      <td align="center" valign="top">No</td>
-    </tr>
-    <tr>
-      <td valign="top">loaderRef</td>
-      <td valign="top">the name of the loader that is
-        used to load the script, constructed from the specified
-        classpath. This allows multiple script definitions
-        to reuse the same class loader.
-      </td>
-      <td align="center" valign="top">No</td>
-    </tr>
-  </table>
+    <td>loaderRef</td>
+    <td>the name of the loader that is used to load the script, constructed from the specified
+      classpath. This allows multiple script definitions to reuse the same class loader.
+    </td>
+    <td>No</td>
+  </tr>
+</table>
 
 <h3>Nested elements</h3>
 <h4>attribute</h4>
-<table>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the attribute</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>the name of the attribute</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>element</h4>
-<table>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the nested element to be supported by the
-                     task defined by the script</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>the name of the nested element to be supported by the task defined by the script</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">the classname of the class to be used for the nested element.
-         This specifies the class directly and is an alternative to specifying
-         the Ant type name.</td>
-    <td valign="top" align="center">No</td>
+    <td>classname</td>
+    <td>the classname of the class to be used for the nested element.  This specifies the class
+      directly and is an alternative to specifying the Ant type name.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">This is the name of an Ant task or type which is to
-        be used when this element is to be created. This is an alternative
-        to specifying the class name directly. If the type is in a namespace,
-        the URI and a : must be prefixed to the type. For example
-        <code>type="antlib:example.org:newtype"</code></td>
-    <td valign="top" align="center">No</td>
+    <td>type</td>
+    <td>This is the name of an Ant task or type which is to be used when this element is to be
+      created. This is an alternative to specifying the class name directly. If the type is in a
+      namespace, the URI and a <q>:</q> must be prefixed to the type. For
+      example <var>type</var>=<q>antlib:example.org:newtype</q></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">any resource or resource collection</td>
-    <td valign="top"><em>Since Ant 1.7.1</em>, this task can load scripts
-    from any resource supplied as a nested element.</td>
-    <td valign="top" align="center">No</td>
+    <td>any resource or resource collection</td>
+    <td><em>Since Ant 1.7.1</em>, this task can load scripts from any resource supplied as a nested
+      element.</td>
+    <td>No</td>
   </tr>
-
 </table>
 
-  <h4>classpath</h4>
-  <p>
-    See the <a href="../Tasks/script.html">script</a> task
-    for using this nested element.
-  </p>
-
+<h4>classpath</h4>
+<p>See the <a href="../Tasks/script.html">script</a> task for using this nested element.</p>
 
 <h3>Examples</h3>
 
-<p>
-The following definition creates a task which supports an attribute called
-attr and two nested elements, one being a fileset and the other a path. When
-executed, the resulting task logs the value of the attribute and the basedir
-of the first fileset.
-</p>
+<p>The following definition creates a task which supports an attribute called <var>attr</var> and
+two nested elements, one being a fileset and the other a path. When executed, the resulting task
+logs the value of the attribute and the <var>basedir</var> of the first fileset.</p>
 
 <pre>
-  &lt;scriptdef name=&quot;scripttest&quot; language=&quot;javascript&quot;&gt;
-    &lt;attribute name=&quot;attr1&quot;/&gt;
-    &lt;element name=&quot;fileset&quot; type=&quot;fileset&quot;/&gt;
-    &lt;element name=&quot;path&quot; type=&quot;path&quot;/&gt;
-    &lt;![CDATA[
-
-      self.log(&quot;Hello from script&quot;);
-      self.log(&quot;Attribute attr1 = &quot; + attributes.get(&quot;attr1&quot;));
-      self.log(&quot;First fileset basedir = &quot;
-        + elements.get(&quot;fileset&quot;).get(0).getDir(project));
-
-    ]]&gt;
-  &lt;/scriptdef&gt;
-
-  &lt;scripttest attr1=&quot;test&quot;&gt;
-    &lt;path&gt;
-      &lt;pathelement location=&quot;src&quot;/&gt;
-    &lt;/path&gt;
-    &lt;fileset dir=&quot;src&quot;/&gt;
-    &lt;fileset dir=&quot;main&quot;/&gt;
-  &lt;/scripttest&gt;
-</pre>
-
-<p>
-The following variation on the above script lists the number of fileset elements
-and iterates through them
-</p>
+&lt;scriptdef name=&quot;scripttest&quot; language=&quot;javascript&quot;&gt;
+  &lt;attribute name=&quot;attr1&quot;/&gt;
+  &lt;element name=&quot;fileset&quot; type=&quot;fileset&quot;/&gt;
+  &lt;element name=&quot;path&quot; type=&quot;path&quot;/&gt;
+  &lt;![CDATA[
+
+    self.log(&quot;Hello from script&quot;);
+    self.log(&quot;Attribute attr1 = &quot; + attributes.get(&quot;attr1&quot;));
+    self.log(&quot;First fileset basedir = &quot;
+      + elements.get(&quot;fileset&quot;).get(0).getDir(project));
+
+  ]]&gt;
+&lt;/scriptdef&gt;
+
+&lt;scripttest attr1=&quot;test&quot;&gt;
+  &lt;path&gt;
+    &lt;pathelement location=&quot;src&quot;/&gt;
+  &lt;/path&gt;
+  &lt;fileset dir=&quot;src&quot;/&gt;
+  &lt;fileset dir=&quot;main&quot;/&gt;
+&lt;/scripttest&gt;</pre>
+
+<p>The following variation on the above script lists the number of fileset elements and iterates
+through them</p>
 <pre>
-  &lt;scriptdef name=&quot;scripttest2&quot; language=&quot;javascript&quot;&gt;
-    &lt;element name=&quot;fileset&quot; type=&quot;fileset&quot;/&gt;
-    &lt;![CDATA[
-      filesets = elements.get(&quot;fileset&quot;);
-      self.log(&quot;Number of filesets = &quot; + filesets.size());
-      for (i = 0; i &lt; filesets.size(); ++i) {
-        self.log(&quot;fileset &quot; + i + &quot; basedir = &quot;
-          + filesets.get(i).getDir(project));
-      }
-    ]]&gt;
-  &lt;/scriptdef&gt
-
-  &lt;scripttest2&gt;
-    &lt;fileset dir=&quot;src&quot;/&gt;
-    &lt;fileset dir=&quot;main&quot;/&gt;
-  &lt;/scripttest2&gt;
-</pre>
-
-<p>
-When a script has a syntax error, the scriptdef name will be listed in the
-error. For example in the above script, removing the closing curly bracket
-would result in this error
-</p>
+&lt;scriptdef name=&quot;scripttest2&quot; language=&quot;javascript&quot;&gt;
+  &lt;element name=&quot;fileset&quot; type=&quot;fileset&quot;/&gt;
+  &lt;![CDATA[
+    filesets = elements.get(&quot;fileset&quot;);
+    self.log(&quot;Number of filesets = &quot; + filesets.size());
+    for (i = 0; i &lt; filesets.size(); ++i) {
+      self.log(&quot;fileset &quot; + i + &quot; basedir = &quot;
+        + filesets.get(i).getDir(project));
+    }
+  ]]&gt;
+&lt;/scriptdef&gt
+
+&lt;scripttest2&gt;
+  &lt;fileset dir=&quot;src&quot;/&gt;
+  &lt;fileset dir=&quot;main&quot;/&gt;
+&lt;/scripttest2&gt;</pre>
+
+<p>When a script has a syntax error, the <code>scriptdef</code> name will be listed in the
+error. For example in the above script, removing the closing curly bracket would result in this
+error</p>
 
 <pre>build.xml:15: SyntaxError: missing } in compound
 statement (scriptdef <code>&lt;scripttest2&gt;</code>; line 10)</pre>
 
-<p>
-Script errors are only detected when a script task is actually executed.
-</p>
-<p>
-    The next example does uses nested text in Jython. It also declares
-    the script in a new xml namespace, which must be used to refer to
-    the task. Declaring scripts in a new namespace guarantees that Ant will
-    not create a task of the same (namespace,localname) name pair.
-</p>
+<p>Script errors are only detected when a <code>script</code> task is actually executed.</p>
+<p>The next example does uses nested text in Jython. It also declares the script in a new xml
+namespace, which must be used to refer to the task. Declaring scripts in a new namespace guarantees
+that Ant will not create a task of the same (namespace,localname) name pair.</p>
 
 <pre>
 &lt;target name="echo-task-jython"&gt;
   &lt;scriptdef language="jython"
-      name="echo"
-      uri="http://example.org/script"&gt;
+             name="echo"
+             uri="http://example.org/script"&gt;
       &lt;![CDATA[
 self.log("text: " +self.text)
-    ]]&gt;
+      ]]&gt;
     &lt;/scriptdef&gt;
 &lt;/target&gt;
 
 &lt;target name="testEcho" depends="echo-task-jython"
-    xmlns:s="http://example.org/script"&gt;
+        xmlns:s="http://example.org/script"&gt;
   &lt;s:echo&gt;nested text&lt;/s:echo&gt;
-&lt;/target&gt;
-</pre>
+&lt;/target&gt;</pre>
 
-The next example shows the use of &lt;classpath&gt; and
-"loaderref" to get access to the beanshell jar.
+<p>The next example shows the use of &lt;classpath&gt; and <var>loaderref</var> to get access to the
+beanshell jar.</p>
 <pre>
-    &lt;scriptdef name="b1" language="beanshell"
-               loaderref="beanshell-ref"&gt;
-      &lt;attribute name="a"/&gt;
-      &lt;classpath
-        path="${user.home}/scripting/beanshell/bsh-1.3b1.jar"/&gt;
-      self.log("attribute a is " + attributes.get("a"));
-    &lt;/scriptdef&gt;
-
-    &lt;scriptdef name="b2" language="beanshell"
-               loaderref="beanshell-ref"&gt;
-      &lt;attribute name="a2"/&gt;
-      self.log("attribute a2 is " + attributes.get("a2"));
-    &lt;/scriptdef&gt;
+&lt;scriptdef name="b1" language="beanshell"
+           loaderref="beanshell-ref"&gt;
+  &lt;attribute name="a"/&gt;
+  &lt;classpath path="${user.home}/scripting/beanshell/bsh-1.3b1.jar"/&gt;
+  self.log("attribute a is " + attributes.get("a"));
+&lt;/scriptdef&gt;
+
+&lt;scriptdef name="b2" language="beanshell"
+           loaderref="beanshell-ref"&gt;
+  &lt;attribute name="a2"/&gt;
+  self.log("attribute a2 is " + attributes.get("a2"));
+&lt;/scriptdef&gt;
+
+&lt;b1 a="this is an 'a'"/&gt;
+&lt;b2 a2="this is an 'a2' for b2"/&gt;</pre>
 
-    &lt;b1 a="this is an 'a'"/&gt;
-    &lt;b2 a2="this is an 'a2' for b2"/&gt;
-</pre>
 <h3>Testing Scripts</h3>
 
-<p>
-The easiest way to test scripts is to use the
-<a href="http://ant.apache.org/antlibs/antunit/">AntUnit</a> ant library.
-This will run all targets in a script that begin with "test" (and their dependencies).</p>
+<p>The easiest way to test scripts is to use
+the <a href="https://ant.apache.org/antlibs/antunit/">AntUnit</a> Ant library.  This will run all
+targets in a script that begin with <q>test</q> (and their dependencies).</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/sequential.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sequential.html b/manual/Tasks/sequential.html
index 3551d60..3d7fc10 100644
--- a/manual/Tasks/sequential.html
+++ b/manual/Tasks/sequential.html
@@ -26,14 +26,12 @@
 
 <h2>Sequential</h2>
 <h3>Description</h3>
-<p>Sequential is a container task - it can contain other Apache Ant tasks. The nested
-tasks are simply executed in sequence. Sequential's primary use is to support
-the sequential execution of a subset of tasks within the
-<a href="parallel.html">parallel</a> task</p>
+<p><code>Sequential</code> is a container task&mdash;it can contain other Apache Ant tasks. The
+nested tasks are simply executed in sequence. Sequential's primary use is to support the sequential
+execution of a subset of tasks within the <a href="parallel.html">parallel</a> task</p>
 
-<p>The sequential task has no attributes and does not support any nested
-elements apart from Ant tasks. Any valid Ant task may be embedded within the
-sequential task.</p>
+<p>The <code>sequential</code> task has no attributes and does not support any nested elements apart
+from Ant tasks. Any valid Ant task may be embedded within the sequential task.</p>
 
 <h3>Example</h3>
 <pre>
@@ -44,9 +42,8 @@ sequential task.</p>
     &lt;junit ... &gt;
     &lt;wlstop/&gt;
   &lt;/sequential&gt;
-&lt;/parallel&gt;
-</pre>
-<p>This example shows how the sequential task is used to execute three tasks in
+&lt;/parallel&gt;</pre>
+<p>This example shows how the <code>sequential</code> task is used to execute three tasks in
 sequence, while another task is being executed in a separate thread.</p>
 
 </body>


Mime
View raw message