diff --git a/docs/manual/CoreTypes/filelist.html b/docs/manual/CoreTypes/filelist.html
index acaa47bf3..cc0827b13 100644
--- a/docs/manual/CoreTypes/filelist.html
+++ b/docs/manual/CoreTypes/filelist.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+FileList Type
diff --git a/docs/manual/CoreTypes/fileset.html b/docs/manual/CoreTypes/fileset.html
index 5f61c9f7b..72976c4ef 100644
--- a/docs/manual/CoreTypes/fileset.html
+++ b/docs/manual/CoreTypes/fileset.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+FileSet Type
diff --git a/docs/manual/CoreTypes/filterset.html b/docs/manual/CoreTypes/filterset.html
index c0895e682..85d807b16 100644
--- a/docs/manual/CoreTypes/filterset.html
+++ b/docs/manual/CoreTypes/filterset.html
@@ -2,10 +2,7 @@
- Ant User Manual
-
-
-
+ FilterSet Type
diff --git a/docs/manual/CoreTypes/mapper.html b/docs/manual/CoreTypes/mapper.html
index c21a4dfcd..56a9676a9 100644
--- a/docs/manual/CoreTypes/mapper.html
+++ b/docs/manual/CoreTypes/mapper.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Mapper Type
diff --git a/docs/manual/CoreTypes/patternset.html b/docs/manual/CoreTypes/patternset.html
index 74260bd79..270d787bd 100644
--- a/docs/manual/CoreTypes/patternset.html
+++ b/docs/manual/CoreTypes/patternset.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+PatternSet Type
diff --git a/docs/manual/OptionalTasks/BorlandEJBTasks.html b/docs/manual/OptionalTasks/BorlandEJBTasks.html
index 421b74d4c..b1ae9f8d1 100644
--- a/docs/manual/OptionalTasks/BorlandEJBTasks.html
+++ b/docs/manual/OptionalTasks/BorlandEJBTasks.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Borland EJB Tasks
diff --git a/docs/manual/OptionalTasks/BorlandGenerateClient.html b/docs/manual/OptionalTasks/BorlandGenerateClient.html
index 277ee2bf4..fbb201d1f 100644
--- a/docs/manual/OptionalTasks/BorlandGenerateClient.html
+++ b/docs/manual/OptionalTasks/BorlandGenerateClient.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+BorlandGenerateClient Task
diff --git a/docs/manual/OptionalTasks/cab.html b/docs/manual/OptionalTasks/cab.html
index 9b2808bbc..bb7171684 100644
--- a/docs/manual/OptionalTasks/cab.html
+++ b/docs/manual/OptionalTasks/cab.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Cab Task
diff --git a/docs/manual/OptionalTasks/ccm.html b/docs/manual/OptionalTasks/ccm.html
index 19a7967b9..339a13346 100644
--- a/docs/manual/OptionalTasks/ccm.html
+++ b/docs/manual/OptionalTasks/ccm.html
@@ -2,7 +2,7 @@
-Apache Ant
+Continuus Tasks
diff --git a/docs/manual/OptionalTasks/clearcase.html b/docs/manual/OptionalTasks/clearcase.html
index 584f97851..8e6fa3ee2 100644
--- a/docs/manual/OptionalTasks/clearcase.html
+++ b/docs/manual/OptionalTasks/clearcase.html
@@ -2,7 +2,7 @@
-Apache Ant
+Clearcase Tasks
diff --git a/docs/manual/OptionalTasks/depend.html b/docs/manual/OptionalTasks/depend.html
index 56be9257c..ebcc352ed 100644
--- a/docs/manual/OptionalTasks/depend.html
+++ b/docs/manual/OptionalTasks/depend.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Depend Task
diff --git a/docs/manual/OptionalTasks/dotnet.html b/docs/manual/OptionalTasks/dotnet.html
index 727afa228..aab7c3b5c 100644
--- a/docs/manual/OptionalTasks/dotnet.html
+++ b/docs/manual/OptionalTasks/dotnet.html
@@ -1,7 +1,6 @@
- .NET classes for Ant
-
+.NET Tasks
diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html
index 236c80fe1..81d4f6bc3 100644
--- a/docs/manual/OptionalTasks/ejb.html
+++ b/docs/manual/OptionalTasks/ejb.html
@@ -2,7 +2,7 @@
-Apache Ant EJB Tasks
+EJB Tasks
diff --git a/docs/manual/OptionalTasks/ftp.html b/docs/manual/OptionalTasks/ftp.html
index 81ef1faa0..1ef7811fe 100644
--- a/docs/manual/OptionalTasks/ftp.html
+++ b/docs/manual/OptionalTasks/ftp.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+FTP Task
diff --git a/docs/manual/OptionalTasks/icontract.html b/docs/manual/OptionalTasks/icontract.html
index f5a357c3a..ff06edfdb 100644
--- a/docs/manual/OptionalTasks/icontract.html
+++ b/docs/manual/OptionalTasks/icontract.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+IContract Task
diff --git a/docs/manual/OptionalTasks/javah.html b/docs/manual/OptionalTasks/javah.html
index 23cea3213..2640947e4 100644
--- a/docs/manual/OptionalTasks/javah.html
+++ b/docs/manual/OptionalTasks/javah.html
@@ -2,12 +2,12 @@
-Apache Ant
+Javah Task
-
+
Description
Generates JNI headers from a Java class.
When this task executes, it will generate the C header and source files that
diff --git a/docs/manual/OptionalTasks/jlink.html b/docs/manual/OptionalTasks/jlink.html
index 673070c20..d0daf2b63 100644
--- a/docs/manual/OptionalTasks/jlink.html
+++ b/docs/manual/OptionalTasks/jlink.html
@@ -1,5 +1,6 @@
+JLink Task
diff --git a/docs/manual/OptionalTasks/jpcoverage.html b/docs/manual/OptionalTasks/jpcoverage.html
index 6dba63c43..d1def891e 100644
--- a/docs/manual/OptionalTasks/jpcoverage.html
+++ b/docs/manual/OptionalTasks/jpcoverage.html
@@ -1,5 +1,6 @@
+JProbe Tasks
diff --git a/docs/manual/OptionalTasks/jspc.html b/docs/manual/OptionalTasks/jspc.html
index a3be5c728..83de8628b 100644
--- a/docs/manual/OptionalTasks/jspc.html
+++ b/docs/manual/OptionalTasks/jspc.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+JSPC Task
diff --git a/docs/manual/OptionalTasks/junit.html b/docs/manual/OptionalTasks/junit.html
index 0160f1483..a373b3c27 100644
--- a/docs/manual/OptionalTasks/junit.html
+++ b/docs/manual/OptionalTasks/junit.html
@@ -1,5 +1,6 @@
+JUnit Task
diff --git a/docs/manual/OptionalTasks/junitreport.html b/docs/manual/OptionalTasks/junitreport.html
index 78a732505..213da3fa1 100644
--- a/docs/manual/OptionalTasks/junitreport.html
+++ b/docs/manual/OptionalTasks/junitreport.html
@@ -1,6 +1,6 @@
-JUnitReport
+JUnitReport Task
diff --git a/docs/manual/OptionalTasks/mimemail.html b/docs/manual/OptionalTasks/mimemail.html
index 46bd2adcd..8d8bbc0fa 100644
--- a/docs/manual/OptionalTasks/mimemail.html
+++ b/docs/manual/OptionalTasks/mimemail.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+MimeMail Task
diff --git a/docs/manual/OptionalTasks/native2ascii.html b/docs/manual/OptionalTasks/native2ascii.html
index 9708a4b11..6b4946253 100644
--- a/docs/manual/OptionalTasks/native2ascii.html
+++ b/docs/manual/OptionalTasks/native2ascii.html
@@ -1,5 +1,5 @@
- Native2Ascii
+ Native2Ascii Task
Native2Ascii
diff --git a/docs/manual/OptionalTasks/netrexxc.html b/docs/manual/OptionalTasks/netrexxc.html
index a46a9ea3b..f28c18452 100644
--- a/docs/manual/OptionalTasks/netrexxc.html
+++ b/docs/manual/OptionalTasks/netrexxc.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+NetRexxC Task
diff --git a/docs/manual/OptionalTasks/perforce.html b/docs/manual/OptionalTasks/perforce.html
index 45a419b35..da132d710 100644
--- a/docs/manual/OptionalTasks/perforce.html
+++ b/docs/manual/OptionalTasks/perforce.html
@@ -1,6 +1,6 @@
-Perforce Tasks for ANT
+Perforce Tasks
Perforce Tasks User Manual
diff --git a/docs/manual/OptionalTasks/propertyfile.html b/docs/manual/OptionalTasks/propertyfile.html
index edd75658b..33285054d 100644
--- a/docs/manual/OptionalTasks/propertyfile.html
+++ b/docs/manual/OptionalTasks/propertyfile.html
@@ -1,7 +1,7 @@
-Apache Ant PropertyFile Task
+PropertyFile Task
diff --git a/docs/manual/OptionalTasks/renameextensions.html b/docs/manual/OptionalTasks/renameextensions.html
index 795e5ec1d..a10b44033 100644
--- a/docs/manual/OptionalTasks/renameextensions.html
+++ b/docs/manual/OptionalTasks/renameextensions.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+RenameExtensions Task
diff --git a/docs/manual/OptionalTasks/replaceregexp.html b/docs/manual/OptionalTasks/replaceregexp.html
index e849e0ad8..930ac3023 100644
--- a/docs/manual/OptionalTasks/replaceregexp.html
+++ b/docs/manual/OptionalTasks/replaceregexp.html
@@ -2,7 +2,7 @@
-Ant User Manual
+ReplaceRegeExp Task
diff --git a/docs/manual/OptionalTasks/script.html b/docs/manual/OptionalTasks/script.html
index ea40f1d06..18c0900df 100644
--- a/docs/manual/OptionalTasks/script.html
+++ b/docs/manual/OptionalTasks/script.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Script Task
diff --git a/docs/manual/OptionalTasks/sos.html b/docs/manual/OptionalTasks/sos.html
index bca3ea05c..6e74151bb 100644
--- a/docs/manual/OptionalTasks/sos.html
+++ b/docs/manual/OptionalTasks/sos.html
@@ -1,10 +1,9 @@
-
- Ant User Manual
+ SOS Tasks
diff --git a/docs/manual/OptionalTasks/sound.html b/docs/manual/OptionalTasks/sound.html
index f33c39e38..73078350a 100644
--- a/docs/manual/OptionalTasks/sound.html
+++ b/docs/manual/OptionalTasks/sound.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Sound Task
diff --git a/docs/manual/OptionalTasks/starteam.html b/docs/manual/OptionalTasks/starteam.html
index c366537a1..2e2515d91 100644
--- a/docs/manual/OptionalTasks/starteam.html
+++ b/docs/manual/OptionalTasks/starteam.html
@@ -1,7 +1,7 @@
-Apache Ant User Manual
+StartTeam Tasks
StarTeam Support
diff --git a/docs/manual/OptionalTasks/stylebook.html b/docs/manual/OptionalTasks/stylebook.html
index f0b58b76f..220f48dd7 100644
--- a/docs/manual/OptionalTasks/stylebook.html
+++ b/docs/manual/OptionalTasks/stylebook.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+StyleBook Task
diff --git a/docs/manual/OptionalTasks/telnet.html b/docs/manual/OptionalTasks/telnet.html
index c92198af8..1352c1f81 100644
--- a/docs/manual/OptionalTasks/telnet.html
+++ b/docs/manual/OptionalTasks/telnet.html
@@ -2,7 +2,7 @@
-Telnet
+Telnet Task
diff --git a/docs/manual/OptionalTasks/test.html b/docs/manual/OptionalTasks/test.html
index c4d89b8f7..03dfd348c 100644
--- a/docs/manual/OptionalTasks/test.html
+++ b/docs/manual/OptionalTasks/test.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Test Task
diff --git a/docs/manual/OptionalTasks/translate.html b/docs/manual/OptionalTasks/translate.html
index 78608bd3d..d9d3041af 100644
--- a/docs/manual/OptionalTasks/translate.html
+++ b/docs/manual/OptionalTasks/translate.html
@@ -2,7 +2,7 @@
-Ant User Manual
+Translate Task
diff --git a/docs/manual/OptionalTasks/vss.html b/docs/manual/OptionalTasks/vss.html
index 6bf8839d1..2d0cbeadd 100644
--- a/docs/manual/OptionalTasks/vss.html
+++ b/docs/manual/OptionalTasks/vss.html
@@ -1,6 +1,6 @@
-Microsoft Visual SourceSafe Tasks for ANT
+Microsoft Visual SourceSafe(VSS) Tasks
Microsoft Visual SourceSafe Tasks User Manual
diff --git a/docs/manual/OptionalTasks/wljspc.html b/docs/manual/OptionalTasks/wljspc.html
index f16a87d7b..b8952c317 100644
--- a/docs/manual/OptionalTasks/wljspc.html
+++ b/docs/manual/OptionalTasks/wljspc.html
@@ -1,5 +1,5 @@
- Ant optional task manual : wljspc
+WLJSPC Task
wljspc
Description