diff --git a/build.xml b/build.xml
index a9fb5c618..c4e80073a 100644
--- a/build.xml
+++ b/build.xml
@@ -28,7 +28,7 @@ Authors:
 
 ==================================================================== -->
 <project default="usage" basedir=".">
-    
+
   <!-- Xerces Java directories -->
   <property name="build.dir" value="./build"/>
   <property name="data.dir" value="./data"/>
@@ -179,10 +179,10 @@ Authors:
 
     <copy file="${src.dir}/org/apache/xerces/jaxp/javax.xml.parsers.SAXParserFactory"
       tofile="${build.dest}/META-INF/services/javax.xml.parsers.SAXParserFactory"/>
-    
+
     <copy file="${src.dir}/org/apache/xerces/jaxp/datatype/javax.xml.datatype.DatatypeFactory"
       tofile="${build.dest}/META-INF/services/javax.xml.datatype.DatatypeFactory"/>
-    
+
     <copy file="${src.dir}/org/apache/xerces/jaxp/validation/javax.xml.validation.SchemaFactory"
       tofile="${build.dest}/META-INF/services/javax.xml.validation.SchemaFactory"/>
 
@@ -198,11 +198,11 @@ Authors:
   <!-- Prepares the source code                                            -->
   <!-- =================================================================== -->
   <target name="prepare-src" depends="prepare-common">
-    
-    <!-- Do not include this file in xercesImpl.jar. It prevents applications further down the 
-         classpath from overriding the parser's default and may also cause an incompatible mix 
-         of classes to be loaded leading to a failure such as a NoSuchMethodError. -->
-    <!-- <copy file="${src.dir}/org/apache/xerces/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration"
+  	
+  	<!-- Do not include this file in xercesImpl.jar. It prevents applications further down the 
+  	     classpath from overriding the parser's default and may also cause an incompatible mix 
+  	     of classes to be loaded leading to a failure such as a NoSuchMethodError. -->
+  	<!-- <copy file="${src.dir}/org/apache/xerces/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration"
       tofile="${build.dest}/META-INF/services/org.apache.xerces.xni.parser.XMLParserConfiguration"/> -->
       
     <copy file="${src.dir}/org/apache/xerces/dom/org.w3c.dom.DOMImplementationSourceList"
@@ -220,7 +220,7 @@ Authors:
                        javax.xml.parsers.ConvertToURI.java">
         </fileset>
     </copy>
-    
+
     <!-- create English message bundles from the default ones -->
     <copy file="${src.dir}/org/apache/xerces/impl/msg/DatatypeMessages.properties"
       tofile="${build.src}/org/apache/xerces/impl/msg/DatatypeMessages_en.properties"/>
@@ -494,29 +494,29 @@ Authors:
     <replace token="@xerces.internal" dir="${build.src}">
       <replacevalue><![CDATA[<dl><dt><strong>INTERNAL:</strong></dt><dd>Usage of this class is not supported. It may be altered or removed at any time.</dd></dl>]]></replacevalue>
     </replace>
-    
+
     <replace token="@xerces.experimental" dir="${build.src}">
       <replacevalue><![CDATA[<dl><dt><strong>EXPERIMENTAL:</strong></dt><dd>This class should not be considered stable. It is likely to be altered or replaced in the future.</dd></dl>]]></replacevalue>
     </replace>
   </target>
-    
+
   <!-- =================================================================== -->
   <!-- Creates the API documentation                                       -->
   <!-- =================================================================== -->
-  <target name="javadocs" depends="prepare-src">    
-        
+  <target name="javadocs" depends="prepare-src">	
+
     <condition property="additional.param" value=" -taglet org.apache.xerces.util.ExperimentalTaglet -taglet org.apache.xerces.util.InternalTaglet -tagletpath ${tools.dir}/bin/xerces2taglets.jar">
       <available classname="com.sun.tools.doclets.Taglet"/>
     </condition>
-    
+
     <antcall target="javadoc-replace" />
