You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/02/09 05:54:14 UTC

[4/4] ant git commit: Chop off redundant blockquotes

Chop off redundant blockquotes

Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/7eeb33d5
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/7eeb33d5
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/7eeb33d5

Branch: refs/heads/master
Commit: 7eeb33d5e8967edf6ba8523f354e4d7e45ab929b
Parents: 63dc4df
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Feb 9 06:54:03 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Feb 9 06:54:09 2018 +0100

----------------------------------------------------------------------
 manual/Tasks/ant.html                  |  32 ++--
 manual/Tasks/antcall.html              |   8 +-
 manual/Tasks/antlr.html                |   4 +-
 manual/Tasks/antstructure.html         |   4 +-
 manual/Tasks/antversion.html           |  17 +-
 manual/Tasks/apply.html                |  24 +--
 manual/Tasks/attrib.html               |  14 +-
 manual/Tasks/available.html            |  20 +-
 manual/Tasks/basename.html             |  12 +-
 manual/Tasks/bindtargets.html          |  14 +-
 manual/Tasks/buildnumber.html          |   8 +-
 manual/Tasks/cab.html                  |  16 +-
 manual/Tasks/ccm.html                  |  40 ++--
 manual/Tasks/checksum.html             |  22 +--
 manual/Tasks/chgrp.html                |  15 +-
 manual/Tasks/chmod.html                |  18 +-
 manual/Tasks/chown.html                |  12 +-
 manual/Tasks/clearcase.html            |  52 ++---
 manual/Tasks/conditions.html           |  84 ++++-----
 manual/Tasks/copyfile.html             |   6 +-
 manual/Tasks/dependset.html            |   3 +-
 manual/Tasks/echoproperties.html       |  28 +--
 manual/Tasks/exec.html                 |  33 +---
 manual/Tasks/genkey.html               |   8 +-
 manual/Tasks/image.html                |  16 +-
 manual/Tasks/jar.html                  |  46 +++--
 manual/Tasks/javac.html                |   4 +-
 manual/Tasks/javacc.html               |   4 +-
 manual/Tasks/jdepend.html              |   7 +-
 manual/Tasks/jjdoc.html                |  60 +++---
 manual/Tasks/jjtree.html               |   3 -
 manual/Tasks/junitreport.html          |  17 +-
 manual/Tasks/macrodef.html             |  14 --
 manual/Tasks/mail.html                 |  12 +-
 manual/Tasks/manifestclasspath.html    |   6 +-
 manual/Tasks/netrexxc.html             |   8 +-
 manual/Tasks/pack.html                 |  16 +-
 manual/Tasks/presetdef.html            |  18 +-
 manual/Tasks/propertyfile.html         |  16 +-
 manual/Tasks/renameextensions.html     |   8 +-
 manual/Tasks/replace.html              |  14 +-
 manual/Tasks/replaceregexp.html        |  35 ++--
 manual/Tasks/rexec.html                |   8 +-
 manual/Tasks/script.html               |  32 ++--
 manual/Tasks/scriptdef.html            |   4 +-
 manual/Tasks/setpermissions.html       |   8 +-
 manual/Tasks/signjar.html              |  17 +-
 manual/Tasks/sound.html                |   5 +-
 manual/Tasks/splash.html               |  14 +-
 manual/Tasks/sql.html                  |  36 ++--
 manual/Tasks/sync.html                 |   8 +-
 manual/Tasks/telnet.html               |  16 +-
 manual/Tasks/unpack.html               |  26 +--
 manual/Tasks/verifyjar.html            |   5 +-
 manual/Tasks/vss.html                  |  52 +++--
 manual/Tasks/waitfor.html              |  12 +-
 manual/Tasks/whichresource.html        |  12 +-
 manual/Types/antlib.html               |  61 ++----
 manual/Types/classfileset.html         |  12 +-
 manual/Types/custom-programming.html   |  80 +++-----
 manual/Types/dirset.html               |  21 +--
 manual/Types/extension.html            |  12 +-
 manual/Types/extensionset.html         |   5 +-
 manual/Types/filelist.html             |  16 +-
 manual/Types/fileset.html              |  24 +--
 manual/Types/filterchain.html          | 281 ++++++++++++++--------------
 manual/Types/filterset.html            |  23 +--
 manual/Types/mapper.html               |  72 +++----
 manual/Types/multirootfileset.html     |   8 +-
 manual/Types/patternset.html           |  20 +-
 manual/Types/permissions.html          |  12 +-
 manual/Types/propertyset.html          |  11 +-
 manual/Types/regexp.html               |  20 +-
 manual/Types/resources.html            |   2 -
 manual/Types/selectors.html            | 100 +++++-----
 manual/Types/tarfileset.html           |   4 +-
 manual/Types/xmlcatalog.html           |  16 +-
 manual/Types/zipfileset.html           |  12 +-
 manual/develop.html                    |  36 ++--
 manual/ifunless.html                   |   6 +-
 manual/install.html                    |  22 +--
 manual/listeners.html                  |  32 +---
 manual/running.html                    |  39 ++--
 manual/stylesheets/style.css           |   4 +-
 manual/targets.html                    |  34 ++--
 manual/tutorial-HelloWorldWithAnt.html |  10 +-
 manual/using.html                      |  45 +++--
 87 files changed, 899 insertions(+), 1194 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/ant.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ant.html b/manual/Tasks/ant.html
index 7088d2c..25f25a6 100644
--- a/manual/Tasks/ant.html
+++ b/manual/Tasks/ant.html
@@ -330,7 +330,7 @@ targets so specified, in the order specified.</p>
   corresponding Ant tasks set the dir attribute explicitly.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;subproject/subbuild.xml&quot; target=&quot;compile&quot;/&gt;
 
 &lt;ant dir=&quot;subproject&quot;/&gt;
@@ -343,66 +343,66 @@ targets so specified, in the order specified.</p>
 &lt;ant inheritAll=&quot;false&quot; antfile=&quot;subproject/subbuild.xml&quot;&gt;
   &lt;property name=&quot;output.type&quot; value=&quot;html&quot;/&gt;
 &lt;/ant&gt;
-</pre></blockquote>
+</pre>
 
 <p>These lines invoke the same build file:</p>
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;sub1/sub2/build.xml&quot; /&gt;
 &lt;ant antfile=&quot;sub2/build.xml&quot; dir=&quot;sub1&quot; /&gt;
 &lt;ant antfile=&quot;build.xml&quot; dir=&quot;sub1/sub2&quot; /&gt;
-</pre></blockquote>
+</pre>
 
 <p>The build file of the calling project defines some
 <code>&lt;path&gt;</code> elements like this:</p>
 
-<blockquote><pre>
+<pre>
 &lt;path id="path1"&gt;
     ...
 &lt;/path&gt;
 &lt;path id="path2"&gt;
     ...
 &lt;/path&gt;
-</pre></blockquote>
+</pre>
 
 <p>and the called build file (<code>subbuild.xml</code>) also defines
 a <code>&lt;path&gt;</code> with the id <code>path1</code>, but
 <code>path2</code> is not defined:</p>
 
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;true&quot;/&gt;
-</pre></blockquote>
+</pre>
 
 <p>will not override <code>subbuild</code>'s definition of
 <code>path1</code>, but make the parent's definition of
 <code>path2</code> available in the subbuild.</p>
 
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;subbuild.xml&quot;/&gt;
-</pre></blockquote>
+</pre>
 
 <p>as well as</p>
 
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;/&gt;
-</pre></blockquote>
+</pre>
 
 <p>will neither override <code>path1</code> nor copy
 <code>path2</code>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;&gt;
   &lt;reference refid=&quot;path1&quot;/&gt;
 &lt;/ant&gt;
-</pre></blockquote>
+</pre>
 
 <p>will override <code>subbuild</code>'s definition of
 <code>path1</code>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;&gt;
   &lt;reference refid=&quot;path1&quot; torefid=&quot;path2&quot;/&gt;
 &lt;/ant&gt;
-</pre></blockquote>
+</pre>
 
 <p>will copy the parent's definition of <code>path1</code> into the
 new project using the id <code>path2</code>.</p>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/antcall.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antcall.html b/manual/Tasks/antcall.html
index 32044c8..08dab5a 100644
--- a/manual/Tasks/antcall.html
+++ b/manual/Tasks/antcall.html
@@ -173,7 +173,7 @@ targets so specified, in the order specified.</p>
 <p><em>since Ant 1.6.3</em>.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;target name=&quot;default&quot;&gt;
   &lt;antcall target=&quot;doSomethingElse&quot;&gt;
     &lt;param name=&quot;param1&quot; value=&quot;value&quot;/&gt;
@@ -183,14 +183,14 @@ targets so specified, in the order specified.</p>
 &lt;target name=&quot;doSomethingElse&quot;&gt;
   &lt;echo message=&quot;param1=${param1}&quot;/&gt;
 &lt;/target&gt;
-</pre></blockquote>
+</pre>
 <p>Will run the target 'doSomethingElse' and echo 'param1=value'.</p>
 
-<blockquote><pre>
+<pre>
 &lt;antcall ... &gt;
   &lt;reference refid=&quot;path1&quot; torefid=&quot;path2&quot;/&gt;
 &lt;/antcall&gt;
-</pre></blockquote>
+</pre>
 
 <p>will copy the parent's definition of <code>path1</code> into the
 new project using the id <code>path2</code>.</p>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/antlr.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antlr.html b/manual/Tasks/antlr.html
index 36d22cb..55277c8 100644
--- a/manual/Tasks/antlr.html
+++ b/manual/Tasks/antlr.html
@@ -186,11 +186,11 @@ VM via nested <code>&lt;jvmarg&gt;</code> attributes, for example:</p>
 href="../using.html#arg">Command line arguments</a>.</p>
 
 <h3>Example</h3>
-<blockquote><pre>
+<pre>
 &lt;antlr
     target=&quot;etc/java.g&quot;
     outputdirectory=&quot;build/src&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>
   This invokes ANTLR on grammar file etc/java.g, writing the generated
   files to build/src.

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/antstructure.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antstructure.html b/manual/Tasks/antstructure.html
index 5581040..3d525bb 100644
--- a/manual/Tasks/antstructure.html
+++ b/manual/Tasks/antstructure.html
@@ -68,9 +68,7 @@ element of this task - see the example below.
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;antstructure output=&quot;project.dtd&quot; /&gt;
-</pre></blockquote>
+<pre>&lt;antstructure output=&quot;project.dtd&quot;/&gt;</pre>
 
 <p><b>Emitting your own structure instead of a DTD</b></p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/antversion.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antversion.html b/manual/Tasks/antversion.html
index 3e9919f..ee1bece 100644
--- a/manual/Tasks/antversion.html
+++ b/manual/Tasks/antversion.html
@@ -60,34 +60,33 @@ Stores the Apache Ant version (when used as task) or checks for a specific Ant v
   </tr>
 </table>
 
-
 <h3>Examples</h3>
 
-<blockquote><pre>
+<pre>
 &lt;antversion property=&quot;antversion&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>Stores the current Ant version in the property <i>antversion</i>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;antversion property=&quot;antversion&quot; atleast=&quot;1.6&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>Stores the Ant version in the property <i>antversion</i> if the current Ant version is 1.6.0
 or higher. Otherwise the property remains unset.</p>
 
-<blockquote><pre>
+<pre>
 &lt;antversion property=&quot;ant-is-exact-7&quot; exactly=&quot;1.7.0&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>Sets the property <i>ant-is-exact-7</i> if Ant 1.7.0 is running. Neither 1.6.5 nor 1.7.0
 would match.</p>
 
-<blockquote><pre>
+<pre>
 &lt;condition property=&quot;Ant17isOnline&quot;&gt;
   &lt;and&gt;
     &lt;antversion exactly=&quot;1.7.0&quot;/&gt;
     &lt;http url=&quot;http://ant.apache.org&quot;/&gt;
   &lt;/and&gt;
 &lt;/condition&gt;
