http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/rmic.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/rmic.html b/manual/Tasks/rmic.html
index 8e82cc3..0cb43b6 100644
--- a/manual/Tasks/rmic.html
+++ b/manual/Tasks/rmic.html
@@ -26,7 +26,7 @@
 
 <h2 id="rmic">Rmic</h2>
 <h3>Description</h3>
-<p>Runs the <code>rmic</code> compiler for a certain class.</p>
+<p>Runs the <kbd>rmic</kbd> compiler for a certain class.</p>
 <p><code>Rmic</code> can be run on a single class (as specified with the 
classname attribute) or a
 number of classes at once (all classes below base that are neither 
<code>_Stub</code>
 nor <code>_Skel</code> classes).  If you want to <code>rmic</code> a single 
class and this class is
@@ -58,9 +58,9 @@ are the choices:</p>
   <li><q>forking</q>&mdash;(<em>since Apache Ant 1.7</em>) the <q>sun</q> 
compiler forked into a
     separate process.  <em>Since Ant 1.9.8</em>, this is the default when 
running on JDK 9+.</li>
   <li><q>xnew</q>&mdash;(<em>since Ant 1.7</em>) the <q>sun</q> compiler 
forked into a separate
-    process, with the <code>-Xnew</code> option. This is the most reliable way 
to
-    use <code>-Xnew</code>.<br/>JDK 9 has removed support for 
<code>-Xnew</code> and <em>since Ant
-    1.9.8</em> this option will be rejected when running on JDK 9.</li>
+    process, with the <kbd>-Xnew</kbd> option. This is the most reliable way to
+    use <kbd>-Xnew</kbd>.<br/>JDK 9 has removed support for <kbd>-Xnew</kbd> 
and <em>since Ant
+    1.9.8</em> this option will be rejected when running on JDK 9+.</li>
   <li><q></q> (empty string). This has the same behaviour as not setting the 
compiler attribute.
     First the value of <code>build.rmic</code> is used if defined, and if not, 
the default for the
     platform is chosen. If <code>build.rmic</code> is set to this, you get the 
default.</li>
@@ -73,8 +73,8 @@ consult miniRMI's documentation to learn how to use it.</p>
 <h4>CORBA support</h4>
 
 <p>Java 11 <a href="http://openjdk.java.net/jeps/320"; 
target="_top">removes</a> the Java EE and
-CORBA packages and <code>rmic</code> no longer supports either 
<code>iiop</code>
-or <code>idl</code>. Starting with Ant 1.10.3, the <code>rmic</code> task will 
fail when using
+CORBA packages and <kbd>rmic</kbd> no longer supports either <kbd>-iiop</kbd>
+or <kbd>-idl</kbd> options. Starting with Ant 1.10.3, the <kbd>rmic</kbd> task 
will fail when using
 either while running Java 11+ unless you fork the task and explicitly specify 
an executable.</p>
 
 <h3>Parameters</h3>
@@ -96,7 +96,7 @@ either while running Java 11+ unless you fork the task and 
explicitly specify an
   </tr>
   <tr>
     <td>classname</td>
-    <td>the class for which to run <code>rmic</code>.</td>
+    <td>the class for which to run <kbd>rmic</kbd>.</td>
     <td>No</td>
   </tr>
   <tr>
@@ -106,15 +106,15 @@ either while running Java 11+ unless you fork the task 
and explicitly specify an
   </tr>
   <tr>
     <td>sourcebase</td>
-    <td>Pass the <code>-keepgenerated</code> flag to <code>rmic</code> and 
move the generated source
+    <td>Pass the <kbd>-keepgenerated</kbd> flag to <kbd>rmic</kbd> and move 
the generated source
       file to the given <var>sourcebase</var> directory.</td>
     <td>No</td>
   </tr>
   <tr>
     <td>stubversion</td>
     <td>Specify the JDK version for the generated stub code.  Specify 
<q>1.1</q> to pass
-      the <code>-v1.1</code> option to <code>rmic</code>, <q>1.2</q>
-      for <code>-v12</code>, <q>compat</q> for 
<code>-vcompat</code>.<br/><em>Since Ant 1.7</em>, if
+      the <kbd>-v1.1</kbd> option to <kbd>rmic</kbd>, <q>1.2</q>
+      for <kbd>-v1.2</kbd>, <q>compat</q> for 
<kbd>-vcompat</kbd>.<br/><em>Since Ant 1.7</em>, if
       you do not specify a version, and do not ask for <samp>.iiop</samp> or 
<samp>.idl</samp>
       files, <q>compat</q> is selected.</td>
     <td>No; default is <q>compat</q></td>
@@ -157,7 +157,7 @@ either while running Java 11+ unless you fork the task and 
explicitly specify an
   </tr>
   <tr>
     <td>verify</td>
-    <td>check that classes implement <code>Remote</code> before handing them 
to <code>rmic</code></td>
+    <td>check that classes implement <code>Remote</code> before handing them 
to <kbd>rmic</kbd></td>
     <td>No; default is <q>false</q></td>
   </tr>
   <tr>
@@ -184,7 +184,7 @@ either while running Java 11+ unless you fork the task and 
explicitly specify an
   </tr>
   <tr>
     <td>debug</td>
-    <td>generate debug info (passes <code>-g</code> to <code>rmic</code>)</td>
+    <td>generate debug info (passes <kbd>-g</kbd> to <kbd>rmic</kbd>)</td>
     <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
@@ -211,9 +211,9 @@ either while running Java 11+ unless you fork the task and 
explicitly specify an
   </tr>
   <tr>
     <td>executable</td>
-    <td>Complete path to the <code>rmic</code> executable to use in case of 
the <q>forking</q>
+    <td>Complete path to the <kbd>rmic</kbd> executable to use in case of the 
<q>forking</q>
       or <q>xnew</q> compiler. <em>Since Ant 1.8.0</em>.</td>
-    <td>No; defaults to the <code>rmic</code> compiler of JDK that is 
currently running Ant</td>
+    <td>No; defaults to the <kbd>rmic</kbd> compiler of JDK that is currently 
running Ant</td>
   </tr>
   <tr>
     <td>listfiles</td>
@@ -298,10 +298,10 @@ can be used as an alternative to the <var>compiler</var> 
attribute.</p>
 
 <h3>Examples</h3>
 <pre>&lt;rmic classname=&quot;com.xyz.FooBar&quot; 
base=&quot;${build}/classes&quot;/&gt;</pre>
-<p>runs the <code>rmic</code> compiler for the class 
<code>com.xyz.FooBar</code>. The compiled files
+<p>runs the <kbd>rmic</kbd> compiler for the class 
<code>com.xyz.FooBar</code>. The compiled files
 will be stored in the directory <samp>${build}/classes</samp>.</p>
 <pre>&lt;rmic base=&quot;${build}/classes&quot; 
includes=&quot;**/Remote*.class&quot;/&gt;</pre>
-<p>runs the <code>rmic</code> compiler for all classes with 
<samp>.class</samp> files
+<p>runs the <kbd>rmic</kbd> compiler for all classes with <samp>.class</samp> 
files
 below <samp>${build}/classes</samp> whose classname starts with 
<code>Remote</code>. The compiled
 files will be stored in the directory <samp>${build}/classes</samp>.</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/rpm.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/rpm.html b/manual/Tasks/rpm.html
index f6e35e8..5b80fdb 100644
--- a/manual/Tasks/rpm.html
+++ b/manual/Tasks/rpm.html
@@ -56,31 +56,31 @@ with <code>rpm</code> support.</p>
   <tr>
     <td>cleanBuildDir</td>
     <td>This will remove the generated files in the <samp>BUILD</samp> 
directory.  See the
-      the <code>--clean</code> option of rpmbuild.</td>
+      the <kbd>--clean</kbd> option of <kbd>rpmbuild</kbd>.</td>
     <td>No</td>
   </tr>
   <tr>
     <td>removeSpec</td>
-    <td>This will remove the spec file from <samp>SPECS</samp>.  See the the 
<code>--rmspec</code>
-      option of <code>rpmbuild</code>.</td>
+    <td>This will remove the spec file from <samp>SPECS</samp>.  See the the 
<kbd>--rmspec</kbd>
+      option of <kbd>rpmbuild</kbd>.</td>
     <td>No</td>
   </tr>
   <tr>
     <td>removeSource</td>
-    <td>Flag to remove the sources after the build.  See the 
<code>--rmsource</code> option
-      of <code>rpmbuild</code>.</td>
+    <td>Flag to remove the sources after the build.  See the 
<kbd>--rmsource</kbd> option
+      of <kbd>rpmbuild</kbd>.</td>
     <td>No; default is <q>false</q></td>
   </tr>
   <tr>
     <td>rpmBuildCommand</td>
     <td>The executable to use for building the RPM. Set this if default 
executables are not on
       <code>PATH</code> or a different executable is needed.  <em>Since Apache 
