diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 7b052d882..326793391 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -1214,8 +1214,8 @@ public class Project {
     }
 
     /**
-     * Executes a <CODE>Vector</CODE> of sorted targets.
-     * @param sortedTargets   the aforementioned <CODE>Vector</CODE>.
+     * Executes a <code>Vector</code> of sorted targets.
+     * @param sortedTargets   the aforementioned <code>Vector</code>.
      */
     public void executeSortedTargets(Vector sortedTargets)
         throws BuildException {
@@ -1580,7 +1580,7 @@ public class Project {
 
     /**
      * Topologically sorts a set of targets.  Equivalent to calling
-     * <CODE>topoSort(new String[] {root}, targets, true)</CODE>.
+     * <code>topoSort(new String[] {root}, targets, true)</code>.
      *
      * @param root The name of the root target. The sort is created in such
      *             a way that the sequence of Targets up to the root
@@ -1599,7 +1599,7 @@ public class Project {
 
     /**
      * Topologically sorts a set of targets.  Equivalent to calling
-     * <CODE>topoSort(new String[] {root}, targets, returnAll)</CODE>.
+     * <code>topoSort(new String[] {root}, targets, returnAll)</code>.
      *
      * @param root The name of the root target. The sort is created in such
      *             a way that the sequence of Targets up to the root
@@ -1607,7 +1607,7 @@ public class Project {
      *             Must not be <code>null</code>.
      * @param targets A Hashtable mapping names to Targets.
      *                Must not be <code>null</code>.
-     * @param returnAll <CODE>boolean</CODE> indicating whether to return all
+     * @param returnAll <code>boolean</code> indicating whether to return all
      *                  targets, or the execution sequence only.
      * @return a Vector of Target objects in sorted order.
      * @exception BuildException if there is a cyclic dependency among the
@@ -1622,14 +1622,14 @@ public class Project {
     /**
      * Topologically sorts a set of targets.
      *
-     * @param root <CODE>String[]</CODE> containing the names of the root targets.
+     * @param root <code>String[]</code> containing the names of the root targets.
      *             The sort is created in such a way that the ordered sequence of
      *             Targets is the minimum possible such sequence to the specified
      *             root targets.
      *             Must not be <code>null</code>.
      * @param targets A map of names to targets (String to Target).
      *                Must not be <code>null</code>.
-     * @param returnAll <CODE>boolean</CODE> indicating whether to return all
+     * @param returnAll <code>boolean</code> indicating whether to return all
      *                  targets, or the execution sequence only.
      * @return a Vector of Target objects in sorted order.
      * @exception BuildException if there is a cyclic dependency among the