diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index f5731132e..a32eeb671 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -622,7 +622,10 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
         }
     }
 
-    /** {@inheritDoc}. */
+    /**
+     * Add a formatter.
+     * @param f the formatter to add.
+     */
     public void addFormatter(JUnitResultFormatter f) {
         formatters.addElement(f);
     }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java
index 66ad97f74..367482a2f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java
@@ -20,10 +20,46 @@ package org.apache.tools.ant.taskdefs.optional.junit;
 /**
  * <p> Interface groups XML constants.
  * Interface that groups all constants used throughout the <tt>XML</tt>
- * documents that are generated by the <tt>XMLJUnitResultFormatter</tt>
+ * documents that are generated by the <tt>XMLJUnitResultFormatter</tt>.
+ * <p>
  * As of now the DTD is:
  * <code><pre>
- * <----------------- @todo describe DTDs ---------------------->
+ * &lt;!ELEMENT testsuites (testsuite*)&gt;
+ *
+ * &lt;!ELEMENT testsuite (properties, testcase*,
+ *                    failure?, error?,
+ *                     system-out?, system-err?)&gt;
+ * &lt;!ATTLIST testsuite name      CDATA #REQUIRED&gt;
+ * &lt;!ATTLIST testsuite tests     CDATA #REQUIRED&gt;
+ * &lt;!ATTLIST testsuite failures  CDATA #REQUIRED&gt;
+ * &lt;!ATTLIST testsuite errors    CDATA #REQUIRED&gt;
+ * &lt;!ATTLIST testsuite time      CDATA #REQUIRED&gt;
+ * &lt;!ATTLIST testsuite package   CDATA #IMPLIED&gt;
+ * &lt;!ATTLIST testsuite id        CDATA #IMPLIED&gt;
+ *
+ *
+ * &lt;!ELEMENT properties (property*)&gt;
+ *
+ * &lt;!ELEMENT property EMPTY&gt;
+ *   &lt;!ATTLIST property name  CDATA #REQUIRED&gt;
+ *   &lt;!ATTLIST property value CDATA #REQUIRED&gt;
+ *
+ * &lt;!ELEMENT testcase (failure?, error?)&gt;
+ *   &lt;!ATTLIST testcase name       CDATA #REQUIRED&gt;
+ *   &lt;!ATTLIST testcase classname  CDATA #IMPLIED&gt;
+ *   &lt;!ATTLIST testcase time       CDATA #REQUIRED&gt;
+ *
+ * &lt;!ELEMENT failure (#PCDATA)&gt;
+ *  &lt;!ATTLIST failure message CDATA #IMPLIED&gt;
+ *  &lt;!ATTLIST failure type    CDATA #REQUIRED&gt;
+ *
+ * &lt;!ELEMENT error (#PCDATA)&gt;
+ *   &lt;!ATTLIST error message CDATA #IMPLIED&gt;
+ *   &lt;!ATTLIST error type    CDATA #REQUIRED&gt;
+ *
+ * &lt;!ELEMENT system-err (#PCDATA)&gt;
+ *
+ * &lt;!ELEMENT system-out (#PCDATA)&gt;
  *
  * </pre></code>
  * @see XMLJUnitResultFormatter