Ant 1.6</em>.</td>
-    <td>No; defaults to <code>rpmbuild</code> if it can be found or 
<code>rpm</code> otherwise</td>
+    <td>No; defaults to <kbd>rpmbuild</kbd> if it can be found or 
<kbd>rpm</kbd> otherwise</td>
   </tr>
   <tr>
     <td>command</td>
     <td>The command to pass to the <code>rpmbuild</code> program.</td>
-    <td>No; default is <code>-bb</code></td>
+    <td>No; default is <kbd>-bb</kbd></td>
   </tr>
   <tr>
     <td>quiet</td>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/schemavalidate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/schemavalidate.html b/manual/Tasks/schemavalidate.html
index 8b1964d..abc3c61 100644
--- a/manual/Tasks/schemavalidate.html
+++ b/manual/Tasks/schemavalidate.html
@@ -169,7 +169,7 @@ their URL equivalents.</p>
 perform entity resolution.</p>
 <h4>attribute</h4>
 <p>The <code>&lt;attribute&gt;</code> element is used to set parser 
features.<br/>Features usable
-with the xerces parser are defined here: <a 
href="https://xml.apache.org/xerces-j/features.html";
+with the Xerces parser are defined here: <a 
href="https://xml.apache.org/xerces-j/features.html";
 target="_top">Setting features</a><br/>SAX features are defined
 here: <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";
 target="_top"><code>http://xml.org/sax/features/</code></a></p>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/scp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scp.html b/manual/Tasks/scp.html
index 14781fa..98db95a 100644
--- a/manual/Tasks/scp.html
+++ b/manual/Tasks/scp.html
@@ -260,9 +260,9 @@ can be a serious security hole.  Consider using variable 
substitution and includ
 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
+<pre class="input">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 <kbd>ps</kbd> 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

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/script.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/script.html b/manual/Tasks/script.html
index a53870f..cd33533 100644
--- a/manual/Tasks/script.html
+++ b/manual/Tasks/script.html
@@ -39,10 +39,10 @@ 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
+task.  The name <code class="code">project</code> is a pre-defined reference 
to the Project, which
+can be used instead of the project name. The name <code 
class="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>
@@ -124,7 +124,7 @@ In particular all targets should have different location 
values.</p>
 <h4>classpath</h4>
 <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.
+structure</a> and can also be set via a nested <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
@@ -266,21 +266,22 @@ of all files a <code>&lt;fileset/&gt;</code> caught.</p>
 <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
+so <code class="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/>
+with <code 
class="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
+a <code class="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>
+its <code class="code">execute()</code> method, because the <code 
class="code">perform()</code>
+method (implemented in Task itself) does the appropriate logging before and 
after
+invoking <code class="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>
@@ -313,7 +314,7 @@ paths to a referenced path. If the path does not exist, it 
will be created.</p>
     project.addTaskDefinition("addtopath", AddToPath.class);
 &lt;/script&gt;</pre>
 <p>An example of using this task to create a path from a list of directories 
(using
-ant-contrib's <a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html";
+Ant-Contrib's <a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html";
 target="_top">&lt;for&gt;</a> task) follows:</p>
 <pre>
 &lt;path id="main.path"&gt;

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/scriptdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html
index 8b497ff..942a07f 100644
--- a/manual/Tasks/scriptdef.html
+++ b/manual/Tasks/scriptdef.html
@@ -43,28 +43,29 @@ 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>
+variables <code class="code">attributes</code> and <code 
class="code">elements</code>. The elements
+in the <code class="code">attributes</code> collection may be accessed by the 
attribute
+name. The <code class="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>
+retrieve the attribute's value from the <code class="code">attributes</code> 
collection.</p>
 
-<p>The name <code>self</code> (<em>since Ant 1.6.3</em>) is a pre-defined 
reference to
+<p>The name <code class="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>
+rest of Ant. The <code class="code">self.text</code> attribute 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
+<p>If an attribute or element is not passed in, then <code 
class="code">attributes.get()</code>
+or <code class="code">elements.get()</code> will return null. It is up to the 
script to perform any
+checks and validation. <code class="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>
+<p>The name <code class="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 class="attr">
@@ -236,8 +237,8 @@ through them</p>
 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>
+<pre class="output">build.xml:15: SyntaxError: missing } in compound
+statement (scriptdef &lt;scripttest2&gt;; line 10)</pre>
 
 <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

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/signjar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/signjar.html b/manual/Tasks/signjar.html
index 2dde124..53269f3 100644
--- a/manual/Tasks/signjar.html
+++ b/manual/Tasks/signjar.html
@@ -29,7 +29,7 @@
 <p>Signing a jar allows users to authenticate the publisher.</p>
 <p>Signs JAR files with
 the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jarsigner.html";
-target="_top"><code>jarsigner</code> command line tool</a>.  It will take a 
named file in
+target="_top"><kbd>jarsigner</kbd></a> command line tool.  It will take a 
named file in
 the <var>jar</var> attribute, and an optional <var>destDir</var> or 
<var>signedJar</var>
 attribute. Nested paths are also supported; here only an (optional) 
<var>destDir</var> is
 allowed. If a destination directory or explicit JAR file name is not provided, 
JARs are signed in
@@ -119,7 +119,7 @@ place.</p>
   </tr>
   <tr>
     <td>maxmemory</td>
-    <td>Specifies the maximum memory the <code>jarsigner</code> JVM will use. 
Specified in the style
+    <td>Specifies the maximum memory the <kbd>jarsigner</kbd> JVM will use. 
Specified in the style
       of standard Java memory specs (e.g. <q>128m</q> = 128 MBytes)</td>
     <td>No</td>
   </tr>
@@ -150,9 +150,9 @@ place.</p>
   </tr>
   <tr>
     <td>executable</td>
-    <td>Specify a particular <code>jarsigner</code> executable to use in place 
of the default binary
+    <td>Specify a particular <kbd>jarsigner</kbd> executable to use in place 
of the default binary
       (found in the same JDK as Apache Ant is running in).<br/>Must support 
the same command line
-      options as the Sun JDK <code>jarsigner</code> command.  <em>since Ant 
1.8.0</em>.</td>
+      options as the Sun JDK <kbd>jarsigner</kbd> command.  <em>since Ant 
1.8.0</em>.</td>
     <td>No</td>
   </tr>
   <tr>
@@ -250,7 +250,7 @@ the files will only be signed if they are not already 
signed.</p>
 &lt;/signjar&gt;</pre>
 <p>Sign all the JAR files in <samp>dist/**/*.jar</samp> using the digest 
algorithm SHA1 and the
 signature algorithm MD5withRSA. This is especially useful when you want to use 
the JDK
-7 <code>jarsigner</code> (which uses SHA256 and SHA256withRSA as default) to 
create signed jars that
+7 <kbd>jarsigner</kbd> (which uses SHA256 and SHA256withRSA as default) to 
create signed jars that
 will be deployed on platforms not supporting SHA256 and SHA256withRSA.</p>
 <h3>About timestamp signing</h3>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sos.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sos.html b/manual/Tasks/sos.html
index 4d242a3..1180e97 100644
--- a/manual/Tasks/sos.html
+++ b/manual/Tasks/sos.html
@@ -45,10 +45,10 @@ target="_top">SourceGear's</a> <a 
href="https://sourcegear.com/sos/"; target="_to
 product. SourceOffSite is an add-on to Microsoft's VSS, that allows remote 
development teams and
 tele-commuters that need fast and secure read/write access to a centralized 
SourceSafe database via
 any TCP/IP connection. SOS provides Linux, Solaris &amp; Windows
-clients. The <code>org.apache.tools.ant.taskdefs.optional.sos</code> package 
consists of a simple
-framework to support SOS functionality as well as some Apache Ant tasks 
encapsulating frequently
-used SOS commands.  Although it is possible to use these commands on the 
desktop, they were
-primarily intended to be used by automated build systems. These tasks have 
been tested with
+clients. The <code 
class="code">org.apache.tools.ant.taskdefs.optional.sos</code> package consists
+of a simple framework to support SOS functionality as well as some Apache Ant 
tasks encapsulating
+frequently used SOS commands.  Although it is possible to use these commands 
on the desktop, they
+were primarily intended to be used by automated build systems. These tasks 
have been tested with
 SourceOffSite version 3.5.1 connecting to VisualSourceSafe 6.0. The tasks have 
been tested with
 Linux, Solaris &amp; Windows 2000.</p>
 
@@ -95,7 +95,7 @@ Linux, Solaris &amp; Windows 2000.</p>
   <tbody>
     <tr>
       <td>soscmd</td>
-      <td>Directory which contains <code>soscmd(.exe)</code></td>
+      <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
       <td>No; by default, the executable must be in the path</td>
     </tr>
     <tr>
@@ -207,7 +207,7 @@ working directory.</p>
   <tbody>
     <tr>
       <td>soscmd</td>
-      <td>Directory which contains <code>soscmd(.exe)</code></td>
+      <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
       <td>No; by default, the executable must be in the path</td>
     </tr>
     <tr>
