This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xerces-j.git


The following commit(s) were added to refs/heads/main by this push:
     new 7b096eda8 [XERCESJ-1781] Javadoc fixes (#44)
7b096eda8 is described below

commit 7b096eda8241fc7c1f5c48060e307c05ca20ffb8
Author: Samael <[email protected]>
AuthorDate: Mon Nov 10 00:15:57 2025 +0000

    [XERCESJ-1781] Javadoc fixes (#44)
    
    * [XERCESJ-1781] Javadoc fixes
    
    [XERCESJ-1781] Javadoc fixes
    
    [XERCESJ-1781] Javadoc fixes
    
    * [XERCESJ-1781] Javadoc fixes
    
    * [XERCESJ-1781] Javadoc fixes
    
    * [XERCESJ-1781] Javadoc fixes
    
    * [XERCESJ-1781] Javadoc fixes
    
    * [XERCESJ-1781] Javadoc fixes
    
    * [XERCESJ-1781] Javadoc fix: use text-align instead instead of attribute
    
    * [XERCESJ-1781] Javadoc fix: use width style instead instead of attribute
    
    * [XERCESJ-1781] Javadoc fix
    
    * [XERCESJ-1781] Javadoc fix for PR review
    
    * [XERCESJ-1781] Javadoc fix for PR review
---
 src/org/apache/xerces/dom/AttrImpl.java            |   2 +-
 src/org/apache/xerces/dom/AttrNSImpl.java          |  47 ++--
 src/org/apache/xerces/dom/AttributeMap.java        |   4 +-
 src/org/apache/xerces/dom/CoreDocumentImpl.java    |   2 +-
 src/org/apache/xerces/dom/DOMNormalizer.java       |   7 +-
 src/org/apache/xerces/dom/DeferredEntityImpl.java  |  10 +-
 .../xerces/dom/DeferredEntityReferenceImpl.java    |   6 +-
 src/org/apache/xerces/dom/DocumentTypeImpl.java    |   1 -
 src/org/apache/xerces/dom/ElementImpl.java         |  16 +-
 src/org/apache/xerces/dom/ElementNSImpl.java       |  26 +--
 src/org/apache/xerces/dom/EntityImpl.java          |  10 +-
 src/org/apache/xerces/dom/EntityReferenceImpl.java |   6 +-
 src/org/apache/xerces/dom/NamedNodeMapImpl.java    |   2 +-
 .../apache/xerces/dom/NodeEqualityWithQname.java   |   2 +-
 src/org/apache/xerces/dom/NodeImpl.java            |  24 +-
 src/org/apache/xerces/dom/PSVIAttrNSImpl.java      |   4 +-
 src/org/apache/xerces/dom/PSVIElementNSImpl.java   |   8 +-
 src/org/apache/xerces/dom/TextImpl.java            |  15 +-
 .../apache/xerces/dom/XPathCollationSupport.java   |   2 +-
 .../xerces/impl/XML11DocumentScannerImpl.java      |  22 +-
 .../xerces/impl/XML11NSDocumentScannerImpl.java    |  17 +-
 src/org/apache/xerces/impl/XMLDTDScannerImpl.java  |  37 +--
 .../impl/XMLDocumentFragmentScannerImpl.java       |  61 ++---
 src/org/apache/xerces/impl/XMLEntityScanner.java   |   8 +-
 .../xerces/impl/XMLNSDocumentScannerImpl.java      |  26 +--
 src/org/apache/xerces/impl/XMLScanner.java         |  38 +--
 .../impl/dv/dtd/ENTITYDatatypeValidator.java       |   8 +-
 .../xerces/impl/dv/dtd/IDDatatypeValidator.java    |   8 +-
 .../xerces/impl/dv/dtd/IDREFDatatypeValidator.java |   8 +-
 .../xerces/impl/dv/dtd/ListDatatypeValidator.java  |   8 +-
 .../impl/dv/dtd/NMTOKENDatatypeValidator.java      |   8 +-
 .../impl/dv/dtd/NOTATIONDatatypeValidator.java     |   8 +-
 .../impl/dv/dtd/StringDatatypeValidator.java       |   8 +-
 .../impl/dv/dtd/XML11IDDatatypeValidator.java      |   8 +-
 .../impl/dv/dtd/XML11IDREFDatatypeValidator.java   |   8 +-
 .../impl/dv/dtd/XML11NMTOKENDatatypeValidator.java |   8 +-
 src/org/apache/xerces/impl/dv/xs/DateDV.java       |   2 +-
 src/org/apache/xerces/impl/dv/xs/DayDV.java        |   2 +-
 .../apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java |   4 +-
 .../apache/xerces/impl/xpath/regex/BMPattern.java  |   7 +-
 .../apache/xerces/impl/xs/AttributePSVImpl.java    |   4 +-
 src/org/apache/xerces/impl/xs/ElementPSVImpl.java  |   8 +-
 .../xerces/impl/xs/SchemaNamespaceSupport.java     |  14 +-
 .../apache/xerces/impl/xs/XSComplexTypeDecl.java   |   2 +-
 .../xerces/impl/xs/models/CMNodeFactory.java       |  13 +-
 src/org/apache/xerces/impl/xs/opti/AttrImpl.java   |   4 +-
 .../xerces/impl/xs/traversers/XSDHandler.java      |  12 +-
 .../xerces/jaxp/DocumentBuilderFactoryImpl.java    |   2 +-
 .../apache/xerces/jaxp/SAXParserFactoryImpl.java   |   2 +-
 .../xerces/jaxp/datatype/DatatypeFactoryImpl.java  |  28 +--
 .../jaxp/datatype/XMLGregorianCalendarImpl.java    |  54 ++---
 .../parsers/SecureProcessingConfiguration.java     |  16 +-
 .../SoftReferenceSymbolTableConfiguration.java     |  12 +-
 .../parsers/XIncludeAwareParserConfiguration.java  |  14 +-
 .../parsers/XMLGrammarCachingConfiguration.java    |   4 +-
 .../parsers/XPointerParserConfiguration.java       |  12 +-
 .../apache/xerces/stax/events/CharactersImpl.java  |  10 +-
 .../xerces/stax/events/EntityDeclarationImpl.java  |  10 +-
 .../apache/xerces/stax/events/NamespaceImpl.java   |   7 +-
 .../stax/events/NotationDeclarationImpl.java       |  12 +-
 .../xerces/stax/events/StartElementImpl.java       |   9 +-
 src/org/apache/xerces/util/AugmentationsImpl.java  |   1 -
 src/org/apache/xerces/util/SymbolTable.java        |   3 +-
 .../apache/xerces/xinclude/XIncludeHandler.java    |   3 +-
 .../xerces/xni/XMLDTDContentModelHandler.java      |  42 ++--
 src/org/apache/xerces/xs/datatypes/package.html    | 254 ++++++++++-----------
 tests/idc/AllTests.java                            |   2 +-
 tests/idc/IDConstraintTests.java                   |   2 +-
 tests/util/FailureMesgFragments.java               |   2 +-
 tests/util/XercesAbstractTestCase.java             |   2 +-
 70 files changed, 500 insertions(+), 558 deletions(-)

diff --git a/src/org/apache/xerces/dom/AttrImpl.java 
b/src/org/apache/xerces/dom/AttrImpl.java
index ca4d42315..55ccc6364 100644
--- a/src/org/apache/xerces/dom/AttrImpl.java
+++ b/src/org/apache/xerces/dom/AttrImpl.java
@@ -1092,7 +1092,7 @@ public class AttrImpl
      * @param derivationMethod
      *        The derivation method
      * 
-     * @return boolean True if the type is derived by restriciton for the
+     * @return boolean True if the type is derived by restriction for the
      *         reference type
      */
     public boolean isDerivedFrom(String typeNamespaceArg, 
diff --git a/src/org/apache/xerces/dom/AttrNSImpl.java 
b/src/org/apache/xerces/dom/AttrNSImpl.java
index 782795ed5..ce913a9ac 100644
--- a/src/org/apache/xerces/dom/AttrNSImpl.java
+++ b/src/org/apache/xerces/dom/AttrNSImpl.java
@@ -173,12 +173,10 @@ public class AttrNSImpl
     }
     
     /** 
-     * Introduced in DOM Level 2. <p>
-     *
-     * The namespace prefix of this node, or null if it is unspecified. <p>
-     *
-     * For nodes created with a DOM Level 1 method, such as createElement
-     * from the Document interface, this is null. <p>
+     * Introduced in DOM Level 2.
+     * <p>The namespace prefix of this node, or null if it is unspecified.</p>
+     * <p>For nodes created with a DOM Level 1 method, such as createElement
+     * from the Document interface, this is null. </p>
      *
      * @since WD-DOM-Level-2-19990923
      */
@@ -192,18 +190,17 @@ public class AttrNSImpl
     }
     
     /**
-     * Introduced in DOM Level 2. <p>
-     * 
-     * Note that setting this attribute changes the nodeName attribute, which
+     * Introduced in DOM Level 2.
+     * <p>Note that setting this attribute changes the nodeName attribute, 
which
      * holds the qualified name, as well as the tagName and name attributes of
-     * the Element and Attr interfaces, when applicable.<p>
+     * the Element and Attr interfaces, when applicable.</p>
      * 
      * @param prefix The namespace prefix of this node, or null(empty string) 
if it is unspecified.
      *
-     * @exception INVALID_CHARACTER_ERR
+     * @throws DOMException INVALID_CHARACTER_ERR
      *                   Raised if the specified
      *                   prefix contains an invalid character.
-     * @exception DOMException
+     *
      * @since WD-DOM-Level-2-19990923
      */
     public void setPrefix(String prefix)
@@ -255,9 +252,9 @@ public class AttrNSImpl
     }
                                         
     /** 
-     * Introduced in DOM Level 2. <p>
+     * Introduced in DOM Level 2.
+     * <p>Returns the local part of the qualified name of this node.</p>
      *
-     * Returns the local part of the qualified name of this node.
      * @since WD-DOM-Level-2-19990923
      */
     public String getLocalName()
