diff --git a/docs/manual/anttaskslist.html b/docs/manual/anttaskslist.html
index 9fb2d7b3a..ff72d3c45 100644
--- a/docs/manual/anttaskslist.html
+++ b/docs/manual/anttaskslist.html
@@ -29,14 +29,14 @@
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
 <h3>Ant Tasks</h3>
-<a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a><br/>
-<a href="coretasklist.html" target="navFrame">Core Tasks</a><br/>
-<a href="optionaltasklist.html" target="navFrame">Optional Tasks</a><br/>
+<ul class="inlinelist">
+<li><a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a></li>
+<li><a href="coretasklist.html" target="navFrame">Core Tasks</a></li>
+<li><a href="optionaltasklist.html" target="navFrame">Optional Tasks</a></li>
 <div style="padding-left:1em">
-  <a href="install.html#librarydependencies" target="mainFrame">
-  Library Dependencies</a><br/>
+  <li><a href="install.html#librarydependencies" target="mainFrame">Library Dependencies</a></li>
 </div>
-
+</ul>
 
 </body>
 </html>
diff --git a/docs/manual/conceptstypeslist.html b/docs/manual/conceptstypeslist.html
index cdb23f878..738a42f10 100644
--- a/docs/manual/conceptstypeslist.html
+++ b/docs/manual/conceptstypeslist.html
@@ -28,52 +28,64 @@
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
 <h3>Concepts</h3>
-<a href="properties.html">Properties and PropertyHelpers</a>
-<a href="clonevm.html">ant.build.clonevm</a><br/>
-<a href="sysclasspath.html">build.sysclasspath</a><br/>
-<a href="javacprops.html">Ant properties controlling javac</a><br/>
-<a href="CoreTasks/common.html">Common Attributes</a><br/>
+<ul class="inlinelist">
+<li><a href="properties.html">Properties and PropertyHelpers</a></li>
+<li><a href="clonevm.html">ant.build.clonevm</a></li>
+<li><a href="sysclasspath.html">build.sysclasspath</a></li>
+<li><a href="javacprops.html">Ant properties controlling javac</a></li>
+<li><a href="CoreTasks/common.html">Common Attributes</a></li>
+</ul>
 
 <h3>Core Types</h3>
-<a href="CoreTypes/description.html">Description Type</a><br/>
-<a href="dirtasks.html">Directory-based Tasks</a><br/>
-<a href="CoreTypes/dirset.html">DirSet</a><br/>
-<a href="CoreTypes/filelist.html">FileList</a><br/>
-<a href="CoreTypes/fileset.html">FileSet</a><br/>
-<a href="CoreTypes/mapper.html">File Mappers</a><br/>
-<a href="CoreTypes/filterchain.html">FilterChains and FilterReaders</a><br/>
-<a href="CoreTypes/filterset.html">FilterSet</a><br/>
-<a href="CoreTypes/patternset.html">PatternSet</a><br/>
-<a href="using.html#path">Path-like Structures</a><br/>
-<a href="CoreTypes/permissions.html">Permissions</a><br/>
-<a href="CoreTypes/propertyset.html">PropertySet</a><br/>
-<a href="CoreTypes/redirector.html">I/O Redirectors</a><br/>
-<a href="CoreTypes/regexp.html">Regexp</a><br/>
-<a href="CoreTypes/resources.html">Resources</a><br/>
-<a href="CoreTypes/resources.html#collection">Resource Collections</a><br/>
-<a href="CoreTypes/selectors.html">Selectors</a><br/>
-<a href="CoreTypes/tarfileset.html">TarFileSet</a><br/>
-<a href="CoreTypes/xmlcatalog.html">XMLCatalog</a><br/>
-<a href="CoreTypes/zipfileset.html">ZipFileSet</a><br/>
+<ul class="inlinelist">
+<li><a href="CoreTypes/description.html">Description Type</a></li>
+<li><a href="dirtasks.html">Directory-based Tasks</a></li>
+<li><a href="CoreTypes/dirset.html">DirSet</a></li>
+<li><a href="CoreTypes/filelist.html">FileList</a></li>
+<li><a href="CoreTypes/fileset.html">FileSet</a></li>
+<li><a href="CoreTypes/mapper.html">File Mappers</a></li>
+<li><a href="CoreTypes/filterchain.html">FilterChains and FilterReaders</a></li>
+<li><a href="CoreTypes/filterset.html">FilterSet</a></li>
+<li><a href="CoreTypes/patternset.html">PatternSet</a></li>
+<li><a href="using.html#path">Path-like Structures</a></li>
+<li><a href="CoreTypes/permissions.html">Permissions</a></li>
+<li><a href="CoreTypes/propertyset.html">PropertySet</a></li>
+<li><a href="CoreTypes/redirector.html">I/O Redirectors</a></li>
+<li><a href="CoreTypes/regexp.html">Regexp</a></li>
+<li><a href="CoreTypes/resources.html">Resources</a></li>
+<li><a href="CoreTypes/resources.html#collection">Resource Collections</a></li>
+<li><a href="CoreTypes/selectors.html">Selectors</a></li>
+<li><a href="CoreTypes/tarfileset.html">TarFileSet</a></li>
+<li><a href="CoreTypes/xmlcatalog.html">XMLCatalog</a></li>
+<li><a href="CoreTypes/zipfileset.html">ZipFileSet</a></li>
+</ul>
 
 <h3>Optional Types</h3>
