diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
index d200dc939..db05acabb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -522,7 +522,7 @@ public class PropertyFile extends Task
         
         /**
          * Check if parameter combinations can be supported
-         * To-do: make sure the 'unit' attribute is only specified on date
+         * @todo make sure the 'unit' attribute is only specified on date
          *      fields
          */
         private void checkParameters() throws BuildException {
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 24e3172d7..04023127d 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
@@ -307,7 +307,7 @@ public class XMLResultAggregator extends Task implements XMLConstants {
     /**
      * Create a new document builder. Will issue an <tt>ExceptionInitializerError</tt>
      * if something is going wrong. It is fatal anyway.
-     * To-do: factorize this somewhere else. It is duplicated code.
+     * @todo factorize this somewhere else. It is duplicated code.
      * @return a new document builder to create a DOM
      */
     private static DocumentBuilder getDocumentBuilder() {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java
index 40c52387e..90224e151 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java
@@ -63,7 +63,7 @@ import org.apache.xalan.xslt.XSLTResultTarget;
 /**
  * Xalan 1 executor. It will need a lot of things in the classpath:
  * xerces for the serialization, xalan and bsf for the extension.
- * To-do: do everything via reflection to avoid compile problems ?
+ * @todo do everything via reflection to avoid compile problems ?
  */
 public class Xalan1Executor extends XalanExecutor {
     void execute() throws Exception {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
index 79b3d9726..981d00565 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
@@ -235,7 +235,7 @@ final class NullLoader implements ClassPathLoader.FileLoader {
 
 /**
  * jar loader specified in looking for classes in jar and zip
- * To-do: read the jar manifest in case there is a Class-Path
+ * @todo read the jar manifest in case there is a Class-Path
  * entry.
  */
 final class JarLoader implements ClassPathLoader.FileLoader {
@@ -270,7 +270,7 @@ final class JarLoader implements ClassPathLoader.FileLoader {
 
 /**
  * directory loader that will look all classes recursively
- * To-do: should discard classes which package name does not
+ * @todo should discard classes which package name does not
  * match the directory ?
  */
 final class DirectoryLoader implements ClassPathLoader.FileLoader {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java
index 94c9fdcfa..147c77a59 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java
@@ -61,7 +61,7 @@ import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.Attrib
 
 /**
  * Method info structure.
- * To-do: give a more appropriate name to methods.
+ * @todo give a more appropriate name to methods.
  *
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
  */