-    
+
     <condition property="additional.param" value="">
       <not>
         <available classname="com.sun.tools.doclets.Taglet"/>
       </not>
     </condition>
-    
+
     <mkdir dir='${build.dir}/docs/javadocs/api'/>
     <javadoc packagenames='javax.xml.*,org.w3c.*,org.xml.*'
       locale='en_US'
@@ -525,7 +525,11 @@ Authors:
       windowtitle='XML Standard API' doctitle='XML Standard API'
       bottom='${copyright}'
       additionalparam='-quiet ${additional.param}'
-      />
+      failonerror='no'
+      failonwarning='no'
+      >
+        <arg value="-Xdoclint:none"/>
+    </javadoc>
     <mkdir dir='${build.dir}/docs/javadocs/xni'/>
     <javadoc packagenames='org.apache.xerces.xni.*'
       locale='en_US'
@@ -535,7 +539,11 @@ Authors:
       doctitle='Xerces Native Interface'
       bottom='${copyright}'
       additionalparam='-quiet ${additional.param}'
-      />
+      failonerror='yes'
+      failonwarning='yes'
+      >
+        <arg value="-Xdoclint:html,accessibility"/>
+    </javadoc>
     <mkdir dir='${build.dir}/docs/javadocs/xs'/>
     <javadoc packagenames='org.apache.xerces.xs, org.apache.xerces.xs.datatypes'
       locale='en_US'
@@ -545,7 +553,11 @@ Authors:
       doctitle='XML Schema API'
       bottom='${copyright}'
       additionalparam='-quiet ${additional.param}'
-      />
+      failonerror='yes'
+      failonwarning='yes'
+      >
+        <arg value="-Xdoclint:html,accessibility"/>
+    </javadoc>
     
     <mkdir dir='${build.dir}/docs/javadocs/xerces2'/>
     <javadoc packagenames='org.apache.xerces.dom.*,
@@ -564,7 +576,11 @@ Authors:
       doctitle='Xerces2 Implementation'
       bottom='${copyright}'
       additionalparam='-quiet ${additional.param}'
-      />
+      failonerror='no'
+      failonwarning='no'
+      >
+        <arg value="-Xdoclint:html"/>
+    </javadoc>
     <mkdir dir='${build.dir}/docs/javadocs/other'/>
     <javadoc packagenames='org.apache.html.*,
                            org.apache.wml.*,
@@ -575,7 +591,11 @@ Authors:
       windowtitle='Other Classes' doctitle='Other Classes'
       bottom='${copyright}'
       additionalparam='-quiet ${additional.param}'
-      />
+      failonerror='yes'
+      failonwarning='yes'
+      >
+        <arg value="-Xdoclint:html"/>
+    </javadoc>
   </target>
 
   <!-- =================================================================== -->
@@ -1075,7 +1095,7 @@ Authors:
       
     <copy file="${src.dir}/org/apache/xerces/dom/org.apache.xerces.dom.DOMImplementationSourceImpl"
       tofile="${build.dest}/META-INF/services/org.w3c.dom.DOMImplementationSourceList"/>
-    
+
     <!-- delete META-INF/services files for DatatypeFactory/SchemaFactory 
          since no implementation is provided in this jar -->
     <delete file="${build.dest}/META-INF/services/javax.xml.datatype.DatatypeFactory"/>
@@ -1203,7 +1223,7 @@ Authors:
              token="return ((XSComplexTypeDecl) type).isDOMDerivedFrom(" value="return false;"/>
     <replace file="${build.dir}/src/org/apache/xerces/dom/ElementNSImpl.java" 
              token="typeNamespaceArg, typeNameArg, derivationMethod);" value=""/>
-    
+
     <!-- HACK: Remove references to schema DOM from DOMUtil -->
     <replace file="${build.dir}/src/org/apache/xerces/util/DOMUtil.java" 
              token="import org.apache.xerces.impl.xs.opti.ElementImpl;" value=""/>