-<a href="OptionalTypes/classfileset.html">Class Fileset</a><br/>
-<a href="OptionalTypes/extension.html">Extension Package</a><br/>
-<a href="OptionalTypes/extensionset.html">Set of Extension Packages</a><br/>
+<ul class="inlinelist">
+<li><a href="OptionalTypes/classfileset.html">Class Fileset</a></li>
+<li><a href="OptionalTypes/extension.html">Extension Package</a></li>
+<li><a href="OptionalTypes/extensionset.html">Set of Extension Packages</a></li>
+</ul>
 
 <h3>Namespace</h3>
-<a href="CoreTypes/namespace.html">Namespace Support</a><br/>
+<ul class="inlinelist">
+<li><a href="CoreTypes/namespace.html">Namespace Support</a></li>
+</ul>
 
 <h3>Antlib</h3>
-<a href="CoreTypes/antlib.html">Antlib</a><br/>
-<a href="CoreTypes/antlib.html#antlibnamespace">Antlib namespace</a><br/>
-<a href="CoreTypes/antlib.html#currentnamespace">Current namespace</a><br/>
+<ul class="inlinelist">
+<li><a href="CoreTypes/antlib.html">Antlib</a></li>
+<li><a href="CoreTypes/antlib.html#antlibnamespace">Antlib namespace</a></li>
+<li><a href="CoreTypes/antlib.html#currentnamespace">Current namespace</a></li>
+</ul>
 
 <h3>Custom Components</h3>
-<a href="CoreTypes/custom-programming.html">Custom Components</a><br/>
-<a href="CoreTypes/custom-programming.html#customconditions">Conditions</a><br/>
-<a href="CoreTypes/custom-programming.html#customselectors">Selectors</a><br/>
-<a href="CoreTypes/custom-programming.html#filterreaders">FilterReaders</a><br/>
+<ul class="inlinelist">
+<li><a href="CoreTypes/custom-programming.html">Custom Components</a></li>
+<li><a href="CoreTypes/custom-programming.html#customconditions">Conditions</a></li>
+<li><a href="CoreTypes/custom-programming.html#customselectors">Selectors</a></li>
+<li><a href="CoreTypes/custom-programming.html#filterreaders">FilterReaders</a></li>
+</ul>
 
 </body>
 </html>
diff --git a/docs/manual/coretasklist.html b/docs/manual/coretasklist.html
index 4ff3e2b14..3d3fcdecd 100644
--- a/docs/manual/coretasklist.html
+++ b/docs/manual/coretasklist.html
@@ -27,111 +27,115 @@
 
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
-<a href="optionaltasklist.html" target="navFrame">Optional Tasks</a><br/>
-<a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a><br/>
-<a href="conceptstypeslist.html" target="navFrame">Concepts and Types</a><br/>
+<ul class="inlinelist">
+<li><a href="optionaltasklist.html" target="navFrame">Optional Tasks</a></li>
+<li><a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a></li>
+<li><a href="conceptstypeslist.html" target="navFrame">Concepts and Types</a></li>
+</ul>
 
 <h3>Core Tasks</h3>
-<a href="CoreTasks/ant.html">Ant</a><br/>
-<a href="CoreTasks/antcall.html">AntCall</a><br/>
-<a href="CoreTasks/antstructure.html">AntStructure</a><br/>
-<a href="CoreTasks/antversion.html">AntVersion</a><br/>
-<a href="CoreTasks/apply.html">Apply/<i>ExecOn</i></a><br/>
-<a href="CoreTasks/apt.html">Apt</a><br/>
-<a href="CoreTasks/available.html">Available</a><br/>
-<a href="CoreTasks/basename.html">Basename</a><br/>
-<a href="CoreTasks/buildnumber.html">BuildNumber</a><br/>
-<a href="CoreTasks/unpack.html">BUnzip2</a><br/>
-<a href="CoreTasks/pack.html">BZip2</a><br/>
-<a href="CoreTasks/checksum.html">Checksum</a><br/>
-<a href="CoreTasks/chmod.html">Chmod</a><br/>
-<a href="CoreTasks/concat.html">Concat</a><br/>
-<a href="CoreTasks/condition.html">Condition</a><br/>
+<ul class="inlinelist">
+<li><a href="CoreTasks/ant.html">Ant</a></li>
+<li><a href="CoreTasks/antcall.html">AntCall</a></li>
+<li><a href="CoreTasks/antstructure.html">AntStructure</a></li>
+<li><a href="CoreTasks/antversion.html">AntVersion</a></li>
+<li><a href="CoreTasks/apply.html">Apply/<i>ExecOn</i></a></li>
+<li><a href="CoreTasks/apt.html">Apt</a></li>
+<li><a href="CoreTasks/available.html">Available</a></li>
+<li><a href="CoreTasks/basename.html">Basename</a></li>
+<li><a href="CoreTasks/buildnumber.html">BuildNumber</a></li>
+<li><a href="CoreTasks/unpack.html">BUnzip2</a></li>
+<li><a href="CoreTasks/pack.html">BZip2</a></li>
+<li><a href="CoreTasks/checksum.html">Checksum</a></li>
+<li><a href="CoreTasks/chmod.html">Chmod</a></li>
+<li><a href="CoreTasks/concat.html">Concat</a></li>
+<li><a href="CoreTasks/condition.html">Condition</a></li>
 <div style="padding-left:1em">
-  <a href="CoreTasks/conditions.html">Supported conditions</a><br/>
+  <li><a href="CoreTasks/conditions.html">Supported conditions</a></li>
 </div>