-</pre></blockquote>
+</pre>
 <p>Sets <i>Ant17isOnline</i> if Ant 1.7.0 is running and can get a non-error-response from
 the Ant homepage.</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/apply.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/apply.html b/manual/Tasks/apply.html
index dd42fe9..0ed8879 100644
--- a/manual/Tasks/apply.html
+++ b/manual/Tasks/apply.html
@@ -399,7 +399,7 @@ files for each sourcefile.
   of executions (with <i>maxparallel</i> &gt; 0) and null will be used
   a source file just like it is in the case of <code>exec</code>.</p>
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;apply executable=&quot;ls&quot;&gt;
   &lt;arg value=&quot;-l&quot;/&gt;
   &lt;fileset dir=&quot;/tmp&quot;&gt;
@@ -409,25 +409,25 @@ files for each sourcefile.
   &lt;/fileset&gt;
   &lt;fileset refid=&quot;other.files&quot;/&gt;
 &lt;/apply&gt;
-</pre></blockquote>
+</pre>
 <p>invokes <code>ls -l</code>, adding the absolute filenames of all
 files below <code>/tmp</code> not ending in <code>.txt</code> and all
 files of the FileSet with <code>id</code> <code>other.files</code> to
 the command line.</p>
-<blockquote><pre>
+<pre>
 &lt;apply executable=&quot;somecommand&quot; parallel=&quot;false&quot;&gt;
   &lt;arg value=&quot;arg1&quot;/&gt;
   &lt;srcfile/&gt;
   &lt;arg value=&quot;arg2&quot;/&gt;
   &lt;fileset dir=&quot;/tmp&quot;/&gt;
 &lt;/apply&gt;
-</pre></blockquote>
+</pre>
 <p>invokes <code>somecommand arg1 SOURCEFILENAME arg2</code> for each
 file in <code>/tmp</code> replacing SOURCEFILENAME with the absolute
 filename of each file in turn. If <code>parallel</code> had been set
 to true, SOURCEFILENAME would be replaced with the absolute filenames
 of all files separated by spaces.</p>
-<blockquote><pre>
+<pre>
 &lt;apply executable=&quot;cc&quot; dest=&quot;src/C&quot; parallel=&quot;false&quot;&gt;
   &lt;arg value=&quot;-c&quot;/&gt;
   &lt;arg value=&quot;-o&quot;/&gt;
@@ -436,13 +436,13 @@ of all files separated by spaces.</p>
   &lt;fileset dir=&quot;src/C&quot; includes=&quot;*.c&quot;/&gt;
   &lt;mapper type=&quot;glob&quot; from=&quot;*.c&quot; to=&quot;*.o&quot;/&gt;
 &lt;/apply&gt;
-</pre></blockquote>
+</pre>
 <p>invokes <code>cc -c -o TARGETFILE SOURCEFILE</code> for each
 <code>.c</code> file that is newer than the corresponding
 <code>.o</code>, replacing TARGETFILE with the absolute filename of
 the <code>.o</code> and SOURCEFILE with the absolute name of the
 <code>.c</code> file.</p>
-<blockquote><pre>
+<pre>
 &lt;mapper id=&quot;out&quot; type=&quot;glob&quot;
            from=&quot;src${file.separator}*.file&quot;
            to=&quot;dest${file.separator}*.out&quot;/&gt;
@@ -454,7 +454,7 @@ the <code>.o</code> and SOURCEFILE with the absolute name of the
     &lt;outputmapper refid=&quot;out&quot;/&gt;
   &lt;/redirector&gt;
 &lt;/apply&gt;
-</pre></blockquote>
+</pre>
 Applies the fictitious &quot;processfile&quot; executable to all
 files matching <code>*.file</code> in the <code>src</code> directory.
 The <code>out</code> <code>&lt;mapper&gt;</code> has been set up to map
@@ -464,7 +464,7 @@ task.  A reference to <code>out</code> is then used as an
 <code>&lt;outputmapper&gt;</code> nested in a <code>&lt;redirector&gt;</code>, which in turn is
 nested beneath this <code>&lt;apply&gt;</code> instance.  This allows us to perform
 dependency checking against output files--the target files in this case.
-<blockquote><pre>
+<pre>
 &lt;apply executable="ls" parallel="true"
        force="true" dest="${basedir}" append="true" type="both"&gt;
   &lt;path&gt;
@@ -472,11 +472,11 @@ dependency checking against output files--the target files in this case.
   &lt;/path&gt;
   &lt;identitymapper/&gt;
 &lt;/apply&gt;
-</pre></blockquote>
+</pre>
 Applies the "ls" executable to all directories in the PATH, effectively
 listing all executables that are available on the PATH.
 
-<blockquote><pre>
+<pre>
 &lt;apply executable="jsmin" addsourcefile="false"&gt;
     &lt;!-- Collect the JS-files --&gt;
     &lt;fileset dir="src" includes="*.js"/&gt;
@@ -488,7 +488,7 @@ listing all executables that are available on the PATH.
         &lt;outputmapper id="out" type="glob" from="*.js" to="dest/*.js"/&gt;
     &lt;/redirector&gt;
 &lt;/apply&gt;
-</pre></blockquote>
+</pre>
 Conversion of the command <code>jsmin &lt; src/a.js &gt; dest/a.js</code> but for
 all files in the src-directory. Because the filename itself should not be passed
 to the <code>jsmin</code> program, the <code>addsourcefile</code> is set to

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/attrib.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/attrib.html b/manual/Tasks/attrib.html
index 86200b8..dc8d734 100644
--- a/manual/Tasks/attrib.html
+++ b/manual/Tasks/attrib.html
@@ -136,21 +136,15 @@ directory tree), so you'll have to experiment a little.</p-->
 </table>
 
 <h3>Examples</h3>
-  <blockquote>
+
 <pre>&lt;attrib file=&quot;${dist}/run.bat&quot; readonly=&quot;true&quot; hidden=&quot;true&quot;/&gt;</pre>
-</blockquote>
 <p>makes the &quot;run.bat&quot; file read-only and hidden.</p>
-
-<blockquote>
-  <pre>&lt;attrib readonly=&quot;false&quot;&gt;
+<pre>&lt;attrib readonly=&quot;false&quot;&gt;
   &lt;fileset dir=&quot;${meta.inf}&quot; includes=&quot;**/*.xml&quot;/&gt;
 &lt;/attrib&gt;
 </pre>
-</blockquote>
 <p>makes all &quot;.xml&quot; files below <code>${meta.inf}</code> readable.</p>
-
-<blockquote>
-  <pre>
+<pre>
 &lt;attrib readonly=&quot;true&quot; archive=&quot;true&quot;&gt;
   &lt;fileset dir=&quot;shared/sources1&quot;&gt;
     &lt;exclude name=&quot;**/trial/**&quot;/&gt;
@@ -158,7 +152,7 @@ directory tree), so you'll have to experiment a little.</p-->
   &lt;fileset refid=&quot;other.shared.sources&quot;/&gt;
 &lt;/attrib&gt;
 </pre>
-</blockquote>
+
 <p>makes all files below <code>shared/sources1</code> (except those below any
   directory named trial) read-only and archived. In addition all files belonging
   to a FileSet with <code>id</code> <code>other.shared.sources</code> get the

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/available.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/available.html b/manual/Tasks/available.html
index 3b0a9c7..57ba9ce 100644
--- a/manual/Tasks/available.html
+++ b/manual/Tasks/available.html
@@ -115,41 +115,41 @@ href="../using.html#path">path-like structure</a> and can also be set via a nest
 href="../using.html#path">path-like structure</a> and can also be set via a nested
 <code>&lt;filepath&gt;</code> element.</p>
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;available classname=&quot;org.whatever.Myclass&quot; property=&quot;Myclass.present&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>sets the <code>Myclass.present</code> property to the value &quot;true&quot;
 if the class <code>org.whatever.Myclass</code> is found in Ant's classpath.</p>
-<blockquote><pre>
+<pre>
 &lt;property name=&quot;jaxp.jar&quot; value=&quot;./lib/jaxp11/jaxp.jar&quot;/&gt;
 &lt;available file=&quot;${jaxp.jar}&quot; property=&quot;jaxp.jar.present&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>sets the <code>jaxp.jar.present</code> property to the value &quot;true&quot;
 if the file <code>./lib/jaxp11/jaxp.jar</code> is found.</p>
-<blockquote><pre>
+<pre>
 &lt;available file=&quot;/usr/local/lib&quot; type=&quot;dir&quot;
            property=&quot;local.lib.present&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>sets the <code>local.lib.present</code> property to the value &quot;true&quot;
 if the directory <code>/usr/local/lib</code> is found.</p>
-<blockquote><pre>
+<pre>
 ...in project ...
 &lt;property name=&quot;jaxp.jar&quot; value=&quot;./lib/jaxp11/jaxp.jar&quot;/&gt;
 &lt;path id=&quot;jaxp&quot; location=&quot;${jaxp.jar}&quot;/&gt;
 ...in target ...
 &lt;available classname=&quot;javax.xml.transform.Transformer&quot;
            classpathref=&quot;jaxp&quot; property=&quot;jaxp11.present&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>sets the <code>jaxp11.present</code> property to the value &quot;true&quot;
 if the class <code>javax.xml.transform.Transformer</code> is found in the classpath referenced by <code>jaxp</code> (in this case, <code>./lib/jaxp11/jaxp.jar</code>).
 </p>
-<blockquote><pre>
+<pre>
 &lt;available property=&quot;have.extras&quot; resource=&quot;extratasks.properties&quot;&gt;
   &lt;classpath&gt;
     &lt;pathelement location=&quot;/usr/local/ant/extra.jar&quot; /&gt;
   &lt;/classpath&gt;
 &lt;/available&gt;
-</pre></blockquote>
+</pre>
 <p>sets the <code>have.extras</code> property to the value &quot;true&quot;
 if the resource-file <code>extratasks.properties</code> is found.
 </p>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/basename.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/basename.html b/manual/Tasks/basename.html
index b185b24..bc55c6e 100644
--- a/manual/Tasks/basename.html
+++ b/manual/Tasks/basename.html
@@ -64,23 +64,23 @@ the basename will be the simple file name, without any directory elements.
 </table>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;basename property=&quot;jar.filename&quot; file=&quot;${lib.jarfile}&quot;/&gt;
-</pre></blockquote>
+</pre>
 will set <code>jar.filename</code> to
 <code>myjar.jar</code>, if <code>lib.jarfile</code> is defined as either a
 full-path filename (eg., <code>/usr/local/lib/myjar.jar</code>),
 a relative-path filename (eg., <code>lib/myjar.jar</code>),
 or a simple filename (eg., <code>myjar.jar</code>).
-<blockquote><pre>
+<pre>
 &lt;basename property=&quot;cmdname&quot; file=&quot;D:/usr/local/foo.exe&quot;
           suffix=&quot;.exe&quot;/&gt;
-</pre></blockquote>
+</pre>
 will set <code>cmdname</code> to <code>foo</code>.
-<blockquote><pre>
+<pre>
 &lt;property environment=&quot;env&quot;/&gt;
 &lt;basename property=&quot;temp.dirname&quot; file=&quot;${env.TEMP}&quot;/&gt;
-</pre></blockquote>
+</pre>
 will set <code>temp.dirname</code> to the last directory element of
 the path defined for the <code>TEMP</code> environment variable.
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/bindtargets.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/bindtargets.html b/manual/Tasks/bindtargets.html
index fdf679f..538d538 100644
--- a/manual/Tasks/bindtargets.html
+++ b/manual/Tasks/bindtargets.html
@@ -44,12 +44,10 @@ target dependencies but only in your context.
 target which will be the bridge between the target to bind and the extension
 point. For instance:
 </p>
-<blockquote><pre>&lt;bindtargets targets="jar,javadoc" extensionPoint="dist" /&gt;</pre></blockquote>
+<pre>&lt;bindtargets targets="jar,javadoc" extensionPoint="dist" /&gt;</pre>
 is quite equivalent to:
-<blockquote><pre>&lt;target name="bind-to-dist" depends="jar,javadoc" extensionOf="dist" /&gt;</pre></blockquote>
-<p>
-This task basically avoid the creation of a target.
-</p>
+<pre>&lt;target name="bind-to-dist" depends="jar,javadoc" extensionOf="dist" /&gt;</pre>
+<p>This task basically avoid the creation of a target.</p>
 
 <p>The bindtargets task may only be used as a top-level task. This means that
 it may not be used in a target. This is making the target dependency graph static
@@ -84,9 +82,9 @@ and predictable as soon as every build file is loaded.</p>
 </table>
 
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;bindtargets targets=&quot;build-jar,build-src-jar&quot; extensionPoint=&quot;dist&quot; /&gt;
-</pre></blockquote>
+<pre>
+&lt;bindtargets targets=&quot;build-jar,build-src-jar&quot; extensionPoint=&quot;dist&quot;/&gt;
+</pre>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/buildnumber.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/buildnumber.html b/manual/Tasks/buildnumber.html
index 7351e22..474a925 100644
--- a/manual/Tasks/buildnumber.html
+++ b/manual/Tasks/buildnumber.html
@@ -53,16 +53,16 @@ the number format.)
 </table>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;buildnumber/&gt;
-</pre></blockquote>
+</pre>
 
 <p>Read, increment, and write a build number to the default file,
 <code>build.number</code>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;buildnumber file=&quot;mybuild.number&quot;/&gt;
-</pre></blockquote>
+</pre>
 
 <p>Read, increment, and write a build number to the file
 <code>mybuild.number</code>.</p>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/cab.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cab.html b/manual/Tasks/cab.html
index 6d7a4d6..115d739 100644
--- a/manual/Tasks/cab.html
+++ b/manual/Tasks/cab.html
@@ -118,34 +118,34 @@ element to specify the files to be included in the archive.
 </p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;cab cabfile=&quot;${dist}/manual.cab&quot;
      basedir=&quot;htdocs/manual&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>cabs all files in the htdocs/manual directory into a file called
 manual.cab in the ${dist} directory.</p>
-<blockquote><pre>
+<pre>
 &lt;cab cabfile=&quot;${dist}/manual.cab&quot;
      basedir=&quot;htdocs/manual&quot;
      excludes=&quot;mydocs/**, **/todo.html&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>cabs all files in the htdocs/manual directory into a file called
 manual.cab in the ${dist} directory. Files in the directory mydocs,
 or files with the name todo.html are excluded.</p>
