diff --git a/src/org/apache/xerces/impl/xpath/regex/REUtil.java b/src/org/apache/xerces/impl/xpath/regex/REUtil.java
index f8a594412..d0569092c 100644
--- a/src/org/apache/xerces/impl/xpath/regex/REUtil.java
+++ b/src/org/apache/xerces/impl/xpath/regex/REUtil.java
@@ -218,7 +218,7 @@ else if (next == '^' && offset + 1 < len) {
 
     /**
      * Sample entry.
-     * <div>Usage: <KBD>org.apache.xerces.utils.regex.REUtil &lt;regex&gt; &lt;string&gt;</KBD></div>
+     * <p>Usage: <samp>org.apache.xerces.utils.regex.REUtil &lt;regex&gt; &lt;string&gt;</samp></p>
      */
     public static void main(String[] argv) {
         String pattern = null;
diff --git a/src/org/apache/xerces/impl/xs/models/XSCMValidator.java b/src/org/apache/xerces/impl/xs/models/XSCMValidator.java
index 9597aca33..a2fe4fe7c 100644
--- a/src/org/apache/xerces/impl/xs/models/XSCMValidator.java
+++ b/src/org/apache/xerces/impl/xs/models/XSCMValidator.java
@@ -54,8 +54,9 @@ public interface XSCMValidator {
     /**
      * The method corresponds to one transaction in the content model.
      *
-     * @param elementName
-     * @param state  Current state
+     * @param elementName the element's qualified name
+     * @param state current state of the content model
+     * @param subGroupHandler the substitution group handler
      * @return element decl or wildcard decl that
      *         corresponds to the element from the Schema grammar
      */
@@ -94,14 +95,13 @@ public interface XSCMValidator {
      * or <code>null</code> if no occurrence counting was being performed at the
      * current state.</p>
      * 
-     * <p>If an array is returned it will have a length == 4 and will contain:
-     *  <ul>
-     *   <li>a[0] :: min occurs</li>
-     *   <li>a[1] :: max occurs</li>
-     *   <li>a[2] :: current value of the counter</li>
-     *   <li>a[3] :: identifier for the repeating term</li>
-     *  </ul>
-     * </p>
+     * <p>If an array is returned it will have a length == 4 and will contain:</p>
+     * <ul>
+     *  <li>a[0] :: min occurs</li>
+     *  <li>a[1] :: max occurs</li>
+     *  <li>a[2] :: current value of the counter</li>
+     *  <li>a[3] :: identifier for the repeating term</li>
+     * </ul>
      * 
      * @param state the current state
      * @return an array containing information about the current repeating term
diff --git a/src/org/apache/xerces/xs/datatypes/XSDateTime.java b/src/org/apache/xerces/xs/datatypes/XSDateTime.java
index 147fbf1ce..c1e35f6e5 100644
--- a/src/org/apache/xerces/xs/datatypes/XSDateTime.java
+++ b/src/org/apache/xerces/xs/datatypes/XSDateTime.java
@@ -24,8 +24,9 @@
  * table shows the methods defined for various XML Schema 1.0 built-in types. 'X' 
  * marks whether a particular method is defined for a particular type. Accessing undefined
  * methods may return unexpected values.
- * 
+ *
  * <table border="1">
+ * <caption>Mappings between XML Schema 1.0 date-time related types and their supported accessors</caption>
  * <tr>
  * <td> XML Schema Datatype </td>
  * <td> getYears() </td>