@@ -283,7 +283,7 @@ the <samp>$/SourceRoot/project1</samp> project with <q>test 
label</q>.</p>
   <tbody>
     <tr>
       <td>soscmd</td>
-      <td>Directory which contains <code>soscmd(.exe)</code></td>
+      <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
       <td>No; by default, the executable must be in the path</td>
     </tr>
     <tr>
@@ -391,7 +391,7 @@ be displayed on screen.</p>
   <tbody>
     <tr>
       <td>soscmd</td>
-      <td>Directory which contains <code>soscmd(.exe)</code></td>
+      <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
       <td>No; by default, the executable must be in the path</td>
     </tr>
     <tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sound.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sound.html b/manual/Tasks/sound.html
index 9a441a2..d46ffd0 100644
--- a/manual/Tasks/sound.html
+++ b/manual/Tasks/sound.html
@@ -36,7 +36,7 @@ specify.</p>
 finishes. Therefore you have to place this task as top level or inside a 
target which is always
 executed.</p>
 <p>Unless you are running on Java 1.3 or later, you need the Java Media 
Framework on the classpath
-(<code>javax.sound</code>).</p>
+(<code class="code">javax.sound</code>).</p>
 
 <h3>Parameters specified as nested elements</h3>
 <h4>success</h4>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sql.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sql.html b/manual/Tasks/sql.html
index 764eaea..4923b47 100644
--- a/manual/Tasks/sql.html
+++ b/manual/Tasks/sql.html
@@ -45,7 +45,7 @@ and transaction and fail task.</p>
 proxy settings to route their JDBC operations to the database.  <em>Since 
Apache Ant 1.7</em>, Ant
 running on Java 5 or later defaults to <a href="../proxy.html">using the proxy 
settings of the
 operating system</a>.  Accordingly, the OS proxy settings need to be valid, or 
Ant's proxy support
-disabled with <code>-noproxy</code> option.</p>
+disabled with <kbd>-noproxy</kbd> option.</p>
 
 <h3>Parameters</h3>
 <table class="attr">

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sshexec.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sshexec.html b/manual/Tasks/sshexec.html
index fb0cdc2..2b291a0 100644
--- a/manual/Tasks/sshexec.html
+++ b/manual/Tasks/sshexec.html
@@ -173,7 +173,7 @@ JSCh earlier than 0.1.28.</p>
   <tr>
     <td>verbose</td>
     <td>Determines whether <code>sshexec</code> outputs verbosely to the 
user.<br/>  Similar output
-      is generated as the <code>ssh</code> commandline tool with the 
<code>-v</code>
+      is generated as the <kbd>ssh</kbd> command line tool with the 
<kbd>-v</kbd>
       option.  <em>since Ant 1.8.0</em></td>
     <td>No; defaults to <q>false</q></td>
   </tr>
@@ -196,7 +196,7 @@ JSCh earlier than 0.1.28.</p>
   </tr>
   <tr>
     <td>usepty</td>
-    <td>Whether to allocate a pseudo-tty (like <code>ssh -t</code>).  
<em>since Ant 1.8.3</em></td>
+    <td>Whether to allocate a pseudo-tty (like <kbd>ssh -t</kbd>).  <em>since 
Ant 1.8.3</em></td>
     <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
@@ -261,9 +261,9 @@ command line. For example:</p>
          password=&quot;${password}&quot;
          command=&quot;touch somefile&quot;/&gt;</pre>
 <p>Invoking Ant with the following command line:</p>
-<pre>ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
+<pre class="input">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
+the <kbd>ps</kbd> 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>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sshsession.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sshsession.html b/manual/Tasks/sshsession.html
index ec60bbf..d94f80f 100644
--- a/manual/Tasks/sshsession.html
+++ b/manual/Tasks/sshsession.html
@@ -242,9 +242,9 @@ and include the password on the command line. For 
example:</p>
 &lt;/sshsession&gt;</pre>
 
 <p>Invoking Ant with the following command line:</p>
-<pre>ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
+<pre class="input">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
+the <kbd>ps</kbd> 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>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/style.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html
index f8de21a..c792122 100644
--- a/manual/Tasks/style.html
+++ b/manual/Tasks/style.html
@@ -45,7 +45,7 @@ whether you want to use default exclusions or not. See the 
section
 on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, 
on how the
 inclusion/exclusion of files works, and how to write patterns.</p>
 <p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and 
supports all
-attributes of <code>&lt;fileset&gt;</code> (<code>dir</code> becomes 
<code>basedir</code>) as well
+attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes 
<var>basedir</var>) as well
 as the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
 and <code>&lt;patternset&gt;</code> elements.</p>
 
@@ -55,7 +55,7 @@ stylesheets to all files contain in them as well.  Since the 
default <var>includ
 is <code>**</code> this means it will apply the stylesheet to all files.  If 
you specify
 an <var>excludes</var> pattern, it may still work on the files matched by 
those patterns because the
 parent directory has been matched.  If this behavior is not what you want, set
-the <var>scanincludedirectories</var> attribute to false.</p>
+the <var>scanincludedirectories</var> attribute to <q>false</q>.</p>
 
 <p><em>Since Ant 1.7</em>, this task supports
 nested <a href="../Types/resources.html#collection">resource collections</a> 