-<a href="CoreTasks/copy.html">Copy</a><br/>
-<a href="CoreTasks/copydir.html"><i>Copydir</i></a><br/>
-<a href="CoreTasks/copyfile.html"><i>Copyfile</i></a><br/>
-<a href="CoreTasks/componentdef.html">Componentdef</a><br/>
-<a href="CoreTasks/cvs.html">Cvs</a><br/>
-<a href="CoreTasks/changelog.html">CvsChangeLog</a><br/>
-<a href="CoreTasks/cvsversion.html">CvsVersion</a><br/>
-<a href="CoreTasks/cvspass.html">CVSPass</a><br/>
-<a href="CoreTasks/cvstagdiff.html">CvsTagDiff</a><br/>
-<a href="CoreTasks/defaultexcludes.html">Defaultexcludes</a><br/>
-<a href="CoreTasks/delete.html">Delete</a><br/>
-<a href="CoreTasks/deltree.html"><i>Deltree</i></a><br/>
-<a href="CoreTasks/dependset.html">Dependset</a><br/>
-<a href="CoreTasks/diagnostics.html">Diagnostics</a><br/>
-<a href="CoreTasks/dirname.html">Dirname</a><br/>
-<a href="CoreTasks/ear.html">Ear</a><br/>
-<a href="CoreTasks/echo.html">Echo</a><br/>
-<a href="CoreTasks/echoxml.html">EchoXML</a><br/>
-<a href="CoreTasks/exec.html">Exec</a><br/>
-<a href="CoreTasks/fail.html">Fail</a><br/>
-<a href="CoreTasks/filter.html">Filter</a><br/>
-<a href="CoreTasks/fixcrlf.html">FixCRLF</a><br/>
-<a href="CoreTasks/genkey.html">GenKey</a><br/>
-<a href="CoreTasks/get.html">Get</a><br/>
-<a href="CoreTasks/hostinfo.html">Hostinfo</a><br/>
-<a href="CoreTasks/unpack.html">GUnzip</a><br/>
-<a href="CoreTasks/pack.html">GZip</a><br/>
-<a href="CoreTasks/import.html">Import</a><br/>
-<a href="CoreTasks/include.html">Include</a><br/>
-<a href="CoreTasks/input.html">Input</a><br/>
-<a href="CoreTasks/jar.html">Jar</a><br/>
-<a href="CoreTasks/java.html">Java</a><br/>
-<a href="CoreTasks/javac.html">Javac</a><br/>
-<a href="CoreTasks/javadoc.html">Javadoc/<i>Javadoc2</i></a><br/>
-<a href="CoreTasks/length.html">Length</a><br/>
-<a href="CoreTasks/loadfile.html">LoadFile</a><br/>
-<a href="CoreTasks/loadproperties.html">LoadProperties</a><br/>
-<a href="CoreTasks/loadresource.html">LoadResource</a><br/>
-<a href="CoreTasks/local.html">Local</a><br/>
-<a href="CoreTasks/makeurl.html">MakeURL</a><br/>
-<a href="CoreTasks/mail.html">Mail</a><br/>
-<a href="CoreTasks/macrodef.html">MacroDef</a><br/>
-<a href="CoreTasks/manifest.html">Manifest</a><br/>
-<a href="CoreTasks/manifestclasspath.html">ManifestClassPath</a><br/>
-<a href="CoreTasks/mkdir.html">Mkdir</a><br/>
-<a href="CoreTasks/move.html">Move</a><br/>
-<a href="CoreTasks/nice.html">Nice</a><br/>
-<a href="CoreTasks/parallel.html">Parallel</a><br/>
-<a href="CoreTasks/patch.html">Patch</a><br/>
-<a href="CoreTasks/pathconvert.html">PathConvert</a><br/>
-<a href="CoreTasks/presetdef.html">PreSetDef</a><br/>
-<a href="CoreTasks/property.html">Property</a><br/>
-<a href="CoreTasks/propertyhelper.html">PropertyHelper</a><br/>
-<a href="CoreTasks/recorder.html">Record</a><br/>
-<a href="CoreTasks/rename.html"><i>Rename</i></a><br/>
-<a href="CoreTasks/replace.html">Replace</a><br/>
-<a href="CoreTasks/resourcecount.html">ResourceCount</a><br/>
-<a href="CoreTasks/retry.html">Retry</a><br/>
-<a href="CoreTasks/rmic.html">Rmic</a><br/>
-<a href="CoreTasks/sequential.html">Sequential</a><br/>
-<a href="CoreTasks/signjar.html">SignJar</a><br/>
-<a href="CoreTasks/sleep.html">Sleep</a><br/>
-<a href="CoreTasks/sql.html">Sql</a><br/>
-<a href="CoreTasks/subant.html">Subant</a><br/>
-<a href="CoreTasks/sync.html">Sync</a><br/>
-<a href="CoreTasks/tar.html">Tar</a><br/>
-<a href="CoreTasks/taskdef.html">Taskdef</a><br/>
-<a href="CoreTasks/tempfile.html">Tempfile</a><br/>
-<a href="CoreTasks/touch.html">Touch</a><br/>
-<a href="CoreTasks/truncate.html">Truncate</a><br/>
-<a href="CoreTasks/tstamp.html">TStamp</a><br/>
-<a href="CoreTasks/typedef.html">Typedef</a><br/>
-<a href="CoreTasks/unzip.html">Unjar</a><br/>
-<a href="CoreTasks/unzip.html">Untar</a><br/>
-<a href="CoreTasks/unzip.html">Unwar</a><br/>
-<a href="CoreTasks/unzip.html">Unzip</a><br/>
-<a href="CoreTasks/uptodate.html">Uptodate</a><br/>
-<a href="CoreTasks/waitfor.html">Waitfor</a><br/>
-<a href="CoreTasks/whichresource.html">WhichResource</a><br/>
-<a href="CoreTasks/war.html">War</a><br/>
-<a href="CoreTasks/xmlproperty.html">XmlProperty</a><br/>
-<a href="CoreTasks/style.html">XSLT/<i>Style</i></a><br/>
-<a href="CoreTasks/zip.html">Zip</a><br/>
+<li><a href="CoreTasks/copy.html">Copy</a></li>
+<li><a href="CoreTasks/copydir.html"><i>Copydir</i></a></li>
+<li><a href="CoreTasks/copyfile.html"><i>Copyfile</i></a></li>
+<li><a href="CoreTasks/componentdef.html">Componentdef</a></li>
+<li><a href="CoreTasks/cvs.html">Cvs</a></li>
+<li><a href="CoreTasks/changelog.html">CvsChangeLog</a></li>
+<li><a href="CoreTasks/cvsversion.html">CvsVersion</a></li>
+<li><a href="CoreTasks/cvspass.html">CVSPass</a></li>
+<li><a href="CoreTasks/cvstagdiff.html">CvsTagDiff</a></li>
+<li><a href="CoreTasks/defaultexcludes.html">Defaultexcludes</a></li>
+<li><a href="CoreTasks/delete.html">Delete</a></li>
+<li><a href="CoreTasks/deltree.html"><i>Deltree</i></a></li>
+<li><a href="CoreTasks/dependset.html">Dependset</a></li>
+<li><a href="CoreTasks/diagnostics.html">Diagnostics</a></li>
+<li><a href="CoreTasks/dirname.html">Dirname</a></li>
+<li><a href="CoreTasks/ear.html">Ear</a></li>
+<li><a href="CoreTasks/echo.html">Echo</a></li>
+<li><a href="CoreTasks/echoxml.html">EchoXML</a></li>
+<li><a href="CoreTasks/exec.html">Exec</a></li>
+<li><a href="CoreTasks/fail.html">Fail</a></li>
+<li><a href="CoreTasks/filter.html">Filter</a></li>
+<li><a href="CoreTasks/fixcrlf.html">FixCRLF</a></li>
+<li><a href="CoreTasks/genkey.html">GenKey</a></li>
+<li><a href="CoreTasks/get.html">Get</a></li>
+<li><a href="CoreTasks/hostinfo.html">Hostinfo</a></li>
+<li><a href="CoreTasks/unpack.html">GUnzip</a></li>
+<li><a href="CoreTasks/pack.html">GZip</a></li>
+<li><a href="CoreTasks/import.html">Import</a></li>
+<li><a href="CoreTasks/include.html">Include</a></li>
+<li><a href="CoreTasks/input.html">Input</a></li>
+<li><a href="CoreTasks/jar.html">Jar</a></li>
+<li><a href="CoreTasks/java.html">Java</a></li>
+<li><a href="CoreTasks/javac.html">Javac</a></li>
+<li><a href="CoreTasks/javadoc.html">Javadoc/<i>Javadoc2</i></a></li>
+<li><a href="CoreTasks/length.html">Length</a><br/></li>
+<li><a href="CoreTasks/loadfile.html">LoadFile</a></li>
+<li><a href="CoreTasks/loadproperties.html">LoadProperties</a></li>
+<li><a href="CoreTasks/loadresource.html">LoadResource</a></li>
+<li><a href="CoreTasks/local.html">Local</a></li>
+<li><a href="CoreTasks/makeurl.html">MakeURL</a></li>
+<li><a href="CoreTasks/mail.html">Mail</a></li>
+<li><a href="CoreTasks/macrodef.html">MacroDef</a></li>
+<li><a href="CoreTasks/manifest.html">Manifest</a></li>
+<li><a href="CoreTasks/manifestclasspath.html">ManifestClassPath</a></li>
+<li><a href="CoreTasks/mkdir.html">Mkdir</a></li>
+<li><a href="CoreTasks/move.html">Move</a></li>
+<li><a href="CoreTasks/nice.html">Nice</a></li>
+<li><a href="CoreTasks/parallel.html">Parallel</a></li>
+<li><a href="CoreTasks/patch.html">Patch</a></li>
+<li><a href="CoreTasks/pathconvert.html">PathConvert</a></li>
+<li><a href="CoreTasks/presetdef.html">PreSetDef</a></li>
+<li><a href="CoreTasks/property.html">Property</a></li>
+<li><a href="CoreTasks/propertyhelper.html">PropertyHelper</a></li>
+<li><a href="CoreTasks/recorder.html">Record</a></li>
+<li><a href="CoreTasks/rename.html"><i>Rename</i></a></li>
+<li><a href="CoreTasks/replace.html">Replace</a></li>
+<li><a href="CoreTasks/resourcecount.html">ResourceCount</a></li>
+<li><a href="CoreTasks/retry.html">Retry</a></li>
+<li><a href="CoreTasks/rmic.html">Rmic</a></li>
+<li><a href="CoreTasks/sequential.html">Sequential</a></li>
+<li><a href="CoreTasks/signjar.html">SignJar</a></li>
+<li><a href="CoreTasks/sleep.html">Sleep</a></li>
+<li><a href="CoreTasks/sql.html">Sql</a></li>
+<li><a href="CoreTasks/subant.html">Subant</a></li>
+<li><a href="CoreTasks/sync.html">Sync</a></li>
+<li><a href="CoreTasks/tar.html">Tar</a></li>
+<li><a href="CoreTasks/taskdef.html">Taskdef</a></li>
+<li><a href="CoreTasks/tempfile.html">Tempfile</a></li>
+<li><a href="CoreTasks/touch.html">Touch</a></li>
+<li><a href="CoreTasks/truncate.html">Truncate</a></li>
+<li><a href="CoreTasks/tstamp.html">TStamp</a></li>
+<li><a href="CoreTasks/typedef.html">Typedef</a></li>
+<li><a href="CoreTasks/unzip.html">Unjar</a></li>
+<li><a href="CoreTasks/unzip.html">Untar</a></li>
+<li><a href="CoreTasks/unzip.html">Unwar</a></li>
+<li><a href="CoreTasks/unzip.html">Unzip</a></li>
+<li><a href="CoreTasks/uptodate.html">Uptodate</a></li>
+<li><a href="CoreTasks/waitfor.html">Waitfor</a></li>
+<li><a href="CoreTasks/whichresource.html">WhichResource</a></li>
+<li><a href="CoreTasks/war.html">War</a></li>
+<li><a href="CoreTasks/xmlproperty.html">XmlProperty</a></li>
+<li><a href="CoreTasks/style.html">XSLT/<i>Style</i></a></li>
+<li><a href="CoreTasks/zip.html">Zip</a></li>
+</ul>
 </body>
 </html>