-<blockquote><pre>
+<pre>
 &lt;cab cabfile=&quot;${dist}/manual.cab&quot;
      basedir=&quot;htdocs/manual&quot;
      includes=&quot;api/**/*.html&quot;
      excludes=&quot;**/todo.html&quot;
      verbose=&quot;yes&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>Cab all files in the htdocs/manual directory into a file called
 manual.cab in the ${dist} directory. Only html files under the
 directory api are archived, and files with the name todo.html are
 excluded. Output from the cabarc tool is displayed in the build
 output.</p>
 
-<blockquote><pre>
+<pre>
 &lt;cab cabfile=&quot;${dist}/manual.cab&quot;
      verbose=&quot;yes&quot;&gt;
   &lt;fileset
@@ -153,7 +153,7 @@ output.</p>
        includes=&quot;api/**/*.html&quot;
        excludes=&quot;**/todo.html&quot;/&gt;
 &lt;/cab&gt;
-</pre></blockquote>
+</pre>
 <p>is equivalent to the example above.</p>
 
 </body>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/ccm.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ccm.html b/manual/Tasks/ccm.html
index 8e22909..39ca671 100644
--- a/manual/Tasks/ccm.html
+++ b/manual/Tasks/ccm.html
@@ -68,11 +68,11 @@ Task to checkin a file
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
+
   <pre>&lt;ccmcheckin file=&quot;c:/wa/com/foo/MyFile.java&quot;
         comment=&quot;mycomment&quot;/&gt;
 </pre>
-</blockquote>
+
 <p>Checks in the file <i>c:/wa/com/foo/MyFile.java</i>.
   Comment attribute <i>mycomment</i> is added as a task comment. The task
   used is the one set as the default.</p>
@@ -114,22 +114,19 @@ Task to perform a Checkout command to Continuus
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <pre>&lt;ccmcheckout file=&quot;c:/wa/com/foo/MyFile.java&quot;
-        comment=&quot;mycomment&quot;/&gt;
-</pre>
-</blockquote>
+
+<pre>&lt;ccmcheckout file=&quot;c:/wa/com/foo/MyFile.java&quot;
+        comment=&quot;mycomment&quot;/&gt;</pre>
+
 <p>Check out the file <i>c:/wa/com/foo/MyFile.java</i>.
   Comment attribute <i>mycomment</i> is added as a task comment
    The used task is the one set as the default.</p>
-<blockquote>
-  <pre>&lt;ccmcheckout  comment=&quot;mycomment&quot;&gt;
+
+<pre>&lt;ccmcheckout  comment=&quot;mycomment&quot;&gt;
   &lt;fileset dir=&quot;lib&quot; &gt;
     &lt;include name=&quot;**/*.jar&quot;/&gt;
   &lt;/fileset&gt;
-&lt;/ccmcheckout &gt;
-  </pre>
-</blockquote>
+&lt;/ccmcheckout &gt;</pre>
 
 <p>Check out all the files in the <i>lib</i> directory having the <i>.jar</i> extension.
   Comment attribute <i>mycomment</i> is added as a task comment
@@ -162,10 +159,9 @@ Task to perform a check in default task command to Continuus
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <pre>&lt;ccmcheckintask comment=&quot;blahblah/&gt;
-</pre>
-</blockquote>
+
+<pre>&lt;ccmcheckintask comment=&quot;blahblah/&gt;</pre>
+
 <p>Does a Checkin default task on all the checked out files in the current task.</p>
 <hr/>
 <h2 id="ccmreconfigure">CCMReconfigure</h2>
@@ -200,11 +196,11 @@ Task to perform an reconfigure command to Continuus.
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
- <pre>&lt;ccmreconfigure ccmproject=&quot;ANTCCM_TEST#BMO_1&quot;
+
+<pre>&lt;ccmreconfigure ccmproject=&quot;ANTCCM_TEST#BMO_1&quot;
          verbose=&quot;true&quot;/&gt;
 </pre>
-</blockquote>
+
 <p>Does a Continuus <i>reconfigure</i> on the project <i>ANTCCM_TEST#BMO_1</i>.
 </p>
 <hr/>
@@ -255,11 +251,11 @@ Create a Continuus task.
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <pre>&lt;ccmcreatetask resolver=&quot;${user.name}&quot;
+
+<pre>&lt;ccmcreatetask resolver=&quot;${user.name}&quot;
             release=&quot;ANTCCM_TEST&quot; comment=&quot;blahblah&quot;/&gt;
 </pre>
-</blockquote>
+
 <p>Creates a task for the release <i>ANTCCM_TEST</i> with the
   current user as the resolver for this task.</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/checksum.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/checksum.html b/manual/Tasks/checksum.html
index 8abb45f..cf7bb87 100644
--- a/manual/Tasks/checksum.html
+++ b/manual/Tasks/checksum.html
@@ -202,48 +202,48 @@ or set the <tt>fileext</tt> attribute. The names of common hashing algorithms ca
 
 <h3>Examples</h3>
 <p><b>Example 1</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot;/&gt;</pre></blockquote>
+<pre>&lt;checksum file=&quot;foo.bar&quot;/&gt;</pre>
 Generates a MD5 checksum for foo.bar and stores the checksum in the destination file
 foo.bar.MD5.  foo.bar.MD5 is overwritten only if foo.bar is newer than itself.
 
 <p><b>Example 2</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot; forceOverwrite=&quot;yes&quot;/&gt;</pre></blockquote>
+<pre>&lt;checksum file=&quot;foo.bar&quot; forceOverwrite=&quot;yes&quot;/&gt;</pre>
 Generates a MD5 checksum for foo.bar and stores the checksum in foo.bar.MD5.
 If foo.bar.MD5 already exists, it is overwritten.
 
 <p><b>Example 3</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot; property=&quot;foobarMD5&quot;/&gt;</pre></blockquote>
+<pre>&lt;checksum file=&quot;foo.bar&quot; property=&quot;foobarMD5&quot;/&gt;</pre>
 Generates a MD5 checksum for foo.bar and stores it in the Project Property foobarMD5.
 
 <p><b>Example 4</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot; verifyProperty=&quot;isMD5ok&quot;/&gt;</pre></blockquote>
+<pre>&lt;checksum file=&quot;foo.bar&quot; verifyProperty=&quot;isMD5ok&quot;/&gt;</pre>
 Generates a MD5 checksum for foo.bar, compares it against foo.bar.MD5 and sets
 isMD5ok to either true or false, depending upon the result.
 
 <p><b>Example 5</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot; algorithm=&quot;SHA-512&quot; fileext=&quot;asc&quot;/&gt;</pre></blockquote>
+<pre>&lt;checksum file=&quot;foo.bar&quot; algorithm=&quot;SHA-512&quot; fileext=&quot;asc&quot;/&gt;</pre>
 Generates a SHA-512 checksum for foo.bar and stores the checksum in the destination file
 foo.bar.asc.  foo.bar.asc is overwritten only if foo.bar is newer than itself.
 
 <p><b>Example 6</b></p>
-<blockquote><pre>
+<pre>
 &lt;checksum file=&quot;foo.bar&quot; property=&quot;${md5}&quot; verifyProperty=&quot;isEqual&quot;/&gt;
-</pre></blockquote>
+</pre>
 Generates a MD5 checksum for foo.bar, compares it against the value of the property
 md5, and sets isEqual to either true or false, depending upon the result.
 
 <p><b>Example 7</b></p>
-<blockquote><pre>
+<pre>
 &lt;checksum&gt;
   &lt;fileset dir=&quot;.&quot;&gt;
     &lt;include name=&quot;foo*&quot;/&gt;
   &lt;/fileset&gt;
 &lt;/checksum&gt;
-</pre></blockquote>
+</pre>
 Works just like Example 1, but generates a .MD5 file for every file that begins with the name foo.
 
 <p><b>Example 8</b></p>
-<blockquote><pre>
+<pre>
 &lt;condition property=&quot;isChecksumEqual&quot;&gt;
   &lt;checksum&gt;
     &lt;fileset dir=&quot;.&quot;&gt;
@@ -251,7 +251,7 @@ Works just like Example 1, but generates a .MD5 file for every file that begins
     &lt;/fileset&gt;
   &lt;/checksum&gt;
 &lt;/condition&gt;
-</pre></blockquote>
+</pre>
 Works like Example 4, but only sets isChecksumEqual to true, if the
 checksum matches - it will never be set to false.  This example
 demonstrates use with the Condition task.

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/chgrp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chgrp.html b/manual/Tasks/chgrp.html
index a56c1ad..fecc783 100644
--- a/manual/Tasks/chgrp.html
+++ b/manual/Tasks/chgrp.html
@@ -127,22 +127,22 @@ could use as initial value for these experiments.</p>
 
 </table>
 <h3>Examples</h3>
-  <blockquote><pre>
+<pre>
 &lt;chgrp file=&quot;${dist}/start.sh&quot; group=&quot;coders&quot;/&gt;
 </pre>
-</blockquote>
+
 <p>makes the &quot;start.sh&quot; file belong to the coders group on a
 UNIX system.</p>
-<blockquote>
+
 <pre>
 &lt;chgrp group=&quot;coders&quot;&gt;
   &lt;fileset dir=&quot;${dist}/bin&quot; includes=&quot;**/*.sh&quot;/&gt;
 &lt;/chgrp&gt;
 </pre>
