diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java
index c828614c3..131211ef1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Ant.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java
@@ -90,7 +90,7 @@ import java.util.Enumeration;
  *
  * @author costin@dnt.ro
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 public class Ant extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
index 593322c1a..a1833a799 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
@@ -79,7 +79,7 @@ import java.io.IOException;
  *
  * @version $Revision$
  *
- * @ant:task category="xml"
+ * @ant.task category="xml"
  */
 
 public class AntStructure extends Task {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index ddc38875f..93462608a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -72,7 +72,7 @@ import org.apache.tools.ant.util.FileUtils;
  * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 
 public class Available extends Task implements Condition {
diff --git a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
index 9c902c415..5df0c0918 100644
--- a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
+++ b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
@@ -69,7 +69,7 @@ import org.apache.tools.bzip2.CBZip2InputStream;
  *
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 
 public class BUnzip2 extends Unpack {
diff --git a/src/main/org/apache/tools/ant/taskdefs/BZip2.java b/src/main/org/apache/tools/ant/taskdefs/BZip2.java
index ce587a3b6..62f8c9fe6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/BZip2.java
+++ b/src/main/org/apache/tools/ant/taskdefs/BZip2.java
@@ -68,7 +68,7 @@ import org.apache.tools.bzip2.CBZip2OutputStream;
  *
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 
 public class BZip2 extends Pack {
diff --git a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
index 43bd1f8c3..805fa7d0e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
@@ -73,7 +73,7 @@ import java.io.IOException;
  * @author <a href="jeff@custommonkey.org">Jeff Martin</a>
  * @version $Revision$
  *
- * @ant:task category="scm"
+ * @ant.task category="scm"
  */
 public class CVSPass extends Task {
     /** CVS Root */
diff --git a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
index eae2b9927..a269b05e9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
@@ -79,7 +79,7 @@ import org.apache.tools.ant.BuildException;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  *
- * @ant:task name="antcall" category="control"
+ * @ant.task name="antcall" category="control"
  */
 public class CallTarget extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
index e27e36434..b40c0e0c4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
@@ -79,7 +79,7 @@ import org.apache.tools.ant.types.FileSet;
  *
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 public class Checksum extends MatchingTask implements Condition {
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/src/main/org/apache/tools/ant/taskdefs/Chmod.java
index dccb0dcdc..56938d911 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Chmod.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Chmod.java
@@ -70,7 +70,7 @@ import org.apache.tools.ant.types.PatternSet;
  * @author Mariusz Nowostawski (Marni) <a href="mailto:mnowostawski@infoscience.otago.ac.nz">mnowostawski@infoscience.otago.ac.nz</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  */
 public class Chmod extends ExecuteOn {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java b/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
index 3348965f9..72f312e80 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
@@ -71,7 +71,7 @@ import org.apache.tools.ant.taskdefs.condition.ConditionBase;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @version $Revision$
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 public class ConditionTask extends ConditionBase {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 80e672238..ca9020eb7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -91,7 +91,7 @@ import java.util.Enumeration;
  *
  * @version $Revision$
  *
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  */
 public class Copy extends Task {
     protected File file = null;     // the source file
diff --git a/src/main/org/apache/tools/ant/taskdefs/Cvs.java b/src/main/org/apache/tools/ant/taskdefs/Cvs.java
index d121f1580..daf8d2fc1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Cvs.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Cvs.java
@@ -65,7 +65,7 @@ package org.apache.tools.ant.taskdefs;
  * @author Wolfgang Werner <a href="mailto:wwerner@picturesafe.de">wwerner@picturesafe.de</a>
  * @author Kevin Ross <a href="mailto:kevin.ross@bredex.com">kevin.ross@bredex.com</a>
  *
- * @ant:task category="scm"
+ * @ant.task category="scm"
  */
 public class Cvs extends AbstractCvsTask {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java
index 16959370b..66666ba3e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Delete.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java
@@ -77,7 +77,7 @@ import java.util.Vector;
  * @author Glenn McAllister <a href="mailto:glennm@ca.ibm.com">glennm@ca.ibm.com</a>
  * @author Jon S. Stevens <a href="mailto:jon@latchkey.com">jon@latchkey.com</a>
  *
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  */
 public class Delete extends MatchingTask {
     protected File file = null;
diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
index 561a0ea8e..95c5bd937 100644
--- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
@@ -108,7 +108,7 @@ import org.apache.tools.ant.types.FileList;
  * </li></ul>
  * 
  * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  * @version $Revision$ $Date$
  */
 public class DependSet extends MatchingTask {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Ear.java b/src/main/org/apache/tools/ant/taskdefs/Ear.java
index ac909fc18..a8c9850f3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Ear.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Ear.java
@@ -68,7 +68,7 @@ import java.io.IOException;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  * @author <a href="mailto:leslie.hughes@rubus.com">Les Hughes</a> 
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 public class Ear extends Jar {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Echo.java b/src/main/org/apache/tools/ant/taskdefs/Echo.java
index 10ab94e6a..f6be4808d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Echo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Echo.java
@@ -67,7 +67,7 @@ import java.io.IOException;
  *
  * @author costin@dnt.ro
  *
- * @ant:task category="utility"
+ * @ant.task category="utility"
  */
 public class Echo extends Task {
     protected String message = ""; // required
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
index 5dac104cc..bd5473e6d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -77,7 +77,7 @@ import java.io.FileNotFoundException;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:mariusz@rakiura.org">Mariusz Nowostawski</a>
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 public class ExecTask extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
index f03fb3e47..29486a24e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
@@ -73,7 +73,9 @@ import java.io.IOException;
  * Executes a given command, supplying a set of files as arguments. 
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
- * @author <a href="mailto:mariusz@rakiura.org">Mariusz Nowostawski</a> 
+ * @author <a href="mailto:mariusz@rakiura.org">Mariusz Nowostawski</a>
+ *
+ * @ant.task name="execon"
  */
 public class ExecuteOn extends ExecTask {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java
index e438450e2..37e9d0c49 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Exit.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java
@@ -64,7 +64,7 @@ import org.apache.tools.ant.BuildException;
  *
  * @author <a href="mailto:nico@seessle.de">Nico Seessle</a>
  *
- * @ant:task name="fail" category="control"
+ * @ant.task name="fail" category="control"
  */
 public class Exit extends Task { 
     private String message;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java
index a1f1982d3..31d35b495 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Expand.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -78,7 +78,7 @@ import java.util.zip.ZipEntry;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  *           name="unzip"
  *           name="unjar"
  *           name="unwar"
diff --git a/src/main/org/apache/tools/ant/taskdefs/Filter.java b/src/main/org/apache/tools/ant/taskdefs/Filter.java
index ad5f8a5fa..43a29ddbf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Filter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Filter.java
@@ -72,7 +72,7 @@ import org.apache.tools.ant.Project;
  * @author Gero Vermaas <a href="mailto:gero@xs4all.nl">gero@xs4all.nl</a>
  * @author <A href="gholam@xtra.co.nz">Michael McCallum</A>
  *
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  */
 public class Filter extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
index d55b8c184..da69ddd54 100644
--- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -118,7 +118,7 @@ import java.util.NoSuchElementException;
  * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
  * @version $Revision$ $Name$
  *
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  */
 
 public class FixCRLF extends MatchingTask {
diff --git a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java b/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
index 7a8c69b62..5b9951e1c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
@@ -69,7 +69,7 @@ import java.util.zip.GZIPInputStream;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 
 public class GUnzip extends Unpack {
diff --git a/src/main/org/apache/tools/ant/taskdefs/GZip.java b/src/main/org/apache/tools/ant/taskdefs/GZip.java
index b6b023de3..a8ef2c8d9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GZip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GZip.java
@@ -69,7 +69,7 @@ import java.util.zip.GZIPOutputStream;
  * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 
 public class GZip extends Pack {
diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
index a47593688..38bbb1f98 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -65,7 +65,7 @@ import org.apache.tools.ant.types.Commandline;
  * 
  * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
  *
- * @ant:task name="genkey" category="java"
+ * @ant.task name="genkey" category="java"
  */
 public class GenerateKey extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java
index 03c147bba..b36f1a3d6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -75,7 +75,7 @@ import org.apache.tools.ant.Project;
  * @author costin@dnt.ro
  * @author gg@grtmail.com (Added Java 1.1 style HTTP basic auth)
  *
- * @ant:task category="network"
+ * @ant.task category="network"
  */
 public class Get extends Task {
     private URL source; // required
diff --git a/src/main/org/apache/tools/ant/taskdefs/Input.java b/src/main/org/apache/tools/ant/taskdefs/Input.java
index beda2c768..5fdb6f5a6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Input.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Input.java
@@ -71,7 +71,7 @@ import org.apache.tools.ant.Project;
  *
  * @author <a href="mailto:usch@usch.net">Ulrich Schmidt</a>
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 public class Input extends Task {
     private String validargs = null;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index 60626f9b6..c9f95a42f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -78,7 +78,7 @@ import java.util.Enumeration;
  * 
  * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 public class Jar extends Zip {
     /** The index file name. */
diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java
index f48b8e466..ad73bf307 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -78,7 +78,7 @@ import java.util.Vector;
  * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task category="java"
+ * @ant.task category="java"
  */
 public class Java extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 2a22f2810..191387155 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -105,7 +105,7 @@ import java.util.Vector;
  *
  * @version $Revision$
  *
- * @ant:task category="java"
+ * @ant.task category="java"
  */
 
 public class Javac extends MatchingTask {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index c11af997b..60160cede 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -102,7 +102,7 @@ import org.apache.tools.ant.util.FileUtils;
  * @author Ernst de Haan <a href="mailto:ernst@jollem.com">ernst@jollem.com</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task category="java"
+ * @ant.task category="java"
  */
 
 public class Javadoc extends Task {
diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
index 218f54b2b..1900e8e57 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
@@ -65,7 +65,7 @@ import java.io.*;
  *
  * @author Steve Loughran
  *
- * @ant:task category="utility"
+ * @ant.task category="utility"
  */
 public class LoadFile extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
index 3b0ee162c..f12496292 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -79,7 +79,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
  * @author <a href="mailto:conor@apache.org">Conor MacNeill</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task category="java"
+ * @ant.task category="java"
  */
 public class Manifest extends Task {
     /** The standard manifest version header */
diff --git a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java b/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
index 78f13bc1d..db53da15a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
@@ -63,7 +63,7 @@ import java.io.File;
  *
  * @author duncan@x180.com
  *
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  */
 
 public class Mkdir extends Task {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java
index f0b4fed3f..73a60980a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Move.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Move.java
@@ -84,7 +84,7 @@ import java.util.Vector;
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  * @version $Revision$
  *
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  */
 public class Move extends Copy {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Parallel.java b/src/main/org/apache/tools/ant/taskdefs/Parallel.java
index 04b3c63d5..1aebb9764 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Parallel.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Parallel.java
@@ -69,7 +69,7 @@ import java.util.Enumeration;
  * @author Thomas Christen <a href="mailto:chr@active.ch">chr@active.ch</a>
  * @author <a href="mailto:conor@apache.org">Conor MacNeill </a>
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 public class Parallel extends Task
                       implements TaskContainer {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Patch.java b/src/main/org/apache/tools/ant/taskdefs/Patch.java
index 74e1ac40a..6b6c0b4fd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Patch.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Patch.java
@@ -66,7 +66,7 @@ import java.io.IOException;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task category="utility"
+ * @ant.task category="utility"
  */
 public class Patch extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
index 3155c3b25..2ffd58ec1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
@@ -73,7 +73,7 @@ import java.io.File;
  *
  * @author Larry Streepy <a href="mailto:streepy@healthlanguage.com">streepy@healthlanguage.com</a>
  *
- * @ant:task category="utility"
+ * @ant.task category="utility"
  */
 public class PathConvert extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
index f9dbe4006..dbb7ae0f0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
@@ -76,7 +76,7 @@ import java.util.Hashtable;
  * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
  * @version 0.5
  *
- * @ant:task category="utility"
+ * @ant.task name="record" category="utility"
  */
 public class Recorder extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java
index 4e58247b5..ecf6f2f15 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -83,7 +83,7 @@ import java.util.Vector;
  * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  * @author <a href="mailto:erik@desknetinc.com">Erik Langenbach</a>
  *
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  */
 public class Replace extends MatchingTask {
     
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index b3d7e28eb..fee4219c5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -99,7 +99,7 @@ import java.util.Vector;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  * @author Takashi Okamoto tokamoto@rd.nttdata.co.jp
  *
- * @ant:task category="java"
+ * @ant.task category="java"
  */
 
 public class Rmic extends MatchingTask {
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index 0048749ec..4072d8e6e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -100,7 +100,7 @@ import java.sql.ResultSetMetaData;
  * @author <A href="mailto:gholam@xtra.co.nz">Michael McCallum</A>
  * @author <A href="mailto:tim.stephenson@sybase.com">Tim Stephenson</A>
  *
- * @ant:task name="sql" category="database"
+ * @ant.task name="sql" category="database"
  */
 public class SQLExec extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/SendEmail.java b/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
index 21ae8658d..d071db630 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
@@ -106,7 +106,7 @@ import org.apache.tools.ant.taskdefs.email.EmailTask;
  * @author glenn_twiggs@bmc.com
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  *
- * @ant:task name="mail" category="network"
+ * @ant.task name="mail" category="network"
  */
 public class SendEmail extends EmailTask
 {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Sequential.java b/src/main/org/apache/tools/ant/taskdefs/Sequential.java
index 812a3c638..fc682661a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Sequential.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Sequential.java
@@ -67,7 +67,7 @@ import java.util.Enumeration;
  * <p>
  * @author Thomas Christen <a href="mailto:chr@active.ch">chr@active.ch</a>
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 public class Sequential extends Task
                         implements TaskContainer {
diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
index fd48acd40..3477c7e3d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
@@ -72,7 +72,7 @@ import org.apache.tools.ant.types.FileSet;
  * @author Peter Donald <a href="mailto:donaldp@apache.org">donaldp@apache.org</a>
  * @author Nick Fortescue <a href="mailto:nick@ox.compsoc.net">nick@ox.compsoc.net</a>
  *
- * @ant:task category="java"
+ * @ant.task category="java"
  */
 public class SignJar extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Sleep.java b/src/main/org/apache/tools/ant/taskdefs/Sleep.java
index 05fb03421..4350fa06a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Sleep.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Sleep.java
@@ -63,7 +63,7 @@ import org.apache.tools.ant.BuildException;
  *
  * @author steve_l@iseran.com steve loughran
  *
- * @ant:task category="utility"
+ * @ant.task category="utility"
  */
 
 public class Sleep extends Task {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java
index 043b99c52..03eee48a7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java
@@ -78,7 +78,7 @@ import org.apache.tools.tar.TarEntry;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 
 public class Tar extends MatchingTask {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Taskdef.java b/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
index 0abbe0cea..fc1c3f50c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
@@ -61,7 +61,7 @@ import org.apache.tools.ant.BuildException;
  *
  * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task category="internal"
+ * @ant.task category="internal"
  */
 public class Taskdef extends Definer {
     protected void addDefinition(String name, Class c) throws BuildException {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java
index 780b632be..f2d4e56fd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Touch.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java
@@ -86,7 +86,7 @@ import java.util.Vector;
  * @author <a href="mailto:mj@servidium.com">Michael J. Sikorsky</a>
  * @author <a href="mailto:shaw@servidium.com">Robert Shaw</a>
  *
- * @ant:task category="filesystem"
+ * @ant.task category="filesystem"
  */
 public class Touch extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Transform.java b/src/main/org/apache/tools/ant/taskdefs/Transform.java
index a2b81cffc..22d11458e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Transform.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Transform.java
@@ -59,6 +59,6 @@ package org.apache.tools.ant.taskdefs;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  *
- * @ant:task name="apply" category="control"
+ * @ant.task name="apply" category="control"
  */
 public class Transform extends ExecuteOn {}
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index 8318e35e0..32be72650 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -80,7 +80,7 @@ import java.text.SimpleDateFormat;
  * @author conor@cognet.com.au
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  *
- * @ant:task category="utility"
+ * @ant.task category="utility"
  */
 public class Tstamp extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Typedef.java b/src/main/org/apache/tools/ant/taskdefs/Typedef.java
index ab6da2e8e..1114bc6c8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Typedef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Typedef.java
@@ -61,7 +61,7 @@ import org.apache.tools.ant.BuildException;
  *
  * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task category="internal"
+ * @ant.task category="internal"
  */
 public class Typedef extends Definer {
     protected void addDefinition(String name, Class c) throws BuildException {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Untar.java b/src/main/org/apache/tools/ant/taskdefs/Untar.java
index 7099a1fbc..902b3c99b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Untar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Untar.java
@@ -72,7 +72,7 @@ import java.io.IOException;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 public class Untar extends Expand {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
index 58817c457..f66e6eaf5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
@@ -76,7 +76,7 @@ import java.util.Vector;
  * @author Hiroaki Nakamura <a href="mailto:hnakamur@mc.neweb.ne.jp">hnakamur@mc.neweb.ne.jp</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 
 public class UpToDate extends MatchingTask implements Condition {
diff --git a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
index f0408243d..8ba323062 100644
--- a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
+++ b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
@@ -83,7 +83,7 @@ import java.util.Hashtable;
  * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  *
- * @ant:task category="control"
+ * @ant.task category="control"
  */
 
 public class WaitFor extends ConditionBase {
diff --git a/src/main/org/apache/tools/ant/taskdefs/War.java b/src/main/org/apache/tools/ant/taskdefs/War.java
index 33dcac5c0..d0b15ce9a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/War.java
+++ b/src/main/org/apache/tools/ant/taskdefs/War.java
@@ -68,7 +68,7 @@ import java.io.IOException;
  * 
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 public class War extends Jar {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 6a80dfc1e..9ebba9fd7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -94,7 +94,7 @@ import org.apache.tools.ant.util.FileUtils;
  * @author <a href="mailto:russgold@acm.org">Russell Gold</a>
  * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task name="style" category="xml"
+ * @ant.task name="style" category="xml"
  */
 
 public class XSLTProcess extends MatchingTask implements XSLTLogger {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index e44dbd132..45d329ffd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -90,7 +90,7 @@ import org.apache.tools.zip.ZipEntry;
  * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  *
- * @ant:task category="packaging"
+ * @ant.task category="packaging"
  */
 public class Zip extends MatchingTask {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
index 40aa3425b..bd1732625 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
@@ -77,6 +77,8 @@ import org.apache.tools.ant.types.FileSet;
  * @author paulo.gaspar@krankikom.de Paulo Gaspar
  * @author roxspring@yahoo.com Rob Oxspring
  * @since 1.5
+ *
+ * @ant.task name="mail" category="network"
  */
 public class EmailTask
     extends Task
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
index be9a2d4db..6466eec65 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
@@ -66,6 +66,7 @@ import org.apache.tools.ant.BuildException;
 /**
  * Execute a script
  *
+ * @ant.task name="script"
  * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
  */
 public class Script extends Task {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java
index b6750a01b..06c1f975b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java
@@ -57,6 +57,8 @@ package org.apache.tools.ant.taskdefs.optional.ccm;
 /**
  * Task to perform Checkin Default task command to Continuus
  * @author Benoit Moussaud benoit.moussaud@criltelecom.com
+ *
+ * @ant.task name="ccmchecktask" category="scm"
  */
 public class CCMCheckinDefault extends CCMCheck {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
index 9aa7f7b32..b3edc3d82 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
@@ -70,6 +70,8 @@ import org.apache.tools.ant.types.Commandline;
 /**
  * Task allows to create new ccm task and set it as the default
  * @author Benoit Moussaud benoit.moussaud@criltelecom.com
+ *
+ * @ant.task name="ccmcreatetask" category="scm"
  */
 public class CCMCreateTask extends Continuus implements ExecuteStreamHandler {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
index 16d985ca3..6421569b7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
@@ -132,6 +132,7 @@ History
  @version 0.3
  @author Steve Loughran steve_l@iseran.com
 
+ * @ant.task name="csc" category="dotnet"
  */
 
 public class CSharp
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
index f53135473..ada1f4104 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
@@ -78,6 +78,7 @@ import org.apache.tools.ant.types.Reference;
  * 
  * @author  <a href="mailto:benoit.moussaud@criltelecom.com">Benoit Moussaud</a>
  *
+ * @ant.task name="blgenclient" category="ejb"
  */
 public class BorlandGenerateClient extends Task
 {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
index 380be0f53..8df86f835 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
@@ -120,6 +120,8 @@ import org.apache.tools.ant.BuildException;
  *
  * @see    IPlanetEjbc
  * @author Greg Nelson <a href="mailto:greg@netscape.com">greg@netscape.com</a>
+ *
+ * @ant.task name="iplanet-ejbc" category="ejb"
  */
 public class IPlanetEjbcTask extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
index 04023127d..1a858101d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
@@ -91,6 +91,8 @@ import org.apache.tools.ant.util.StringUtils;
  * is IMHO the simplest way to do it to avoid this file hacking thing.
  *
  * @author <a href="mailto:sbailliez@imediation.com">Stephane Bailliez</a>
+ *
+ * @ant.task name="junitreport" category="testing"
  */
 public class XMLResultAggregator extends Task implements XMLConstants {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
index 966b2bd05..74157c941 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
@@ -112,6 +112,8 @@ import org.apache.tools.ant.Project;
  * @author <A HREF="mailto:stevec@ignitesports.com">Steve Cohen</A>
  * @version 1.0
  * @see <A HREF="http://www.starbase.com/">StarBase Web Site</A>
+ *
+ * @ant.task name="starteam" category="scm"
  */
 public class AntStarTeamCheckOut extends org.apache.tools.ant.Task
 {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
index b38fede81..b15c084ae 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
@@ -74,6 +74,8 @@ import org.apache.tools.ant.types.FileSet;
  * Convenient task to run the snapshot merge utility for JProbe Coverage.
  *
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
+ *
+ * @ant.task name="jpcovmerge" category="metrics"
  */
 public class CovMerge extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
index a977b747c..5b83c93d0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
@@ -81,6 +81,8 @@ import org.apache.tools.ant.types.Path;
  * Convenient task to run the snapshot merge utility for JProbe Coverage 3.0.
  *
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
+ *
+ * @ant.task name="jpcovreport" category="metrics"
  */
 public class CovReport extends Task {
     /*
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
index 06e15a0d9..06e9b8190 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
@@ -83,6 +83,8 @@ import org.apache.tools.ant.types.Path;
  * For additional information, visit <a href="http://www.sitraka.com">www.sitraka.com</a>
  *
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
+ *
+ * @ant.task name="jpcoverage" category="metrics"
  */
 public class Coverage extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
index 1906f333d..f4afc2c47 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
@@ -77,6 +77,8 @@ import org.apache.tools.ant.Project;
  *
  * @author <a href="mailto:scohen@localhost.localdomain">Steve Cohen</a>
  * @version 1.0
+ *
+ * @ant.task name="stcheckin" category="scm" product="Starteam"
  */
 public class StarTeamCheckin extends TreeBasedTask {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
index b46556a1a..1d85b91c9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
@@ -86,6 +86,8 @@ import org.apache.tools.ant.Project;
  * @author <a href="mailto:stevec@ignitesports.com">Steve Cohen</a>
  * @version 1.1
  * @see <A HREF="http://www.starbase.com/">StarBase Web Site</A>
+ *
+ * @ant.task name="stcheckout" category="scm"
  */
 public class StarTeamCheckout extends TreeBasedTask {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
index e418b000d..dc1babf92 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
@@ -81,6 +81,8 @@ import org.apache.tools.ant.BuildException;
  * @author Christopher Charlier, ThoughtWorks, Inc. 2001
  * @author <a href="mailto:jcyip@thoughtworks.com">Jason Yip</a>
  * @see <A HREF="http://www.starbase.com/">StarBase Web Site</A>
+ *
+ * @ant.task name="stlabel" category="scm"
  */
 public class StarTeamLabel extends StarTeamTask {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java
index 8d53491e9..ce6a0f874 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java
@@ -74,6 +74,8 @@ import org.apache.tools.ant.BuildException;
  *
  * @author <a href="mailto:stevec@ignitesports.com">Steve Cohen</a>
  * @version 1.0
+ *
+ * @ant.task name="stlist" category="scm"
  */
 
 public class StarTeamList extends TreeBasedTask {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
index 7a35b4922..5a0b7fa04 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
@@ -64,6 +64,8 @@ import java.io.File;
  * Task to perform CheckIn commands to Microsoft Visual Source Safe.
  *
  * @author Martin Poeschl
+ *
+ * @ant.task name="vsscheckin" category="scm"
  */
 public class MSVSSCHECKIN extends MSVSS {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
index 210388af7..5964c47d4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
@@ -64,6 +64,8 @@ import java.io.File;
  * Task to perform CheckOut commands to Microsoft Visual Source Safe.
  *
  * @author Martin Poeschl
+ *
+ * @ant.task name="vsscheckout" category="scm"
  */
 public class MSVSSCHECKOUT extends MSVSS {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
index b1d866848..78fd09976 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
@@ -126,6 +126,8 @@ import java.io.File;
  *
  * @author Craig Cottingham
  * @author Andrew Everitt
+ *
+ * @ant.task name="vssget" category="scm"
  */
 public class MSVSSGET extends MSVSS {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
index 83a6396c1..224a26fc5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
@@ -69,6 +69,8 @@ import java.text.ParseException;
  *
  * @author Balazs Fejes 2
  * @author Glenn_Twiggs@bmc.com
+ *
+ * @ant.task name="vsshistory" category="scm"
  */
 
 public class MSVSSHISTORY extends MSVSS {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
index 3f88a9731..5b41b7230 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
@@ -108,6 +108,8 @@ import org.apache.tools.ant.types.Commandline;
  * </table>
  *
  * @author Phillip Wells
+ *
+ * @ant.task name="vsslabel" category="scm"
  */
 public class MSVSSLABEL extends MSVSS
 {