diff --git a/docs/manual/developlist.html b/docs/manual/developlist.html
index 4aaadcb70..ca81be02a 100644
--- a/docs/manual/developlist.html
+++ b/docs/manual/developlist.html
@@ -29,20 +29,24 @@
 
 <h3>Developing with Ant</h3>
 
-<a href="../ant_in_anger.html">Ant in Anger</a><br/>
-<a href="../ant_task_guidelines.html">Ant Task Guidelines</a><br/>
-<a href="develop.html#writingowntask">Writing Your Own Task</a><br/>
-<a href="base_task_classes.html">Tasks Designed for Extension</a><br/>
-<a href="develop.html#buildevents">Build Events</a><br/>
-<a href="develop.html#integration">Source-code Integration</a><br/>
-<a href="inputhandler.html">InputHandler</a><br/>
-<a href="antexternal.html">Using Ant Tasks Outside of Ant</a><br/>
-<a href="projecthelper.html">The Ant frontend: ProjectHelper</a><br/>
-
-<br/>Tutorials<br/>
-<a href="tutorial-HelloWorldWithAnt.html">Hello World with Ant</a><br/>
-<a href="tutorial-writing-tasks.html">Writing Tasks</a><br/>
-<a href="tutorial-tasks-filesets-properties.html">Tasks using Properties, Filesets &amp; Paths</a><br/>
+<ul class="inlinelist">
+<li><a href="../ant_in_anger.html">Ant in Anger</a></li>
+<li><a href="../ant_task_guidelines.html">Ant Task Guidelines</a></li>
+<li><a href="develop.html#writingowntask">Writing Your Own Task</a></li>
+<li><a href="base_task_classes.html">Tasks Designed for Extension</a></li>
+<li><a href="develop.html#buildevents">Build Events</a></li>
+<li><a href="develop.html#integration">Source-code Integration</a></li>
+<li><a href="inputhandler.html">InputHandler</a></li>
+<li><a href="antexternal.html">Using Ant Tasks Outside of Ant</a></li>
+<li><a href="projecthelper.html">The Ant frontend: ProjectHelper</a></li>
+</ul>
+
+<h3>Tutorials</h3>
+<ul class="inlinelist">
+<li><a href="tutorial-HelloWorldWithAnt.html">Hello World with Ant</a></li>
+<li><a href="tutorial-writing-tasks.html">Writing Tasks</a></li>
+<li><a href="tutorial-tasks-filesets-properties.html">Tasks using Properties, Filesets &amp; Paths</a></li>
+</ul>
 
 </body>
 </html>