-</blockquote>
+
 <p>makes all &quot;.sh&quot; files below <code>${dist}/bin</code>
 belong to the coders group on a UNIX system.</p>
-<blockquote>
+
 <pre>
 &lt;chgrp group=&quot;coders&quot;&gt;
   &lt;fileset dir=&quot;shared/sources1&quot;&gt;
@@ -151,14 +151,14 @@ belong to the coders group on a UNIX system.</p>
   &lt;fileset refid=&quot;other.shared.sources&quot;/&gt;
 &lt;/chgrp&gt;
 </pre>
-</blockquote>
+
 <p>makes all files below <code>shared/sources1</code> (except those
 below any directory named trial) belong to the coders group on a UNIX
 system. In addition all files belonging to a FileSet
 with <code>id</code> <code>other.shared.sources</code> get the same
 group.</p>
 
-<blockquote>
+
 <pre>
 &lt;chgrp group=&quot;webdev&quot; type=&quot;file&quot;&gt;
   &lt;fileset dir=&quot;/web&quot;&gt;
@@ -170,7 +170,6 @@ group.</p>
   &lt;/dirset&gt;
 &lt;/chmod&gt;
 </pre>
-</blockquote>
 
 <p>makes all <code>.test.jsp</code>, and <code>.new</code> files belong to
 group webdev. Directories beginning with <code>test_</code> also will belong

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/chmod.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chmod.html b/manual/Tasks/chmod.html
index 5dd369a..c1c0f11 100644
--- a/manual/Tasks/chmod.html
+++ b/manual/Tasks/chmod.html
@@ -155,25 +155,23 @@ could use as initial value for these experiments.</p>
   </tr>
 </table>
 <h3>Examples</h3>
-  <blockquote><pre>
+  <pre>
 &lt;chmod file=&quot;${dist}/start.sh&quot; perm=&quot;ugo+rx&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>makes the &quot;start.sh&quot; file readable and executable for anyone on a
 UNIX system.</p>
-<blockquote><pre>
+<pre>
 &lt;chmod file=&quot;${dist}/start.sh&quot; perm=&quot;700&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>makes the &quot;start.sh&quot; file readable, writable and executable only for the owner on a
 UNIX system.</p>
-<blockquote>
 <pre>
 &lt;chmod dir=&quot;${dist}/bin&quot; perm=&quot;ugo+rx&quot;
        includes=&quot;**/*.sh&quot;/&gt;
 </pre>
-</blockquote>
 <p>makes all &quot;.sh&quot; files below <code>${dist}/bin</code>
 readable and executable for anyone on a UNIX system.</p>
-<blockquote>
+
 <pre>
 &lt;chmod perm=&quot;g+w&quot;&gt;
   &lt;fileset dir=&quot;shared/sources1&quot;&gt;
@@ -182,14 +180,11 @@ readable and executable for anyone on a UNIX system.</p>
   &lt;fileset refid=&quot;other.shared.sources&quot;/&gt;
 &lt;/chmod&gt;
 </pre>
-</blockquote>
 <p>makes all files below <code>shared/sources1</code> (except those
 below any directory named trial) writable for members of the same
 group on a UNIX system. In addition all files belonging to a FileSet
 with <code>id</code> <code>other.shared.sources</code> get the same
 permissions.</p>
-
-<blockquote>
 <pre>
 &lt;chmod perm=&quot;go-rwx&quot; type=&quot;file&quot;&gt;
   &lt;fileset dir=&quot;/web&quot;&gt;
@@ -201,14 +196,11 @@ permissions.</p>
   &lt;/dirset&gt;
 &lt;/chmod&gt;
 </pre>
-</blockquote>
-
 <p>keeps non-owners from touching cgi scripts, files with a <code>.old</code>
 extension or directories beginning with <code>private_</code>. A directory
 ending in <code>.old</code> or a file beginning with private_ would remain
 unaffected.</p>
 
-
   <h3>Note on maxparallel attribute</h3>
   <p>
     Some shells have a limit of the number of characters that

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/chown.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chown.html b/manual/Tasks/chown.html
index 587878a..a0194c0 100644
--- a/manual/Tasks/chown.html
+++ b/manual/Tasks/chown.html
@@ -126,22 +126,20 @@ could use as initial value for these experiments.</p>
 
 </table>
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;chown file="${dist}/start.sh" owner="coderjoe"/&gt;
 </pre>
-</blockquote>
 <p>makes the "start.sh" file belong to coderjoe on a
 UNIX system.</p>
-<blockquote>
+
 <pre>
     &lt;chown owner="coderjoe"&gt;
       &lt;fileset dir="${dist}/bin" includes="**/*.sh"/&gt;
     &lt;/chown&gt;
 </pre>
-</blockquote>
 <p>makes all ".sh" files below <code>${dist}/bin</code>
 belong to coderjoe on a UNIX system.</p>
-<blockquote>
+
 <pre>
 &lt;chown owner="coderjoe"&gt;
   &lt;fileset dir="shared/sources1"&gt;
@@ -150,14 +148,12 @@ belong to coderjoe on a UNIX system.</p>
   &lt;fileset refid="other.shared.sources"/&gt;
 &lt;/chown&gt;
 </pre>
-</blockquote>
 <p>makes all files below <code>shared/sources1</code> (except those
 below any directory named trial) belong to coderjoe on a UNIX
 system. In addition all files belonging to a FileSet
 with <code>id</code> <code>other.shared.sources</code> get the same
 owner.</p>
 
-<blockquote>
 <pre>
 &lt;chown owner="webadmin" type="file"&gt;
   &lt;fileset dir="/web"&gt;
@@ -169,8 +165,6 @@ owner.</p>
   &lt;/dirset&gt;
 &lt;/chmod&gt;
 </pre>
-</blockquote>
-
 <p>makes cgi scripts, files with a <code>.old</code> extension or
 directories beginning with <code>private_</code> belong to the user named
 webadmin. A directory ending in <code>.old</code> or a file beginning with

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/clearcase.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/clearcase.html b/manual/Tasks/clearcase.html
index 18e4e66..d1b5b9c 100644
--- a/manual/Tasks/clearcase.html
+++ b/manual/Tasks/clearcase.html
@@ -121,14 +121,14 @@ Task to perform a "cleartool checkin" command to ClearCase.
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;cccheckin viewpath="c:/views/viewdir/afile"
         commentfile="acomment.txt"
         nowarn="true"
         identical="true"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>checkin</i> on the file <i>c:/views/viewdir/afile</i>.
 Comment text from the file <i>acomment.txt</i> is added to ClearCase as a comment.
 All warning messages are suppressed. The file is checked in even if it is
@@ -204,7 +204,7 @@ Task to perform a "cleartool checkout" command to ClearCase.
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;cccheckout viewpath="c:/views/viewdir/afile"
         reserved="true"
@@ -212,7 +212,7 @@ Task to perform a "cleartool checkout" command to ClearCase.
         nowarn="true"
         comment="Some comment text"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>checkout</i> on the file <i>c:/views/viewdir/afile</i>.
 It is checked out as <i>reserved</i> on branch called <i>abranch</i>. All
 warning messages are suppressed. A <i>Some comment text</i> is added to
@@ -248,12 +248,12 @@ Task to perform a UnCheckout command to ClearCase.
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccuncheckout viewpath="c:/views/viewdir/afile"
         keepcopy="true"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>uncheckout</i> on the file <i>c:/views/viewdir/afile</i>.
 A copy of the file called <i>c:/views/viewdir/afile.keep</i> is kept.</p>
 <hr/>
@@ -315,7 +315,7 @@ Task to perform an "cleartool update" command to ClearCase.
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccupdate viewpath="c:/views/viewdir"
         graphical="false"
@@ -324,7 +324,7 @@ Task to perform an "cleartool update" command to ClearCase.
         currenttime="true"
         rename="false"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>update</i> on the snapshot view directory <i>c:/views/viewdir</i>.
 A graphical dialog will be displayed. The output will be logged to
 <i>log.log</i> and it will overwrite any hijacked files. The modified
@@ -393,13 +393,13 @@ Task to perform a "mklbtype" command to ClearCase.
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmklbtype typename="VERSION_1"
         ordinary="true"
         comment="Development version 1"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>mklbtype</i> to create a label type named <i>VERSION_1</i>.
 It is created as <i>ordinary</i> so it is available only to the current VOB.
 The text <i>Development version 1</i> is added as a comment.</p>
@@ -462,7 +462,7 @@ Task to perform a "mklabel" command to ClearCase.
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmklabel viewpath="c:/views/viewdir/afile"
         comment="Some comment text"
@@ -470,7 +470,7 @@ Task to perform a "mklabel" command to ClearCase.
         version="\main\2"
         typename="VERSION_1"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>mklabel</i> on the file <i>c:/views/viewdir/afile</i> under
 the main branch for version 2 (<i>\main\2</i>). Text <i>Some comment text</i> is added
 as a comment. It will <i>recurse</i> all subdirectories.
@@ -561,14 +561,14 @@ Task to perform a "rmtype" command to ClearCase.
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccrmtype typekind="lbtype"
         typename="VERSION_1"
         commentfile="acomment.txt"
         rmall="true"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>rmtype</i> to remove a label type (<i>lbtype</i>) named <i>VERSION_1</i>.
 Comment text from the file <i>acomment.txt</i> is added as a comment. All instances of the type
 are removed, including the type object itself.</p>
@@ -627,12 +627,12 @@ Task to perform a "cleartool lock" command to ClearCase.
    </tr>
  </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;cclock
     objsel="stream:Application_Integration@\MyProject_PVOB"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>lock</i> on the object <i>stream:Application_Integration@\MyProject_PVOB</i>.</p>
 <hr>
 <h2 id="ccunlock">CCUnlock</h2>
@@ -674,12 +674,12 @@ Task to perform a "cleartool unlock" command to ClearCase.
    </tr>
  </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccunlock
     objsel="stream:Application_Integration@\MyProject_PVOB"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>unlock</i> on the object <i>stream:Application_Integration@\MyProject_PVOB</i>.</p>
 <hr>
 <h2 id="ccmkbl">CCMkbl</h2>
@@ -736,7 +736,7 @@ Task to perform a "cleartool mkbl" command to ClearCase.
   </tr>
  </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmkbl
     baselinerootname="Application_Baseline_AUTO"
@@ -744,7 +744,7 @@ Task to perform a "cleartool mkbl" command to ClearCase.
     full="no"
     viewpath="v:\ApplicationCC"/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>mkbl</i> on the Integration view at <i>v:\ApplicationCC</i>
 even if it is <i>identical</i> to a previous baseline. The new baseline with be
 incremental and named "Application_Baseline_AUTO".</p>
@@ -807,13 +807,13 @@ Task to perform a &quot;cleartool mkattr&quot; command to ClearCase.<br>
    </tr>
  </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmkattr viewpath=&quot;c:/views/viewdir/afile&quot;
     typename=&quot;BugFix&quot;
     typevalue=&quot;34445&quot;/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>mkattr</i> on the file <i>c:/views/viewdir/afile</i> and
 attaches the attribute <i>BugFix</i> with a value of <i>34445</i> to it.</p>
 <hr/>
@@ -854,13 +854,13 @@ Task to perform a &quot;cleartool mkdir&quot; command to ClearCase.<br>
    </tr>
  </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmkdir viewpath=&quot;c:/views/viewdir/adir&quot;
         nocheckout=&quot;true&quot;
         comment=&quot;Some comment text&quot;/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>mkdir</i> on the dir <i>c:/views/viewdir/adir</i> and
 does not automatically check it out.</p>
 <hr/>
@@ -927,14 +927,14 @@ Task to perform a &quot;cleartool mkelem&quot; command to ClearCase.<br>
    </tr>
  </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmkelem viewpath=&quot;c:/views/viewdir/afile&quot;
         eltype=&quot;text_file&quot;
         checkin=&quot;true&quot;
         comment=&quot;Some comment text&quot;/&gt;
 </pre>