in addition to (or
@@ -405,7 +405,7 @@ documentation of your processor.  For example, in Xalan 
2.x:</p>
   <tr>
     <td>classloaderforpath</td>
     <td class="left">Value of the attribute is a classloader that uses the 
classpath specified by a
-      path that is the project reference with the given id. <em>since Ant 
1.9.8</em></td>
+      path that is the project reference with the given <var>id</var>. 
<em>since Ant 1.9.8</em></td>
   </tr>
 </table>
 </blockquote>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/subant.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/subant.html b/manual/Tasks/subant.html
index 22783f2..2f15d2a 100644
--- a/manual/Tasks/subant.html
+++ b/manual/Tasks/subant.html
@@ -168,7 +168,7 @@ whose dependencies are the targets so specified, in the 
order specified.</p>
         &lt;/subant&gt;
     &lt;/target&gt;
 &lt;/project&gt;</pre>
-<p>this snippet build file will run <code>ant</code> in each subdirectory of 
the project directory,
+<p>this snippet build file will run <kbd>ant</kbd> in each subdirectory of the 
project directory,
 where a file called <samp>build.xml</samp> can be found.  The property 
<code>build.dir</code> will
 have the value <q>subant1.build</q> in the Ant projects called by 
<code>subant</code>.</p>
 <pre>
@@ -179,7 +179,7 @@ have the value <q>subant1.build</q> in the Ant projects 
called by <code>subant</
     &lt;/propertyset&gt;
     &lt;fileset dir="." includes="*/build.xml"/&gt;
 &lt;/subant&gt;</pre>
-<p>this snippet build file will run <code>ant</code> in each subdirectory of 
the project directory,
+<p>this snippet build file will run <kbd>ant</kbd> in each subdirectory of the 
project directory,
 where a file called <samp>build.xml</samp> can be found.  All properties whose 
name starts
 with <q>foo</q> are passed, their names are changed to start with <q>bar</q> 
instead</p>
 <pre>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/symlink.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/symlink.html b/manual/Tasks/symlink.html
index ad1714f..67e97dd 100644
--- a/manual/Tasks/symlink.html
+++ b/manual/Tasks/symlink.html
@@ -111,14 +111,14 @@ named <samp>dir.links</samp></p>
 
 <p><strong>Java 1.2 and earlier</strong>: Due to limitations on executing 
system level commands in
 Java versions earlier than 1.3 this task may have difficulty operating with a 
relative path
-in <code>ANT_HOME</code>. The typical symptom is an IOException where Apache 
Ant can't
+in <code>ANT_HOME</code>. The typical symptom is an <code>IOException</code> 
where Apache Ant can't
 find <samp>/some/working/directory${ANT_HOME}/bin/antRun</samp> or something 
similar. The workaround
 is to change your <code>ANT_HOME</code> environment variable to an absolute 
path, which will remove
 the <samp>/some/working/directory</samp> portion of the above path and allow 
Ant to find the correct
 command line execution script.</p>
 
 <p><strong>Note</strong>: <em>Since Ant 1.10.2</em>, this task relies on the 
symbolic link support
-introduced in Java 7 through the <code>java.nio.file.Files</code> APIs</p>
+introduced in Java 7 through the <code class="code">java.nio.file.Files</code> 
APIs</p>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/tar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/tar.html b/manual/Tasks/tar.html
index 98518ce..927b96b 100644
--- a/manual/Tasks/tar.html
+++ b/manual/Tasks/tar.html
@@ -40,27 +40,28 @@ access mode, username and groupname to be applied to the 
tar entries. This is us
 when preparing archives for Unix systems where some files need to have execute 
permission.  By
 default this task will use Unix permissions of 644 for files and 755 for 
directories.</p>
 
-<p>Early versions of <code>tar</code> utility did not support paths longer 
than 100 characters. Over
+<p>Early versions of <kbd>tar</kbd> utility did not support paths longer than 
100 characters. Over
 time several incompatible extensions have been developed until a new POSIX 
standard was created that
-added so called PAX extension headers (as the <code>pax</code> utility first 
introduced them) that
-among another things addressed file names longer than 100 characters.  All 
modern implementations of
-tar support PAX extension headers.</p>
-
-<p>Ant's tar support predates the standard with PAX extension headers, it 
supports different
-dialects that can be enabled using the <var>longfile</var> attribute.  If the 
<var>longfile</var>
-attribute is set to <q>fail</q>, any long paths will cause the tar task to 
fail.  If
-the <var>longfile</var> attribute is set to <q>truncate</q>, any long paths 
will be truncated to the
-100 character maximum length prior to adding to the archive. If the value of 
the <var>longfile</var>
-attribute is set to <q>omit</q> then files containing long paths will be 
omitted from the archive.
-Either option ensures that the archive can be untarred by any compliant 
version of tar.</p>
+added so called PAX extension headers (as the <kbd>pax</kbd> utility first 
introduced them) that
+among another things addressed file names longer than 100 characters.  All 
modern implementations
+of <kbd>tar</kbd> support PAX extension headers.</p>
+
+<p>Ant's <kbd>tar</kbd> support predates the standard with PAX extension 
headers, it supports
+different dialects that can be enabled using the <var>longfile</var> 
attribute.  If
+the <var>longfile</var> attribute is set to <q>fail</q>, any long paths will 
cause
+the <code>tar</code> task to fail.  If the <var>longfile</var> attribute is 
set to <q>truncate</q>,
+any long paths will be truncated to the 100 character maximum length prior to 
adding to the
+archive. If the value of the <var>longfile</var> attribute is set to 
<q>omit</q> then files
+containing long paths will be omitted from the archive.  Either option ensures 
that the archive can
+be untarred by any compliant version of <kbd>tar</kbd>.</p>
 
 <p>If the loss of path or file information is not acceptable, and it rarely 
is, <var>longfile</var>
 may be set to the value <q>gnu</q> or <q>posix</q>.  With <q>posix</q> Ant 
will add PAX extension
-headers, with <q>gnu</q> it adds GNU tar specific extensions that newer 
versions of GNU tar
-call <q>oldgnu</q>.  GNU tar still creates these extensions by default but 
supports PAX extension
-headers as well.  Either choice will produce a tar file which can have 
arbitrary length paths. Note
-however, that the resulting archive will only be able to be untarred with tar 
tools that support the
-chosen format.</p>
+headers, with <q>gnu</q> it adds GNU <kbd>tar</kbd> specific extensions that 
newer versions of
+GNU <kbd>tar</kbd> call <q>oldgnu</q>.  GNU <kbd>tar</kbd> still creates these 
extensions by default
+but supports PAX extension headers as well.  Either choice will produce a tar 
file which can have
+arbitrary length paths. Note however, that the resulting archive will only be 
able to be untarred
+with <kbd>tar</kbd> tools that support the chosen format.</p>
 
 <p>The default for the <var>longfile</var> attribute is <q>warn</q> which 
behaves just like
 the <q>gnu</q> option except that it produces a warning for each filepath 
encountered that does not

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/telnet.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/telnet.html b/manual/Tasks/telnet.html
index 3f81e46..78a7c97 100644
--- a/manual/Tasks/telnet.html
+++ b/manual/Tasks/telnet.html
@@ -26,8 +26,8 @@
 
 <h2 id="telnet">Telnet</h2>
 <h3>Description</h3>
-<q>Task to automate a remote telnet session. The task uses nested 
<code>&lt;read&gt;</code> to
-indicate strings to wait for, and <code>&lt;write&gt;</code> tags to specify 
text to send.</q>
+<p>Task to automate a remote telnet session. The task uses nested 
<code>&lt;read&gt;</code> to
+indicate strings to wait for, and <code>&lt;write&gt;</code> tags to specify 
text to send.</p>
 
 <p>If you do specify a userid and password, the system will assume a common 
Unix prompt to wait
 on. This behavior can be easily overridden.</p>
@@ -115,7 +115,7 @@ of <q>ogin:</q> for the userid, and a prompt of 
<q>assword:</q> for the password
 &lt;/telnet&gt;</pre>
 
 <p>A timeout can be specified at the <code>&lt;telnet&gt;</code> level or at
-the <code>&lt;read&gt;</code> level.  This will connect, issue a 
<code>sleep</code> command that is
+the <code>&lt;read&gt;</code> level.  This will connect, issue a 
<kbd>sleep</kbd> command that is
 suppressed from displaying and wait 10 seconds before quitting.</p>
 
 <pre>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/tempfile.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/tempfile.html b/manual/Tasks/tempfile.html
index d2f0c5b..9a3da65 100644
--- a/manual/Tasks/tempfile.html
+++ b/manual/Tasks/tempfile.html
@@ -26,8 +26,8 @@
 <h2>Tempfile Task</h2>
 <h3 id="description">Description</h3>
 <p>This task sets a property to the name of a temporary file.
-Unlike <code>java.io.File.createTempFile</code>, this task does not actually 
create the temporary
-file, but it does guarantee that the file did not exist when the task was 
executed.</p>
+Unlike <code class="code">java.io.File.createTempFile</code>, this task does 
not actually create the
+temporary file, but it does guarantee that the file did not exist when the 
task was executed.</p>
 <h3 id="attributes">Parameters</h3>
 <table class="attr">
   <tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/touch.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/touch.html b/manual/Tasks/touch.html
index d4ed96b..2ce9e42 100644
--- a/manual/Tasks/touch.html
+++ b/manual/Tasks/touch.html
@@ -33,10 +33,10 @@ on <a href="../Types/resources.html">resources</a> and 
resource collections (whi
 directories).  Prior to Apache Ant 1.7 only FileSet or <a 
href="../Types/filelist.html">Filelist</a>
 (<em>since Ant 1.6</em>) were supported.</p>
 
-<p>Ant uses the API of <code>java.io.File</code> to set the last modification 
time which has some
-limitations.  For example, the timestamp granularity depends on the operating 
system and sometimes
-the operating system may allow a granularity smaller than milliseconds.  If 
you need more control
-you have to fall back to the <code>&lt;exec&gt;</code> task and native 
commands.</p>
+<p>Ant uses the API of <code class="code">java.io.File</code> to set the last 
modification time
+which has some limitations.  For example, the timestamp granularity depends on 
the operating system
+and sometimes the operating system may allow a granularity smaller than 
milliseconds.  If you need
+more control you have to fall back to the <code>&lt;exec&gt;</code> task and 
native commands.</p>
 
 <p><em>Since Ant 1.8.2</em>, a warning message is logged upon failure to 
change the file
 modification time.  This will happen if you try to change the modification 
time of a file you do not
@@ -90,8 +90,9 @@ own on many Unix systems, for example.</p>
 
 <p>You can use any number of nested resource collection elements to define the 
resources for this
 task and refer to resources defined elsewhere. <strong>Note</strong>: 
resources passed to this task
-must implement the <code>org.apache.tools.ant.types.resources.Touchable</code> 
interface, this is
-true for all filesystem-based resources like those returned by path, fileset 
ot filelist.</p>
+must implement the <code 
class="code">org.apache.tools.ant.types.resources.Touchable</code>
+interface, this is true for all filesystem-based resources like those returned 
by path, fileset ot
+filelist.</p>
 
 <p>For backwards compatibility directories matched by nested filesets will be 
"touched" as well, use
 a <var>type</var> selector to suppress this.  This only applies to filesets 
nested into the task
@@ -103,7 +104,7 @@ Files specified via nested <code>fileset</code>s, 
<code>filelist</code>s, or the
 attribute are mapped using the specified mapper.  For each file mapped, the 
resulting files are
 touched. If no time has been specified and the original file exists its 
timestamp will be used.  If
 no time has been specified and the original file does not exist the current 
time is used. <em>Since
-Ant 1.8</em>, the task settings (<var>millis</var>, and <var>datetime</var>) 
have priority over the
+Ant 1.8</em>, the task settings (<var>millis</var> and <var>datetime</var>) 
have priority over the
 timestamp of the original file.</p>
 <h3>Examples</h3>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/translate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/translate.html b/manual/Tasks/translate.html
index ea1f5a5..5f16457 100644
--- a/manual/Tasks/translate.html
+++ b/manual/Tasks/translate.html
@@ -54,7 +54,7 @@ bundle files can be specified.</p>
 If <var>forceoverwrite</var> is <q>false</q>, the destination file is 
overwritten only if either the
 source file or any of the files that make up the bundle have been modified 
after the destination
 file was last modified.</p>
-<p><em>Since Apache Ant 1.6</em>:<br/>Line endings of source files are 
preserved in the translated
+<p><em>Since Apache Ant 1.6</em> line endings of source files are preserved in 
the translated
 files.</p>
 <p><a href="../Types/fileset.html">FileSet</a>s are used to select files to 
translate.</p>
 <h3>Parameters</h3>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/truncate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/truncate.html b/manual/Tasks/truncate.html
index 54a8610..3bd9c26 100644
--- a/manual/Tasks/truncate.html
+++ b/manual/Tasks/truncate.html
@@ -28,8 +28,8 @@
 <p><em>Since Apache Ant 1.7.1</em></p>
 <h3>Description</h3>
 
-<p>Set the length of one or more files, as the intermittently available 
<code>truncate</code> Unix
-utility/function. In addition to working with a single file, this Task can 
also work
+<p>Set the length of one or more files, as the <code>truncate</code> Unix 
function or GNU
+utility. In addition to working with a single file, this Task can also work
 on <a href="../Types/resources.html">resources</a> and resource 
collections.</p>
 
 <h3>Parameters</h3>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/typedef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/typedef.html b/manual/Tasks/typedef.html
index 3908447..77ef03d 100644
--- a/manual/Tasks/typedef.html
+++ b/manual/Tasks/typedef.html
@@ -28,8 +28,8 @@
 <h3>Description</h3>
 <p>Adds a task or a data type definition to the current project such that this 
new type or task can
 be used in the current project.</p>
-<p>A Task is any class that extends <code>org.apache.tools.ant.Task</code> or 
can be adapted as a
-Task using an adapter class.</p>
+<p>A Task is any class that extends <code 
class="code">org.apache.tools.ant.Task</code> or can be adapted
+as a Task using an adapter class.</p>
 <p>Data types are things like <a href="../using.html#path">paths</a>
 or <a href="../Types/fileset.html">filesets</a> that can be defined at the 
project level and
 referenced via their <var>id</var> attribute.  Custom data types usually need 
custom tasks to put
@@ -159,9 +159,10 @@ structure</a> and can also be set via a nested 
<code>classpath</code> element.</
 type.</p>
 
 <p>Assuming a class <code>org.acme.ant.RunnableAdapter</code> that extends 
Task and
-implements <code>org.apache.tools.ant.TypeAdapter</code>, and in the execute 
method
-invokes <code>run()</code> on the proxied object, one may use a Runnable class 
as an Ant task. The
-following fragment defines a task called <code>runclock</code>.</p>
+implements <code class="code">org.apache.tools.ant.TypeAdapter</code>, and in
+the <code class="code">execute()</code> method invokes <code 
class="code">run()</code> on the
+proxied object, one may use a <code>Runnable</code> class as an Ant task. The 
following fragment
+defines a task called <code>runclock</code>.</p>
 <pre>
 &lt;typedef name="runclock"
          classname="com.acme.ant.RunClock"
@@ -191,7 +192,7 @@ important:</p>
               classpath="path/to/ant-contrib.jar"/&gt;</pre>
 
 <p>Here the namespace declaration 
<code>xmlns:antcontrib="antlib:net.sf.antcontrib"</code> allows
-tasks and types of the AntContrib Antlib to be used with the 
<samp>antcontrib</samp> prefix
+tasks and types of the Ant-Contrib Antlib to be used with the 
<samp>antcontrib</samp> prefix
 like <code>&lt;antcontrib:if&gt;</code>.  The normal rules of XML namespaces 
apply and you can
 declare the prefix at any element to make it usable for the element it is 
declared on as well as all
 its child elements.</p>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/verifyjar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/verifyjar.html b/manual/Tasks/verifyjar.html
index 3fe02ce..e20c401 100644
--- a/manual/Tasks/verifyjar.html
+++ b/manual/Tasks/verifyjar.html
@@ -26,8 +26,10 @@
 
 <h2 id="verifyjar">VerifyJar</h2>
 <h3>Description</h3>
-<p>Verifies JAR files with the <code>jarsigner</code> command line tool.  It 
will take a named file
-in the <var>jar</var> attribute. Nested paths are also supported.</p>
+<p>Verifies JAR files with
+the <a 
href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jarsigner.html";
+target="_top"><kbd>jarsigner</kbd></a> command line tool.  It will take a 
named file in
+the <var>jar</var> attribute. Nested paths are also supported.</p>
 
 <h3>Parameters</h3>
 <table class="attr">
@@ -83,15 +85,15 @@ in the <var>jar</var> attribute. Nested paths are also 
supported.</p>
   </tr>
   <tr>
     <td>maxmemory</td>
-    <td>Specifies the maximum memory the <code>jarsigner</code> JVM will use. 
Specified in the style
+    <td>Specifies the maximum memory the <kbd>jarsigner</kbd> JVM will use. 
Specified in the style
       of standard Java memory specs (e.g. <q>128m</q> = 128 MBytes)</td>
     <td>No</td>
   </tr>
   <tr>
     <td>executable</td>
-    <td>Specify a particular <code>jarsigner</code> executable to use in place 
of the default binary
+    <td>Specify a particular <kbd>jarsigner</kbd> executable to use in place 
of the default binary
       (found in the same JDK as Apache Ant is running in).<br/>  Must support 
the same command line
-      options as the Sun JDK <code>jarsigner</code> command.  <em>since Ant 
1.8.0</em>.</td>
+      options as the Sun JDK <kbd>jarsigner</kbd> command.  <em>since Ant 
1.8.0</em>.</td>
     <td>No</td>
   </tr>
 </table>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/vss.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/vss.html b/manual/Tasks/vss.html
index 8e6117c..e7ece0b 100644
--- a/manual/Tasks/vss.html
+++ b/manual/Tasks/vss.html
@@ -46,13 +46,13 @@
 <p>These tasks provide an interface to
 the <a href="https://msdn.microsoft.com/en-us/library/3h0544kx(v=vs.80).aspx"
 target="_top">Microsoft Visual SourceSafe</a> SCM.
-The <code>org.apache.tools.ant.taskdefs.optional.vss</code> package consists 
of a simple framework
-to support VSS functionality as well as some Apache Ant tasks encapsulating 
frequently used VSS
-commands.  Although it is possible to use these commands on the desktop, they 
were primarily
-intended to be used by automated build systems.</p>
-<p>If you get a <code>CreateProcess error=2</code> when running these, it means
-that <code>ss.exe</code> was not found. Check to see if you can run it from 
the command
-line&mdash;you may need to alter your path, or set the <var>ssdir</var> 
property.</p>
+The <code class="code">org.apache.tools.ant.taskdefs.optional.vss</code> 
package consists of a
+simple framework to support VSS functionality as well as some Apache Ant tasks 
encapsulating
+frequently used VSS commands.  Although it is possible to use these commands 
on the desktop, they
+were primarily intended to be used by automated build systems.</p>
+<p>If you get a <code class="output">CreateProcess error=2</code> when running 
these, it means
+that <kbd>ss.exe</kbd> was not found. Check to see if you can run it from the 
command line&mdash;you
+may need to alter your path, or set the <var>ssdir</var> property.</p>
 <h2 id="tasks">The Tasks</h2>
 
 <table>
@@ -127,7 +127,7 @@ order version, date, label.</p>
   </tr>
   <tr>
     <td>ssdir</td>
-    <td>directory where <code>ss.exe</code> resides.</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
     <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
@@ -168,7 +168,7 @@ order version, date, label.</p>
   </tr>
   <tr>
     <td>autoresponse</td>
-    <td>What to respond with (sets the <code>-I</code> option). By default, 
<code>-I-</code> is
+    <td>What to respond with (sets the <kbd>-I</kbd> option). By default, 
<kbd>-I-</kbd> is
       used; values of <q>Y</q> or <q>N</q> will be appended to this.</td>
     <td>No</td>
   </tr>
@@ -180,7 +180,7 @@ order version, date, label.</p>
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the build process if <code>ss.exe</code> exits with a return code 
<q>100</q></td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code 
<q>100</q></td>
     <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
@@ -233,7 +233,7 @@ writable.</p>
   </tr>
   <tr>
     <td>ssdir</td>
-    <td>directory where <code>ss.exe</code> resides.</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
     <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
@@ -259,13 +259,13 @@ writable.</p>
   </tr>
   <tr>
     <td>autoresponse</td>
-    <td>What to respond with (sets the <code>-I</code> option). By default, 
<code>-I-</code> is
+    <td>What to respond with (sets the <kbd>-I</kbd> option). By default, 
<kbd>-I-</kbd> is
       used; values of <q>Y</q> or <q>N</q> will be appended to this.</td>
     <td>No</td>
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the build process if <code>ss.exe</code> exits with a return code 
<q>100</q>.</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code 
<q>100</q>.</td>
     <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
@@ -314,7 +314,7 @@ Task to perform HISTORY commands to Microsoft Visual 
SourceSafe.
   </tr>
   <tr>
     <td>ssdir</td>
-    <td>directory where <code>ss.exe</code> resides.</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
     <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
@@ -376,7 +376,7 @@ Task to perform HISTORY commands to Microsoft Visual 
SourceSafe.
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the build process if <code>ss.exe</code> exits with a return code 
<q>100</q></td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code 
<q>100</q></td>
     <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
@@ -451,7 +451,7 @@ specified according to your locale).</p>
   </tr>
   <tr>
      <td>ssdir</td>