@@ -283,19 +280,15 @@ public class AttrNSImpl
     }
 
     /**
-     * Introduced in DOM Level 3. <p>
-     * Checks if a type is derived from another by restriction. See:
-     * http://www.w3.org/TR/DOM-Level-3-Core/core.html#TypeInfo-isDerivedFrom
-     * 
-     * @param typeNamespaceArg 
-     *        The namespace of the ancestor type declaration
-     * @param typeNameArg
-     *        The name of the ancestor type declaration
-     * @param derivationMethod
-     *        The derivation method
-     * 
-     * @return boolean True if the type is derived by restriciton for the
-     *         reference type
+     * Introduced in DOM Level 3.
+     * <p>Checks if a type is derived from another by restriction. See:
+     * <a 
href="http://www.w3.org/TR/DOM-Level-3-Core/core.html#TypeInfo-isDerivedFrom";>http://www.w3.org/TR/DOM-Level-3-Core/core.html#TypeInfo-isDerivedFrom</a>
+     *
+     * @param typeNamespaceArg the namespace of the ancestor type declaration
+     * @param typeNameArg the name of the ancestor type declaration
+     * @param derivationMethod the derivation method
+     *
+     * @return boolean true if the type is derived by restriction for the 
reference type
      */
     public boolean isDerivedFrom(String typeNamespaceArg, 
                                  String typeNameArg, 
diff --git a/src/org/apache/xerces/dom/AttributeMap.java 
b/src/org/apache/xerces/dom/AttributeMap.java
index 136bf603b..443613362 100644
--- a/src/org/apache/xerces/dom/AttributeMap.java
+++ b/src/org/apache/xerces/dom/AttributeMap.java
@@ -219,7 +219,7 @@ public class AttributeMap extends NamedNodeMapImpl {
      *      as well as the corresponding namespace URI, local name,
      *      and prefix when applicable.
      * @return The node removed from the map if a node with such a name exists.
-     * @throws              NOT_FOUND_ERR: Raised if there is no node named
+     * @throws              DOMException NOT_FOUND_ERR: Raised if there is no 
node named
      *                      name in the map.
      */
     /***/
@@ -365,7 +365,7 @@ public class AttributeMap extends NamedNodeMapImpl {
      *                      containing the default value.
      * @return Node         The node removed from the map if a node with such
      *                      a local name and namespace URI exists.
-     * @throws              NOT_FOUND_ERR: Raised if there is no node named
+     * @throws              DOMException NOT_FOUND_ERR: Raised if there is no 
node named
      *                      name in the map.
      */
     public Node removeNamedItemNS(String namespaceURI, String name)
diff --git a/src/org/apache/xerces/dom/CoreDocumentImpl.java 
b/src/org/apache/xerces/dom/CoreDocumentImpl.java
index 69b908df0..f377905d1 100644
--- a/src/org/apache/xerces/dom/CoreDocumentImpl.java
+++ b/src/org/apache/xerces/dom/CoreDocumentImpl.java
@@ -2129,7 +2129,7 @@ extends ParentNode implements Document  {
      * @param localpart  The local name of the attribute to instantiate.
      *
      * @return Element A new Element object with the following attributes:
-     * @exception DOMException INVALID_CHARACTER_ERR: Raised if the specified
+     * @throws DOMException INVALID_CHARACTER_ERR: Raised if the specified
      *                   name contains an invalid character.
      */
     public Element createElementNS(String namespaceURI, String qualifiedName,
diff --git a/src/org/apache/xerces/dom/DOMNormalizer.java 
b/src/org/apache/xerces/dom/DOMNormalizer.java
index 300919bba..ab48a579b 100644
--- a/src/org/apache/xerces/dom/DOMNormalizer.java
+++ b/src/org/apache/xerces/dom/DOMNormalizer.java
@@ -1048,11 +1048,10 @@ public class DOMNormalizer implements 
XMLDocumentHandler {
      * attribute with the given prefix and value for URI.
      * In case prefix is empty will add/update default namespace declaration.
      * 
-     * @param prefix
-     * @param uri
-     * @exception IOException
+     * @param prefix the text to use as a namespace
+     * @param uri the URI that is being namespaced
+     * @param element the element that is having the namespace attribute 
applied
      */
-
     protected final void addNamespaceDecl(String prefix, String uri, 
ElementImpl element){
         if (DEBUG) {
             System.out.println("[ns-fixup] addNamespaceDecl ["+prefix+"]");
diff --git a/src/org/apache/xerces/dom/DeferredEntityImpl.java 
b/src/org/apache/xerces/dom/DeferredEntityImpl.java
index cf1325cfe..87e4b099c 100644
--- a/src/org/apache/xerces/dom/DeferredEntityImpl.java
+++ b/src/org/apache/xerces/dom/DeferredEntityImpl.java
@@ -34,17 +34,17 @@ package org.apache.xerces.dom;
  * the structure model is passed to the DOM; in this case, there will
  * be no EntityReferences in the DOM tree.
  * </p>
- * <p>
- * Quoting the 10/01 DOM Proposal,
- * <BLOCKQUOTE>
+ * <p>Quoting the 10/01 DOM Proposal,</p>
+ * <blockquote>
  * "The DOM Level 1 does not support editing Entity nodes; if a user
  * wants to make changes to the contents of an Entity, every related
  * EntityReference node has to be replaced in the structure model by
  * a clone of the Entity's contents, and then the desired changes
  * must be made to each of those clones instead. All the
  * descendants of an Entity node are readonly."
- * </BLOCKQUOTE>
- * I'm interpreting this as: It is the parser's responsibilty to call
+ * </blockquote>
+ * <p>
+ * I'm interpreting this as: It is the parser's responsibility to call
  * the non-DOM operation setReadOnly(true,true) after it constructs
  * the Entity. Since the DOM explicitly decided not to deal with this,
  * _any_ answer will involve a non-DOM operation, and this is the
diff --git a/src/org/apache/xerces/dom/DeferredEntityReferenceImpl.java 
b/src/org/apache/xerces/dom/DeferredEntityReferenceImpl.java
index cf861a39c..1ca93a8d3 100644
--- a/src/org/apache/xerces/dom/DeferredEntityReferenceImpl.java
+++ b/src/org/apache/xerces/dom/DeferredEntityReferenceImpl.java
@@ -18,7 +18,7 @@
 package org.apache.xerces.dom;
 
 /**
- * EntityReference models the XML &entityname; syntax, when used for
+ * EntityReference models the XML <code>&entityname;</code> syntax, when used 
for
  * entities defined by the DOM. Entities hardcoded into XML, such as
  * character entities, should instead have been translated into text
  * by the code which generated the DOM tree.
@@ -38,7 +38,7 @@ package org.apache.xerces.dom;
  * EntityReference behaves as a read-only node, and the children of 
  * the EntityReference (which reflect those of the Entity, and should
  * also be read-only) give its replacement value, if any. They are 
- * supposed to automagically stay in synch if the DocumentType is 
+ * supposed to automagically stay in sync if the DocumentType is
  * updated with new values for the Entity.
  * </p>
  * <p>
@@ -55,7 +55,7 @@ package org.apache.xerces.dom;
  * For now I have decided, since REC-DOM-Level-1-19980818 doesn't
  * cover this in much detail, that synchronization doesn't have to be
  * considered while the user is deep in the tree. That is, if you're
- * looking within one of the EntityReferennce's children and the Entity
+ * looking within one of the EntityReference's children and the Entity
  * changes, you won't be informed; instead, you will continue to access
  * the same object -- which may or may not still be part of the tree.
  * This is the same behavior that obtains elsewhere in the DOM if the
diff --git a/src/org/apache/xerces/dom/DocumentTypeImpl.java 
b/src/org/apache/xerces/dom/DocumentTypeImpl.java
index 006ef6b54..adb968025 100644
--- a/src/org/apache/xerces/dom/DocumentTypeImpl.java
+++ b/src/org/apache/xerces/dom/DocumentTypeImpl.java
@@ -372,7 +372,6 @@ public class DocumentTypeImpl
     /**
      * Access the collection of general Entities, both external and
      * internal, defined in the DTD. For example, in:
-     * <p>
      * <pre>
      *   &lt;!doctype example SYSTEM "ex.dtd" [
      *     &lt;!ENTITY foo "foo"&gt;
diff --git a/src/org/apache/xerces/dom/ElementImpl.java 
b/src/org/apache/xerces/dom/ElementImpl.java
index 63fb91ed9..5c26a9deb 100644
--- a/src/org/apache/xerces/dom/ElementImpl.java
+++ b/src/org/apache/xerces/dom/ElementImpl.java
@@ -643,13 +643,13 @@ public class ElementImpl
      * @param namespaceURI      the namespace URI of the attribute to create 
or alter
      * @param qualifiedName     the qualified name of the attribute to create 
or alter
      * @param value             the value to set in string form
-     * @throws                  INVALID_CHARACTER_ERR: Raised if the specified
+     * @throws                  DOMException INVALID_CHARACTER_ERR: Raised if 
the specified
      *                          name contains an invalid character
      *
-     * @throws                  NO_MODIFICATION_ALLOWED_ERR: Raised if this
+     * @throws                  DOMException NO_MODIFICATION_ALLOWED_ERR: 
Raised if this
      *                          node is readonly
      *
-     * @throws                  NAMESPACE_ERR: Raised if the qualifiedName
+     * @throws                  DOMException NAMESPACE_ERR: Raised if the 
qualifiedName
      *                          has a prefix that is "xml" and the namespaceURI
      *                          is neither null nor an empty string nor
      *                          "http://www.w3.org/XML/1998/namespace";, or if
@@ -726,13 +726,13 @@ public class ElementImpl
      * Removes an attribute by local name and namespace URI. If the removed
      * attribute has a default value it is immediately replaced.
      * The replacing attribute has the same namespace URI and local name,
-     * as well as the original prefix.<p>
+     * as well as the original prefix.
      * </p>
      *
      * @param namespaceURI  the namespace URI of the attribute to remove
      *
      * @param localName     the local name of the attribute to remove
-     * @throws              NO_MODIFICATION_ALLOWED_ERR: Raised if this node 
is readonly
+     * @throws              DOMException NO_MODIFICATION_ALLOWED_ERR: Raised 
if this node is readonly
      * @since WD-DOM-Level-2-19990923
      */
     public void removeAttributeNS(String namespaceURI, String localName) {
@@ -792,14 +792,14 @@ public class ElementImpl
      *                  with the same local name and namespace URI, the *
      *                  previously existing Attr node is returned, otherwise
      *                  null is returned.
-     * @throws          WRONG_DOCUMENT_ERR: Raised if newAttr
+     * @throws          DOMException WRONG_DOCUMENT_ERR: Raised if newAttr
      *                  was created from a different document than the one that
      *                  created the element.
      *
-     * @throws          NO_MODIFICATION_ALLOWED_ERR: Raised if
+     * @throws          DOMException NO_MODIFICATION_ALLOWED_ERR: Raised if
      *                  this node is readonly.
      *
-     * @throws          INUSE_ATTRIBUTE_ERR: Raised if newAttr is
+     * @throws          DOMException INUSE_ATTRIBUTE_ERR: Raised if newAttr is
      *                  already an attribute of another Element object. The
      *                  DOM user must explicitly clone Attr nodes to re-use
      *                  them in other elements.
diff --git a/src/org/apache/xerces/dom/ElementNSImpl.java 
b/src/org/apache/xerces/dom/ElementNSImpl.java
index c0e5442b9..9cf839b10 100644
--- a/src/org/apache/xerces/dom/ElementNSImpl.java
+++ b/src/org/apache/xerces/dom/ElementNSImpl.java
@@ -218,12 +218,10 @@ public class ElementNSImpl
     }
 
     /**
-     * Introduced in DOM Level 2. <p>
-     *
-     * The namespace prefix of this node, or null if it is unspecified. <p>
-     *
-     * For nodes created with a DOM Level 1 method, such as createElement
-     * from the Document interface, this is null. <p>
+     * Introduced in DOM Level 2.
+     * <p>The namespace prefix of this node, or null if it is unspecified.</p>
+     * <p>For nodes created with a DOM Level 1 method, such as createElement
+     * from the Document interface, this is null.</p>
      *
      * @since WD-DOM-Level-2-19990923
      */
@@ -238,18 +236,16 @@ public class ElementNSImpl
     }
 
     /**
-     * Introduced in DOM Level 2. <p>
-     *
-     * Note that setting this attribute changes the nodeName attribute, which 
holds the
-     * qualified name, as well as the tagName and name attributes of the 
Element
-     * and Attr interfaces, when applicable.<p>
+     * Introduced in DOM Level 2.
+     * <p>Note that setting this attribute changes the nodeName attribute, 
which holds the qualified name,
+     * as well as the tagName and name attributes of the Element and Attr 
interfaces, when applicable.</p>
      *
-     * @param prefix The namespace prefix of this node, or null(empty string) 
if it is unspecified.
+     * @param prefix the namespace prefix of this node, or null(empty string) 
if it is unspecified
      *
-     * @exception INVALID_CHARACTER_ERR
+     * @throws DOMException INVALID_CHARACTER_ERR
      *                   Raised if the specified
      *                   prefix contains an invalid character.
-     * @exception DOMException
+     *
      * @since WD-DOM-Level-2-19990923
      */
     public void setPrefix(String prefix)
@@ -349,7 +345,7 @@ public class ElementNSImpl
      * @param derivationMethod
      *        The derivation method
      * 
-     * @return boolean True if the type is derived by restriciton for the
+     * @return boolean True if the type is derived by restriction for the
      *         reference type
      */
     public boolean isDerivedFrom(String typeNamespaceArg, String typeNameArg, 
diff --git a/src/org/apache/xerces/dom/EntityImpl.java 
b/src/org/apache/xerces/dom/EntityImpl.java
index 7a9fb9f80..e29fc44e9 100644
--- a/src/org/apache/xerces/dom/EntityImpl.java
+++ b/src/org/apache/xerces/dom/EntityImpl.java
@@ -36,17 +36,17 @@ import org.w3c.dom.Node;
  * the structure model is passed to the DOM; in this case, there will
  * be no EntityReferences in the DOM tree.
  * </p>
- * <p>
- * Quoting the 10/01 DOM Proposal,
- * <BLOCKQUOTE>
+ * <p>Quoting the 10/01 DOM Proposal,</p>
+ * <blockquote>
  * "The DOM Level 1 does not support editing Entity nodes; if a user
  * wants to make changes to the contents of an Entity, every related
  * EntityReference node has to be replaced in the structure model by
  * a clone of the Entity's contents, and then the desired changes
  * must be made to each of those clones instead. All the
  * descendants of an Entity node are readonly."
- * </BLOCKQUOTE>
- * I'm interpreting this as: It is the parser's responsibilty to call
+ * </blockquote>
+ * <p>
+ * I'm interpreting this as: It is the parser's responsibility to call
  * the non-DOM operation setReadOnly(true,true) after it constructs
  * the Entity. Since the DOM explicitly decided not to deal with this,
  * _any_ answer will involve a non-DOM operation, and this is the
diff --git a/src/org/apache/xerces/dom/EntityReferenceImpl.java 
b/src/org/apache/xerces/dom/EntityReferenceImpl.java
index a188517d0..03e21ad91 100644
--- a/src/org/apache/xerces/dom/EntityReferenceImpl.java
+++ b/src/org/apache/xerces/dom/EntityReferenceImpl.java
@@ -24,7 +24,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 /**
- * EntityReference models the XML &entityname; syntax, when used for
+ * EntityReference models the XML <code>&entityname;</code> syntax, when used 
for
  * entities defined by the DOM. Entities hardcoded into XML, such as
  * character entities, should instead have been translated into text
  * by the code which generated the DOM tree.
@@ -44,7 +44,7 @@ import org.w3c.dom.Node;
  * EntityReference behaves as a read-only node, and the children of 
  * the EntityReference (which reflect those of the Entity, and should
  * also be read-only) give its replacement value, if any. They are 
- * supposed to automagically stay in synch if the DocumentType is 
+ * supposed to automagically stay in sync if the DocumentType is 
  * updated with new values for the Entity.
  * </p>
  * <p>
@@ -61,7 +61,7 @@ import org.w3c.dom.Node;
  * For now I have decided, since REC-DOM-Level-1-19980818 doesn't
  * cover this in much detail, that synchronization doesn't have to be
  * considered while the user is deep in the tree. That is, if you're
- * looking within one of the EntityReferennce's children and the Entity
+ * looking within one of the EntityReference's children and the Entity
  * changes, you won't be informed; instead, you will continue to access
  * the same object -- which may or may not still be part of the tree.
  * This is the same behavior that obtains elsewhere in the DOM if the
diff --git a/src/org/apache/xerces/dom/NamedNodeMapImpl.java 
b/src/org/apache/xerces/dom/NamedNodeMapImpl.java
index 59440a433..61cf010c2 100644
--- a/src/org/apache/xerces/dom/NamedNodeMapImpl.java
+++ b/src/org/apache/xerces/dom/NamedNodeMapImpl.java
@@ -294,7 +294,7 @@ public class NamedNodeMapImpl
      * @param name          The local name of the node to remove.
      * @return Node         The node removed from the map if a node with such
      *                      a local name and namespace URI exists.
-     * @throws              NOT_FOUND_ERR: Raised if there is no node named
+     * @throws              DOMException NOT_FOUND_ERR: Raised if there is no 
node named
      *                      name in the map.
 
      */
diff --git a/src/org/apache/xerces/dom/NodeEqualityWithQname.java 
b/src/org/apache/xerces/dom/NodeEqualityWithQname.java
index 09d44fa28..8de206a75 100644
--- a/src/org/apache/xerces/dom/NodeEqualityWithQname.java
+++ b/src/org/apache/xerces/dom/NodeEqualityWithQname.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Node;
  * 
  * @xerces.internal
  * 
- * @author Mukul Gandhi <[email protected]>
+ * @author <a href="mailto:[email protected]";>Mukul Gandhi</a>
  * 
  * @version $Id$
  */
diff --git a/src/org/apache/xerces/dom/NodeImpl.java 
b/src/org/apache/xerces/dom/NodeImpl.java
index 79010969b..8d51b9ec7 100644
--- a/src/org/apache/xerces/dom/NodeImpl.java
+++ b/src/org/apache/xerces/dom/NodeImpl.java
@@ -1315,22 +1315,22 @@ public abstract class NodeImpl
      * <th>Content</th>
      * </tr>
      * <tr>
-     * <td valign='top' rowspan='1' colspan='1'>
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>
      * ELEMENT_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, 
      * DOCUMENT_FRAGMENT_NODE</td>
-     * <td valign='top' rowspan='1' colspan='1'>concatenation of the 
<code>textContent</code> 
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>concatenation 
of the <code>textContent</code> 
      * attribute value of every child node, excluding COMMENT_NODE and 
      * PROCESSING_INSTRUCTION_NODE nodes</td>
      * </tr>
      * <tr>
-     * <td valign='top' rowspan='1' colspan='1'>ATTRIBUTE_NODE, TEXT_NODE, 
+     * <td style="vertical-align: top;" rowspan='1' 
colspan='1'>ATTRIBUTE_NODE, TEXT_NODE, 
      * CDATA_SECTION_NODE, COMMENT_NODE, PROCESSING_INSTRUCTION_NODE</td>
-     * <td valign='top' rowspan='1' colspan='1'>
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>
      * <code>nodeValue</code></td>
      * </tr>
      * <tr>
-     * <td valign='top' rowspan='1' colspan='1'>DOCUMENT_NODE, 
DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
-     * <td valign='top' rowspan='1' colspan='1'>
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>DOCUMENT_NODE, 
DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>
      * null</td>
      * </tr>
      * </table>
@@ -1372,22 +1372,22 @@ public abstract class NodeImpl
      * <th>Content</th>
      * </tr>
      * <tr>
-     * <td valign='top' rowspan='1' colspan='1'>
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>
      * ELEMENT_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, 
      * DOCUMENT_FRAGMENT_NODE</td>
-     * <td valign='top' rowspan='1' colspan='1'>concatenation of the 
<code>textContent</code> 
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>concatenation 
of the <code>textContent</code> 
      * attribute value of every child node, excluding COMMENT_NODE and 
      * PROCESSING_INSTRUCTION_NODE nodes</td>
      * </tr>
      * <tr>
-     * <td valign='top' rowspan='1' colspan='1'>ATTRIBUTE_NODE, TEXT_NODE, 
+     * <td style="vertical-align: top;" rowspan='1' 
colspan='1'>ATTRIBUTE_NODE, TEXT_NODE, 
      * CDATA_SECTION_NODE, COMMENT_NODE, PROCESSING_INSTRUCTION_NODE</td>
-     * <td valign='top' rowspan='1' colspan='1'>
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>
      * <code>nodeValue</code></td>
      * </tr>
      * <tr>
-     * <td valign='top' rowspan='1' colspan='1'>DOCUMENT_NODE, 
DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
-     * <td valign='top' rowspan='1' colspan='1'>
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>DOCUMENT_NODE, 
DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
+     * <td style="vertical-align: top;" rowspan='1' colspan='1'>
      * null</td>
      * </tr>
      * </table>
diff --git a/src/org/apache/xerces/dom/PSVIAttrNSImpl.java 
b/src/org/apache/xerces/dom/PSVIAttrNSImpl.java
index 2d9fdd19f..4de6aa457 100644
--- a/src/org/apache/xerces/dom/PSVIAttrNSImpl.java
+++ b/src/org/apache/xerces/dom/PSVIAttrNSImpl.java
@@ -114,7 +114,7 @@ public class PSVIAttrNSImpl extends AttrNSImpl implements 
AttributePSVI {
      * [schema default]
      *
      * @return The canonical lexical representation of the declaration's 
{value constraint} value
-     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default>XML 
Schema Part 1: Structures [schema default]</a>
+     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default";>XML 
Schema Part 1: Structures [schema default]</a>
      */
     public String getSchemaDefault() {
         return fDeclaration == null ? null : fDeclaration.getConstraintValue();
@@ -124,7 +124,7 @@ public class PSVIAttrNSImpl extends AttrNSImpl implements 
AttributePSVI {
      * [schema normalized value]
      *
      *
-     * @see <a 
href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value>XML Schema 
Part 1: Structures [schema normalized value]</a>
+     * @see <a 
href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value";>XML Schema 
Part 1: Structures [schema normalized value]</a>
      * @return the normalized value of this item after validation
      */
     public String getSchemaNormalizedValue() {
diff --git a/src/org/apache/xerces/dom/PSVIElementNSImpl.java 
b/src/org/apache/xerces/dom/PSVIElementNSImpl.java
index 3a6aec259..e06ce80c6 100644
--- a/src/org/apache/xerces/dom/PSVIElementNSImpl.java
+++ b/src/org/apache/xerces/dom/PSVIElementNSImpl.java
@@ -128,7 +128,7 @@ public class PSVIElementNSImpl extends ElementNSImpl 
implements ElementPSVI {
      * [schema default]
      *
      * @return The canonical lexical representation of the declaration's 
{value constraint} value.
-     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default>XML 
Schema Part 1: Structures [schema default]</a>
+     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default";>XML 
Schema Part 1: Structures [schema default]</a>
      */
     public String getSchemaDefault() {
         return fDeclaration == null ? null : fDeclaration.getConstraintValue();
@@ -138,7 +138,7 @@ public class PSVIElementNSImpl extends ElementNSImpl 
implements ElementPSVI {
      * [schema normalized value]
      *
      *
-     * @see <a 
href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value>XML Schema 
Part 1: Structures [schema normalized value]</a>
+     * @see <a 
href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value";>XML Schema 
Part 1: Structures [schema normalized value]</a>
      * @return the normalized value of this item after validation
      */
     public String getSchemaNormalizedValue() {
@@ -208,7 +208,7 @@ public class PSVIElementNSImpl extends ElementNSImpl 
implements ElementPSVI {
 
     /**
      * [nil]
-     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-nil>XML Schema Part 
1: Structures [nil]</a>
+     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-nil";>XML Schema Part 
1: Structures [nil]</a>
      * @return true if clause 3.2 of Element Locally Valid (Element) (3.3.4) 
above is satisfied, otherwise false
      */
     public boolean getNil() {
@@ -217,7 +217,7 @@ public class PSVIElementNSImpl extends ElementNSImpl 
implements ElementPSVI {
 
     /**
      * [notation] 
-     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-notation>XML Schema 
Part 1: Structures [notation]</a>
+     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-notation";>XML Schema 
Part 1: Structures [notation]</a>
      * @return The notation declaration. 
      */
     public XSNotationDeclaration getNotation() {
diff --git a/src/org/apache/xerces/dom/TextImpl.java 
b/src/org/apache/xerces/dom/TextImpl.java
index 96bf95273..3372f7d22 100644
--- a/src/org/apache/xerces/dom/TextImpl.java
+++ b/src/org/apache/xerces/dom/TextImpl.java
@@ -116,12 +116,15 @@ public class TextImpl
 
     /**
      * DOM L3 Core CR - Experimental 
-     * 
-     * Returns whether this text node contains 
-     * element content whitespace</a>, often abusively called "ignorable 
whitespace". 
+     *
+     * <p>Returns whether this text node contains
+     * element content whitespace, often abusively called "ignorable 
whitespace".
      * The text node is determined to contain whitespace in element content 
      * during the load of the document or if validation occurs while using 
      * <code>Document.normalizeDocument()</code>.
+     * </p>
+     *
+     * @return true if this text node contains element content whitespace
      * @since DOM Level 3
      */
     public boolean isElementContentWhitespace() {
@@ -166,9 +169,9 @@ public class TextImpl
     
     /**
      * internal method taking a StringBuffer in parameter and inserts the 
-     * text content at the start of the buffer
-     * 
-     * @param buf
+     * text content at the start of the buffer.
+     *
+     * @param buf the buffer which text content will be inserted into
      */
     protected void insertTextContent(StringBuffer buf) throws DOMException {
          String content = getNodeValue();
diff --git a/src/org/apache/xerces/dom/XPathCollationSupport.java 
b/src/org/apache/xerces/dom/XPathCollationSupport.java
index a7228127d..d5c24e364 100644
--- a/src/org/apache/xerces/dom/XPathCollationSupport.java
+++ b/src/org/apache/xerces/dom/XPathCollationSupport.java
@@ -32,7 +32,7 @@ import javax.xml.transform.TransformerException;
  * 
  * Ref : https://www.w3.org/TR/xpath-functions-31/#collations
  * 
- * @author Mukul Gandhi <[email protected]>
+ * @author <a href="mailto:[email protected]";>Mukul Gandhi</a>
  * 
  * @version $Id$
  *
diff --git a/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java 
b/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
index ce932975a..c0318c5f9 100644
--- a/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
+++ b/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
@@ -135,22 +135,24 @@ public class XML11DocumentScannerImpl
     /**
      * Scans an attribute value and normalizes whitespace converting all
      * whitespace characters to space characters.
-     * 
+     * <pre>
      * [10] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | 
Reference)* "'"
+     * </pre>
      *
-     * @param value The XMLString to fill in with the value.
-     * @param nonNormalizedValue The XMLString to fill in with the 
-     *                           non-normalized value.
-     * @param atName The name of the attribute being parsed (for error msgs).
+     * @param value the XMLString to fill in with the value
+     * @param nonNormalizedValue the XMLString to fill in with the 
non-normalized value
+     * @param atName the name of the attribute being parsed (for error msgs)
      * @param checkEntities true if undeclared entities should be reported as 
VC violation,  
      *                      false if undeclared entities should be reported as 
WFC violation.
-     * @param eleName The name of element to which this attribute belongs.
+     * @param eleName the name of element to which this attribute belongs
      *
      * @return true if the non-normalized and normalized value are the same
-     * 
-     * <strong>Note:</strong> This method uses fStringBuffer2, anything in it
-     * at the time of calling is lost.
-     **/
+     *
+     * <p>
+     * <strong>Note:</strong> This method uses fStringBuffer2, anything in it 
at the time
+     * of calling is lost.
+     * </p>
+     */
     protected boolean scanAttributeValue(XMLString value, 
                                       XMLString nonNormalizedValue,
                                       String atName,
diff --git a/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java 
b/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java
index 4c3aaecdc..b2fea39b7 100644
--- a/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java
+++ b/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java
@@ -86,10 +86,12 @@ public class XML11NSDocumentScannerImpl extends 
XML11DocumentScannerImpl {
     
     /** 
      * Saw spaces after element name or between attributes.
-     * 
+     *
+     * <p>
      * This is reserved for the case where scanning of a start element spans
      * several methods, as is the case when scanning the start of a root 
element 
      * where a DTD external subset may be read after scanning the element name.
+     * </p>
      */
     private boolean fSawSpace;
 
@@ -107,12 +109,10 @@ public class XML11NSDocumentScannerImpl extends 
XML11DocumentScannerImpl {
      * Scans a start element. This method will handle the binding of
      * namespace information and notifying the handler of the start
      * of the element.
-     * <p>
      * <pre>
      * [44] EmptyElemTag ::= '&lt;' Name (S Attribute)* S? '/>'
      * [40] STag ::= '&lt;' Name (S Attribute)* S? '>'
      * </pre>
-     * <p>
      * <strong>Note:</strong> This method assumes that the leading
      * '&lt;' character has been consumed.
      * <p>
@@ -120,9 +120,9 @@ public class XML11NSDocumentScannerImpl extends 
XML11DocumentScannerImpl {
      * fAttributes variables. The contents of these variables will be
      * destroyed. The caller should copy important information out of
      * these variables before calling this method.
+     * </p>
      *
-     * @return True if element is empty. (i.e. It matches
-     *          production [44].
+     * @return true if element is empty. (i.e. It matches production [44])
      */
     protected boolean scanStartElement() throws IOException, XNIException {
         if (DEBUG_CONTENT_SCANNING)
@@ -335,7 +335,7 @@ public class XML11NSDocumentScannerImpl extends 
XML11DocumentScannerImpl {
      * Scans the remainder of a start or empty tag after the element name.
      * 
      * @see #scanStartElement
-     * @return True if element is empty.
+     * @return true if element is empty
      */    
     protected boolean scanStartElementAfterName()
         throws IOException, XNIException {
@@ -530,11 +530,9 @@ public class XML11NSDocumentScannerImpl extends 
XML11DocumentScannerImpl {
 
     /**
      * Scans an attribute.
-     * <p>
      * <pre>
      * [41] Attribute ::= Name Eq AttValue
      * </pre>
-     * <p>
      * <strong>Note:</strong> This method assumes that the next
      * character on the stream is the first character of the attribute
      * name.
@@ -542,8 +540,9 @@ public class XML11NSDocumentScannerImpl extends 
XML11DocumentScannerImpl {
      * <strong>Note:</strong> This method uses the fAttributeQName and
      * fQName variables. The contents of these variables will be
      * destroyed.
+     * </p>
      *
-     * @param attributes The attributes list for the scanned attribute.
+     * @param attributes the attributes list for the scanned attribute
      */
     protected void scanAttribute(XMLAttributesImpl attributes)
         throws IOException, XNIException {
diff --git a/src/org/apache/xerces/impl/XMLDTDScannerImpl.java 
b/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
index 1a2d530e0..7ed158a6f 100644
--- a/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
+++ b/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
@@ -43,13 +43,13 @@ import org.apache.xerces.xni.parser.XMLInputSource;
  * communicated to the DTD handlers.
  * <p>
  * This component requires the following features and properties from the
- * component manager that uses it:
+ * component manager that uses it:</p>
  * <ul>
- *  <li>http://xml.org/sax/features/validation</li>
- *  <li>http://apache.org/xml/features/scanner/notify-char-refs</li>
- *  <li>http://apache.org/xml/properties/internal/symbol-table</li>
- *  <li>http://apache.org/xml/properties/internal/error-reporter</li>
- *  <li>http://apache.org/xml/properties/internal/entity-manager</li>
+ *  <li><code>http://xml.org/sax/features/validation</code></li>
+ *  
<li><code>http://apache.org/xml/features/scanner/notify-char-refs</code></li>
+ *  
<li><code>http://apache.org/xml/properties/internal/symbol-table</code></li>
+ *  
<li><code>http://apache.org/xml/properties/internal/error-reporter</code></li>
+ *  
<li><code>http://apache.org/xml/properties/internal/entity-manager</code></li>
  * </ul>
  * 
  * @xerces.internal
@@ -746,11 +746,9 @@ public class XMLDTDScannerImpl
 
     /**
      * Scans a comment.
-     * <p>
      * <pre>
      * [15] Comment ::= '&lt!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
      * </pre>
-     * <p>
      * <strong>Note:</strong> Called after scanning past '&lt;!--'
      */
     protected final void scanComment() throws IOException, XNIException {
@@ -768,13 +766,11 @@ public class XMLDTDScannerImpl
     } // scanComment()
 
     /**
-     * Scans an element declaration
-     * <p>
+     * Scans an element declaration.
      * <pre>
      * [45]    elementdecl    ::=    '&lt;!ELEMENT' S Name S contentspec S? '>'
      * [46]    contentspec    ::=    'EMPTY' | 'ANY' | Mixed | children  
      * </pre>
-     * <p>
      * <strong>Note:</strong> Called after scanning past '&lt;!ELEMENT'
      */
     protected final void scanElementDecl() throws IOException, XNIException {
@@ -1087,13 +1083,11 @@ public class XMLDTDScannerImpl
     }
 
     /**
-     * Scans an attlist declaration
-     * <p>
+     * Scans an attlist declaration.
      * <pre>
      * [52]  AttlistDecl    ::=   '&lt;!ATTLIST' S Name AttDef* S? '>' 
      * [53]  AttDef         ::=   S Name S AttType S DefaultDecl 
      * </pre>
-     * <p>
      * <strong>Note:</strong> Called after scanning past '&lt;!ATTLIST'
      */
     protected final void scanAttlistDecl() throws IOException, XNIException {
@@ -1197,8 +1191,7 @@ public class XMLDTDScannerImpl
     } // scanAttlistDecl()
 
     /**
-     * Scans an attribute type definition
-     * <p>
+     * Scans an attribute type definition.
      * <pre>
      * [54]  AttType        ::=   StringType | TokenizedType | EnumeratedType  
      * [55]  StringType     ::=   'CDATA' 
@@ -1213,7 +1206,6 @@ public class XMLDTDScannerImpl
      * [58]  NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')'
      * [59]  Enumeration    ::=    '(' S? Nmtoken (S? '|' S? Nmtoken)* S? ')' 
      * </pre>
-     * <p>
      * <strong>Note:</strong> Called after scanning past '&lt;!ATTLIST'
      *
      * @param elName The element type name this declaration is about.
@@ -1329,8 +1321,7 @@ public class XMLDTDScannerImpl
 
 
     /**
-     * Scans an attribute default declaration
-     * <p>
+     * Scans an attribute default declaration.
      * <pre>
      * [60] DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue)
      * </pre>
@@ -1374,8 +1365,7 @@ public class XMLDTDScannerImpl
     } // ScanAttDefaultDecl
 
     /**
-     * Scans an entity declaration
-     * <p>
+     * Scans an entity declaration.
      * <pre>
      * [70]    EntityDecl  ::=    GEDecl | PEDecl 
      * [71]    GEDecl      ::=    '&lt;!ENTITY' S Name S EntityDef S? '>' 
@@ -1386,7 +1376,6 @@ public class XMLDTDScannerImpl
      *                          | 'PUBLIC' S PubidLiteral S SystemLiteral  
      * [76]    NDataDecl   ::=    S 'NDATA' S Name 
      * </pre>
-     * <p>
      * <strong>Note:</strong> Called after scanning past '&lt;!ENTITY'
      */
     private final void scanEntityDecl() throws IOException, XNIException {
@@ -1696,12 +1685,10 @@ public class XMLDTDScannerImpl
 
     /**
      * Scans a notation declaration
-     * <p>
      * <pre>
      * [82] NotationDecl ::= '&lt;!NOTATION' S Name S (ExternalID|PublicID) S? 
'>'
      * [83]  PublicID    ::= 'PUBLIC' S PubidLiteral  
      * </pre>
-     * <p>
      * <strong>Note:</strong> Called after scanning past '&lt;!NOTATION'
      */
     private final void scanNotationDecl() throws IOException, XNIException {
@@ -1776,7 +1763,6 @@ public class XMLDTDScannerImpl
      * closing bracket has been found. When it's an include section though, it
      * returns to let the main loop take care of scanning it. In that case the
      * end of the section if handled by the main loop (scanDecls).
-     * <p>
      * <pre>
      * [61] conditionalSect   ::= includeSect | ignoreSect  
      * [62] includeSect       ::= '&lt;![' S? 'INCLUDE' S? '[' extSubsetDecl 
']]>'
@@ -1784,7 +1770,6 @@ public class XMLDTDScannerImpl
      * [64] ignoreSectContents ::= Ignore ('&lt;![' ignoreSectContents ']]>' 
Ignore)* 
      * [65] Ignore            ::=    Char* - (Char* ('&lt;![' | ']]>') Char*)  
      * </pre>
-     * <p>
      * <strong>Note:</strong> Called after scanning past '&lt;![' */
     private final void scanConditionalSect(int currPEDepth)
         throws IOException, XNIException {
diff --git a/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java 
b/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java
index 10f3b7be1..4e448ee96 100644
--- a/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java
+++ b/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java
@@ -216,11 +216,6 @@ public class XMLDocumentFragmentScannerImpl
 
     // other info
 
-    /** Document system identifier. 
-     * REVISIT:  So what's this used for?  - NG
-    * protected String fDocumentSystemId;
-     ******/
-
     // features
 
     /** Notify built-in references. */
@@ -299,7 +294,6 @@ public class XMLDocumentFragmentScannerImpl
     public void setInputSource(XMLInputSource inputSource) throws IOException {
         fEntityManager.setEntityHandler(this);
         fEntityManager.startEntity("$fragment$", inputSource, false, true);
-        //fDocumentSystemId = 
fEntityManager.expandSystemId(inputSource.getSystemId());
     } // setInputSource(XMLInputSource)
 
     /** 
@@ -358,7 +352,6 @@ public class XMLDocumentFragmentScannerImpl
         super.reset(componentManager);
 
         // other settings
-        //fDocumentSystemId = null;
 
         // sax features
         fAttributes.setNamespaces(fNamespaces);
@@ -510,7 +503,7 @@ public class XMLDocumentFragmentScannerImpl
      * component does not want to report a default value for this
      * property. 
      *
-     * @param propertyId The property identifier.
+     * @param propertyId the property identifier
      *
      * @since Xerces 2.2.0
      */
@@ -528,16 +521,21 @@ public class XMLDocumentFragmentScannerImpl
     //
 
     /**
-     * setDocumentHandler
+     * Sets the document handler
      * 
-     * @param documentHandler 
+     * @param documentHandler the document handler
+     * @see XMLDocumentHandler
      */
     public void setDocumentHandler(XMLDocumentHandler documentHandler) {
         fDocumentHandler = documentHandler;
     } // setDocumentHandler(XMLDocumentHandler)
 
 
-    /** Returns the document handler */
+    /**
+     * Returns the document handler.
+     *
+     * @return the document handler
+     */
     public XMLDocumentHandler getDocumentHandler(){
         return fDocumentHandler;
     }
@@ -596,10 +594,10 @@ public class XMLDocumentFragmentScannerImpl
      * of "[dtd]" parameter entity names start with '%'; and general entities 
      * are just specified by their name.
      * 
-     * @param name The name of the entity.
-     * @param augs Additional information that may include infoset 
augmentations
+     * @param name the name of the entity
+     * @param augs additional information that may include infoset 
augmentations
      *
-     * @throws XNIException Thrown by handler to signal an error.
+     * @throws XNIException thrown by handler to signal an error
      */
     public void endEntity(String name, Augmentations augs) throws XNIException 
{
 
@@ -641,7 +639,6 @@ public class XMLDocumentFragmentScannerImpl
 
     /**
      * Scans an XML or text declaration.
-     * <p>
      * <pre>
      * [23] XMLDecl ::= '&lt;?xml' VersionInfo EncodingDecl? SDDecl? S? '?>'
      * [24] VersionInfo ::= S 'version' Eq (' VersionNum ' | " VersionNum ")
@@ -653,9 +650,7 @@ public class XMLDocumentFragmentScannerImpl
      * [77] TextDecl ::= '&lt;?xml' VersionInfo? EncodingDecl S? '?>'
      * </pre>
      *
-     * @param scanningTextDecl True if a text declaration is to
-     *                         be scanned instead of an XML
-     *                         declaration.
+     * @param scanningTextDecl true if a text declaration is to be scanned 
instead of an XML declaration.
      */
     protected void scanXMLDeclOrTextDecl(boolean scanningTextDecl) 
         throws IOException, XNIException {
@@ -716,11 +711,9 @@ public class XMLDocumentFragmentScannerImpl
 
     /**
      * Scans a comment.
-     * <p>
      * <pre>
      * [15] Comment ::= '&lt!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
      * </pre>
-     * <p>
      * <strong>Note:</strong> Called after scanning past '&lt;!--'
      */
     protected void scanComment() throws IOException, XNIException {
@@ -739,12 +732,10 @@ public class XMLDocumentFragmentScannerImpl
      * Scans a start element. This method will handle the binding of
      * namespace information and notifying the handler of the start
      * of the element.
-     * <p>
      * <pre>
      * [44] EmptyElemTag ::= '&lt;' Name (S Attribute)* S? '/>'
      * [40] STag ::= '&lt;' Name (S Attribute)* S? '>'
-     * </pre> 
-     * <p>
+     * </pre>
      * <strong>Note:</strong> This method assumes that the leading
      * '&lt;' character has been consumed.
      * <p>
@@ -752,9 +743,9 @@ public class XMLDocumentFragmentScannerImpl
      * fAttributes variables. The contents of these variables will be
      * destroyed. The caller should copy important information out of
      * these variables before calling this method.
+     * </p>
      *
-     * @return True if element is empty. (i.e. It matches
-     *          production [44].
+     * @return True if element is empty. (i.e. It matches production [44])
      */
     protected boolean scanStartElement() 
         throws IOException, XNIException {
@@ -934,11 +925,9 @@ public class XMLDocumentFragmentScannerImpl
 
     /** 
      * Scans an attribute.
-     * <p>
      * <pre>
      * [41] Attribute ::= Name Eq AttValue
-     * </pre> 
-     * <p>
+     * </pre>
      * <strong>Note:</strong> This method assumes that the next 
      * character on the stream is the first character of the attribute
      * name.
@@ -946,6 +935,7 @@ public class XMLDocumentFragmentScannerImpl
      * <strong>Note:</strong> This method uses the fAttributeQName and
      * fQName variables. The contents of these variables will be
      * destroyed.
+     * </p>
      *
      * @param attributes The attributes list for the scanned attribute.
      */
@@ -1144,7 +1134,6 @@ public class XMLDocumentFragmentScannerImpl
 
     /**
      * Scans an end element.
-     * <p>
      * <pre>
      * [42] ETag ::= '&lt;/' Name S? '>'
      * </pre>
@@ -1152,7 +1141,7 @@ public class XMLDocumentFragmentScannerImpl
      * <strong>Note:</strong> This method uses the fElementQName variable.
      * The contents of this variable will be destroyed. The caller should
      * copy the needed information out of this variable before calling
-     * this method.
+     * this method.</p>
      *
      * @return The element depth.
      */
@@ -1202,7 +1191,6 @@ public class XMLDocumentFragmentScannerImpl
 
     /**
      * Scans a character reference.
-     * <p>
      * <pre>
      * [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'
      * </pre>
@@ -1801,11 +1789,10 @@ public class XMLDocumentFragmentScannerImpl
 
         /** 
          * Scan for DOCTYPE hook. This method is a hook for subclasses
-         * to add code to handle scanning for a the "DOCTYPE" string 
-         * after the string "<!" has been scanned.
+         * to add code to handle scanning for the "DOCTYPE" string
+         * after the string <code>&lt;!</code> has been scanned.
          * 
-         * @return True if the "DOCTYPE" was scanned; false if "DOCTYPE"
-         *          was not scanned.
+         * @return true if the "DOCTYPE" was scanned; false if "DOCTYPE" was 
not scanned
          */
         protected boolean scanForDoctypeHook() 
             throws IOException, XNIException {
@@ -1813,11 +1800,11 @@ public class XMLDocumentFragmentScannerImpl
         } // scanForDoctypeHook():boolean
 
         /** 
-         * Element depth iz zero. This methos is a hook for subclasses
+         * Element depth iz zero. This method is a hook for subclasses
          * to add code to handle when the element depth hits zero. When
          * scanning a document fragment, an element depth of zero is
          * normal. However, when scanning a full XML document, the
-         * scanner must handle the trailing miscellanous section of
+         * scanner must handle the trailing miscellaneous section of
          * the document after the end of the document's root element.
          *
          * @return True if the caller should stop and return true which
diff --git a/src/org/apache/xerces/impl/XMLEntityScanner.java 
b/src/org/apache/xerces/impl/XMLEntityScanner.java
index 4e491bde7..b860d9100 100644
--- a/src/org/apache/xerces/impl/XMLEntityScanner.java
+++ b/src/org/apache/xerces/impl/XMLEntityScanner.java
@@ -1522,9 +1522,9 @@ public class XMLEntityScanner implements XMLLocator {
      * The return value is the literal system identifier of the document
      * entity or of the external parsed entity in which the markup
      * triggering the event appears.
-     * <p>
-     * @return A string containing the literal system identifier, or null
-     *         if none is available.
+     * </p>
+     *
+     * @return a string containing the literal system identifier, or null if 
none is available
      */
     public final String getLiteralSystemId() {
         if (fCurrentEntity != null) {
@@ -1688,7 +1688,7 @@ public class XMLEntityScanner implements XMLLocator {
     // set buffer size:
     public final void setBufferSize(int size) {
         // REVISIT: Buffer size passed to entity scanner 
-        // was not being kept in synch with the actual size
+        // was not being kept in sync with the actual size
         // of the buffers in each scanned entity. If any
         // of the buffers were actually resized, it was possible
         // that the parser would throw an ArrayIndexOutOfBoundsException
diff --git a/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java 
b/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java
index 8cb0332d2..83b98ebaf 100644
--- a/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java
+++ b/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java
@@ -35,15 +35,17 @@ import org.apache.xerces.xni.parser.XMLDocumentSource;
  * The scanner acts as the source for the document
  * information which is communicated to the document handler.
  *
+ * <p>
  * This class scans an XML document, checks if document has a DTD, and if
  * DTD is not found the scanner will remove the DTD Validator from the 
pipeline and perform
  * namespace binding.
+ * </p>
  *
  * Note: This scanner should only be used when the namespace processing is on!
  *
  * <p>
  * This component requires the following features and properties from the
- * component manager that uses it:
+ * component manager that uses it:</p>
  * <ul>
  *  <li>http://xml.org/sax/features/namespaces {true} -- if the value of this
  *      feature is set to false this scanner must not be used.</li>
@@ -82,10 +84,10 @@ extends XMLDocumentScannerImpl {
     
     /** 
      * Saw spaces after element name or between attributes.
-     * 
-     * This is reserved for the case where scanning of a start element spans
+     *
+     * <p>This is reserved for the case where scanning of a start element spans
      * several methods, as is the case when scanning the start of a root 
element 
-     * where a DTD external subset may be read after scanning the element name.
+     * where a DTD external subset may be read after scanning the element 
name.</p>
      */
     private boolean fSawSpace;
 
@@ -104,12 +106,10 @@ extends XMLDocumentScannerImpl {
      * Scans a start element. This method will handle the binding of
      * namespace information and notifying the handler of the start
      * of the element.
-     * <p>
      * <pre>
      * [44] EmptyElemTag ::= '&lt;' Name (S Attribute)* S? '/>'
      * [40] STag ::= '&lt;' Name (S Attribute)* S? '>'
      * </pre>
-     * <p>
      * <strong>Note:</strong> This method assumes that the leading
      * '&lt;' character has been consumed.
      * <p>
@@ -117,9 +117,9 @@ extends XMLDocumentScannerImpl {
      * fAttributes variables. The contents of these variables will be
      * destroyed. The caller should copy important information out of
      * these variables before calling this method.
+     * </p>
      *
-     * @return True if element is empty. (i.e. It matches
-     *          production [44].
+     * @return true if element is empty. (i.e. It matches production [44])
      */
     protected boolean scanStartElement()
     throws IOException, XNIException {
@@ -307,7 +307,7 @@ extends XMLDocumentScannerImpl {
      * Scans the remainder of a start or empty tag after the element name.
      * 
      * @see #scanStartElement
-     * @return True if element is empty.
+     * @return true if element is empty
      */
     protected boolean scanStartElementAfterName()
         throws IOException, XNIException {
@@ -476,20 +476,18 @@ extends XMLDocumentScannerImpl {
 
     /**
      * Scans an attribute.
-     * <p>
      * <pre>
      * [41] Attribute ::= Name Eq AttValue
      * </pre>
-     * <p>
      * <strong>Note:</strong> This method assumes that the next
      * character on the stream is the first character of the attribute
      * name.
      * <p>
      * <strong>Note:</strong> This method uses the fAttributeQName and
      * fQName variables. The contents of these variables will be
-     * destroyed.
+     * destroyed.</p>
      *
-     * @param attributes The attributes list for the scanned attribute.
+     * @param attributes the attributes list for the scanned attribute
      */
     protected void scanAttribute(XMLAttributesImpl attributes)
     throws IOException, XNIException {
@@ -619,11 +617,9 @@ extends XMLDocumentScannerImpl {
 
     /**
      * Scans an end element.
-     * <p>
      * <pre>
      * [42] ETag ::= '&lt;/' Name S? '>'
      * </pre>
-     * <p>
      * <strong>Note:</strong> This method uses the fElementQName variable.
      * The contents of this variable will be destroyed. The caller should
      * copy the needed information out of this variable before calling
diff --git a/src/org/apache/xerces/impl/XMLScanner.java 
b/src/org/apache/xerces/impl/XMLScanner.java
index 2b8462937..c9c18d07b 100644
--- a/src/org/apache/xerces/impl/XMLScanner.java
+++ b/src/org/apache/xerces/impl/XMLScanner.java
@@ -331,7 +331,6 @@ public abstract class XMLScanner
 
     /**
      * Scans an XML or text declaration.
-     * <p>
      * <pre>
      * [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>'
      * [24] VersionInfo ::= S 'version' Eq (' VersionNum ' | " VersionNum ")
@@ -630,13 +629,14 @@ public abstract class XMLScanner
     
     /**
      * Scans a processing instruction.
-     * <p>
      * <pre>
      * [16] PI ::= '&lt;?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>'
      * [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l'))
      * </pre>
+     * <p>
      * <strong>Note:</strong> This method uses fString, anything in it
      * at the time of calling is lost.
+     * </p>
      */
     protected void scanPI() throws IOException, XNIException {
 
@@ -663,11 +663,13 @@ public abstract class XMLScanner
      * where a document starts with a processing instruction whose 
      * target name <em>starts with</em> "xml". (e.g. xmlfoo)
      *
+     * <p>
      * <strong>Note:</strong> This method uses fStringBuffer, anything in it
      * at the time of calling is lost.
+     * </p>
      *
-     * @param target The PI target
-     * @param data The string to fill in with the data
+     * @param target the PI target
+     * @param data the string to fill in with the data
      */
     protected void scanPIData(String target, XMLString data) 
         throws IOException, XNIException {
@@ -729,7 +731,6 @@ public abstract class XMLScanner
 
     /**
      * Scans a comment.
-     * <p>
      * <pre>
      * [15] Comment ::= '&lt!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
      * </pre>
@@ -737,8 +738,9 @@ public abstract class XMLScanner
      * <strong>Note:</strong> Called after scanning past '&lt;!--'
      * <strong>Note:</strong> This method uses fString, anything in it
      * at the time of calling is lost.
+     * </p>
      *
-     * @param text The buffer to fill in with the text.
+     * @param text the buffer to fill in with the text
      */
     protected void scanComment(XMLStringBuffer text)
         throws IOException, XNIException {
@@ -768,22 +770,22 @@ public abstract class XMLScanner
     /**
      * Scans an attribute value and normalizes whitespace converting all
      * whitespace characters to space characters.
-     * 
-     * [10] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | 
Reference)* "'"
+     * <p>
+     * <code>[10] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | 
Reference)* "'"</code>
+     * </p>
      *
-     * @param value The XMLString to fill in with the value.
-     * @param nonNormalizedValue The XMLString to fill in with the 
-     *                           non-normalized value.
-     * @param atName The name of the attribute being parsed (for error msgs).
+     * @param value the XMLString to fill in with the value
+     * @param nonNormalizedValue the XMLString to fill in with the 
non-normalized value
+     * @param atName the name of the attribute being parsed (for error msgs)
      * @param checkEntities true if undeclared entities should be reported as 
VC violation,  
      *                      false if undeclared entities should be reported as 
WFC violation.
-     * @param eleName The name of element to which this attribute belongs.
+     * @param eleName the name of element to which this attribute belongs
      *
      * @return true if the non-normalized and normalized value are the same
-     * 
+     * <p>
      * <strong>Note:</strong> This method uses fStringBuffer2, anything in it
-     * at the time of calling is lost.
-     **/
+     * at the time of calling is lost.</p>
+     */
     protected boolean scanAttributeValue(XMLString value, 
                                       XMLString nonNormalizedValue,
                                       String atName,
@@ -1265,14 +1267,14 @@ public abstract class XMLScanner
     /**
      * Scans a character reference and append the corresponding chars to the
      * specified buffer.
-     *
-     * <p>
      * <pre>
      * [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'
      * </pre>
      *
+     * <p>
      * <strong>Note:</strong> This method uses fStringBuffer, anything in it
      * at the time of calling is lost.
+     * </p>
      *
      * @param buf the character buffer to append chars to
      * @param buf2 the character buffer to append non-normalized chars to
diff --git a/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java
index 3a78b516f..67c7b67b2 100644
--- a/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java
@@ -52,11 +52,9 @@ public class ENTITYDatatypeValidator implements 
DatatypeValidator {
      * Checks that "content" string is valid ID value.
      * If invalid, a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeValueException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
 
diff --git a/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java
index c38524ddc..fbd7a097a 100644
--- a/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java
@@ -54,11 +54,9 @@ public class IDDatatypeValidator implements 
DatatypeValidator {
      * Checks that "content" string is valid ID value.
      * If invalid a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeValueException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
 
diff --git a/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java
index 375626753..9b22f5fbd 100644
--- a/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java
@@ -51,11 +51,9 @@ public class IDREFDatatypeValidator implements 
DatatypeValidator {
      * Checks that "content" string is valid IDREF value.
      * If invalid a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeValueException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
 
diff --git a/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java
index a7a198854..3fa95c93a 100644
--- a/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java
@@ -47,11 +47,9 @@ public class ListDatatypeValidator implements 
DatatypeValidator {
      * Checks that "content" string is valid.
      * If invalid a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
 
diff --git a/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java
index 3b9cb3e92..2b24271c7 100644
--- a/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java
@@ -42,11 +42,9 @@ public class NMTOKENDatatypeValidator implements 
DatatypeValidator {
      * Checks that "content" string is valid NMTOKEN value.
      * If invalid a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
         if (!XMLChar.isValidNmtoken(content)) {
diff --git a/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java
index e5b0c8a3c..5d2acf6c9 100644
--- a/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java
@@ -43,11 +43,9 @@ import org.apache.xerces.impl.dv.ValidationContext;
      * Checks that "content" string is valid NOTATION value.
      * If invalid a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
     }
diff --git a/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java
index 736fad0af..89c74c5c8 100644
--- a/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java
@@ -48,11 +48,9 @@ public class StringDatatypeValidator implements 
DatatypeValidator {
      * Checks that "content" string is valid string value.
      * If invalid, a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeValueException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
     }
diff --git a/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java
index 006e30eb7..7a9c33282 100644
--- a/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java
@@ -55,11 +55,9 @@ public class XML11IDDatatypeValidator extends 
IDDatatypeValidator {
      * Checks that "content" string is valid ID value.
      * If invalid, a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeValueException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
 
diff --git a/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java
index e5bdc0f8c..c684ec3cf 100644
--- a/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java
@@ -52,11 +52,9 @@ public class XML11IDREFDatatypeValidator extends 
IDREFDatatypeValidator {
      * Checks that "content" string is valid IDREF value.
      * If invalid, a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeValueException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
 
diff --git 
a/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java 
b/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
index 3d226d97d..cc442c8cb 100644
--- a/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
+++ b/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
@@ -43,11 +43,9 @@ public class XML11NMTOKENDatatypeValidator extends 
NMTOKENDatatypeValidator {
      * Checks that "content" string is valid NMTOKEN value.
      * If invalid a Datatype validation exception is thrown.
      * 
-     * @param content       the string value that needs to be validated
-     * @param context       the validation context
-     * @throws InvalidDatatypeException if the content is
-     *         invalid according to the rules for the validators
-     * @see InvalidDatatypeValueException
+     * @param content the string value that needs to be validated
+     * @param context the validation context
+     * @throws InvalidDatatypeValueException if the content is invalid 
according to the rules for the validators
      */
     public void validate(String content, ValidationContext context) throws 
InvalidDatatypeValueException {
         if (!XML11Char.isXML11ValidNmtoken(content)) {
diff --git a/src/org/apache/xerces/impl/dv/xs/DateDV.java 
b/src/org/apache/xerces/impl/dv/xs/DateDV.java
index abe1d9b13..1ce30792a 100644
--- a/src/org/apache/xerces/impl/dv/xs/DateDV.java
+++ b/src/org/apache/xerces/impl/dv/xs/DateDV.java
@@ -24,7 +24,7 @@ import 
org.apache.xerces.impl.dv.InvalidDatatypeValueException;
 import org.apache.xerces.impl.dv.ValidationContext;
 
 /**
- * Validator for <date> datatype (W3C Schema datatypes)
+ * Validator for <code>date</code> datatype (W3C Schema datatypes)
  *
  * @xerces.internal 
  *
diff --git a/src/org/apache/xerces/impl/dv/xs/DayDV.java 
b/src/org/apache/xerces/impl/dv/xs/DayDV.java
index c2073ae57..241c4fade 100644
--- a/src/org/apache/xerces/impl/dv/xs/DayDV.java
+++ b/src/org/apache/xerces/impl/dv/xs/DayDV.java
@@ -24,7 +24,7 @@ import 
org.apache.xerces.impl.dv.InvalidDatatypeValueException;
 import org.apache.xerces.impl.dv.ValidationContext;
 
 /**
- * Validator for &lt;gDay&gt; datatype (W3C Schema datatypes)
+ * Validator for <code>Day</code> datatype (W3C Schema datatypes)
  *
  * @xerces.internal 
  *
diff --git a/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java 
b/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java
index 57b6eff1f..07f210c57 100644
--- a/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java
+++ b/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java
@@ -2692,7 +2692,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, 
TypeInfo {
      * @param type
      *            The reference type definition
      * 
-     * @return boolean True if the type is derived by restriciton for the 
reference type
+     * @return boolean True if the type is derived by restriction for the 
reference type
      */
     private boolean isDerivedByAny(String ancestorNS, String ancestorName,
             XSTypeDefinition type) {
@@ -2749,7 +2749,7 @@ public class XSSimpleTypeDecl implements XSSimpleType, 
TypeInfo {
      * @param type
      *            The reference type definition
      * 
-     * @return boolean True if the type is derived by restriciton for the
+     * @return boolean True if the type is derived by restriction for the
      *         reference type
      */
     private boolean isDerivedByRestriction (String ancestorNS, String 
ancestorName, XSTypeDefinition type) {
diff --git a/src/org/apache/xerces/impl/xpath/regex/BMPattern.java 
b/src/org/apache/xerces/impl/xpath/regex/BMPattern.java
index d720af420..58f8fb5f5 100644
--- a/src/org/apache/xerces/impl/xpath/regex/BMPattern.java
+++ b/src/org/apache/xerces/impl/xpath/regex/BMPattern.java
@@ -113,9 +113,12 @@ public class BMPattern {
         }
         return -1;
     }
+
     /**
-     *
-     * @return -1 if <var>chars</char> does not contain this pattern.
+     * @param chars the chars to check
+     * @param start the start position
+     * @param limit the limit of the chars to check
+     * @return -1 if <var>chars</var> does not contain this pattern.
      */
     public int matches(char[] chars, int start, int limit) {
         if (this.ignoreCase)  return this.matchesIgnoreCase(chars, start, 
limit);
diff --git a/src/org/apache/xerces/impl/xs/AttributePSVImpl.java 
b/src/org/apache/xerces/impl/xs/AttributePSVImpl.java
index dc99b2a03..a0a40beea 100644
--- a/src/org/apache/xerces/impl/xs/AttributePSVImpl.java
+++ b/src/org/apache/xerces/impl/xs/AttributePSVImpl.java
@@ -123,7 +123,7 @@ public class AttributePSVImpl implements AttributePSVI {
      * [schema default]
      *
      * @return The canonical lexical representation of the declaration's 
{value constraint} value.
-     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default>XML 
Schema Part 1: Structures [schema default]</a>
+     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default";>XML 
Schema Part 1: Structures [schema default]</a>
      */
     public String getSchemaDefault() {
         return fDeclaration == null ? null : fDeclaration.getConstraintValue();
@@ -133,7 +133,7 @@ public class AttributePSVImpl implements AttributePSVI {
      * [schema normalized value]
      *
      *
-     * @see <a 
href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value>XML Schema 
Part 1: Structures [schema normalized value]</a>
+     * @see <a 
href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value";>XML Schema 
Part 1: Structures [schema normalized value]</a>
      * @return the normalized value of this item after validation
      */
     public String getSchemaNormalizedValue() {
diff --git a/src/org/apache/xerces/impl/xs/ElementPSVImpl.java 
b/src/org/apache/xerces/impl/xs/ElementPSVImpl.java
index 6673bbc94..9924b424a 100644
--- a/src/org/apache/xerces/impl/xs/ElementPSVImpl.java
+++ b/src/org/apache/xerces/impl/xs/ElementPSVImpl.java
@@ -148,7 +148,7 @@ public class ElementPSVImpl implements ElementPSVI {
      * [schema default]
      *
      * @return The canonical lexical representation of the declaration's 
{value constraint} value.
-     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default>XML 
Schema Part 1: Structures [schema default]</a>
+     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default";>XML 
Schema Part 1: Structures [schema default]</a>
      */
     public String getSchemaDefault() {
         return fDeclaration == null ? null : fDeclaration.getConstraintValue();
@@ -158,7 +158,7 @@ public class ElementPSVImpl implements ElementPSVI {
      * [schema normalized value]
      *
      *
-     * @see <a 
href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value>XML Schema 
Part 1: Structures [schema normalized value]</a>
+     * @see <a 
href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value";>XML Schema 
Part 1: Structures [schema normalized value]</a>
      * @return the normalized value of this item after validation
      */
     public String getSchemaNormalizedValue() {
@@ -228,7 +228,7 @@ public class ElementPSVImpl implements ElementPSVI {
 
     /**
      * [nil]
-     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-nil>XML Schema Part 
1: Structures [nil]</a>
+     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-nil";>XML Schema Part 
1: Structures [nil]</a>
      * @return true if clause 3.2 of Element Locally Valid (Element) (3.3.4) 
above is satisfied, otherwise false
      */
     public boolean getNil() {
@@ -237,7 +237,7 @@ public class ElementPSVImpl implements ElementPSVI {
 
     /**
      * [notation] 
-     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-notation>XML Schema 
Part 1: Structures [notation]</a>
+     * @see <a href="http://www.w3.org/TR/xmlschema-1/#e-notation";>XML Schema 
Part 1: Structures [notation]</a>
      * @return The notation declaration. 
      */
     public XSNotationDeclaration getNotation() {
diff --git a/src/org/apache/xerces/impl/xs/SchemaNamespaceSupport.java 
b/src/org/apache/xerces/impl/xs/SchemaNamespaceSupport.java
index 09e534451..80f52bdce 100644
--- a/src/org/apache/xerces/impl/xs/SchemaNamespaceSupport.java
+++ b/src/org/apache/xerces/impl/xs/SchemaNamespaceSupport.java
@@ -71,13 +71,17 @@ public class SchemaNamespaceSupport
     /**
      * This method takes a set of Strings, as stored in a
      * NamespaceSupport object, and "fools" the object into thinking
-     * that this is one unified context.  This is meant to be used in
-     * conjunction with things like local elements, whose declarations
-     * may be deeply nested but which for all practical purposes may
-     * be regarded as being one level below the global <schema>
-     * element--at least with regard to namespace declarations.
+     * that this is one unified context.
+     * <p>This is meant to be used in conjunction with things like local
+     * elements, whose declarations may be deeply nested but which for
+     * all practical purposes may be regarded as being one level below
+     * the global <code>schema</code> element--at least with regard to
+     * namespace declarations.
+     * </p>
      * It's worth noting that the context from which the strings are
      * being imported had better be using the same SymbolTable.
+     *
+     * @param namespaceDecls an array of namespace declarations
      */
     public void setEffectiveContext (String [] namespaceDecls) {
         if(namespaceDecls == null || namespaceDecls.length == 0) return;
diff --git a/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java 
b/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
index 110506d9f..aa40ae97f 100644
--- a/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
+++ b/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
@@ -407,7 +407,7 @@ public class XSComplexTypeDecl implements 
XSComplexTypeDefinition, TypeInfo {
      * @param type
      *            The reference type definition
      * 
-     * @return boolean True if the type is derived by restriciton for the
+     * @return boolean True if the type is derived by restriction for the
      *         reference type
      */
     private boolean isDerivedByRestriction(String ancestorNS,
diff --git a/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java 
b/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java
index 786e96c3d..e1ceaed38 100644
--- a/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java
+++ b/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java
@@ -131,20 +131,19 @@ public class CMNodeFactory {
     public void resetNodeCount(){
         nodeCount = 0 ;
     }
-        /**
+
+    /**
      * Sets the value of a property. This method is called by the component
      * manager any time after reset when a property changes value.
      * <p>
      * <strong>Note:</strong> Components should silently ignore properties
      * that do not affect the operation of the component.
+     * </p>
      *
-     * @param propertyId The property identifier.
-     * @param value      The value of the property.
+     * @param propertyId the property identifier
+     * @param value the value of the property
      *
-     * @throws SAXNotRecognizedException The component should not throw
-     *                                   this exception.
-     * @throws SAXNotSupportedException The component should not throw
-     *                                  this exception.
+     * @throws XMLConfigurationException declared but not actually thrown
      */
     public void setProperty(String propertyId, Object value)
         throws XMLConfigurationException {
diff --git a/src/org/apache/xerces/impl/xs/opti/AttrImpl.java 
b/src/org/apache/xerces/impl/xs/opti/AttrImpl.java
index eb3081415..fcda63750 100644
--- a/src/org/apache/xerces/impl/xs/opti/AttrImpl.java
+++ b/src/org/apache/xerces/impl/xs/opti/AttrImpl.java
@@ -44,7 +44,7 @@ public class AttrImpl extends NodeImpl
     public AttrImpl() {
         nodeType = Node.ATTRIBUTE_NODE;
     }
-    
+
     /**
      * Constructs an attribute.
      *
@@ -52,7 +52,7 @@ public class AttrImpl extends NodeImpl
      * @param prefix the QName prefix
      * @param localpart the QName local part
      * @param rawname the QName raw name
-     * @param uri the uri binding for the associated prefix
+     * @param uri the URI binding for the associated prefix
      * @param value the value of the attribute
      */
     public AttrImpl(Element element, String prefix, String localpart, String 
rawname, String uri, String value) {
diff --git a/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java 
b/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
index d56e39631..8340e6852 100644
--- a/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
+++ b/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
@@ -111,12 +111,12 @@ import org.xml.sax.helpers.XMLReaderFactory;
 
 
 /**
- * The purpose of this class is to co-ordinate the construction of a
- * grammar object corresponding to a schema.  To do this, it must be
- * prepared to parse several schema documents (for instance if the
- * schema document originally referred to contains <include> or
- * <redefined> information items).  If any of the schemas imports a
- * schema, other grammars may be constructed as a side-effect.
+ * The purpose of this class is to co-ordinate the construction of a grammar 
object
+ * corresponding to a schema.  To do this, it must be prepared to parse several
+ * schema documents (for instance if the schema document originally referred to
+ * contains <code>include</code> or <code>redefined</code> information items).
+ * If any of the schemas imports a schema, other grammars may be constructed as
+ * a side effect.
  *
  * @xerces.internal 
  *
diff --git a/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java 
b/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java
index 22d36341b..c40ccc004 100644
--- a/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java
+++ b/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java
@@ -244,7 +244,7 @@ public class DocumentBuilderFactoryImpl extends 
DocumentBuilderFactory {
             fSecureProcess = value;
             return;
         }
-        // Keep built-in settings in synch with the feature values.
+        // Keep built-in settings in sync with the feature values.
         else if (name.equals(NAMESPACES_FEATURE)) {
             setNamespaceAware(value);
             return;
diff --git a/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java 
b/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java
index ef2e47cb9..2fd2df920 100644
--- a/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java
+++ b/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java
@@ -117,7 +117,7 @@ public class SAXParserFactoryImpl extends SAXParserFactory {
             fSecureProcess = value;
             return;
         }
-        // Keep built-in settings in synch with the feature values.
+        // Keep built-in settings in sync with the feature values.
         else if (name.equals(NAMESPACES_FEATURE)) {
             setNamespaceAware(value);
             return;
diff --git a/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java 
b/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java
index 0e3c76875..59244a5cc 100644
--- a/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java
+++ b/src/org/apache/xerces/jaxp/datatype/DatatypeFactoryImpl.java
@@ -20,6 +20,7 @@ package org.apache.xerces.jaxp.datatype;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.GregorianCalendar;
+import java.util.TimeZone;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeConstants;
@@ -233,12 +234,11 @@ public class DatatypeFactoryImpl extends DatatypeFactory {
     /**
      * <p>Create an <code>XMLGregorianCalendar</code> from a {@link 
GregorianCalendar}.</p> 
      *
-     * <table border="2" rules="all" cellpadding="2">
+     * <table border="1" rules="all" cellpadding="2">
      *   <thead>
      *     <tr>
-     *       <th align="center" colspan="2">
-     *          Field by Field Conversion from
-     *          {@link GregorianCalendar} to an {@link XMLGregorianCalendar} 
+     *       <th style="text-align: center;" colspan="2">
+     *          Field by Field Conversion from {@link GregorianCalendar} to an 
{@link XMLGregorianCalendar}
      *       </th>
      *     </tr>
      *     <tr>
@@ -277,20 +277,20 @@ public class DatatypeFactoryImpl extends DatatypeFactory {
      * a <code>java.util.GregorianCalendar</code> daylight savings timezone id 
in the 
      * XML Schema 1.0 date/time datatype representation.</p>
      * 
-     * <p>To compute the return value's <code>TimeZone</code> field,
+     * <p>To compute the return value's <code>TimeZone</code> field:</p>
      * <ul>
-     * <li>when <code>this.getTimezone() != FIELD_UNDEFINED</code>,
-     * create a <code>java.util.TimeZone</code> with a custom timezone id 
-     * using the <code>this.getTimezone()</code>.</li>
-     * <li>else use the <code>GregorianCalendar</code> default timezone value 
-     * for the host is defined as specified by 
-     * <code>java.util.TimeZone.getDefault()</code>.</li></p>     
+     *   <li>when <code>this.getTimezone() != FIELD_UNDEFINED</code>, create a
+     *   <code>java.util.TimeZone</code> with a custom timezone id using
+     *   the <code>this.getTimezone()</code>.</li>
+     *   <li>else use the {@link GregorianCalendar} default timezone value
+     *   for the host is defined as specified by {@link 
TimeZone#getDefault()}.</li>
+     * </ul>
      *
-     * @param cal <code>java.util.GregorianCalendar</code> used to create 
<code>XMLGregorianCalendar</code>
+     * @param cal {@link GregorianCalendar} used to create 
<code>XMLGregorianCalendar</code>
      * 
-     * @return <code>XMLGregorianCalendar</code> created from 
<code>java.util.GregorianCalendar</code>
+     * @return <code>XMLGregorianCalendar</code> created from {@link 
GregorianCalendar}
      *  
-     * @throws NullPointerException If <code>cal</code> is <code>null</code>.
+     * @throws NullPointerException if <code>cal</code> is <code>null</code>
      */
     public XMLGregorianCalendar newXMLGregorianCalendar(final 
GregorianCalendar cal) {
 
diff --git a/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java 
b/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java
index 0a3648867..9c3b1a8f4 100644
--- a/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java
+++ b/src/org/apache/xerces/jaxp/datatype/XMLGregorianCalendarImpl.java
@@ -35,7 +35,7 @@ import javax.xml.namespace.QName;
 import org.apache.xerces.util.DatatypeMessageFormatter;
 
 /** 
- * <p>Representation for W3C XML Schema 1.0 date/time datatypes.
+ * Representation for W3C XML Schema 1.0 date/time datatypes.
  * Specifically, these date/time datatypes are 
  * {@link DatatypeConstants#DATETIME dateTime},
  * {@link DatatypeConstants#TIME time},
@@ -48,19 +48,18 @@ import org.apache.xerces.util.DatatypeMessageFormatter;
  * defined in the XML Namespace
  * <code>"http://www.w3.org/2001/XMLSchema";</code>.
  * These datatypes are normatively defined in 
- * <a href="http://www.w3.org/TR/xmlschema-2/#dateTime";>W3C XML Schema 1.0 
Part 2, Section 3.2.7-14</a>.</p>
+ * <a href="http://www.w3.org/TR/xmlschema-2/#dateTime";>W3C XML Schema 1.0 
Part 2, Section 3.2.7-14</a>.
  *
- * <p>The table below defines the mapping between XML Schema 1.0
- * date/time datatype fields and this class' fields. It also summarizes
- * the value constraints for the date and time fields defined in
- * <a href="http://www.w3.org/TR/xmlschema-2/#isoformats";>W3C XML Schema 1.0 
Part 2, Appendix D,
- * <i>ISO 8601 Date and Time Formats</i></a>.</p>
+ * <p>The table below defines the mapping between XML Schema 1.0 date/time 
datatype fields and this class' fields.
+ * It also summarizes the value constraints for the date and time fields 
defined in
+ * <a href="http://www.w3.org/TR/xmlschema-2/#isoformats";>W3C XML Schema 1.0 
Part 2, Appendix D, <i>ISO 8601 Date and Time Formats</i></a>.
+ * </p>
  * 
- * <a name="datetimefieldsmapping"/>
- * <table border="2" rules="all" cellpadding="2">
+ * <a name="datetimefieldsmapping"></a>
+ * <table border="1">
  *   <thead>
  *     <tr>
- *       <th align="center" colspan="3">
+ *       <th style="text-align: center;" colspan="3">
  *         Date/time datatype field mapping between XML Schema 1.0 and Java 
representation
  *       </th>
  *     </tr>
@@ -73,8 +72,7 @@ import org.apache.xerces.util.DatatypeMessageFormatter;
  *       <th>Related<br/>XMLGregorianCalendar<br/>Accessor(s)</th>
  *       <th>Value Range</th>
  *     </tr>
- *     <a name="datetimefield-year"/>
- *     <tr>
+ *     <tr id="datetimefield-year">
  *       <td> year </td>
  *       <td> {@link #getYear()} + {@link #getEon()} or<br/>
  *            {@link #getEonAndYear}
@@ -83,7 +81,7 @@ import org.apache.xerces.util.DatatypeMessageFormatter;
  *            or {@link DatatypeConstants#FIELD_UNDEFINED}.<br/>
  *            {@link #getEon()} is high order year value in billion of 
years.<br/>
  *            <code>getEon()</code> has values greater than or equal to (10^9) 
or less than or equal to -(10^9).
- *            A value of null indicates field is undefined.</br>
+ *            A value of null indicates field is undefined.<br/>
  *            Given that <a 
href="http://www.w3.org/2001/05/xmlschema-errata#e2-63";>XML Schema 1.0 
errata</a> states that the year zero
  *            will be a valid lexical value in a future version of XML Schema, 
  *            this class allows the year field to be set to zero. Otherwise,
@@ -92,14 +90,12 @@ import org.apache.xerces.util.DatatypeMessageFormatter;
  *            validation does not allow for the year field to have a value of 
zero.
  *            </td>
  *     </tr>
- *     <a name="datetimefield-month"/>
- *     <tr>
+ *     <tr id="datetimefield-month">
  *       <td> month </td>
  *       <td> {@link #getMonth()} </td>
  *       <td> 1 to 12 or {@link DatatypeConstants#FIELD_UNDEFINED} </td>
  *     </tr>
- *     <a name="datetimefield-day"/>
- *     <tr>
+ *     <tr id="datetimefield-day">
  *       <td> day </td>
  *       <td> {@link #getDay()} </td>
  *       <td> Independent of month, max range is 1 to 31 or {@link 
DatatypeConstants#FIELD_UNDEFINED}.<br/>
@@ -107,8 +103,7 @@ import org.apache.xerces.util.DatatypeMessageFormatter;
  *            field's value is in <a 
href="http://www.w3.org/TR/xmlschema-2/#isoformats";>W3C XML Schema 1.0 Part 2, 
Appendix D</a>.
  *       </td> 
  *     </tr>
- *     <a name="datetimefield-hour"/>
- *     <tr>
+ *     <tr id="datetimefield-hour">
  *       <td> hour </td>
  *       <td> {@link #getHour()} </td>
  *       <td>
@@ -116,14 +111,12 @@ import org.apache.xerces.util.DatatypeMessageFormatter;
  *         <a href="http://www.w3.org/2001/05/xmlschema-errata#e2-45";>For a 
value of 24, the minute and second field must be zero.</a>
  *       </td>
  *     </tr>
- *     <a name="datetimefield-minute"/>
- *     <tr>
+ *     <tr id="datetimefield-minute">
  *       <td> minute </td>
  *       <td> {@link #getMinute()} </td>
  *       <td> 0 to 59 or {@link DatatypeConstants#FIELD_UNDEFINED} </td>
  *     </tr>
- *     <a name="datetimefield-second"/>
- *     <tr>
+ *     <tr id="datetimefield-second">
  *       <td>second</td>
  *       <td>
  *         {@link #getSecond()} + {@link #getMillisecond()}/1000 or<br/>
@@ -158,7 +151,7 @@ import org.apache.xerces.util.DatatypeMessageFormatter;
  * fields are not checked by these methods. 
  * </p>
  * 
- * <p>The following operations are defined for this class:
+ * <p>The following operations are defined for this class:</p>
  * <ul>
  *   <li>factory methods to create instances</li>
  *   <li>accessors/mutators for independent date/time fields</li>
@@ -170,7 +163,6 @@ import org.apache.xerces.util.DatatypeMessageFormatter;
  * instance as defined in <a 
href="http://www.w3.org/TR/xmlschema-2/#adding-durations-to-dateTimes";>
  * W3C XML Schema 1.0 Part 2, Appendix E, <i>Adding durations to 
dateTimes</i></a>.</li>
  * </ul>
- * </p>
  * 
  * @author <a href="mailto:[email protected]";>Kohsuke Kawaguchi</a>
  * @author <a href="mailto:[email protected]";>Joseph Fialli</a>
@@ -653,10 +645,10 @@ class XMLGregorianCalendarImpl
         * <p>Convert a <code>java.util.GregorianCalendar</code> to XML Schema 
1.0 
         * representation.</p>
         *
-        * <table border="2" rules="all" cellpadding="2">
+        * <table border="1">
         *   <thead>
         *     <tr>
-        *       <th align="center" colspan="2">
+        *       <th colspan="2">
         *          Field by Field Conversion from
         *          <code>java.util.GregorianCalendar</code> to this class 
         *       </th>
@@ -1830,10 +1822,10 @@ class XMLGregorianCalendarImpl
      * <p>Return the name of the XML Schema date/time type that this instance 
      * maps to. Type is computed based on fields that are set.</p>
      *
-     * <table border="2" rules="all" cellpadding="2">
+     * <table border="1">
      *   <thead>
      *     <tr>
-     *       <th align="center" colspan="7">
+     *       <th colspan="7">
      *         Required fields for XML Schema 1.0 Date/Time Datatypes.<br/>
      *         <i>(timezone is optional for all date/time datatypes)</i>
      *       </th>
@@ -2399,10 +2391,10 @@ class XMLGregorianCalendarImpl
      * instance, see 
      * {@link #toGregorianCalendar(TimeZone, Locale, 
XMLGregorianCalendar)}.</p>
      * 
-     * <table border="2" rules="all" cellpadding="2">
+     * <table border="1">
      *   <thead>
      *     <tr>
-     *       <th align="center" colspan="2">
+     *       <th colspan="2">
      *          Field by Field Conversion from this class to 
      *          <code>java.util.GregorianCalendar</code>
      *       </th>
diff --git a/src/org/apache/xerces/parsers/SecureProcessingConfiguration.java 
b/src/org/apache/xerces/parsers/SecureProcessingConfiguration.java
index e6b313382..3444d7292 100644
--- a/src/org/apache/xerces/parsers/SecureProcessingConfiguration.java
+++ b/src/org/apache/xerces/parsers/SecureProcessingConfiguration.java
@@ -138,7 +138,7 @@ public final class SecureProcessingConfiguration extends
     /** 
      * Constructs a parser configuration using the specified symbol table. 
      *
-     * @param symbolTable The symbol table to use.
+     * @param symbolTable the symbol table to use
      */
     public SecureProcessingConfiguration(SymbolTable symbolTable) {
         this(symbolTable, null, null);
@@ -147,10 +147,9 @@ public final class SecureProcessingConfiguration extends
     /**
      * Constructs a parser configuration using the specified symbol table and
      * grammar pool.
-     * <p>
      *
-     * @param symbolTable The symbol table to use.
-     * @param grammarPool The grammar pool to use.
+     * @param symbolTable the symbol table to use
+     * @param grammarPool the grammar pool to use
      */
     public SecureProcessingConfiguration(
             SymbolTable symbolTable,
@@ -161,11 +160,10 @@ public final class SecureProcessingConfiguration extends
     /**
      * Constructs a parser configuration using the specified symbol table,
      * grammar pool, and parent settings.
-     * <p>
      *
-     * @param symbolTable    The symbol table to use.
-     * @param grammarPool    The grammar pool to use.
-     * @param parentSettings The parent settings.
+     * @param symbolTable the symbol table to use
+     * @param grammarPool the grammar pool to use
+     * @param parentSettings the parent settings
      */
     public SecureProcessingConfiguration(
             SymbolTable symbolTable,
@@ -221,7 +219,7 @@ public final class SecureProcessingConfiguration extends
     /**
      * Returns the value of a property.
      * 
-     * @param propertyId The property identifier.
+     * @param propertyId the property identifier
      * @return the value of the property
      * 
      * @throws XMLConfigurationException Thrown for configuration error.
diff --git 
a/src/org/apache/xerces/parsers/SoftReferenceSymbolTableConfiguration.java 
b/src/org/apache/xerces/parsers/SoftReferenceSymbolTableConfiguration.java
index b6f7f4df7..0d22a3751 100644
--- a/src/org/apache/xerces/parsers/SoftReferenceSymbolTableConfiguration.java
+++ b/src/org/apache/xerces/parsers/SoftReferenceSymbolTableConfiguration.java
@@ -55,10 +55,9 @@ public class SoftReferenceSymbolTableConfiguration extends
     /**
      * Constructs a parser configuration using the specified symbol table and
      * grammar pool.
-     * <p>
      *
-     * @param symbolTable The symbol table to use.
-     * @param grammarPool The grammar pool to use.
+     * @param symbolTable the symbol table to use
+     * @param grammarPool the grammar pool to use
      */
     public SoftReferenceSymbolTableConfiguration(
             SymbolTable symbolTable,
@@ -69,11 +68,10 @@ public class SoftReferenceSymbolTableConfiguration extends
     /**
      * Constructs a parser configuration using the specified symbol table,
      * grammar pool, and parent settings.
-     * <p>
      *
-     * @param symbolTable    The symbol table to use.
-     * @param grammarPool    The grammar pool to use.
-     * @param parentSettings The parent settings.
+     * @param symbolTable the symbol table to use
+     * @param grammarPool the grammar pool to use
+     * @param parentSettings the parent settings
      */
     public SoftReferenceSymbolTableConfiguration(
             SymbolTable symbolTable,
diff --git 
a/src/org/apache/xerces/parsers/XIncludeAwareParserConfiguration.java 
b/src/org/apache/xerces/parsers/XIncludeAwareParserConfiguration.java
index 04815caac..0ce1b6a09 100644
--- a/src/org/apache/xerces/parsers/XIncludeAwareParserConfiguration.java
+++ b/src/org/apache/xerces/parsers/XIncludeAwareParserConfiguration.java
@@ -90,7 +90,7 @@ public class XIncludeAwareParserConfiguration extends 
XML11Configuration {
     /** 
      * Constructs a parser configuration using the specified symbol table. 
      *
-     * @param symbolTable The symbol table to use.
+     * @param symbolTable the symbol table to use
      */
     public XIncludeAwareParserConfiguration(SymbolTable symbolTable) {
         this(symbolTable, null, null);
@@ -99,10 +99,9 @@ public class XIncludeAwareParserConfiguration extends 
XML11Configuration {
     /**
      * Constructs a parser configuration using the specified symbol table and
      * grammar pool.
-     * <p>
      *
-     * @param symbolTable The symbol table to use.
-     * @param grammarPool The grammar pool to use.
+     * @param symbolTable the symbol table to use
+     * @param grammarPool the grammar pool to use
      */
     public XIncludeAwareParserConfiguration(
             SymbolTable symbolTable,
@@ -113,11 +112,10 @@ public class XIncludeAwareParserConfiguration extends 
XML11Configuration {
     /**
      * Constructs a parser configuration using the specified symbol table,
      * grammar pool, and parent settings.
-     * <p>
      *
-     * @param symbolTable    The symbol table to use.
-     * @param grammarPool    The grammar pool to use.
-     * @param parentSettings The parent settings.
+     * @param symbolTable the symbol table to use
+     * @param grammarPool the grammar pool to use
+     * @param parentSettings the parent settings
      */
     public XIncludeAwareParserConfiguration(
             SymbolTable symbolTable,
diff --git a/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java 
b/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java
index 021f1a32b..f8d7e3239 100644
--- a/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java
+++ b/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java
@@ -38,7 +38,7 @@ import org.apache.xerces.xni.parser.XMLEntityResolver;
 import org.apache.xerces.xni.parser.XMLInputSource;
 
 /**
- * <p> This configuration provides a generic way of using
+ * <p>This configuration provides a generic way of using
  * Xerces's grammar caching facilities.  It extends the
  * XIncludeAwareParserConfiguration and thus may validate documents
  * according to XML schemas or DTD's.  It also allows the user to
@@ -54,8 +54,6 @@ import org.apache.xerces.xni.parser.XMLInputSource;
  * In addition to the features and properties recognized by the base
  * parser configuration, this class recognizes these additional 
  * features and properties:
- * <ul>
- * </ul>
  *
  * @author Neil Graham, IBM
  *
diff --git a/src/org/apache/xerces/parsers/XPointerParserConfiguration.java 
b/src/org/apache/xerces/parsers/XPointerParserConfiguration.java
index 2c595b060..a2fd56c87 100644
--- a/src/org/apache/xerces/parsers/XPointerParserConfiguration.java
+++ b/src/org/apache/xerces/parsers/XPointerParserConfiguration.java
@@ -83,10 +83,9 @@ public class XPointerParserConfiguration extends 
XML11Configuration {
     /**
      * Constructs a parser configuration using the specified symbol table and
      * grammar pool.
-     * <p>
      *
-     * @param symbolTable The symbol table to use.
-     * @param grammarPool The grammar pool to use.
+     * @param symbolTable the symbol table to use
+     * @param grammarPool the grammar pool to use
      */
     public XPointerParserConfiguration(
         SymbolTable symbolTable,
@@ -97,11 +96,10 @@ public class XPointerParserConfiguration extends 
XML11Configuration {
     /**
      * Constructs a parser configuration using the specified symbol table,
      * grammar pool, and parent settings.
-     * <p>
      *
-     * @param symbolTable    The symbol table to use.
-     * @param grammarPool    The grammar pool to use.
-     * @param parentSettings The parent settings.
+     * @param symbolTable    the symbol table to use
+     * @param grammarPool    the grammar pool to use
+     * @param parentSettings the parent settings
      */
     public XPointerParserConfiguration(
         SymbolTable symbolTable,
diff --git a/src/org/apache/xerces/stax/events/CharactersImpl.java 
b/src/org/apache/xerces/stax/events/CharactersImpl.java
index c732af5de..3cffe0d03 100644
--- a/src/org/apache/xerces/stax/events/CharactersImpl.java
+++ b/src/org/apache/xerces/stax/events/CharactersImpl.java
@@ -39,9 +39,13 @@ public final class CharactersImpl extends XMLEventImpl 
implements Characters {
 
     /**
      * Standard constructor.
-     * @param eventType
-     * @param location
-     * @param schemaType
+     *
+     * @param data the text characters of this event
+     * @param eventType int value representing the type of this event. {@see 
javax.xml.stream.XMLStreamConstants}
+     * @param location Location object for this event
+     *
+     * @see javax.xml.stream.XMLStreamConstants
+     * @see javax.xml.stream.Location
      */
     public CharactersImpl(final String data, final int eventType, final 
Location location) {
         super(eventType, location);
diff --git a/src/org/apache/xerces/stax/events/EntityDeclarationImpl.java 
b/src/org/apache/xerces/stax/events/EntityDeclarationImpl.java
index 91e823b18..f9c6f8744 100644
--- a/src/org/apache/xerces/stax/events/EntityDeclarationImpl.java
+++ b/src/org/apache/xerces/stax/events/EntityDeclarationImpl.java
@@ -40,9 +40,13 @@ public final class EntityDeclarationImpl extends 
XMLEventImpl implements
     private final String fNotationName;
 
     /**
-     * @param eventType
-     * @param location
-     * @param schemaType
+     * Constructor for an implementation of {@link EntityDeclaration}.
+     *
+     * @param publicId the entity's public identifier, or null
+     * @param systemId the entity's system identifier
+     * @param name the entity's name
+     * @param notationName the name of the associated notation
+     * @param location the {@link Location}
      */
     public EntityDeclarationImpl(final String publicId, final String systemId, 
final String name, final String notationName, final Location location) {
         super(ENTITY_DECLARATION, location);
diff --git a/src/org/apache/xerces/stax/events/NamespaceImpl.java 
b/src/org/apache/xerces/stax/events/NamespaceImpl.java
index 320931cd4..d326e8ae3 100644
--- a/src/org/apache/xerces/stax/events/NamespaceImpl.java
+++ b/src/org/apache/xerces/stax/events/NamespaceImpl.java
@@ -35,8 +35,11 @@ public final class NamespaceImpl extends AttributeImpl 
implements Namespace {
     private final String fNamespaceURI;
 
     /**
-     * @param location
-     * @param schemaType
+     * Constructor for an implementation of {@link Namespace}.
+     *
+     * @param prefix the prefix
+     * @param namespaceURI the namespaceURI
+     * @param location the {@link Location}
      */
     public NamespaceImpl(final String prefix, final String namespaceURI, final 
Location location) {
         super(NAMESPACE, makeAttributeQName(prefix), namespaceURI, null, true, 
location);
diff --git a/src/org/apache/xerces/stax/events/NotationDeclarationImpl.java 
b/src/org/apache/xerces/stax/events/NotationDeclarationImpl.java
index bfa6a97ca..5a7b27d3c 100644
--- a/src/org/apache/xerces/stax/events/NotationDeclarationImpl.java
+++ b/src/org/apache/xerces/stax/events/NotationDeclarationImpl.java
@@ -20,9 +20,11 @@ package org.apache.xerces.stax.events;
 import java.io.IOException;
 import java.io.Writer;
 
+import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.Location;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.NotationDeclaration;
+import javax.xml.stream.events.StartElement;
 
 /**
  * @xerces.internal
@@ -39,9 +41,13 @@ public final class NotationDeclarationImpl extends 
XMLEventImpl implements
     private final String fName;
 
     /**
-     * @param eventType
-     * @param location
-     * @param schemaType
+     * Constructor for an implementation of {@link NotationDeclaration}.
+     *
+     * @param name the name
+     * @param publicId the public identifier for the notation declaration
+     * @param systemId the system identifier for the notation declaration
+     * @param location the location object for the notation declaration
+     * @see Location
      */
     public NotationDeclarationImpl(final String name, final String publicId, 
final String systemId, final Location location) {
         super(NOTATION_DECLARATION, location);
diff --git a/src/org/apache/xerces/stax/events/StartElementImpl.java 
b/src/org/apache/xerces/stax/events/StartElementImpl.java
index b61d9359d..ba34db35e 100644
--- a/src/org/apache/xerces/stax/events/StartElementImpl.java
+++ b/src/org/apache/xerces/stax/events/StartElementImpl.java
@@ -58,8 +58,13 @@ public final class StartElementImpl extends ElementImpl 
implements StartElement
     private final NamespaceContext fNamespaceContext;
 
     /**
-     * @param location
-     * @param schemaType
+     * Constructor for an implementation of {@link StartElement}.
+     *
+     * @param name the qualified name
+     * @param attributes the element's attributes
+     * @param namespaces the element's namespaces
+     * @param namespaceContext the element's {@link NamespaceContext}
+     * @param location the element's {@link Location}
      */
     public StartElementImpl(final QName name, final Iterator attributes, final 
Iterator namespaces, final NamespaceContext namespaceContext, final Location 
location) {
         super(name, true, namespaces, location);
diff --git a/src/org/apache/xerces/util/AugmentationsImpl.java 
b/src/org/apache/xerces/util/AugmentationsImpl.java
index 32d2a38d0..3b9644abc 100644
--- a/src/org/apache/xerces/util/AugmentationsImpl.java
+++ b/src/org/apache/xerces/util/AugmentationsImpl.java
@@ -31,7 +31,6 @@ import org.apache.xerces.xni.Augmentations;
  * be passed along the document pipeline. The information can contain extra
  * arguments or infoset augmentations, for example PSVI. This additional
  * information is identified by a String key.
- * <p>
  * 
  * @author Elena Litani, IBM
  * @version $Id$
diff --git a/src/org/apache/xerces/util/SymbolTable.java 
b/src/org/apache/xerces/util/SymbolTable.java
index 92f08e185..790f3c408 100644
--- a/src/org/apache/xerces/util/SymbolTable.java
+++ b/src/org/apache/xerces/util/SymbolTable.java
@@ -25,6 +25,7 @@ package org.apache.xerces.util;
  * <p>
  * The symbol table performs the same task as <code>String.intern()</code>
  * with the following differences:
+ * </p>
  * <ul>
  *  <li>
  *   A new string object does not need to be created in order to
@@ -39,7 +40,7 @@ package org.apache.xerces.util;
  *   characters are especially prone to this poor hashing behavior.
  *  </li>
  * </ul>
- * </p>
+ *
  * <p>
  * An instance of <code>SymbolTable</code> has two parameters that affect its
  * performance: <i>initial capacity</i> and <i>load factor</i>.  The
diff --git a/src/org/apache/xerces/xinclude/XIncludeHandler.java 
b/src/org/apache/xerces/xinclude/XIncludeHandler.java
index 74e426275..9cce2aedd 100644
--- a/src/org/apache/xerces/xinclude/XIncludeHandler.java
+++ b/src/org/apache/xerces/xinclude/XIncludeHandler.java
@@ -90,6 +90,7 @@ import org.xml.sax.SAXNotSupportedException;
  * <p>
  * This component requires the following features and properties from the
  * component manager that uses it:
+ * </p>
  * <ul>
  *  <li>http://xml.org/sax/features/allow-dtd-events-after-endDTD</li>
  *  <li>http://apache.org/xml/properties/internal/error-reporter</li>
@@ -99,7 +100,7 @@ import org.xml.sax.SAXNotSupportedException;
  * <ul>
  *  <li>http://apache.org/xml/properties/input-buffer-size</li>
  * </ul>
- * 
+ * <p>
  * Furthermore, the <code>NamespaceContext</code> used in the pipeline is 
required
  * to be an instance of <code>XIncludeNamespaceSupport</code>.
  * </p>
diff --git a/src/org/apache/xerces/xni/XMLDTDContentModelHandler.java 
b/src/org/apache/xerces/xni/XMLDTDContentModelHandler.java
index 0bfe1da45..ca20e17c0 100644
--- a/src/org/apache/xerces/xni/XMLDTDContentModelHandler.java
+++ b/src/org/apache/xerces/xni/XMLDTDContentModelHandler.java
@@ -41,11 +41,9 @@ public interface XMLDTDContentModelHandler {
     // separators
 
     /** 
-     * A choice separator for children and mixed content models. This
-     * separator is used to specify that the allowed child is one of a
-     * collection.
-     * <p>
-     * For example:
+     * A choice separator for children and mixed content models. This 
separator is used
+     * to specify that the allowed child is one of a collection.
+     * <p>For example:</p>
      * <pre>
      * &lt;!ELEMENT elem (foo|bar)&gt;
      * &lt;!ELEMENT elem (foo|bar+)&gt;
@@ -58,10 +56,8 @@ public interface XMLDTDContentModelHandler {
     public static final short SEPARATOR_CHOICE = 0;
 
     /**
-     * A sequence separator for children content models. This separator 
-     * is used to specify that the allowed children must follow in the
-     * specified sequence.
-     * <p>
+     * A sequence separator for children content models. This separator is 
used to
+     * specify that the allowed children must follow in the specified sequence.
      * <pre>
      * &lt;!ELEMENT elem (foo,bar)&gt;
      * &lt;!ELEMENT elem (foo,bar*)&gt;
@@ -75,11 +71,9 @@ public interface XMLDTDContentModelHandler {
     // occurrence counts
 
     /** 
-     * This occurrence count limits the element, choice, or sequence in a
-     * children content model to zero or one. In other words, the child
-     * is optional.
-     * <p>
-     * For example:
+     * This occurrence count limits the element, choice, or sequence in a 
children content
+     * model to zero or one. In other words, the child is optional.
+     * <p>For example:</p>
      * <pre>
      * &lt;!ELEMENT elem (foo?)&gt;
      * </pre>
@@ -90,12 +84,10 @@ public interface XMLDTDContentModelHandler {
     public static final short OCCURS_ZERO_OR_ONE = 2;
 
     /** 
-     * This occurrence count limits the element, choice, or sequence in a
-     * children content model to zero or more. In other words, the child
-     * may appear an arbitrary number of times, or not at all. This
-     * occurrence count is also used for mixed content models.
-     * <p>
-     * For example:
+     * This occurrence count limits the element, choice, or sequence in a 
children content
+     * model to zero or more. In other words, the child may appear an 
arbitrary number of
+     * times, or not at all. This occurrence count is also used for mixed 
content models.
+     * <p>For example:</p>
      * <pre>
      * &lt;!ELEMENT elem (foo*)&gt;
      * &lt;!ELEMENT elem (#PCDATA|foo|bar)*&gt;
@@ -107,12 +99,10 @@ public interface XMLDTDContentModelHandler {
     public static final short OCCURS_ZERO_OR_MORE = 3;
 
     /** 
-     * This occurrence count limits the element, choice, or sequence in a
-     * children content model to one or more. In other words, the child
-     * may appear an arbitrary number of times, but must appear at least
-     * once.
-     * <p>
-     * For example:
+     * This occurrence count limits the element, choice, or sequence in a 
children content
+     * model to one or more. In other words, the child may appear an arbitrary 
number of
+     * times, but must appear at least once.
+     * <p>For example:</p>
      * <pre>
      * &lt;!ELEMENT elem (foo+)&gt;
      * </pre>
diff --git a/src/org/apache/xerces/xs/datatypes/package.html 
b/src/org/apache/xerces/xs/datatypes/package.html
index a343690ad..c866494cb 100644
--- a/src/org/apache/xerces/xs/datatypes/package.html
+++ b/src/org/apache/xerces/xs/datatypes/package.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
-<head >
+<head>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,192 +29,192 @@ The table below gives the data type to applicable 
interface mapping:
 <TABLE border="1">
        <TBODY>
                <TR>
-                       <TD width="332" align="center">XML Schema Data Type</TD>
-                       <TD align="center" width="202">Interface/Class</TD>
+                       <TD style="width: 332px; text-align: center;">XML 
Schema Data Type</TD>
+                       <TD style="width: 202px; text-align: 
center;">Interface/Class</TD>
                </TR>
                <TR>
-                       <TD width="332"></TD>
-                       <TD width="202"></TD>
+                       <TD style="width: 332px;"></TD>
+                       <TD style="width: 202px;"></TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">string</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: 
center;">string</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">boolean</TD>
-                       <TD width="202" align="center">java.lang.Boolean</TD>
+                       <TD style="width: 332px; text-align: 
center;">boolean</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.Boolean</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">decimal</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">decimal</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">float</TD>
-                       <TD width="202" align="center">XSFloat</TD>
+                       <TD style="width: 332px; text-align: center;">float</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSFloat</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">double</TD>
-                       <TD width="202" align="center">XSDouble</TD>
+                       <TD style="width: 332px; text-align: 
center;">double</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDouble</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">duration</TD>
-                       <TD width="202" align="center">XSDateTime</TD>
+                       <TD style="width: 332px; text-align: 
center;">duration</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDateTime</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">dateTime</TD>
-                       <TD width="202" align="center">XSDateTime</TD>
+                       <TD style="width: 332px; text-align: 
center;">dateTime</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDateTime</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">date</TD>
-                       <TD width="202" align="center">XSDateTime</TD>
+                       <TD style="width: 332px; text-align: center;">date</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDateTime</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">time</TD>
-                       <TD width="202" align="center">XSDateTime</TD>
+                       <TD style="width: 332px; text-align: center;">time</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDateTime</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">gYear</TD>
-                       <TD width="202" align="center">XSDateTime</TD>
+                       <TD style="width: 332px; text-align: center;">gYear</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDateTime</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">gMonth</TD>
-                       <TD width="202" align="center">XSDateTime</TD>
+                       <TD style="width: 332px; text-align: 
center;">gMonth</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDateTime</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">gDay</TD>
-                       <TD width="202" align="center">XSDateTime</TD>
+                       <TD style="width: 332px; text-align: center;">gDay</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDateTime</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">gYearMonth</TD>
-                       <TD width="202" align="center">XSDateTime</TD>
+                       <TD style="width: 332px; text-align: 
center;">gYearMonth</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDateTime</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">gMonthDay</TD>
-                       <TD width="202" align="center">XSDateTime</TD>
+                       <TD style="width: 332px; text-align: 
center;">gMonthDay</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDateTime</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">hexBinary</TD>
-                       <TD width="202" align="center">ByteList</TD>
+                       <TD style="width: 332px; text-align: 
center;">hexBinary</TD>
+                       <TD style="width: 202px; text-align: 
center;">ByteList</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">base64Binary</TD>
-                       <TD width="202" align="center">ByteList</TD>
+                       <TD style="width: 332px; text-align: 
center;">base64Binary</TD>
+                       <TD style="width: 202px; text-align: 
center;">ByteList</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">anyURI</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: 
center;">anyURI</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">QName</TD>
-                       <TD width="202" align="center">XSQName</TD>
+                       <TD style="width: 332px; text-align: center;">QName</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSQName</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">NOTATION</TD>
-                       <TD width="202" align="center">XSQName</TD>
+                       <TD style="width: 332px; text-align: 
center;">NOTATION</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSQName</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">normalizedString</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: 
center;">normalizedString</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">token</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: center;">token</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">language</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: 
center;">language</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">NMTOKEN</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: 
center;">NMTOKEN</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">NMTOKENS</TD>
-                       <TD width="202" align="center">ObjectList</TD>
+                       <TD style="width: 332px; text-align: 
center;">NMTOKENS</TD>
+                       <TD style="width: 202px; text-align: 
center;">ObjectList</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">Name</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: center;">Name</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">NCName</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: 
center;">NCName</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">ID</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: center;">ID</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">IDREF</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: center;">IDREF</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">IDREFS</TD>
-                       <TD width="202" align="center">ObjectList</TD>
+                       <TD style="width: 332px; text-align: 
center;">IDREFS</TD>
+                       <TD style="width: 202px; text-align: 
center;">ObjectList</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">ENTITY</TD>
-                       <TD width="202" align="center">java.lang.String</TD>
+                       <TD style="width: 332px; text-align: 
center;">ENTITY</TD>
+                       <TD style="width: 202px; text-align: 
center;">java.lang.String</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">ENTITIES</TD>
-                       <TD width="202" align="center">ObjectList</TD>
+                       <TD style="width: 332px; text-align: 
center;">ENTITIES</TD>
+                       <TD style="width: 202px; text-align: 
center;">ObjectList</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">list</TD>
-                       <TD width="202" align="center">ObjectList</TD>
+                       <TD style="width: 332px; text-align: center;">list</TD>
+                       <TD style="width: 202px; text-align: 
center;">ObjectList</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">integer</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">integer</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">positiveInteger</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">positiveInteger</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">negativeInteger</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">negativeInteger</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">nonPositiveInteger</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">nonPositiveInteger</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">nonNegativeInteger</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">nonNegativeInteger</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">unsignedShort</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">unsignedShort</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">unsignedLong</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">unsignedLong</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">unsignedByte</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">unsignedByte</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">unsignedInt</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: 
center;">unsignedInt</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">long</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: center;">long</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">int</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: center;">int</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">short</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: center;">short</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">byte</TD>
-                       <TD width="202" align="center">XSDecimal</TD>
+                       <TD style="width: 332px; text-align: center;">byte</TD>
+                       <TD style="width: 202px; text-align: 
center;">XSDecimal</TD>
                </TR>
        </TBODY>
 </TABLE>
@@ -227,68 +227,68 @@ The table below gives the data type to applicable 
interface mapping:
 <TABLE border="1">
        <TBODY>
                <TR>
-                       <TD width="308" align="center">XML Schema Data Type</TD>
-                       <TD width="228" align="center">Applicable method in 
XSDateTime*</TD>
+                       <TD style="width: 308px; text-align: center;">XML 
Schema Data Type</TD>
+                       <TD style="width: 228px; text-align: 
center;">Applicable method in XSDateTime*</TD>
                </TR>
                <TR>
-                       <TD width="308"></TD>
-                       <TD width="228"></TD>
+                       <TD style="width: 308px;"></TD>
+                       <TD style="width: 228px;"></TD>
                </TR>
                <TR>
-                       <TD width="332" align="center">integer</TD><TD 
width="202" align="center">getBigInteger()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">integer</TD><TD style="width: 202px; text-align: 
center;">getBigInteger()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">positiveInteger</TD><TD 
width="202" align="center">getBigInteger()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">positiveInteger</TD><TD style="width: 202px; text-align: 
center;">getBigInteger()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">negativeInteger</TD><TD 
width="202" align="center">getBigInteger()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">negativeInteger</TD><TD style="width: 202px; text-align: 
center;">getBigInteger()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" 
align="center">nonPositiveInteger</TD><TD width="202" 
align="center">getBigInteger()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">nonPositiveInteger</TD><TD style="width: 202px; text-align: 
center;">getBigInteger()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" 
align="center">nonNegativeInteger</TD><TD width="202" 
align="center">getBigInteger()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">nonNegativeInteger</TD><TD style="width: 202px; text-align: 
center;">getBigInteger()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">unsignedShort</TD><TD 
width="202" align="center">getInt()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">unsignedShort</TD><TD style="width: 202px; text-align: 
center;">getInt()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">unsignedLong</TD><TD 
width="202" align="center">getBigInteger()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">unsignedLong</TD><TD style="width: 202px; text-align: 
center;">getBigInteger()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">unsignedByte</TD><TD 
width="202" align="center">getShort()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">unsignedByte</TD><TD style="width: 202px; text-align: 
center;">getShort()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">unsignedInt</TD><TD 
width="202" align="center">getLong()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">unsignedInt</TD><TD style="width: 202px; text-align: 
center;">getLong()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">long</TD><TD width="202" 
align="center">getLong()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">long</TD><TD style="width: 202px; text-align: center;">getLong()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">int</TD><TD width="202" 
align="center">getInt()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">int</TD><TD style="width: 202px; text-align: center;">getInt()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">short</TD><TD 
width="202" align="center">getShort()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">short</TD><TD style="width: 202px; text-align: center;">getShort()</TD>
+
                </TR>
                <TR>
-                       <TD width="332" align="center">byte</TD><TD width="202" 
align="center">getByte()</TD>
-                       
+                       <TD style="width: 332px; text-align: 
center;">byte</TD><TD style="width: 202px; text-align: center;">getByte()</TD>
+
                </TR>
                <TR>
-                       <TD width="308"></TD>
-                       <TD width="228"></TD>
+                       <TD style="width: 308px;"></TD>
+                       <TD style="width: 228px;"></TD>
                </TR>
        </TBODY>
 </TABLE>
diff --git a/tests/idc/AllTests.java b/tests/idc/AllTests.java
index b63c5635c..753416709 100644
--- a/tests/idc/AllTests.java
+++ b/tests/idc/AllTests.java
@@ -24,7 +24,7 @@ import junit.textui.TestRunner;
 /**
  * XSD IDC constraints tests.
  * 
- * @author Mukul Gandhi <[email protected]>
+ * @author <a href="mailto:[email protected]";>Mukul Gandhi</a>
  * @version $Id$
  */
 public class AllTests {
diff --git a/tests/idc/IDConstraintTests.java b/tests/idc/IDConstraintTests.java
index 217f194c0..b87e2d62d 100644
--- a/tests/idc/IDConstraintTests.java
+++ b/tests/idc/IDConstraintTests.java
@@ -28,7 +28,7 @@ import util.FailureMesgFragments;
 import util.XercesAbstractTestCase;
 
 /**
- * @author Mukul Gandhi <[email protected]>
+ * @author <a href="mailto:[email protected]";>Mukul Gandhi</a>
  * @version $Id$
  */
 public class IDConstraintTests extends XercesAbstractTestCase {
diff --git a/tests/util/FailureMesgFragments.java 
b/tests/util/FailureMesgFragments.java
index 6552aec7b..3c407c6d9 100644
--- a/tests/util/FailureMesgFragments.java
+++ b/tests/util/FailureMesgFragments.java
@@ -24,7 +24,7 @@ import java.util.List;
  * Represents ONE "error/fatal error/warning" message. Various fragments of 
ONE "error/fatal error/warning" message
  * can be stored in this object.
  * 
- * @author Mukul Gandhi <[email protected]>
+ * @author <a href="mailto:[email protected]";>Mukul Gandhi</a>
  * @version $Id$
  */
 public class FailureMesgFragments {
diff --git a/tests/util/XercesAbstractTestCase.java 
b/tests/util/XercesAbstractTestCase.java
index 08a1275d2..ed5feda0d 100644
--- a/tests/util/XercesAbstractTestCase.java
+++ b/tests/util/XercesAbstractTestCase.java
@@ -31,7 +31,7 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 /**
- * @author Mukul Gandhi <[email protected]>
+ * @author <a href="mailto:[email protected]";>Mukul Gandhi</a>
  * @version $Id$
  */
 public class XercesAbstractTestCase extends TestCase implements ErrorHandler {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]


Reply via email to