-</blockquote>
+
 <p>Does a ClearCase <i>mkelem</i> on the file <i>c:/views/viewdir/afile</i> with
 element type <i>text_file</i>. It also checks in the file after creation.</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/conditions.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/conditions.html b/manual/Tasks/conditions.html
index c397685..e8bc052 100644
--- a/manual/Tasks/conditions.html
+++ b/manual/Tasks/conditions.html
@@ -335,10 +335,10 @@ that is "true","yes", or "on"</p>
     <td valign="top" align="center">Yes</td>
   </tr>
 </table>
-<blockquote><pre>
+<pre>
 &lt;istrue value=&quot;${someproperty}&quot;/&gt;
 &lt;istrue value=&quot;false&quot;/&gt;
-</pre></blockquote>
+</pre>
 
 <h4 id="isfalse">isfalse</h4>
 <p>Tests whether a string is not true, the negation of &lt;istrue&gt;
@@ -355,10 +355,10 @@ that is "true","yes", or "on"</p>
     <td valign="top" align="center">Yes</td>
   </tr>
 </table>
-<blockquote><pre>
+<pre>
 &lt;isfalse value=&quot;${someproperty}&quot;/&gt;
 &lt;isfalse value=&quot;false&quot;/&gt;
-</pre></blockquote>
+</pre>
 
 <h4 id="isreference">isreference</h4>
 <p>Test whether a given reference has been defined in this project and
@@ -449,11 +449,11 @@ that is "true","yes", or "on"</p>
   <p>
     Example usage:
   </p>
-<blockquote><pre>
+<pre>
 &lt;isfileselected file="a.xml"&gt;
   &lt;date datetime="06/28/2000 2:02 pm" when="equal"/&gt;
 &lt;/isfileselected&gt;
-</pre></blockquote>
+</pre>
 
 <h4 id="typefound">typefound</h4>
 
@@ -486,10 +486,10 @@ tasks, datatypes, scriptdefs, macrodefs and presetdefs.</p>
   <p>
     Example usages:
   </p>
-<blockquote><pre>
+<pre>
 &lt;typefound name="junit"/&gt;
 &lt;typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/&gt;
-</pre></blockquote>
+</pre>
 
 <h4 id="scriptcondition">scriptcondition</h4>
 
@@ -578,12 +578,12 @@ Alternatively, <code>self.value</code> can be used to set the evaluation result.
 <p>
 Example:
 </p>
-<blockquote><pre>
+<pre>
 &lt;scriptcondition language=&quot;javascript&quot;
         value=&quot;true&quot;&gt;
     self.setValue(false);
 &lt;/scriptcondition&gt;
-</pre></blockquote>
+</pre>
 
 Sets the default value of the condition to true, then in the script,
 sets the value to false. This condition always evaluates to "false"
@@ -618,18 +618,18 @@ attempting to set the appropriate property/feature/</p>
   </tr>
 </table>
 
-<blockquote><pre>
+<pre>
 &lt;parsersupports feature="http://xml.org/sax/features/namespaces"/&gt;
-</pre></blockquote>
+</pre>
 Check for namespace support. All SAX2 parsers should have this.
-<blockquote><pre>
+<pre>
 &lt;or&gt;
   &lt;parsersupports
     feature="http://apache.org/xml/features/validation/schema"/&gt;
   &lt;parsersupports
     feature="http://java.sun.com/xml/jaxp/properties/schemaSource"/&gt;
 &lt;/or&gt;
-</pre></blockquote>
+</pre>
 
 Check for XML Schema support.
 
@@ -691,21 +691,21 @@ not reachable on other ports (i.e. port 80), because of firewalls.
   </tr>
 </table>
 
-<blockquote><pre>
+<pre>
 &lt;condition property="offline"&gt;
   &lt;isreachable url="http://ibiblio.org/maven/" /&gt;
 &lt;/condition&gt;
-</pre></blockquote>
+</pre>
 
 <p>
 Probe for the maven repository being reachable.
 </p>
 
-<blockquote><pre>
+<pre>
 &lt;condition property="offline"&gt;
   &lt;isreachable host="ibiblio.org" timeout="10" /&gt;
 &lt;/condition&gt;
-</pre></blockquote>
+</pre>
 
 <p>
 Probe for the maven repository being reachable using the hostname, ten second timeout..
@@ -717,14 +717,14 @@ Probe for the maven repository being reachable using the hostname, ten second ti
   <em>Since Ant 1.6.3</em>
 </p>
 
-<blockquote><pre>
+<pre>
 &lt;length string=" foo " trim="true" length="3" /&gt;
-</pre></blockquote>
+</pre>
 <p>Verify a string is of a certain length.</p>
 
-<blockquote><pre>
+<pre>
 &lt;length file=&quot;foo&quot; when=&quot;greater&quot; length=&quot;0&quot; /&gt;
-</pre></blockquote>
+</pre>
 <p>Verify that file <i>foo</i> is not empty.</p>
 
 <h4 id="isfailure">isfailure</h4>
@@ -753,9 +753,9 @@ Probe for the maven repository being reachable using the hostname, ten second ti
   <em>Since Ant 1.7</em>
 </p>
 
-<blockquote><pre>
+<pre>
 &lt;resourcecount refid=&quot;myresourcecollection&quot; when=&quot;greater&quot; count=&quot;0&quot; /&gt;
-</pre></blockquote>
+</pre>
 <p>Verify that a resource collection is not empty.</p>
 
 <h4 id="resourcesmatch">resourcesmatch</h4>
@@ -870,9 +870,9 @@ must match. <em>Since Ant 1.7</em>
     There is also a nested &lt;classpath&gt; element, which can be used to specify
     a classpath.
 </p>
-<blockquote><pre>
+<pre>
 &lt;hasmethod classname="java.util.ArrayList" method="trimToSize"  /&gt;
-</pre></blockquote>
+</pre>
 
 <p>Looks for the method trimToSize in the ArrayList class.</p>
 
@@ -934,29 +934,29 @@ must match. <em>Since Ant 1.7</em>
   <p>
     An example:
   </p>
-<blockquote><pre>
+<pre>
 &lt;condition property="legal-password"&gt;
   &lt;matches pattern="[1-9]" string="${user-input}"/&gt;
 &lt;/condition&gt;
 &lt;fail message="Your password should at least contain one number"
       unless="legal-password"/&gt;
-</pre></blockquote>
+</pre>
   <p>
     The following example sets the property "ok" if
     the property "input" is three characters long, starting
     with 'a' and ending with 'b'.
   </p>
-<blockquote><pre>
+<pre>
 &lt;condition property="ok"&gt;
   &lt;matches string="${input}" pattern="^a.b$"/&gt;
 &lt;/condition&gt;
-</pre></blockquote>
+</pre>
   <p>
     The following defines a reference regular expression for
     matching dates and then uses antunit to check if the
     property "today" is in the correct format:
   </p>
-<blockquote><pre>
+<pre>
 &lt;regexp id="date.pattern" pattern="^[0123]\d-[01]\d-[12]\d\d\d$"/&gt;
 
 &lt;au:assertTrue xmlns:au="antlib:org.apache.ant.antunit"&gt;
@@ -964,12 +964,12 @@ must match. <em>Since Ant 1.7</em>
     &lt;regexp refid="date.pattern"/&gt;
   &lt;/matches&gt;
 &lt;/au:assertTrue&gt;
-</pre></blockquote>
+</pre>
   <p>
     The following example shows the use of the singleline and the casesensitive
     flags.
   </p>
-<blockquote><pre>
+<pre>
 &lt;au:assertTrue&gt;
   &lt;matches string="AB${line.separator}C" pattern="^ab.*C$"
            casesensitive="false"
@@ -980,7 +980,7 @@ must match. <em>Since Ant 1.7</em>
            casesensitive="false"
            singleline="false"/&gt;
 &lt;/au:assertFalse&gt;
-</pre></blockquote>
+</pre>
 
 <h4 id="antversion">antversion</h4>
 <p>This condition is identical to the <a
@@ -1022,9 +1022,9 @@ is redundant and will be ignored.</p>
   <p>
     An example:
   </p>
-<blockquote><pre>
+<pre>
 &lt;hasfreespace partition="c:" needed="100M"/&gt;
-</pre></blockquote>
+</pre>
 
 <h4 id="islastmodified">islastmodified</h4>
 
@@ -1070,11 +1070,11 @@ is redundant and will be ignored.</p>
   <p>
     An example:
   </p>
-<blockquote><pre>
+<pre>
 &lt;islastmodified dateTime="08/18/2009 04:41:19 AM" mode="not-before"&gt;
   &lt;file file="${file}"/&gt;
 &lt;/islastmodified&gt;
-</pre></blockquote>
+</pre>
 
 <h4 id="resourceexists">resourceexists</h4>
 
@@ -1085,11 +1085,11 @@ is redundant and will be ignored.</p>
   <p>
     An example:
   </p>
-<blockquote><pre>
+<pre>
 &lt;resourceexists&gt;
   &lt;file file="${file}"/&gt;
 &lt;/resourceexists&gt;
-</pre></blockquote>
+</pre>
 
 <h4 id="javaversion">javaversion</h4>
 
@@ -1122,9 +1122,9 @@ is redundant and will be ignored.</p>
     An example:
   </p>
 
-<blockquote><pre>
+<pre>
 &lt;javaversion atleast=&quot;9&quot;/&gt;
-</pre></blockquote>
+</pre>
 
 <p>will evaluate to true if the current JVM is Java 9 or above.</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/copyfile.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/copyfile.html b/manual/Tasks/copyfile.html
index 80306ae..2ce4180 100644
--- a/manual/Tasks/copyfile.html
+++ b/manual/Tasks/copyfile.html
@@ -62,10 +62,8 @@ does not exist.</p>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <p><code>&lt;copyfile src=&quot;test.java&quot; dest=&quot;subdir/test.java&quot;/&gt;</code></p>
-  <p><code>&lt;copyfile src=&quot;${src}/index.html&quot; dest=&quot;${dist}/help/index.html&quot;/&gt;</code></p>
-</blockquote>
+<pre>  &lt;copyfile src=&quot;test.java&quot; dest=&quot;subdir/test.java&quot;/&gt;
+  &lt;copyfile src=&quot;${src}/index.html&quot; dest=&quot;${dist}/help/index.html&quot;/&gt;</pre>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/dependset.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/dependset.html b/manual/Tasks/dependset.html
index cb8a841..90aa2da 100644
--- a/manual/Tasks/dependset.html
+++ b/manual/Tasks/dependset.html
@@ -132,7 +132,7 @@ Multiple <code>&lt;targetfilelist&gt;</code> filelists may be specified.
 </p>
 
 <h3>Examples</h3>
-<blockquote> <pre>
+<pre>
     &lt;dependset&gt;
        &lt;srcfilelist
            dir   = &quot;${dtd.dir}&quot;