-     <td>directory where <code>ss.exe</code> resides.</td>
+     <td>directory where <kbd>ss.exe</kbd> resides.</td>
      <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
@@ -481,7 +481,7 @@ specified according to your locale).</p>
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the build process if <code>ss.exe</code> exits with a return code 
<q>100</q>.</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code 
<q>100</q>.</td>
     <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
@@ -531,7 +531,7 @@ order <var>version</var>, <var>date</var>, 
<var>label</var>.</p>
   </tr>
   <tr>
     <td>ssdir</td>
-    <td>directory where <code>ss.exe</code> resides.</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
     <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
@@ -570,7 +570,7 @@ order <var>version</var>, <var>date</var>, 
<var>label</var>.</p>
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the build process if <code>ss.exe</code> exits with a return code 
<q>100</q>.</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code 
<q>100</q>.</td>
     <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
@@ -623,7 +623,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
   </tr>
   <tr>
     <td>ssdir</td>
-    <td>directory where <code>ss.exe</code> resides.</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
     <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
@@ -653,7 +653,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the build process if <code>ss.exe</code> exits with a return code 
<q>100</q>.</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code 
<q>100</q>.</td>
     <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
@@ -694,7 +694,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
   </tr>
   <tr>
     <td>ssdir</td>
-    <td>directory where <code>ss.exe</code> resides.</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
     <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
