diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/CoreTasks/ant.html
index 95802346e..d69c7061a 100644
--- a/docs/manual/CoreTasks/ant.html
+++ b/docs/manual/CoreTasks/ant.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Ant Task
diff --git a/docs/manual/CoreTasks/antcall.html b/docs/manual/CoreTasks/antcall.html
index d42e1eb68..dca5a2746 100644
--- a/docs/manual/CoreTasks/antcall.html
+++ b/docs/manual/CoreTasks/antcall.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+AntCall Task
diff --git a/docs/manual/CoreTasks/antstructure.html b/docs/manual/CoreTasks/antstructure.html
index 2e70b4ecd..90670a35f 100644
--- a/docs/manual/CoreTasks/antstructure.html
+++ b/docs/manual/CoreTasks/antstructure.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+AntStructure Task
diff --git a/docs/manual/CoreTasks/apply.html b/docs/manual/CoreTasks/apply.html
index ac863e93d..7ba809afa 100644
--- a/docs/manual/CoreTasks/apply.html
+++ b/docs/manual/CoreTasks/apply.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Apply Task
diff --git a/docs/manual/CoreTasks/available.html b/docs/manual/CoreTasks/available.html
index c1a6e9087..be65409e5 100644
--- a/docs/manual/CoreTasks/available.html
+++ b/docs/manual/CoreTasks/available.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Available Task
diff --git a/docs/manual/CoreTasks/checksum.html b/docs/manual/CoreTasks/checksum.html
index b089d9933..96ce04239 100644
--- a/docs/manual/CoreTasks/checksum.html
+++ b/docs/manual/CoreTasks/checksum.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Checksum Task
diff --git a/docs/manual/CoreTasks/chmod.html b/docs/manual/CoreTasks/chmod.html
index 45515f0a4..4d07d822b 100644
--- a/docs/manual/CoreTasks/chmod.html
+++ b/docs/manual/CoreTasks/chmod.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Chmod Task
diff --git a/docs/manual/CoreTasks/common.html b/docs/manual/CoreTasks/common.html
index 63233cbf9..4447fb767 100644
--- a/docs/manual/CoreTasks/common.html
+++ b/docs/manual/CoreTasks/common.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Common
diff --git a/docs/manual/CoreTasks/condition.html b/docs/manual/CoreTasks/condition.html
index 22058f568..0b116ce40 100644
--- a/docs/manual/CoreTasks/condition.html
+++ b/docs/manual/CoreTasks/condition.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Condition Task
diff --git a/docs/manual/CoreTasks/conditions.html b/docs/manual/CoreTasks/conditions.html
index 0e1b32752..b89a232fe 100644
--- a/docs/manual/CoreTasks/conditions.html
+++ b/docs/manual/CoreTasks/conditions.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Conditions Task
diff --git a/docs/manual/CoreTasks/copydir.html b/docs/manual/CoreTasks/copydir.html
index b5c86ddad..fd3a0f195 100644
--- a/docs/manual/CoreTasks/copydir.html
+++ b/docs/manual/CoreTasks/copydir.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Copydir Task
diff --git a/docs/manual/CoreTasks/copyfile.html b/docs/manual/CoreTasks/copyfile.html
index c2e5bb1bd..e0ba8f3c8 100644
--- a/docs/manual/CoreTasks/copyfile.html
+++ b/docs/manual/CoreTasks/copyfile.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Copyfile Task
diff --git a/docs/manual/CoreTasks/cvs.html b/docs/manual/CoreTasks/cvs.html
index c977888f9..159a2503a 100644
--- a/docs/manual/CoreTasks/cvs.html
+++ b/docs/manual/CoreTasks/cvs.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+CVS Task
diff --git a/docs/manual/CoreTasks/cvspass.html b/docs/manual/CoreTasks/cvspass.html
index aa1f0ac4d..de5777cfd 100644
--- a/docs/manual/CoreTasks/cvspass.html
+++ b/docs/manual/CoreTasks/cvspass.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+CVSPass Task
diff --git a/docs/manual/CoreTasks/delete.html b/docs/manual/CoreTasks/delete.html
index ef9918279..11f74da0e 100644
--- a/docs/manual/CoreTasks/delete.html
+++ b/docs/manual/CoreTasks/delete.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Delete Task
diff --git a/docs/manual/CoreTasks/deltree.html b/docs/manual/CoreTasks/deltree.html
index 9ffca7c5c..1df22d937 100644
--- a/docs/manual/CoreTasks/deltree.html
+++ b/docs/manual/CoreTasks/deltree.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Deltree Task
diff --git a/docs/manual/CoreTasks/dependset.html b/docs/manual/CoreTasks/dependset.html
index 1e24efc0d..dfd578a7b 100644
--- a/docs/manual/CoreTasks/dependset.html
+++ b/docs/manual/CoreTasks/dependset.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+DependSet Task
diff --git a/docs/manual/CoreTasks/ear.html b/docs/manual/CoreTasks/ear.html
index 00454d405..e115799e3 100644
--- a/docs/manual/CoreTasks/ear.html
+++ b/docs/manual/CoreTasks/ear.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+EAR Task
diff --git a/docs/manual/CoreTasks/echo.html b/docs/manual/CoreTasks/echo.html
index 7d37eadee..7c85d429c 100644
--- a/docs/manual/CoreTasks/echo.html
+++ b/docs/manual/CoreTasks/echo.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Echo Task
diff --git a/docs/manual/CoreTasks/exec.html b/docs/manual/CoreTasks/exec.html
index 1cc4adacd..8bd451290 100644
--- a/docs/manual/CoreTasks/exec.html
+++ b/docs/manual/CoreTasks/exec.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Exec Task
diff --git a/docs/manual/CoreTasks/fail.html b/docs/manual/CoreTasks/fail.html
index ed060e4c0..656314ce8 100644
--- a/docs/manual/CoreTasks/fail.html
+++ b/docs/manual/CoreTasks/fail.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Fail Task
diff --git a/docs/manual/CoreTasks/filter.html b/docs/manual/CoreTasks/filter.html
index 4cb179f22..b6e720432 100644
--- a/docs/manual/CoreTasks/filter.html
+++ b/docs/manual/CoreTasks/filter.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Filter Task
diff --git a/docs/manual/CoreTasks/fixcrlf.html b/docs/manual/CoreTasks/fixcrlf.html
index 5b2d6f563..e305aa01a 100644
--- a/docs/manual/CoreTasks/fixcrlf.html
+++ b/docs/manual/CoreTasks/fixcrlf.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+FixCRLF Task
diff --git a/docs/manual/CoreTasks/genkey.html b/docs/manual/CoreTasks/genkey.html
index a769f92fc..27be18c95 100644
--- a/docs/manual/CoreTasks/genkey.html
+++ b/docs/manual/CoreTasks/genkey.html
@@ -2,7 +2,7 @@
-GenKey
+GenKey Task
diff --git a/docs/manual/CoreTasks/get.html b/docs/manual/CoreTasks/get.html
index ae0bc82e8..1b1b8980c 100644
--- a/docs/manual/CoreTasks/get.html
+++ b/docs/manual/CoreTasks/get.html
@@ -2,7 +2,7 @@
-Get
+Get Task
diff --git a/docs/manual/CoreTasks/gunzip.html b/docs/manual/CoreTasks/gunzip.html
index 945eae22d..07e6cd681 100644
--- a/docs/manual/CoreTasks/gunzip.html
+++ b/docs/manual/CoreTasks/gunzip.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+GUnZip Task
diff --git a/docs/manual/CoreTasks/gzip.html b/docs/manual/CoreTasks/gzip.html
index f97230398..3fe9205ed 100644
--- a/docs/manual/CoreTasks/gzip.html
+++ b/docs/manual/CoreTasks/gzip.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+GZip Task
diff --git a/docs/manual/CoreTasks/input.html b/docs/manual/CoreTasks/input.html
index 8a14bbcd9..f70d6dcbd 100644
--- a/docs/manual/CoreTasks/input.html
+++ b/docs/manual/CoreTasks/input.html
@@ -2,7 +2,7 @@
-Ant User Manual
+Input Task
diff --git a/docs/manual/CoreTasks/jar.html b/docs/manual/CoreTasks/jar.html
index 8565f7c5d..1783cfde8 100644
--- a/docs/manual/CoreTasks/jar.html
+++ b/docs/manual/CoreTasks/jar.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Jar Task
diff --git a/docs/manual/CoreTasks/java.html b/docs/manual/CoreTasks/java.html
index d66d4bf5a..c961dda9c 100644
--- a/docs/manual/CoreTasks/java.html
+++ b/docs/manual/CoreTasks/java.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Java Task
diff --git a/docs/manual/CoreTasks/javac.html b/docs/manual/CoreTasks/javac.html
index 0cefa80fd..8701e4b75 100644
--- a/docs/manual/CoreTasks/javac.html
+++ b/docs/manual/CoreTasks/javac.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Javac Task
diff --git a/docs/manual/CoreTasks/javadoc.html b/docs/manual/CoreTasks/javadoc.html
index 0d0ad477d..25c93db3d 100644
--- a/docs/manual/CoreTasks/javadoc.html
+++ b/docs/manual/CoreTasks/javadoc.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Javadoc Task
diff --git a/docs/manual/CoreTasks/loadfile.html b/docs/manual/CoreTasks/loadfile.html
index f3448c46a..a78aff8b1 100644
--- a/docs/manual/CoreTasks/loadfile.html
+++ b/docs/manual/CoreTasks/loadfile.html
@@ -1,6 +1,6 @@
-LoadFile
+LoadFile Task
diff --git a/docs/manual/CoreTasks/mail.html b/docs/manual/CoreTasks/mail.html
index 5532999c6..31ee3b322 100644
--- a/docs/manual/CoreTasks/mail.html
+++ b/docs/manual/CoreTasks/mail.html
@@ -2,7 +2,7 @@
-Mail
+Mail Task
diff --git a/docs/manual/CoreTasks/mkdir.html b/docs/manual/CoreTasks/mkdir.html
index 6665935d0..059c118eb 100644
--- a/docs/manual/CoreTasks/mkdir.html
+++ b/docs/manual/CoreTasks/mkdir.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Mkdir Task
diff --git a/docs/manual/CoreTasks/move.html b/docs/manual/CoreTasks/move.html
index fcf46eec1..252c13352 100644
--- a/docs/manual/CoreTasks/move.html
+++ b/docs/manual/CoreTasks/move.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Move Task
diff --git a/docs/manual/CoreTasks/pack.html b/docs/manual/CoreTasks/pack.html
index 9363d8b10..3bf280694 100644
--- a/docs/manual/CoreTasks/pack.html
+++ b/docs/manual/CoreTasks/pack.html
@@ -2,7 +2,7 @@
-GZip/BZip2
+GZip/BZip2 Tasks
diff --git a/docs/manual/CoreTasks/parallel.html b/docs/manual/CoreTasks/parallel.html
index 6c6ecd922..45aa0dc32 100644
--- a/docs/manual/CoreTasks/parallel.html
+++ b/docs/manual/CoreTasks/parallel.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Parallel Task
diff --git a/docs/manual/CoreTasks/patch.html b/docs/manual/CoreTasks/patch.html
index 59f74237b..30621d0b4 100644
--- a/docs/manual/CoreTasks/patch.html
+++ b/docs/manual/CoreTasks/patch.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Patch Task
diff --git a/docs/manual/CoreTasks/pathconvert.html b/docs/manual/CoreTasks/pathconvert.html
index 34c4827ad..82a428d8c 100644
--- a/docs/manual/CoreTasks/pathconvert.html
+++ b/docs/manual/CoreTasks/pathconvert.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+PathConvert Task
diff --git a/docs/manual/CoreTasks/property.html b/docs/manual/CoreTasks/property.html
index 53d66dafa..e972176e1 100644
--- a/docs/manual/CoreTasks/property.html
+++ b/docs/manual/CoreTasks/property.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Property Task
diff --git a/docs/manual/CoreTasks/recorder.html b/docs/manual/CoreTasks/recorder.html
index f24a21eb7..45d6fa62d 100644
--- a/docs/manual/CoreTasks/recorder.html
+++ b/docs/manual/CoreTasks/recorder.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Recorder Task
diff --git a/docs/manual/CoreTasks/rename.html b/docs/manual/CoreTasks/rename.html
index 7ef13ad1f..555a2afd2 100644
--- a/docs/manual/CoreTasks/rename.html
+++ b/docs/manual/CoreTasks/rename.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Rename Task
diff --git a/docs/manual/CoreTasks/replace.html b/docs/manual/CoreTasks/replace.html
index c0a6454dc..c49040c65 100644
--- a/docs/manual/CoreTasks/replace.html
+++ b/docs/manual/CoreTasks/replace.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Replace Task
diff --git a/docs/manual/CoreTasks/rmic.html b/docs/manual/CoreTasks/rmic.html
index 9efcadf59..e144cf2c8 100644
--- a/docs/manual/CoreTasks/rmic.html
+++ b/docs/manual/CoreTasks/rmic.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Rmic Task
diff --git a/docs/manual/CoreTasks/sequential.html b/docs/manual/CoreTasks/sequential.html
index 17846fe17..87f361892 100644
--- a/docs/manual/CoreTasks/sequential.html
+++ b/docs/manual/CoreTasks/sequential.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Sequential Task
diff --git a/docs/manual/CoreTasks/signjar.html b/docs/manual/CoreTasks/signjar.html
index 9d5c64782..86c69ca6e 100644
--- a/docs/manual/CoreTasks/signjar.html
+++ b/docs/manual/CoreTasks/signjar.html
@@ -2,7 +2,7 @@
-SignJar
+SignJar Task
diff --git a/docs/manual/CoreTasks/sleep.html b/docs/manual/CoreTasks/sleep.html
index 88c47b269..c732e3acc 100644
--- a/docs/manual/CoreTasks/sleep.html
+++ b/docs/manual/CoreTasks/sleep.html
@@ -1,7 +1,7 @@
-Sleep
+Sleep Task
diff --git a/docs/manual/CoreTasks/sql.html b/docs/manual/CoreTasks/sql.html
index 579217708..a2d7cbf22 100644
--- a/docs/manual/CoreTasks/sql.html
+++ b/docs/manual/CoreTasks/sql.html
@@ -1,7 +1,7 @@
-Apache Ant User Manual
+SQL Task
diff --git a/docs/manual/CoreTasks/style.html b/docs/manual/CoreTasks/style.html
index 516e63bd3..8c651072f 100644
--- a/docs/manual/CoreTasks/style.html
+++ b/docs/manual/CoreTasks/style.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Style Task
diff --git a/docs/manual/CoreTasks/tar.html b/docs/manual/CoreTasks/tar.html
index abf0733c3..49125f470 100644
--- a/docs/manual/CoreTasks/tar.html
+++ b/docs/manual/CoreTasks/tar.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Tar Task
diff --git a/docs/manual/CoreTasks/taskdef.html b/docs/manual/CoreTasks/taskdef.html
index 144881ccc..1071e9341 100644
--- a/docs/manual/CoreTasks/taskdef.html
+++ b/docs/manual/CoreTasks/taskdef.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+TaskDef Task
diff --git a/docs/manual/CoreTasks/touch.html b/docs/manual/CoreTasks/touch.html
index b92ecb929..89ae477f8 100644
--- a/docs/manual/CoreTasks/touch.html
+++ b/docs/manual/CoreTasks/touch.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Touch Task
diff --git a/docs/manual/CoreTasks/tstamp.html b/docs/manual/CoreTasks/tstamp.html
index 36fb4f3a3..fc84999e1 100644
--- a/docs/manual/CoreTasks/tstamp.html
+++ b/docs/manual/CoreTasks/tstamp.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+TStamp Task
diff --git a/docs/manual/CoreTasks/typedef.html b/docs/manual/CoreTasks/typedef.html
index 105ecd4b4..932765330 100644
--- a/docs/manual/CoreTasks/typedef.html
+++ b/docs/manual/CoreTasks/typedef.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Typedef Task
diff --git a/docs/manual/CoreTasks/unpack.html b/docs/manual/CoreTasks/unpack.html
index 846409e6a..f58937f4e 100644
--- a/docs/manual/CoreTasks/unpack.html
+++ b/docs/manual/CoreTasks/unpack.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+GUnzip/BUnzip2 Task
diff --git a/docs/manual/CoreTasks/untar.html b/docs/manual/CoreTasks/untar.html
index 2563280be..796be6454 100644
--- a/docs/manual/CoreTasks/untar.html
+++ b/docs/manual/CoreTasks/untar.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Untar Task
diff --git a/docs/manual/CoreTasks/unzip.html b/docs/manual/CoreTasks/unzip.html
index be0d7c412..4dd756c5c 100644
--- a/docs/manual/CoreTasks/unzip.html
+++ b/docs/manual/CoreTasks/unzip.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Unzip Task
diff --git a/docs/manual/CoreTasks/uptodate.html b/docs/manual/CoreTasks/uptodate.html
index d433a3a80..8fb80bc9d 100644
--- a/docs/manual/CoreTasks/uptodate.html
+++ b/docs/manual/CoreTasks/uptodate.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+Uptodate Task
diff --git a/docs/manual/CoreTasks/waitfor.html b/docs/manual/CoreTasks/waitfor.html
index cf7fae1b3..301fc9b95 100644
--- a/docs/manual/CoreTasks/waitfor.html
+++ b/docs/manual/CoreTasks/waitfor.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+WaitFor Task
diff --git a/docs/manual/CoreTasks/war.html b/docs/manual/CoreTasks/war.html
index cb5a32c1b..0c231d8a5 100644
--- a/docs/manual/CoreTasks/war.html
+++ b/docs/manual/CoreTasks/war.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+WAR Task
diff --git a/docs/manual/CoreTasks/zip.html b/docs/manual/CoreTasks/zip.html
index 64dc7ce40..1ec1a1480 100644
--- a/docs/manual/CoreTasks/zip.html
+++ b/docs/manual/CoreTasks/zip.html
@@ -2,7 +2,7 @@
-Apache Ant User Manual
+AZip Task