diff --git a/docs/manual/installlist.html b/docs/manual/installlist.html
index 1e80d5fdc..36aacc166 100644
--- a/docs/manual/installlist.html
+++ b/docs/manual/installlist.html
@@ -28,17 +28,16 @@
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
 <h3>Installing Ant</h3>
-<p><a href="install.html#getting">Getting Ant</a><br/>
-  <a href="install.html#sysrequirements">System Requirements</a><br/>
-  <a href="install.html#installing">Installing Ant</a><br/>
-  <a href="install.html#checkInstallation">Check Installation</a><br/>
-  <a href="install.html#buildingant">Building Ant</a><br/>
-  <a href="install.html#librarydependencies">Library Dependencies</a><br/>
-  <a href="platform.html">Platform Specific Issues</a><br/>
-  <a href="proxy.html">Proxy configuration</a><br/>
-</p>
-<p><br/>
-</p>
+<ul class="inlinelist">
+<li><a href="install.html#getting">Getting Ant</a></li>
+<li><a href="install.html#sysrequirements">System Requirements</a></li>
+<li><a href="install.html#installing">Installing Ant</a></li>
+<li><a href="install.html#checkInstallation">Check Installation</a></li>
+<li><a href="install.html#buildingant">Building Ant</a></li>
+<li><a href="install.html#librarydependencies">Library Dependencies</a></li>
+<li><a href="platform.html">Platform Specific Issues</a></li>
+<li><a href="proxy.html">Proxy configuration</a></li>
+</ul>
 </body>
 </html>
 