@@ -704,7 +704,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the build process if <code>ss.exe</code> exits with a return code 
<q>100</q>.</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code 
<q>100</q>.</td>
     <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
@@ -740,7 +740,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
   </tr>
   <tr>
     <td>ssdir</td>
-    <td>directory where <code>ss.exe</code> resides.</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
     <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
@@ -755,7 +755,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
   </tr>
   <tr>
     <td>autoresponse</td>
-    <td>What to respond with (sets the <code>-I</code> option). By default, 
<code>-I-</code> is
+    <td>What to respond with (sets the <kbd>-I</kbd> option). By default, 
<kbd>-I-</kbd> is
       used; values of <q>Y</q> or <q>N</q> will be appended to this.</td>
     <td>No</td>
   </tr>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/xmlvalidate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/xmlvalidate.html b/manual/Tasks/xmlvalidate.html
index 9a74c59..f1256bd 100644
--- a/manual/Tasks/xmlvalidate.html
+++ b/manual/Tasks/xmlvalidate.html
@@ -118,10 +118,10 @@ perform entity resolution.</p>
 <h4>attribute</h4>
 <p>The <code>&lt;attribute&gt;</code> element is used to set parser 
features.</p>
 <p>Features usable with the Xerces parser are defined
-here: <a href="https://xml.apache.org/xerces-j/features.html"; 
target="_top">Setting features</a></p>
+here: <a href="https://xml.apache.org/xerces-j/features.html"; 
target="_top">Setting Features</a></p>
 <p>SAX features are defined
 here: <a 
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";
-target="_top"><code>http://xml.org/sax/features/</code></a></p>
+target="_top">SAX2 Standard Feature Flags</a></p>
 <table class="attr">
   <tr>
     <th>Attribute</th>
@@ -212,7 +212,7 @@ task is better for validating W3C XML Schemas, as it 
extends this task with the
 automatically enabled, and makes it easy to add a list of schema files/URLs to 
act as sources.</p>
 
 <pre>
-<!-- Converts path to URL format -->
+&lt;!-- Convert path to URL format --&gt;
 &lt;pathconvert dirsep="/" property="xsd.file"&gt;
 &lt;path&gt;
    &lt;pathelement location="xml/doc.xsd"/&gt;

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/zip.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html
index 28fc209..c83a28c 100644
--- a/manual/Tasks/zip.html
+++ b/manual/Tasks/zip.html
@@ -82,8 +82,8 @@ see <a href="#encoding">below</a></p>
 (see description of the <var>filemode</var> and <var>dirmode</var> attributes
 for <a href="../Types/zipfileset.html">&lt;zipfileset&gt;</a>).  Unfortunately 
there is no portable
 way to store these permissions.  Ant uses the algorithm used by <a 
href="http://www.info-zip.org";
-target="_top">Info-Zip's</a> implementation of the <code>zip</code> and 
<code>unzip</code>
-commands&mdash;these are the default versions of <code>zip</code> and 
<code>unzip</code> for many
+target="_top">Info-Zip's</a> implementation of the <kbd>zip</kbd> and 
<kbd>unzip</kbd>
+commands&mdash;these are the default versions of <kbd>zip</kbd> and 
<kbd>unzip</kbd> for many
 Unix(-like) systems.</p>
 
 <p><strong>Please note that the zip format allows multiple files of the same 
fully-qualified name to
@@ -264,8 +264,8 @@ extract an Ant generated ZIP archive.</p>
 sufficient for many international character sets.</p>
 
 <p>Over time different archivers have chosen different ways to work around the
-limitation&mdash;the <code>java.util.zip</code> packages simply uses UTF-8 as 
its encoding for
-example.</p>
+limitation&mdash;the <code class="code">java.util.zip</code> packages simply 
uses UTF-8 as its
+encoding for example.</p>
 
 <p>Ant has been offering the <q>encoding</q> attribute of the <code>zip</code>
 and <code>unzip</code> task as a way to explicitly specify the encoding to use 
(or expect) <em>since
@@ -307,13 +307,13 @@ ZIP archives.  Below are some test results which may be 
superseded with later ve
 tool.</p>
 
 <ul>
-  <li>The <code>java.util.zip</code> package used by the <code>jar</code> 
executable or to read jars
-    from your <code>CLASSPATH</code> reads and writes UTF-8 names, it doesn't 
set or recognize any
-    flags or unicode extra fields.</li>
-  <li>Since Java 7, <code>java.util.zip</code> writes UTF-8 by default and 
uses the language
-    encoding flag.  It is possible to specify a different encoding when 
reading/writing ZIPs via new
-    constructors.  The package now recognizes the language encoding flag when 
reading and ignores
-    the Unicode extra fields.</li>
+  <li>The <code class="code">java.util.zip</code> package used by the 
<kbd>jar</kbd> executable or
+    to read jars from your <code>CLASSPATH</code> reads and writes UTF-8 
names, it doesn't set or
+    recognize any flags or unicode extra fields.</li>
+  <li>Since Java 7, <code class="code">java.util.zip</code> writes UTF-8 by 
default and uses the
+    language encoding flag.  It is possible to specify a different encoding 
when reading/writing
+    ZIPs via new constructors.  The package now recognizes the language 
encoding flag when reading
+    and ignores the Unicode extra fields.</li>
   <li>7Zip writes CodePage 437 by default but uses UTF-8 and the language 
encoding flag when writing
     entries that cannot be encoded as CodePage 437 (similar to the 
<code>zip</code> task
     with <var>fallbacktoUTF8</var> set to <q>true</q>).  It recognizes the 
language encoding flag
@@ -332,16 +332,16 @@ tool.</p>
 
 <p>So, what to do?</p>
 
-<p>If you are creating jars, then <code>java.util.zip</code> is your main 
consumer.  We recommend
-you set the encoding to UTF-8 and keep the language encoding flag enabled.  
The flag won't help or
-hurt <code>java.util.zip</code> prior to Java 7 but archivers that support it 
will show the correct
-file names.</p>
+<p>If you are creating jars, then <code class="code">java.util.zip</code> is 
your main consumer.  We
+recommend you set the encoding to UTF-8 and keep the language encoding flag 
enabled.  The flag won't
+help or hurt <code class="code">java.util.zip</code> prior to Java 7 but 
archivers that support it
+will show the correct file names.</p>
 
 <p>For maximum interoparability it is probably best to set the encoding to 
UTF-8, enable the
 language encoding flag and create Unicode extra fields when writing ZIPs.  
Such archives should be
-extracted correctly by <code>java.util.zip</code>, 7Zip, WinZIP, PKWARE tools 
and most likely
-InfoZIP tools.  They will be unusable with Windows' "compressed folders" 
feature and bigger than
-archives without the Unicode extra fields, though.</p>
+extracted correctly by <code class="code">java.util.zip</code>, 7Zip, WinZIP, 
PKWARE tools and most
+likely InfoZIP tools.  They will be unusable with Windows' "compressed 
folders" feature and bigger
+than archives without the Unicode extra fields, though.</p>
 
 <p>If Windows' "compressed folders" is your primary consumer, then your best 
option is to explicitly
 set the encoding to the target platform.  You may want to enable creation of 
Unicode extra fields so
@@ -376,9 +376,9 @@ the <code>zip</code> family of tasks.  It supports three 
values:
 limits of traditional zip files but don't want to waste too much space (the 