@@ -1221,7 +1241,7 @@ Authors:
              token="((org.apache.xerces.impl.xs.opti.NodeImpl)node).setReadOnly(false, false);" value="return;"/>
     <replace file="${build.dir}/src/org/apache/xerces/util/DOMUtil.java" 
              token="return ((org.apache.xerces.impl.xs.opti.NodeImpl)node).getReadOnly();" value="return false;"/>
-    
+
     <!-- HACK: Remove references to schema validation support from org.apache.xerces.jaxp -->
     <replace file="${build.dir}/src/org/apache/xerces/jaxp/SAXParserImpl.java" 
              token="import org.apache.xerces.impl.xs.XMLSchemaValidator;" value=""/>
@@ -1247,7 +1267,7 @@ Authors:
              token="(XSGrammarPoolContainer) grammar, fSchemaValidationManager);" value=""/>
     <replace file="${build.dir}/src/org/apache/xerces/jaxp/SAXParserImpl.java" 
              token="fSAXParser.fUnparsedEntityHandler.reset();" value=""/>
-    
+
     <replace file="${build.dir}/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java" 
              token="import org.apache.xerces.impl.xs.XMLSchemaValidator;" value=""/>
     <replace file="${build.dir}/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java" 
@@ -1272,7 +1292,7 @@ Authors:
              token="(XSGrammarPoolContainer) grammar, fSchemaValidationManager);" value=""/>
     <replace file="${build.dir}/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java" 
              token="fUnparsedEntityHandler.reset();" value=""/>
-    
+
     <replace file="${build.dir}/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java" 
              token="return grammar;" value="throw new UnsupportedOperationException();"/>
     <replace file="${build.dir}/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java" 
@@ -1552,7 +1572,7 @@ Authors:
       </manifest>
       <metainf dir="." includes="LICENSE,NOTICE"/>
     </jar>
-  </target> 
+  </target>
 
   <!-- =================================================================== -->
   <!-- Builds xercesImpl, xml-apis and sample jars with Schema 1.1 support -->
@@ -1572,10 +1592,10 @@ Authors:
   <target name="xjavac-jar" depends="prepare">
     <mkdir dir="${build.src}"/>
     <mkdir dir="${build.dest}"/>
-    
+
     <copy file="${tools.dir}/src/XJavac.java"
           tofile="${build.src}/org/apache/xerces/util/XJavac.java"/>
-    
+
     <javac srcdir="${build.src}"
            destdir="${build.dest}"
            source="${javac.source}"
@@ -1587,7 +1607,7 @@ Authors:
            optimize="${optimize}"
            includeAntRuntime="false"
            includeJavaRuntime="false"/>
-    
+
     <jar jarfile="${build.dir}/${jar.xjavac}"
          basedir="${build.dest}"
          compress="true"
diff --git a/src/org/apache/xerces/impl/xpath/regex/REUtil.java b/src/org/apache/xerces/impl/xpath/regex/REUtil.java
index f8a594412..eecbd6cf3 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: <code>org.apache.xerces.utils.regex.REUtil &lt;regex&gt; &lt;string&gt;</code></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>
diff --git a/src/org/apache/xerces/xs/datatypes/package.html b/src/org/apache/xerces/xs/datatypes/package.html
index c866494cb..5fcf2e4cf 100644
--- a/src/org/apache/xerces/xs/datatypes/package.html
+++ b/src/org/apache/xerces/xs/datatypes/package.html
@@ -27,6 +27,7 @@
 <BR>
 <BR>
 <TABLE border="1">
+    <caption>Mappings between XML Schema Data Type and applicable interfaces</caption>
 	<TBODY>
 		<TR>
 			<TD style="width: 332px; text-align: center;">XML Schema Data Type</TD>
@@ -225,6 +226,7 @@
 <P><BR>
 </P>
 <TABLE border="1">
+    <caption>Mappings between XML Schema Data Type and applicable method in XSDateTime*</caption>
 	<TBODY>
 		<TR>
 			<TD style="width: 308px; text-align: center;">XML Schema Data Type</TD>