diff --git a/docs/manual/optionaltasklist.html b/docs/manual/optionaltasklist.html
index 11ce062d7..b36c43795 100644
--- a/docs/manual/optionaltasklist.html
+++ b/docs/manual/optionaltasklist.html
@@ -26,67 +26,69 @@
 <body>
 
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
-
-<a href="coretasklist.html" target="navFrame">Core Tasks</a><br/>
-<a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a><br/>
-<a href="conceptstypeslist.html" target="navFrame">Concepts and Types</a><br/>
+<ul class="inlinelist">
+<li><a href="coretasklist.html" target="navFrame">Core Tasks</a></li>
+<li><a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a></li>
+<li><a href="conceptstypeslist.html" target="navFrame">Concepts and Types</a></li>
+</ul>
 
 <h3>Optional Tasks</h3>
-<a href="OptionalTasks/antlr.html">ANTLR</a><br/>
-<a href="OptionalTasks/attrib.html">Attrib</a><br/>
-<a href="OptionalTasks/cab.html">Cab</a><br/>
-<a href="OptionalTasks/chgrp.html">Chgrp</a><br/>
-<a href="OptionalTasks/chown.html">Chown</a><br/>
-<a href="OptionalTasks/clearcase.html">Clearcase Tasks</a><br/>
-<a href="OptionalTasks/ccm.html">Continuus/Synergy Tasks</a><br/>
-<a href="OptionalTasks/depend.html">Depend</a><br/>
-<a href="OptionalTasks/ejb.html">EJB Tasks</a><br/>
-<a href="OptionalTasks/echoproperties.html">Echoproperties</a><br/>
-<a href="OptionalTasks/ftp.html">FTP</a><br/>
-<a href="OptionalTasks/image.html">Image</a><br/>
-<a href="OptionalTasks/jarlib-available.html">Jarlib-available</a><br/>
-<a href="OptionalTasks/jarlib-display.html">Jarlib-display</a><br/>
-<a href="OptionalTasks/jarlib-manifest.html">Jarlib-manifest</a><br/>
-<a href="OptionalTasks/jarlib-resolve.html">Jarlib-resolve</a><br/>
-<a href="OptionalTasks/javacc.html">JavaCC</a><br/>
-<a href="OptionalTasks/javah.html">Javah</a><br/>
-<a href="OptionalTasks/jspc.html">JspC</a><br/>
-<a href="OptionalTasks/jdepend.html">JDepend</a><br/>
-<a href="OptionalTasks/jjdoc.html">JJDoc</a><br/>
-<a href="OptionalTasks/jjtree.html">JJTree</a><br/>
-<a href="OptionalTasks/jlink.html"><i>Jlink</i></a><br/>
-<a href="OptionalTasks/junit.html">JUnit</a><br/>
-<a href="OptionalTasks/junitreport.html">JUnitReport</a><br/>
-<a href="OptionalTasks/mimemail.html"><i>MimeMail</i></a><br/>
-<a href="OptionalTasks/native2ascii.html">Native2Ascii</a><br/>
-<a href="OptionalTasks/netrexxc.html">NetRexxC</a><br/>
-<a href="OptionalTasks/perforce.html">Perforce Tasks</a><br/>
-<a href="OptionalTasks/propertyfile.html">PropertyFile</a><br/>
-<a href="OptionalTasks/pvcstask.html">Pvcs</a><br/>
-<a href="OptionalTasks/renameextensions.html"><i>RenameExtensions</i></a><br/>
-<a href="OptionalTasks/replaceregexp.html">ReplaceRegExp</a><br/>
-<a href="OptionalTasks/rexec.html">RExec</a><br/>
-<a href="OptionalTasks/rpm.html">Rpm</a><br/>
-<a href="OptionalTasks/schemavalidate.html">SchemaValidate</a><br/>
-<a href="OptionalTasks/scp.html">Scp</a><br/>
-<a href="OptionalTasks/script.html">Script</a><br/>
-<a href="OptionalTasks/scriptdef.html">Scriptdef</a><br/>
-<a href="OptionalTasks/serverdeploy.html">ServerDeploy</a><br/>
-<a href="OptionalTasks/setproxy.html">Setproxy</a><br/>
-<a href="OptionalTasks/sound.html">Sound</a><br/>
-<a href="OptionalTasks/sos.html">SourceOffSite</a><br/>
-<a href="OptionalTasks/splash.html">Splash</a><br/>
-<a href="OptionalTasks/sshexec.html">Sshexec</a><br/>
-<a href="OptionalTasks/sshsession.html">Sshsession</a><br/>
-<a href="OptionalTasks/starteam.html">Starteam Tasks</a><br/>
-<a href="OptionalTasks/stylebook.html"><i>Stylebook</i></a><br/>
-<a href="OptionalTasks/symlink.html">Symlink</a><br/>
-<a href="OptionalTasks/telnet.html">Telnet</a><br/>
-<a href="OptionalTasks/translate.html">Translate</a><br/>
-<a href="OptionalTasks/vss.html#tasks">Microsoft Visual SourceSafe Tasks</a><br/>
-<a href="OptionalTasks/wljspc.html">Weblogic JSP Compiler</a><br/>
-<a href="OptionalTasks/xmlvalidate.html">XmlValidate</a><br/>
-
+<ul class="inlinelist">
+<li><a href="OptionalTasks/antlr.html">ANTLR</a></li>
+<li><a href="OptionalTasks/attrib.html">Attrib</a></li>
+<li><a href="OptionalTasks/cab.html">Cab</a></li>
+<li><a href="OptionalTasks/chgrp.html">Chgrp</a></li>
+<li><a href="OptionalTasks/chown.html">Chown</a></li>
+<li><a href="OptionalTasks/clearcase.html">Clearcase Tasks</a></li>
+<li><a href="OptionalTasks/ccm.html">Continuus/Synergy Tasks</a></li>
+<li><a href="OptionalTasks/depend.html">Depend</a></li>
+<li><a href="OptionalTasks/ejb.html">EJB Tasks</a></li>
+<li><a href="OptionalTasks/echoproperties.html">Echoproperties</a></li>
+<li><a href="OptionalTasks/ftp.html">FTP</a></li>
+<li><a href="OptionalTasks/image.html">Image</a></li>
+<li><a href="OptionalTasks/jarlib-available.html">Jarlib-available</a></li>
+<li><a href="OptionalTasks/jarlib-display.html">Jarlib-display</a></li>
+<li><a href="OptionalTasks/jarlib-manifest.html">Jarlib-manifest</a></li>
+<li><a href="OptionalTasks/jarlib-resolve.html">Jarlib-resolve</a></li>
+<li><a href="OptionalTasks/javacc.html">JavaCC</a></li>
+<li><a href="OptionalTasks/javah.html">Javah</a></li>
+<li><a href="OptionalTasks/jspc.html">JspC</a></li>
+<li><a href="OptionalTasks/jdepend.html">JDepend</a></li>
+<li><a href="OptionalTasks/jjdoc.html">JJDoc</a></li>
+<li><a href="OptionalTasks/jjtree.html">JJTree</a></li>
+<li><a href="OptionalTasks/jlink.html"><i>Jlink</i></a></li>
+<li><a href="OptionalTasks/junit.html">JUnit</a></li>
+<li><a href="OptionalTasks/junitreport.html">JUnitReport</a></li>
+<li><a href="OptionalTasks/mimemail.html"><i>MimeMail</i></a></li>
+<li><a href="OptionalTasks/native2ascii.html">Native2Ascii</a></li>
+<li><a href="OptionalTasks/netrexxc.html">NetRexxC</a></li>
+<li><a href="OptionalTasks/perforce.html">Perforce Tasks</a></li>
+<li><a href="OptionalTasks/propertyfile.html">PropertyFile</a></li>
+<li><a href="OptionalTasks/pvcstask.html">Pvcs</a></li>
+<li><a href="OptionalTasks/renameextensions.html"><i>RenameExtensions</i></a></li>
+<li><a href="OptionalTasks/replaceregexp.html">ReplaceRegExp</a></li>
+<li><a href="OptionalTasks/rexec.html">RExec</a></li>
+<li><a href="OptionalTasks/rpm.html">Rpm</a></li>
+<li><a href="OptionalTasks/schemavalidate.html">SchemaValidate</a></li>
+<li><a href="OptionalTasks/scp.html">Scp</a></li>
+<li><a href="OptionalTasks/script.html">Script</a></li>
+<li><a href="OptionalTasks/scriptdef.html">Scriptdef</a></li>
+<li><a href="OptionalTasks/serverdeploy.html">ServerDeploy</a></li>
+<li><a href="OptionalTasks/setproxy.html">Setproxy</a></li>
+<li><a href="OptionalTasks/sound.html">Sound</a></li>
+<li><a href="OptionalTasks/sos.html">SourceOffSite</a></li>
+<li><a href="OptionalTasks/splash.html">Splash</a></li>
+<li><a href="OptionalTasks/sshexec.html">Sshexec</a></li>
+<li><a href="OptionalTasks/sshsession.html">Sshsession</a></li>
+<li><a href="OptionalTasks/starteam.html">Starteam Tasks</a></li>
+<li><a href="OptionalTasks/stylebook.html"><i>Stylebook</i></a></li>
+<li><a href="OptionalTasks/symlink.html">Symlink</a></li>
+<li><a href="OptionalTasks/telnet.html">Telnet</a></li>
+<li><a href="OptionalTasks/translate.html">Translate</a></li>
+<li><a href="OptionalTasks/vss.html#tasks">Microsoft Visual SourceSafe Tasks</a></li>
+<li><a href="OptionalTasks/wljspc.html">Weblogic JSP Compiler</a></li>
+<li><a href="OptionalTasks/xmlvalidate.html">XmlValidate</a></li>
+</ul>
 </body>
 </html>
 