Zip64 extensions take up
 extra space).  Unfortunately some ZIP implementations don't understand Zip64 
extra fields or fail to
 parse archives with extra fields in local file headers that are not present in 
the central
-directory, one such implementation is the <code>java.util.zip</code> package 
of Java 5, that's why
-the <code>jar</code> tasks default to <q>never</q>.  Archives created with 
<q>as-needed</q> can be
-read without problems with Java 6 and later.</p>
+directory, one such implementation is the <code 
class="code">java.util.zip</code> package of Java 5,
+that's why the <code>jar</code> tasks default to <q>never</q>.  Archives 
created
+with <q>as-needed</q> can be read without problems with Java 6 and later.</p>
 
 <h3>Parameters specified as nested elements</h3>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/antlib.html
----------------------------------------------------------------------
diff --git a/manual/Types/antlib.html b/manual/Types/antlib.html
index bafc2f9..515e39f 100644
--- a/manual/Types/antlib.html
+++ b/manual/Types/antlib.html
@@ -27,10 +27,10 @@
 
     <h3>Description</h3>
     <p>
-      An antlib file is an xml file with a root element of 
<code>antlib</code>.  Antlib's
-      elements are Apache Ant definition
-      tasks&mdash;like <a href="../Tasks/taskdef.html">Taskdef</a> or any Ant 
task that
-      extends <code>org.apache.tools.ant.taskdefs.AntlibDefinition</code>.
+      An antlib file is an xml file with a root element of 
<code>antlib</code>.  Antlib's elements
+      are Apache Ant definition tasks&mdash;like <a 
href="../Tasks/taskdef.html">Taskdef</a> or any
+      Ant task that
+      extends <code 
class="code">org.apache.tools.ant.taskdefs.AntlibDefinition</code>.
     </p>
     <p>
       The current set of declarations bundled with Ant that do this are:

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/classfileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/classfileset.html b/manual/Types/classfileset.html
index f394b2d..eaf4a16 100644
--- a/manual/Types/classfileset.html
+++ b/manual/Types/classfileset.html
@@ -77,11 +77,11 @@ may be used
 
 <h4>RootFileSet</h4>
 <p>
-A root fileset is used to add a set of root classes from a fileset. In this 
case the entries in
-the fileset are expected to be Java class files. The name of the Java class is 
determined by the
+A root fileset is used to add a set of root classes from a fileset. In this 
case the entries in the
+fileset are expected to be Java class files. The name of the Java class is 
determined by the
 relative location of the classfile in the fileset. So, the
 file <code>org/apache/tools/ant/Project.class</code> corresponds to the Java
-class <code>org.apache.tools.ant.Project</code>.</p>
+class <code class="code">org.apache.tools.ant.Project</code>.</p>
 
 <h4>Examples</h4>
 <pre>
@@ -90,8 +90,8 @@ class <code>org.apache.tools.ant.Project</code>.</p>
 &lt;/classfileset&gt;</pre>
 <p>
 This example creates a fileset containing all the class files upon which
-the <code>org.apache.tools.ant.Project</code> class depends. This fileset 
could then be used to
-create a jar.
+the <code class="code">org.apache.tools.ant.Project</code> class depends. This 
fileset could then be
+used to create a jar.
 </p>
 
 <pre>
@@ -104,8 +104,9 @@ create a jar.
   &lt;rootfileset dir=&quot;${classes.dir}&quot; 
includes=&quot;org/apache/tools/ant/Project*.class&quot;/&gt;
 &lt;/classfileset&gt;</pre>
 <p>
-This example constructs the classfileset using all the class with names 
starting with Project in
-the <samp>org.apache.tools.ant</samp> package.
+This example constructs the classfileset using all the class with names 
starting
+with <code class="code">Project</code> in the <code 
class="code">org.apache.tools.ant</code>
+package.
 </p>
 
 </body>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/custom-programming.html
----------------------------------------------------------------------
diff --git a/manual/Types/custom-programming.html 
b/manual/Types/custom-programming.html
index ba743c1..1d233fe 100644
--- a/manual/Types/custom-programming.html
+++ b/manual/Types/custom-programming.html
@@ -24,18 +24,16 @@
     <h2>Custom Components</h2>
     <h3>Overview</h3>
     <p>
-      Custom components are conditions, selectors, filters and other objects
-      that are defined outside Apache Ant core.
+      Custom components are conditions, selectors, filters and other objects 
that are defined
+      outside Apache Ant core.
     </p>
     <p>
-      In Ant 1.6 custom conditions, selectors and filters has been
-      overhauled.
+      In Ant 1.6 custom conditions, selectors and filters has been overhauled.
     </p>
     <p>
-      It is now possible to define custom conditions, selectors and filters
-      that behave like Ant Core components.  This is achieved by allowing
-      datatypes defined in build scripts to be used as custom components if
-      the class of the datatype is compatible, or has been adapted by an
+      It is now possible to define custom conditions, selectors and filters 
that behave like Ant
+      Core components.  This is achieved by allowing datatypes defined in 
build scripts to be used
+      as custom components if the class of the datatype is compatible, or has 
been adapted by an
       adapter class.
     </p>
     <p>
@@ -43,15 +41,13 @@
     </p>
     <h3>Definition and Use</h3>
     <p>
-      A custom component is a normal Java class that implements a particular
-      interface or extends a particular class, or has been adapted to the
-      interface or class.
+      A custom component is a normal Java class that implements a particular 
interface or extends a
+      particular class, or has been adapted to the interface or class.
     </p>
     <p>
-      It is exactly like writing
-      a <a href="../develop.html#writingowntask">custom task</a>.  One
-      defines attributes and nested elements by writing <em>setter</em>
-      methods and <em>add</em> methods.
+      It is exactly like writing a <a 
href="../develop.html#writingowntask">custom task</a>.  One
+      defines attributes and nested elements by writing <em>setter</em> 
methods and <em>add</em>
+      methods.
     </p>
     <p>
       After the class has been written, it is added to the ant system by
@@ -60,9 +56,9 @@
     <h3 id="customconditions">Custom Conditions</h3>
     <p>
       Custom conditions are datatypes that
-      implement <code>org.apache.tools.ant.taskdefs.condition.Condition</code>.
-      For example a custom condition that returns true if a string is all
-      upper case could be written as:
+      implement <code 
class="code">org.apache.tools.ant.taskdefs.condition.Condition</code>.  For
+      example a custom condition that returns true if a string is all upper 
case could be written
+      as:
     </p>
     <pre>
 package com.mydomain;