@@ -147,7 +147,6 @@ Multiple <code>&lt;targetfilelist&gt;</code> filelists may be specified.
            dir      = &quot;${output.dir}&quot;
            includes = &quot;**/*.html&quot;/&gt;
     &lt;/dependset&gt;</pre>
-</blockquote>
 
 <p>
 In this example derived HTML files in the ${output.dir} directory

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/echoproperties.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/echoproperties.html b/manual/Tasks/echoproperties.html
index 96864c2..bb81568 100644
--- a/manual/Tasks/echoproperties.html
+++ b/manual/Tasks/echoproperties.html
@@ -97,46 +97,36 @@ shortcuts that use <tt>propertyset</tt>s internally.
 <p><em>since Ant 1.6</em>.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
-  &lt;echoproperties/&gt;
-</pre></blockquote>
+<pre>&lt;echoproperties/&gt;</pre>
 <p>Report the current properties to the log.</p>
-<blockquote><pre>
-  &lt;echoproperties destfile="my.properties"/&gt;
-</pre></blockquote>
+<pre>&lt;echoproperties destfile="my.properties"/&gt;</pre>
 <p>Report the current properties to the file "my.properties", and will
 fail the build if the file could not be created or written to.</p>
-<blockquote><pre>
-  &lt;echoproperties destfile="my.properties" failonerror="false"/&gt;
-</pre></blockquote>
+<pre>&lt;echoproperties destfile="my.properties" failonerror="false"/&gt;</pre>
 <p>Report the current properties to the file "my.properties", and will
 log a message if the file could not be created or written to, but will still
 allow the build to continue.</p>
-<blockquote><pre>
-  &lt;echoproperties prefix="java."/&gt;
-</pre></blockquote>
+<pre>&lt;echoproperties prefix="java."/&gt;</pre>
 <p>List all properties beginning with "java."</p>
-<blockquote><pre>
+<pre>
   &lt;echoproperties&gt;
     &lt;propertyset&gt;
       &lt;propertyref prefix="java."/&gt;
     &lt;/propertyset&gt;
   &lt;/echoproperties&gt;
-</pre></blockquote>
+</pre>
 <p>This again lists all properties beginning with "java." using a nested
 <tt>&lt;/propertyset&gt;</tt> which is an equivalent but longer way.</p>
-<blockquote><pre>
-  &lt;echoproperties regex=".*ant.*"/&gt;
-</pre></blockquote>
+<pre>&lt;echoproperties regex=".*ant.*"/&gt;</pre>
 <p>Lists all properties that contain "ant" in their names.
 The equivalent snippet with <tt>&lt;/propertyset&gt;</tt> is:</p>
-<blockquote><pre>
+<pre>
   &lt;echoproperties&gt;
     &lt;propertyset&gt;
       &lt;propertyref regex=".*ant.*"/&gt;
     &lt;/propertyset&gt;
   &lt;/echoproperties&gt;
-</pre></blockquote>
+</pre>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/exec.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/exec.html b/manual/Tasks/exec.html
index bb7a17a..96dbdb1 100644
--- a/manual/Tasks/exec.html
+++ b/manual/Tasks/exec.html
@@ -60,7 +60,6 @@ types listed in the environment variable PATHEXT. That is only used by the shell
     One normally needs to execute the command shell executable <code>cmd</code>
     using the <code>/c</code> switch.
   </p>
-  <blockquote>
 <pre>
 &lt;target name="help"&gt;
   &lt;exec executable="cmd"&gt;
@@ -69,7 +68,7 @@ types listed in the environment variable PATHEXT. That is only used by the shell
     &lt;arg value="-p"/&gt;
   &lt;/exec&gt;
 &lt;/target&gt;
-</pre></blockquote>
+</pre>
 
 <p>A common problem is not having the executable on the PATH. In case you get an error
 message <tt>Cannot run program "...":CreateProcess error=2. The system cannot find
@@ -79,7 +78,6 @@ to the PATH (<tt>set PATH=%PATH%;dirOfProgram</tt>) or specify the absolute path
 <tt>executable</tt> attribute in your buildfile.
 </p>
 
-
 <h4>Cygwin Users</h4>
 <p>The <code>&lt;exec&gt;</code> task will not understand paths such as /bin/sh
 for the executable parameter.  This is because the Java VM in which Ant is
@@ -116,27 +114,20 @@ set to <code>true</code> instead as this task will follow the VM's
 interpretation of exit codes.</p>
 
 <h4>RedHat S/390 Users</h4>
-
 <p>It has been <a
 href="http://listserv.uark.edu/scripts/wa.exe?A1=ind0404&L=vmesa-l#33">reported
 on the VMESA-LISTSERV</a> that shell scripts invoked via the Ant Exec
 task must have their interpreter specified, i.e., the scripts must
 start with something like:</p>
 
-<blockquote>
 <pre>
 #!/bin/bash
 </pre>
-</blockquote>
-
 <p>or the task will fail as follows:</p>
-
-<blockquote>
 <pre>
 [exec] Warning: UNIXProcess.forkAndExec native error: Exec format error
 [exec] Result: 255
 </pre>
-</blockquote>
 
 <h4 id="background">Running Ant as a background process on Unix(-like) systems</h4>
 
@@ -318,12 +309,11 @@ start with something like:</p>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
 <pre>
 &lt;exec dir=&quot;${src}&quot; executable=&quot;cmd.exe&quot; os=&quot;Windows 2000&quot; output=&quot;dir.txt&quot;&gt;
   &lt;arg line=&quot;/c dir&quot;/&gt;
 &lt;/exec&gt;</pre>
-</blockquote>
+
 <h3>Parameters specified as nested elements</h3>
 <h4>arg</h4>
 <p>Command line arguments should be specified as nested
@@ -398,34 +388,31 @@ it is not on the path. Any time you see such an error from any Ant task, it is
 usually not an Ant bug, but some configuration problem on your machine.
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;exec executable=&quot;emacs&quot;&gt;
   &lt;env key=&quot;DISPLAY&quot; value=&quot;:1.0&quot;/&gt;
 &lt;/exec&gt;
-</pre></blockquote>
+</pre>
 <p>starts <code>emacs</code> on display 1 of the X Window System.</p>
-
-<blockquote><pre>
+<pre>
 &lt;property environment=&quot;env&quot;/&gt;
 &lt;exec ... &gt;
   &lt;env key=&quot;PATH&quot; path=&quot;${env.PATH}:${basedir}/bin&quot;/&gt;
 &lt;/exec&gt;
-</pre></blockquote>
+</pre>
 <p>adds <code>${basedir}/bin</code> to the <code>PATH</code> of the
 system command.</p>
-
-<blockquote><pre>
+<pre>
 &lt;property name="browser" location="C:/Program Files/Internet Explorer/iexplore.exe"/&gt;
 &lt;property name="file" location="ant/docs/manual/index.html"/&gt;
 
 &lt;exec executable="${browser}" spawn="true"&gt;
     &lt;arg value="${file}"/&gt;
 &lt;/exec&gt;
-</pre></blockquote>
+</pre>
 <p>Starts the <i>${browser}</i> with the specified <i>${file}</i> and end the
 Ant process. The browser will remain.</p>
-
-<blockquote><pre>
+<pre>
 &lt;exec executable=&quot;cat&quot;&gt;
     &lt;redirector outputproperty=&quot;redirector.out&quot;
                 errorproperty=&quot;redirector.err&quot;
@@ -437,7 +424,7 @@ Ant process. The browser will remain.</p>
         &lt;errormapper type=&quot;merge&quot; to=&quot;redirector.err&quot;/&gt;
     &lt;/redirector&gt;
 &lt;/exec&gt;
-</pre></blockquote>
+</pre>
 
 Sends the string &quot;blah before blah&quot; to the &quot;cat&quot; executable,
 using an <a href="../Types/filterchain.html">&lt;inputfilterchain&gt;</a>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/genkey.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/genkey.html b/manual/Tasks/genkey.html
index 5010a20..de8f393 100644
--- a/manual/Tasks/genkey.html
+++ b/manual/Tasks/genkey.html
@@ -102,13 +102,12 @@ with &quot;<code>\,</code>&quot;.</p>
 <p>The following two examples are identical:</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;genkey alias=&quot;apache-group&quot; storepass=&quot;secret&quot;
   dname=&quot;CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US&quot;/&gt;
-</pre></blockquote>
+</pre>
 
-<blockquote>
-  <pre>
+<pre>
 &lt;genkey alias=&quot;apache-group&quot; storepass=&quot;secret&quot; &gt;
   &lt;dname&gt;
     &lt;param name=&quot;CN&quot; value=&quot;Ant Group&quot;/&gt;
@@ -117,7 +116,6 @@ with &quot;<code>\,</code>&quot;.</p>
     &lt;param name=&quot;C&quot;  value=&quot;US&quot;/&gt;
   &lt;/dname&gt;
 &lt;/genkey&gt;</pre>
-</blockquote>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/image.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/image.html b/manual/Tasks/image.html
index d1a06e2..e3153e2 100644
--- a/manual/Tasks/image.html
+++ b/manual/Tasks/image.html
@@ -219,38 +219,38 @@ nested inside the Draw object.</p>
 
 <h3>Examples</h3>
 
-<blockquote><pre>
+<pre>
  &lt;image destdir="samples/low" overwrite="yes"&gt;
      &lt;fileset dir="samples/full"&gt;
          &lt;include name="**/*.jpg"/&gt;
      &lt;/fileset&gt;
      &lt;scale width="160" height="160" proportions="fit"/&gt;
  &lt;/image&gt;
-</pre></blockquote>
+</pre>
 <p>Create thumbnails of my images and make sure they all fit within the 160x160 size whether the
 image is portrait or landscape.</p>
 
-<blockquote><pre>
+<pre>
 &lt;image srcdir="src" includes="*.png"&gt;
     &lt;scale proportions="width" width="40"/&gt;
 &lt;/image&gt;
-</pre></blockquote>
+</pre>
 <p>Creates a thumbnail for all PNG-files in <i>src</i> in the size of 40 pixel keeping the proportions
 and stores the <i>src</i>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;image srcdir="src" destdir="dest" includes="*.png"&gt;
     &lt;scale proportions="width" width="40"/&gt;
 &lt;/image&gt;
-</pre></blockquote>
+</pre>
 <p>Same as above but stores the result in <i>dest</i>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;image srcdir="src" destdir="dest" includes="*.png"&gt;
     &lt;scale proportions="width" width="40"/&gt;
     &lt;globmapper from="*" to="scaled-*"/&gt;
 &lt;/image&gt;
-</pre></blockquote>
+</pre>
 <p>Same as above but stores the resulting file names will be prefixed
   by "scaled-".</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/jar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jar.html b/manual/Tasks/jar.html
index ea3eecc..c2631a3 100644
--- a/manual/Tasks/jar.html
+++ b/manual/Tasks/jar.html
@@ -440,39 +440,38 @@ depend on your manifest:</p>
     nested &lt;provider&gt; elements may be used.
   </p>
 
-
 <h3>Examples</h3>
 
 <h4>Simple</h4>
-<blockquote><pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot; basedir=&quot;${build}/classes&quot;/&gt;</pre></blockquote>
+<pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot; basedir=&quot;${build}/classes&quot;/&gt;</pre>
 <p>jars all files in the <code>${build}/classes</code> directory into a file
 called <code>app.jar</code> in the <code>${dist}/lib</code> directory.</p>
 
 
 <h4>With filters</h4>
 
-<blockquote><pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
+<pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
        basedir=&quot;${build}/classes&quot;
-       excludes=&quot;**/Test.class&quot;/&gt;</pre></blockquote>
+       excludes=&quot;**/Test.class&quot;/&gt;</pre>
 <p>jars all files in the <code>${build}/classes</code> directory into a file
 called <code>app.jar</code> in the <code>${dist}/lib</code> directory. Files
 with the name <code>Test.class</code> are excluded.</p>
 
-<blockquote><pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
+<pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
        basedir=&quot;${build}/classes&quot;
        includes=&quot;mypackage/test/**&quot;
-       excludes=&quot;**/Test.class&quot;/&gt;</pre></blockquote>
+       excludes=&quot;**/Test.class&quot;/&gt;</pre>
 <p>jars all files in the <code>${build}/classes</code> directory into a file
 called <code>app.jar</code> in the <code>${dist}/lib</code> directory. Only
 files under the directory <code>mypackage/test</code> are used, and files with
 the name <code>Test.class</code> are excluded.</p>
 
 <h4>Multiple filesets</h4>
-<blockquote><pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;&gt;
+<pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;&gt;
     &lt;fileset dir=&quot;${build}/classes&quot;
              excludes=&quot;**/Test.class&quot;/&gt;
     &lt;fileset dir=&quot;${src}/resources&quot;/&gt;