diff --git a/docs/manual/runninglist.html b/docs/manual/runninglist.html
index ae61f2745..986b259a3 100644
--- a/docs/manual/runninglist.html
+++ b/docs/manual/runninglist.html
@@ -28,18 +28,20 @@
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
 <h3>Running Ant</h3>
-<a href="running.html#commandline">Command Line</a><br/>
+<ul class="inlinelist">
+<li><a href="running.html#commandline">Command Line</a></li>
 <div style="padding-left:1em">
-  <a href="running.html#options">Options</a><br/>
-  <a href="running.html#libs">Library Directories</a><br/>
-  <a href="running.html#files">Files</a><br/>
-  <a href="running.html#envvars">Environment Variables</a><br/>
-  <a href="running.html#sysprops">Java System Properties</a><br/>
-  <a href="running.html#cygwin">Cygwin Users</a><br/>
-  <a href="running.html#os2">OS/2 Users</a><br/>
-  <a href="running.html#background">Running "in the background"</a><br/>
+  <li><a href="running.html#options">Options</a></li>
+  <li><a href="running.html#libs">Library Directories</a></li>
+  <li><a href="running.html#files">Files</a></li>
+  <li><a href="running.html#envvars">Environment Variables</a></li>
+  <li><a href="running.html#sysprops">Java System Properties</a></li>
+  <li><a href="running.html#cygwin">Cygwin Users</a></li>
+  <li><a href="running.html#os2">OS/2 Users</a></li>
+  <li><a href="running.html#background">Running "in the background"</a></li>
 </div>