@@ -104,13 +100,12 @@ public class AllUpperCaseCondition implements Condition {
     <h3 id="customselectors">Custom Selectors</h3>
     <p>
       Custom selectors are datatypes that
-      implement <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+      implement <code 
class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
     </p>
     <p>
-      There is only one method required, <code>public boolean
-      isSelected(File basedir, String filename, File file)</code>.  It
-      returns true or false depending on whether the given file should be
-      selected or not.
+      There is only one method required, <code class="code">public boolean 
isSelected(File basedir,
+      String filename, File file)</code>.  It returns true or false depending 
on whether the given
+      file should be selected or not.
     </p>
     <p>
       An example of a custom selection that selects filenames ending
@@ -134,8 +129,7 @@ public class JavaSelector implements FileSelector {
     classname="com.mydomain.JavaSelector"
     classpath="${mydomain.classes}"/&gt;</pre>
     <p>
-      This selector can now be used wherever a Core Ant selector is used,
-      for example:
+      This selector can now be used wherever a Core Ant selector is used, for 
example:
     </p>
     <pre>
 &lt;copy todir="to"&gt;
@@ -144,34 +138,30 @@ public class JavaSelector implements FileSelector {
     &lt;/fileset&gt;
 &lt;/copy&gt;</pre>
     <p>
-      One may
-      use <code>org.apache.tools.ant.types.selectors.BaseSelector</code>, a
-      convenience class that provides reasonable default behaviour.  It has
-      some predefined behaviours you can take advantage of. Any time you
-      encounter a problem when setting attributes or adding tags, you can
-      call <code>setError(String errmsg)</code> and the class will know that
-      there is a problem. Then, at the top of your <code>isSelected()</code>
-      method call <code>validate()</code> and a BuildException will be
-      thrown with the contents of your error
-      message. The <code>validate()</code> method also gives you a last
-      chance to check your settings for consistency because it
-      calls <code>verifySettings()</code>. Override this method and
-      call <code>setError()</code> within it if you detect any problems in
-      how your selector is set up.
+      One may use <code 
class="code">org.apache.tools.ant.types.selectors.BaseSelector</code>, a
+      convenience class that provides reasonable default behaviour.  It has 
some predefined
+      behaviours you can take advantage of. Any time you encounter a problem 
when setting attributes
+      or adding tags, you can call <code class="code">setError(String 
errmsg)</code> and the class
+      will know that there is a problem. Then, at the top of
+      your <code class="code">isSelected()</code> method call <code 
class="code">validate()</code>
+      and a <code>BuildException</code> will be thrown with the contents of 
your error
+      message. The <code class="code">validate()</code> method also gives you 
a last chance to check
+      your settings for consistency because it
+      calls <code class="code">verifySettings()</code>. Override this method 
and
+      call <code class="code">setError()</code> within it if you detect any 
problems in how your
+      selector is set up.
     </p>
     <p>
       To write custom selector containers one should
-      extend 
<code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
-      Implement the <code>public boolean isSelected(File baseDir, String
-      filename, File file)</code> method to do the right thing. Chances are
-      you'll want to iterate over the selectors under you, so
-      use <code>selectorElements()</code> to get an iterator that will do
-      that.
+      extend <code 
class="code">org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
+      Implement the <code class="code">public boolean isSelected(File baseDir, 
String filename, File
+      file)</code> method to do the right thing. Chances are you'll want to 
iterate over the
+      selectors under you, so use <code class="code">selectorElements()</code> 
to get an iterator
+      that will do that.
     </p>
     <p>
-      For example to create a selector container that will select files if a
-      certain number of contained selectors select, one could write a
-      selector as follows:
+      For example to create a selector container that will select files if a 
certain number of
+      contained selectors select, one could write a selector as follows:
     </p>
     <pre>
 public class MatchNumberSelectors extends BaseSelectorContainer {
@@ -214,28 +204,24 @@ public class MatchNumberSelectors extends 
BaseSelectorContainer {
       <em>The custom selector</em>
     </p>
     <p>
-      The custom selector was the pre Ant 1.6 way of defining custom
-      selectors.  This method is still supported for backward compatibility.
+      The custom selector was the pre Ant 1.6 way of defining custom 
selectors.  This method is
+      still supported for backward compatibility.
     </p>
     <p>
-      You can write your own selectors and use them within the selector
-      containers by specifying them within the <code>&lt;custom&gt;</code>
-      tag.
+      You can write your own selectors and use them within the selector 
containers by specifying
+      them within the <code>&lt;custom&gt;</code> tag.
     </p>
     <p>
       To create a new Custom Selector, you have to create a class that
-      implements 
<code>org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
+      implements <code 
class="code">org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
       The easiest way to do that is through the convenience base
-      class 
<code>org.apache.tools.ant.types.selectors.BaseExtendSelector</code>,
-      which provides all of the methods for
-      supporting <code>&lt;param&gt;</code> tags. First, override
-      the <code>isSelected()</code> method, and optionally
-      the <code>verifySettings()</code> method. If your custom selector
-      requires parameters to be set, you can also override
-      the <code>setParameters()</code> method and interpret the parameters
-      that are passed in any way you like. Several of the core selectors
-      demonstrate how to do that because they can also be used as custom
-      selectors.
+      class <code 
class="code">org.apache.tools.ant.types.selectors.BaseExtendSelector</code>, 
which
+      provides all of the methods for supporting <code>&lt;param&gt;</code> 
tags. First, override
+      the <code class="code">isSelected()</code> method, and optionally
+      the <code class="code">verifySettings()</code> method. If your custom 
selector requires
+      parameters to be set, you can also override the <code 
class="code">setParameters()</code>
+      method and interpret the parameters that are passed in any way you like. 
Several of the core
+      selectors demonstrate how to do that because they can also be used as 
custom selectors.
     </p>
     <p>
       Once that is written, you include it in your build file by using
@@ -252,7 +238,7 @@ public class MatchNumberSelectors extends 
BaseSelectorContainer {
         <td>classname</td>
         <td>
           The name of your class that
-          implements 
<code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+          implements <code 
class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
         </td>
         <td>Yes</td>
       </tr>
@@ -277,8 +263,7 @@ public class MatchNumberSelectors extends 
BaseSelectorContainer {
     </table>
 
     <p>
-      Here is how you use <code>&lt;custom&gt;</code> to use your class as a
-      selector:
+      Here is how you use <code>&lt;custom&gt;</code> to use your class as a 
selector:
     </p>
     <pre>
 &lt;fileset dir="${mydir}" includes="**/*"&gt;
@@ -290,20 +275,20 @@ public class MatchNumberSelectors extends 
BaseSelectorContainer {
 
     <ul>
       <li><a href="selectors.html#containsselect">Contains Selector</a> with
-        classname 
<code>org.apache.tools.ant.types.selectors.ContainsSelector</code></li>
+        classname <code 
class="code">org.apache.tools.ant.types.selectors.ContainsSelector</code></li>
       <li><a href="selectors.html#dateselect">Date Selector</a> with
-        classname 
<code>org.apache.tools.ant.types.selectors.DateSelector</code></li>
+        classname <code 
class="code">org.apache.tools.ant.types.selectors.DateSelector</code></li>
       <li><a href="selectors.html#depthselect">Depth Selector</a> with
-        classname 
<code>org.apache.tools.ant.types.selectors.DepthSelector</code></li>
+        classname <code 
class="code">org.apache.tools.ant.types.selectors.DepthSelector</code></li>
       <li><a href="selectors.html#filenameselect">Filename Selector</a> with
-        classname 
<code>org.apache.tools.ant.types.selectors.FilenameSelector</code></li>
+        classname <code 
class="code">org.apache.tools.ant.types.selectors.FilenameSelector</code></li>
       <li><a href="selectors.html#sizeselect">Size Selector</a> with
-        classname 
<code>org.apache.tools.ant.types.selectors.SizeSelector</code></li>
+        classname <code 
class="code">org.apache.tools.ant.types.selectors.SizeSelector</code></li>
     </ul>
 
     <p>
-      Here is the example from the Depth Selector section rewritten to use
-      the selector through <code>&lt;custom&gt;</code>.
+      Here is the example from the Depth Selector section rewritten to use the 
selector
+      through <code>&lt;custom&gt;</code>.
     </p>
     <pre>
 &lt;fileset dir="${doc.path}" includes="**/*"&gt;
@@ -316,16 +301,14 @@ public class MatchNumberSelectors extends 
BaseSelectorContainer {
     <h3 id="filterreaders">Custom Filter Readers</h3>
     <p>
       Custom filter readers selectors are datatypes that
-      implement 
<code>org.apache.tools.ant.types.filters.ChainableReader</code>.
+      implement <code 
class="code">org.apache.tools.ant.types.filters.ChainableReader</code>.
     </p>
     <p>
-      There is only one method required. <code>Reader chain(Reader
-      reader)</code>.  This returns a reader that filters input from the
-      specified reader.
+      There is only one method required, <code class="code">Reader 
chain(Reader reader)</code>.
+      This returns a reader that filters input from the specified reader.
     </p>
     <p>
-      For example a filterreader that removes every second character could
-      be:
+      For example a filterreader that removes every second character could be:
     </p>
     <pre>
 public class RemoveOddCharacters implements ChainableReader {
@@ -349,8 +332,8 @@ public class RemoveOddCharacters implements ChainableReader 
{
 }</pre>
     <p>
       For line oriented filters it may be easier to
-      extend <code>ChainableFilterReader</code> an inner class
-      of <code>org.apache.tools.ant.filters.TokenFilter</code>.
+      extend <code class="code">ChainableFilterReader</code> an inner class
+      of <code class="code">org.apache.tools.ant.filters.TokenFilter</code>.
     </p>
     <p>
       For example a filter that appends the line number could be

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/description.html
----------------------------------------------------------------------
diff --git a/manual/Types/description.html b/manual/Types/description.html
index f5cf02c..448aa63 100644
--- a/manual/Types/description.html
+++ b/manual/Types/description.html
@@ -27,7 +27,7 @@
 <h2 id="description">Description</h2>
 <h3>Description</h3>
 <p>Allows for a description of the project to be specified that will be
-included in the output of the <code>ant -projecthelp</code> command.</p>
+included in the output of the <kbd>ant -projecthelp</kbd> command.</p>
 
 <h3>Parameters</h3>
 <p>(none)</p>

http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/fileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/fileset.html b/manual/Types/fileset.html
index ea05ec5..1bc674e 100644
--- a/manual/Types/fileset.html
+++ b/manual/Types/fileset.html
@@ -28,7 +28,7 @@
 <p>A FileSet is a group of files. These files can be found in a directory tree 
starting in a
 base directory and are matched by patterns taken from a number
 of <a href="patternset.html">PatternSets</a> and <a 
href="selectors.html">Selectors</a>.</p>
-<p>PatternSets can be specified as nested q<code>&lt;patternset&gt;</code> 
elements. In
+<p>PatternSets can be specified as nested <code>&lt;patternset&gt;</code> 
elements. In
 addition, FileSet holds an implicit PatternSet and supports the
 nested <code>&lt;include&gt;</code>, <code>&lt;includesfile&gt;</code>, 
<code>&lt;exclude&gt;</code>
 and <code>&lt;excludesfile&gt;</code> elements of PatternSet directly, as well 
as PatternSet's

Reply via email to