-  &lt;/jar&gt;</pre></blockquote>
+  &lt;/jar&gt;</pre>
 <p>jars all files in the <code>${build}/classes</code> directory and also
 in the <code>${src}/resources</code> directory together into a file
 called <code>app.jar</code> in the <code>${dist}/lib</code> directory.
@@ -484,20 +483,20 @@ by Java).</p>
 
 <h4>Merging archives</h4>
 
-<blockquote><pre> &lt;jar destfile="build/main/checksites.jar"&gt;
+<pre> &lt;jar destfile="build/main/checksites.jar"&gt;
     &lt;fileset dir="build/main/classes"/&gt;
     &lt;zipfileset includes="**/*.class" src="lib/main/some.jar"/&gt;
     &lt;manifest&gt;
       &lt;attribute name="Main-Class"
             value="com.acme.checksites.Main"/&gt;
     &lt;/manifest&gt;
-  &lt;/jar&gt;</pre></blockquote>
+  &lt;/jar&gt;</pre>
 <p>
   Creates an executable jar file with a main class "com.acme.checksites.Main", and
   embeds all the classes from the jar <code>lib/main/some.jar</code>.
 </p>
 
-<blockquote><pre> &lt;jar destfile="build/main/checksites.jar"&gt;
+<pre> &lt;jar destfile="build/main/checksites.jar"&gt;
     &lt;fileset dir="build/main/classes"/&gt;
     &lt;restrict&gt;
      &lt;name name="**/*.class"/&gt;
@@ -511,14 +510,14 @@ by Java).</p>
       &lt;attribute name="Main-Class"
             value="com.acme.checksites.Main"/&gt;
     &lt;/manifest&gt;
-  &lt;/jar&gt;</pre></blockquote>
+  &lt;/jar&gt;</pre>
 <p>
   Creates an executable jar file with a main class "com.acme.checksites.Main", and
   embeds all the classes from all the jars in <code>lib/main</code>.
 </p>
 
 <h4>Inline manifest</h4>
-<blockquote><pre>  &lt;jar destfile=&quot;test.jar&quot; basedir=&quot;.&quot;&gt;
+<pre>  &lt;jar destfile=&quot;test.jar&quot; basedir=&quot;.&quot;&gt;
     &lt;include name=&quot;build&quot;/&gt;
     &lt;manifest&gt;
       &lt;!-- If this is an Applet or Web Start application, include
@@ -536,14 +535,14 @@ by Java).</p>
         &lt;attribute name=&quot;Sealed&quot; value=&quot;false&quot;/&gt;
       &lt;/section&gt;
     &lt;/manifest&gt;
-  &lt;/jar&gt;</pre></blockquote>
+  &lt;/jar&gt;</pre>
 <p>
 This is an example of an inline manifest specification including the version of the build
 program (Implementation-Version). Note that the Built-By attribute will take the value of the Ant
 property ${user.name}. The manifest produced by the above would look like this:
 </p>
 
-<blockquote><pre>Manifest-Version: 1.0
+<pre>Manifest-Version: 1.0
 Permissions: sandbox
 Codebase: example.com
 Built-By: conor
@@ -553,7 +552,7 @@ Implementation-Version: 1.0.0beta2
 Created-By: Apache Ant 1.9.2
 
 Name: common/MyClass.class
-Sealed: false</pre></blockquote>
+Sealed: false</pre>
 
 <h4>Service Provider</h4>
 
@@ -561,20 +560,18 @@ Sealed: false</pre></blockquote>
   The following shows how to create a jar file specifying a service
   with an implementation of the JDK 6 scripting interface:
 </p>
-<blockquote><pre>&lt;jar destfile="pinky.jar"&gt;
+<pre>&lt;jar destfile="pinky.jar"&gt;
   &lt;fileset dir="build/classes"/&gt;
   &lt;service type="javax.script.ScriptEngineFactory"
            provider="org.acme.PinkyLanguage"/&gt;
 &lt;/jar&gt;
-</pre></blockquote>
-
-
+</pre>
 
 <p>
   The following shows how to create a jar file specifying a service
   with two implementations of the JDK 6 scripting interface:
 </p>
-<blockquote><pre>
+<pre>
 &lt;jar destfile="pinkyandbrain.jar"&gt;
   &lt;fileset dir="classes"/&gt;
   &lt;service type="javax.script.ScriptEngineFactory"&gt;
@@ -582,8 +579,7 @@ Sealed: false</pre></blockquote>
     &lt;provider classname="org.acme.BrainLanguage"/&gt;
   &lt;/service&gt;
 &lt;/jar&gt;
-</pre></blockquote>
-
+</pre>
 
 <h4 id="jep238-example">JEP 238 example: a Multi-Release JAR Files</h4>
 <p>
@@ -601,7 +597,7 @@ Sealed: false</pre></blockquote>
   <code>${java.classes}</code> and the Java 9 classes are compiled into
   <code>${java9.classes}</code>.
 </p>
-<blockquote><pre>
+<pre>
     &lt;jar destfile=&quot;mrjar.jar&quot;&gt;
       &lt;manifest&gt;
         &lt;!-- special mf-entry according to the spec --&gt;
@@ -613,7 +609,7 @@ Sealed: false</pre></blockquote>
       &lt;!-- ... per release classes, require Java 9+ for loadable via standard ClassLoader --&gt;
       &lt;zipfileset prefix=&quot;META-INF/versions/9/&quot; dir=&quot;${java9.classes}&quot;/&gt;
     &lt;/jar&gt;
-</pre></blockquote>
+</pre>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/javac.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html
index a0656bb..1a79c6f 100644
--- a/manual/Tasks/javac.html
+++ b/manual/Tasks/javac.html
@@ -914,7 +914,7 @@ while all others are <code>false</code>.</p>
   to be given to the runtime system of the javac executable, so it needs
   to be prepended with a "-J". For example:
 
-<blockquote><pre>
+<pre>
   &lt;property name="patched.javac.jar"
             location="${my.patched.compiler}/dist/lib/javac.jar"/&gt;
 
@@ -927,7 +927,7 @@ while all others are <code>false</code>.</p>
 
   &lt;patched.javac srcdir="src/java" destdir="build/classes"
                  debug="yes"/&gt;
-</pre></blockquote>
+</pre>
 
   <h3>Note on package-info.java</h3>
   <p>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/javacc.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/javacc.html b/manual/Tasks/javacc.html
index 0dba9cd..df359b2 100644
--- a/manual/Tasks/javacc.html
+++ b/manual/Tasks/javacc.html
@@ -189,13 +189,13 @@
   </tr>
 </table>
 <h3>Example</h3>
-<blockquote><pre>
+<pre>
 &lt;javacc
     target=&quot;src/Parser.jj&quot;
     outputdirectory=&quot;build/src&quot;
     javacchome=&quot;c:/program files/JavaCC&quot;
     static=&quot;true&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>
   This invokes JavaCC on grammar file src/Parser.jj, writing the generated
   files to build/src.  The grammar option STATIC is set to true when

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/jdepend.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jdepend.html b/manual/Tasks/jdepend.html
index 6fd5486..4ad2b5f 100644
--- a/manual/Tasks/jdepend.html
+++ b/manual/Tasks/jdepend.html
@@ -117,7 +117,6 @@ to ignore (requires JDepend 2.5 or above).</p>
 
 <h3>Examples</h3>
 
-<blockquote>
 <pre>
 &lt;jdepend classpathref="base.path"&gt;
     &lt;classespath&gt;
@@ -125,13 +124,12 @@ to ignore (requires JDepend 2.5 or above).</p>
     &lt;/classespath&gt;
 &lt;/jdepend&gt;
 </pre>
-</blockquote>
 
 <p>This invokes JDepend on the <code>build</code> directory, writing
 the output on the standard output. The classpath is defined using a
 classpath reference.</p>
 
-<blockquote>
+
 <pre>
 &lt;jdepend outputfile="docs/jdepend.xml" fork="yes" format="xml"&gt;
     &lt;sourcespath&gt;
@@ -143,14 +141,12 @@ classpath reference.</p>
     &lt;/classpath&gt;
 &lt;/jdepend&gt;
 </pre>
-</blockquote>
 
 <p>This invokes JDepend in a separate VM on the <code>src</code> and
 <code>testsrc</code> directories, writing the output to the
 <code>&lt;docs/jdepend.xml&gt;</code> file in xml format. The
 classpath is defined using nested elements.</p>
 
-<blockquote>
 <pre>
 &lt;jdepend classpathref="base.path"&gt;
     &lt;exclude name="java.*&gt;
@@ -160,7 +156,6 @@ classpath is defined using nested elements.</p>
     &lt;/classespath&gt;
 &lt;/jdepend&gt;
 </pre>
-</blockquote>
 
 <p>This invokes JDepend with the build directory as the base for class
 files to analyze, and will ignore all classes in the java.* and

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/jjdoc.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jjdoc.html b/manual/Tasks/jjdoc.html
index caf718a..d0bf263 100644
--- a/manual/Tasks/jjdoc.html
+++ b/manual/Tasks/jjdoc.html
@@ -44,56 +44,42 @@ generated BNF documentation file.</p>
 
 <table>
 <tr>
-<td valign="top"><b>Attribute</b></td>
-
-<td valign="top"><b>Description</b></td>
-
-<td align="center" valign="top"><b>Required</b></td>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
 </tr>
 
 <tr>
-<td valign="top">target</td>
-
-<td valign="top">The javacc grammar file to process.</td>
-
-<td align="center" valign="top">Yes</td>
+    <td valign="top">target</td>
+    <td valign="top">The javacc grammar file to process.</td>
+    <td align="center" valign="top">Yes</td>
 </tr>
 
 <tr>
-<td valign="top">javacchome</td>
-
-<td valign="top">The directory containing the JavaCC distribution.</td>
-
-<td align="center" valign="top">Yes</td>
+    <td valign="top">javacchome</td>
+    <td valign="top">The directory containing the JavaCC distribution.</td>
+    <td align="center" valign="top">Yes</td>
 </tr>
 
 <tr>
-<td valign="top">outputfile</td>
-
-<td valign="top">The file to write the generated BNF documentation file to. If not set,
-the file is written with the same name as the JavaCC grammar file but with a the suffix .html or .txt</td>
-
-<td align="center" valign="top">No</td>
+    <td valign="top">outputfile</td>
+    <td valign="top">The file to write the generated BNF documentation file to. If not set,
+    the file is written with the same name as the JavaCC grammar file but with a the suffix .html or .txt</td>
+    <td align="center" valign="top">No</td>
 </tr>
 
 <tr>
-<td valign="top">text</td>
-
-<td valign="top">Sets the TEXT BNF documentation option. This is a boolean
-option.</td>
-
-<td align="center" valign="top">No</td>
+    <td valign="top">text</td>
+    <td valign="top">Sets the TEXT BNF documentation option. This is a boolean option.</td>
+    <td align="center" valign="top">No</td>
 </tr>
 
 <tr>
-<td valign="top">onetable</td>
-
-<td valign="top">Sets the ONE_TABLE BNF documentation option. This is a boolean option.</td>
-
-<td align="center" valign="top">No</td>
+    <td valign="top">onetable</td>
+    <td valign="top">Sets the ONE_TABLE BNF documentation option. This is a boolean option.</td>
+    <td align="center" valign="top">No</td>
 </tr>
-
-  <tr>
+<tr>
     <td valign="top">maxmemory</td>
     <td valign="top">Max amount of memory to allocate to the forked
       VM.  <em>since Ant 1.8.3</em></td>
@@ -101,15 +87,13 @@ option.</td>
   </tr>
 </table>
 
-<h3>
-Example</h3>
+<h3>Example</h3>
 
-<blockquote>
 <pre>&lt;jjdoc
     target="src/Parser.jj"
     outputfile="doc/ParserBNF.html"
     javacchome="c:/program files/JavaCC"/&gt;</pre>