-<a href="running.html#viajava">Running Ant via Java</a><br/>
+<li><a href="running.html#viajava">Running Ant via Java</a></li>
+</ul>
 
 </body>
 </html>
diff --git a/docs/manual/toc.html b/docs/manual/toc.html
index 8a4ab0ccb..9e061dfba 100644
--- a/docs/manual/toc.html
+++ b/docs/manual/toc.html
@@ -26,21 +26,25 @@
 <body>
 
 <h2>Table of Contents</h2>
-<a href="intro.html">Introduction</a><br/>
-<a href="installlist.html" target="navFrame">Installing Ant</a><br/>
-<a href="usinglist.html" target="navFrame">Using Ant</a><br/>
-<a href="runninglist.html" target="navFrame">Running Ant</a><br/>
-<a href="anttaskslist.html" target="navFrame">Ant Tasks</a><br/>
-<a href="conceptstypeslist.html" target="navFrame">Concepts and Types</a><br/>
-<a href="listeners.html" target="mainFrame">Loggers &amp; Listeners</a><br/>
-<a href="ide.html" target="navFrame">Editor/IDE Integration</a><br/>
-<a href="developlist.html" target="navFrame">Developing with Ant</a><br/>
-<a href="tutorials.html" target="navFrame">Tutorials</a><br/>
-<a href="api/index.html" target="_top">Ant API</a><br/>
-<a href="LICENSE">License</a><br/>
-<a href="feedback.html">Feedback and Troubleshooting</a><br/>
-<br/>
-<a href="credits.html">Authors</a><br/>
+<ul class="inlinelist">
+<li><a href="intro.html">Introduction</a></li>
+<li><a href="installlist.html" target="navFrame">Installing Ant</a></li>
+<li><a href="usinglist.html" target="navFrame">Using Ant</a></li>
+<li><a href="runninglist.html" target="navFrame">Running Ant</a></li>
+<li><a href="anttaskslist.html" target="navFrame">Ant Tasks</a></li>
+<li><a href="conceptstypeslist.html" target="navFrame">Concepts and Types</a></li>
+<li><a href="listeners.html" target="mainFrame">Loggers &amp; Listeners</a></li>
+<li><a href="ide.html" target="navFrame">Editor/IDE Integration</a></li>
+<li><a href="developlist.html" target="navFrame">Developing with Ant</a></li>
+<li><a href="tutorials.html" target="navFrame">Tutorials</a></li>
+<li><a href="api/index.html" target="_top">Ant API</a></li>
+<li><a href="LICENSE">License</a></li>
+<li><a href="feedback.html">Feedback and Troubleshooting</a></li>
+</ul>
+
+<ul class="inlinelist">
+<li><a href="credits.html">Authors</a></li>
+</ul>
 
 </body>
 </html>
diff --git a/docs/manual/usinglist.html b/docs/manual/usinglist.html
index abe2c0c95..332cfb6d4 100644
--- a/docs/manual/usinglist.html
+++ b/docs/manual/usinglist.html
@@ -28,21 +28,23 @@
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
 <h3>Using Ant</h3>
-<a href="using.html#buildfile">Writing a Simple Buildfile</a><br/>
+<ul class="inlinelist">
+<li><a href="using.html#buildfile">Writing a Simple Buildfile</a></li>
 <div style="padding-left:1em">
-  <a href="using.html#projects">Projects</a><br/>
-  <a href="using.html#targets">Targets</a><br/>
-  <a href="using.html#tasks">Tasks</a><br/>
-  <a href="using.html#properties">Properties</a><br/>
-  <a href="properties.html#built-in-props">Built-in Properties</a><br/>
-  <a href="properties.html#propertyHelper">Property Helpers</a><br />
-  <a href="using.html#example">Example Buildfile</a><br/>
-  <a href="using.html#filters">Token Filters</a><br/>
-  <a href="using.html#path">Path-like Structures</a><br/>
-  <a href="using.html#arg">Command-line Arguments</a><br/>
-  <a href="using.html#references">References</a><br/>
-  <a href="using.html#external-tasks">Use of external tasks</a><br/>
+  <li><a href="using.html#projects">Projects</a></li>
+  <li><a href="using.html#targets">Targets</a></li>
+  <li><a href="using.html#tasks">Tasks</a></li>
+  <li><a href="using.html#properties">Properties</a></li>
+  <li><a href="properties.html#built-in-props">Built-in Properties</a></li>
+  <li><a href="properties.html#propertyHelper">Property Helpers</a>></li>
+  <li><a href="using.html#example">Example Buildfile</a></li>
+  <li><a href="using.html#filters">Token Filters</a></li>
+  <li><a href="using.html#path">Path-like Structures</a></li>
+  <li><a href="using.html#arg">Command-line Arguments</a></li>
+  <li><a href="using.html#references">References</a></li>
+  <li><a href="using.html#external-tasks">Use of external tasks</a></li>
 </div>
+</ul>
 </body>
 </html>