-</blockquote>
+
 This invokes JJDoc on grammar file src/Parser.jj, writing the generated
 BNF documentation file, ParserBNF.html, file to doc.
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/jjtree.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jjtree.html b/manual/Tasks/jjtree.html
index 4bfd484..a94390e 100644
--- a/manual/Tasks/jjtree.html
+++ b/manual/Tasks/jjtree.html
@@ -194,17 +194,14 @@ option.</td>
 
 <h3>Example</h3>
 
-<blockquote>
 <pre>&lt;jjtree
     target="src/Parser.jjt"
     outputdirectory="build/src"
     javacchome="c:/program files/JavaCC"
     nodeusesparser="true"/&gt;</pre>
-</blockquote>
 This invokes JJTree on grammar file src/Parser.jjt, writing the generated
 grammar file, Parser.jj, file to build/src. The grammar option NODE_USES_PARSER
 is set to true when invoking JJTree.
-<br>
 
 <h3>Comparison output locations between command line JJTree and different Ant taskdef versions</h3>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/junitreport.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/junitreport.html b/manual/Tasks/junitreport.html
index 2b0e72c..6c8e861 100644
--- a/manual/Tasks/junitreport.html
+++ b/manual/Tasks/junitreport.html
@@ -181,20 +181,18 @@ a nested &lt;factory&gt; can be used to specify factory settings.</p>
 
 
 <h3>Example of report</h3>
-<blockquote>
-  <pre>&lt;junitreport todir=&quot;./reports&quot;&gt;
+<pre>&lt;junitreport todir=&quot;./reports&quot;&gt;
   &lt;fileset dir=&quot;./reports&quot;&gt;
     &lt;include name=&quot;TEST-*.xml&quot;/&gt;
   &lt;/fileset&gt;
   &lt;report format=&quot;frames&quot; todir=&quot;./report/html&quot;/&gt;
-&lt;/junitreport&gt;
-</pre>
-</blockquote>
+&lt;/junitreport&gt;</pre>
+
 <p>would generate a <tt>TESTS-TestSuites.xml</tt> file in the directory <tt>reports</tt> and
 generate the default framed report in the directory <tt>report/html</tt>.</p>
+
 <h3>Example of report with xsl params</h3>
-<blockquote>
-  <pre>
+<pre>
 &lt;junitreport todir="${outputdir}"&gt;
     &lt;fileset dir="${jrdir}"&gt;
         &lt;include name="TEST-*.xml"/&gt;
@@ -205,9 +203,8 @@ generate the default framed report in the directory <tt>report/html</tt>.</p>
         &lt;param name="key1" expression="value1"/&gt;
         &lt;param name="key2" expression="value2"/&gt;
     &lt;/report&gt;
-&lt;/junitreport&gt;
-  </pre>
-  </blockquote>
+&lt;/junitreport&gt;</pre>
+
 <p>This example requires a file called <tt>junitreport/junit-frames.xsl</tt>.
     The XSL parameters key1 and key2 will be passed to the XSL transformation.</p>
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/macrodef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/macrodef.html b/manual/Tasks/macrodef.html
index dd816d0..adf6869 100644
--- a/manual/Tasks/macrodef.html
+++ b/manual/Tasks/macrodef.html
@@ -243,7 +243,6 @@
       The following example defined a task called testing and
       runs it.
     </p>
-    <blockquote>
 <pre class=code>
 &lt;macrodef name="testing"&gt;
    &lt;attribute name="v" default="NOT SET"/&gt;
@@ -260,7 +259,6 @@
    &lt;/some-tasks&gt;
 &lt;/testing&gt;
 </pre>
-    </blockquote>
     <p>
       The following fragment defines a task called <code>&lt;call-cc&gt;</code> which
       take the attributes "target", "link" and "target.dir" and the
@@ -268,7 +266,6 @@
       uses the <code>&lt;cc&gt;</code> task from the
       <a href="http://ant-contrib.sourceforge.net/">ant-contrib</a> project.
     </p>
-    <blockquote>
 <pre class="code">
 &lt;macrodef name="call-cc"&gt;
    &lt;attribute name="target"/&gt;
@@ -286,11 +283,9 @@
       &lt;/sequential&gt;
 &lt;/macrodef&gt;
 </pre>
-    </blockquote>
     <p>
       This then can be used as follows:
     </p>
-    <blockquote>
 <pre class="code">
 &lt;call-cc target="unittests" link="executable"
          target.dir="${build.bin.dir}"&gt;
@@ -303,13 +298,11 @@
    &lt;/cc-elements&gt;
 &lt;/call-cc&gt;
 </pre>
-    </blockquote>
     <p>
       The following fragment shows &lt;call-cc&gt;, but this time
       using an implicit element and with the link and target.dir arguments
       having default values.
     </p>
-    <blockquote>
 <pre class="code">
 &lt;macrodef name="call-cc"&gt;
    &lt;attribute name="target"/&gt;
@@ -327,12 +320,10 @@
       &lt;/sequential&gt;
 &lt;/macrodef&gt;
 </pre>
-    </blockquote>
     <p>
       This then can be used as follows, note that &lt;cc-elements&gt;
       is not specified.
     </p>
-    <blockquote>
 <pre class="code">
 &lt;call-cc target="unittests"&gt;
    &lt;includepath location="${gen.dir}"/&gt;
@@ -342,11 +333,9 @@
    &lt;linker refid="linker-libs"/&gt;
 &lt;/call-cc&gt;
 </pre>
-    </blockquote>
     <p>
       The following shows the use of the <code>text</code> element.
     </p>
-    <blockquote>
 <pre class="code">
 &lt;macrodef name="echotest"&gt;
    &lt;text name="text"/&gt;
@@ -358,7 +347,6 @@
    Hello world
 &lt;/echotest&gt;
 </pre>
-    </blockquote>
     <p>
       The following uses a prior defined attribute for setting the
       default value of another. The output would be
@@ -367,7 +355,6 @@
       because while processing the <i>two</i>-line the value for
       <i>one</i> is not set.
     </p>
-    <blockquote>
 <pre class="code">
 &lt;macrodef name="test"&gt;
    &lt;attribute name="one"/&gt;                     <b>*1</b>
@@ -378,7 +365,6 @@
 &lt;/macrodef&gt;
 &lt;test one="test"/&gt;
 </pre>
-    </blockquote>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/mail.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/mail.html b/manual/Tasks/mail.html
index 2ada002..c702b83 100644
--- a/manual/Tasks/mail.html
+++ b/manual/Tasks/mail.html
@@ -309,18 +309,18 @@ the <code>&lt;message&gt;</code> element.</p>
 
 <h3>Examples</h3>
 
-<blockquote><pre>
+<pre>
 &lt;mail from=&quot;me&quot;
       tolist=&quot;you&quot;
       subject=&quot;Results of nightly build&quot;
       files=&quot;build.log&quot;/&gt;
-</pre></blockquote>
+</pre>
 
 <p>Sends an email from <i>me</i> to <i>you</i> with a subject of
 <i>Results of nightly build</i> and includes the contents of the file
 <i>build.log</i> in the body of the message.</p>
 
-<blockquote><pre>
+<pre>
 &lt;mail mailhost=&quot;smtp.myisp.com&quot; mailport=&quot;1025&quot; subject=&quot;Test build&quot;&gt;
   &lt;from address=&quot;config@myisp.com&quot;/&gt;
   &lt;replyto address=&quot;me@myisp.com&quot;/&gt;
@@ -332,7 +332,7 @@ the <code>&lt;message&gt;</code> element.</p>
     &lt;/fileset&gt;
   &lt;/attachments&gt;
 &lt;/mail&gt;
-</pre></blockquote>
+</pre>
 
 <p>Sends an eMail from <i>config@myisp.com</i> to <i>all@xyz.com</i> with a subject of
 <i>Test Build</i>. Replies to this email will go to <i>me@myisp.com</i>.
@@ -341,7 +341,7 @@ task will attempt to use JavaMail and fall back to UU encoding or no encoding in
 that order depending on what support classes are available. <code>${buildname}</code>
 will be replaced with the <code>buildname</code> property's value.</p>
 
-<blockquote><pre>
+<pre>
 &lt;property name=&quot;line2&quot; value=&quot;some_international_message&quot;/&gt;
 &lt;echo message=&quot;${line2}&quot;/&gt;
 
@@ -350,7 +350,7 @@ will be replaced with the <code>buildname</code> property's value.</p>
   &lt;to address=&quot;all@xyz.com&quot;/&gt;
   &lt;message&gt;some international text:${line2}&lt;/message&gt;
 &lt;/mail&gt;
-</pre></blockquote>
+</pre>
 
 <p>Sends an eMail from <i>me@myisp.com</i> to <i>all@xyz.com</i> with a subject of
 <i>Test Build</i>, the message body being coded in UTF-8

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/manifestclasspath.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/manifestclasspath.html b/manual/Tasks/manifestclasspath.html
index c19fb5d..3c09d5c 100644
--- a/manual/Tasks/manifestclasspath.html
+++ b/manual/Tasks/manifestclasspath.html
@@ -96,20 +96,18 @@ defined in-place, or refer to a path defined elsewhere using the
 This classpath must not be empty, and is required.</p>
 
 <h3>Examples</h3>
-<div id="example1">
-  <blockquote><pre>
+  <pre>
     &lt;manifestclasspath property="jar.classpath"
                        jarfile="build/acme.jar"&gt;
       &lt;classpath refid="classpath" /&gt;
     &lt;/manifestclasspath&gt;
-  </pre></blockquote>
+  </pre>
   <p>Assuming a path of id "classpath" was already defined, convert this
   path relatively to the build/ directory that will contain acme.jar, which
   can later be created with <code>&lt;jar&gt;</code> with a nested
   <code>&lt;manifest&gt;</code> element that lists an
   <code>&lt;attribute name="Class-Path" value="${jar.classpath}"/&gt;</code>.
   </p>
-</div>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/netrexxc.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/netrexxc.html b/manual/Tasks/netrexxc.html
index 6231aa9..b7927e0 100644
--- a/manual/Tasks/netrexxc.html
+++ b/manual/Tasks/netrexxc.html
@@ -324,16 +324,14 @@ for more information.</p>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <p><code>&lt;netrexxc srcDir=&quot;/source/project&quot;
+
+<pre>&lt;netrexxc srcDir=&quot;/source/project&quot;
            includes=&quot;vnr/util/*&quot;
            destDir=&quot;/source/project/build&quot;
            classpath=&quot;/source/project2/proj.jar&quot;
            comments=&quot;true&quot;
            crossref=&quot;false&quot; replace=&quot;true&quot;
-           keep=&quot;true&quot;/&gt;</code>
-  </p>
-</blockquote>
+           keep=&quot;true&quot;/&gt;</pre>
 
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/pack.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/pack.html b/manual/Tasks/pack.html
index 3ecebca..c8d6fa8 100644
--- a/manual/Tasks/pack.html
+++ b/manual/Tasks/pack.html
@@ -63,20 +63,20 @@ resource collection</h4>
 <p>The specified resource will be used as src. <em>Since Apache Ant 1.7</em></p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;gzip src=&quot;test.tar&quot; destfile=&quot;test.tar.gz&quot;/&gt;
-</pre></blockquote>
-<blockquote><pre>
+</pre>
+<pre>
 &lt;bzip2 src=&quot;test.tar&quot; destfile=&quot;test.tar.bz2&quot;/&gt;
-</pre></blockquote>
-<blockquote><pre>
+</pre>
+<pre>
 &lt;xz src=&quot;test.tar&quot; destfile=&quot;test.tar.xz&quot;/&gt;
-</pre></blockquote>
-<blockquote><pre>
+</pre>
+<pre>
 &lt;gzip destfile=&quot;archive.tar.gz&quot;&gt;
   &lt;url url="http://example.org/archive.tar"/&gt;
 &lt;/gzip&gt;
-</pre></blockquote>
+</pre>
 <p>downloads <i>http://example.org/archive.tar</i> and compresses it
 to <i>archive.tar.gz</i> in the project's basedir on the fly.</p>