diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java
index 17961e79620..b84949d9ce3 100644
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java
@@ -34,7 +34,7 @@ import jdk.xml.internal.SecuritySupport;
  * The CatalogFeatures holds a collection of features and properties.
  *
  *
- * <table class="plain">
+ * <table class="plain" id="CatalogFeatures">
  * <caption>Catalog Features</caption>
  * <thead>
  * <tr>
@@ -55,7 +55,7 @@ import jdk.xml.internal.SecuritySupport;
  * <tbody>
  *
  * <tr>
- * <th scope="row" style="font-weight:normal">FILES</th>
+ * <th scope="row" style="font-weight:normal" id="FILES">FILES</th>
  * <td>A semicolon-delimited list of URIs to locate the catalog files.
  * The URIs must be absolute and have a URL protocol handler for the URI scheme.
  * </td>
@@ -71,7 +71,7 @@ import jdk.xml.internal.SecuritySupport;
  * </tr>
  *
  * <tr>
- * <th rowspan="2" scope="row" style="font-weight:normal">PREFER</th>
+ * <th rowspan="2" scope="row" style="font-weight:normal" id="PREFER">PREFER</th>
  * <td rowspan="2">Indicates the preference between the public and system
  * identifiers. The default value is public [3].</td>
  * <td rowspan="2">javax.xml.catalog.prefer</td>
@@ -91,7 +91,7 @@ import jdk.xml.internal.SecuritySupport;
  * </tr>
  *
  * <tr>
- * <th rowspan="2" scope="row" style="font-weight:normal">DEFER</th>
+ * <th rowspan="2" scope="row" style="font-weight:normal" id="DEFER">DEFER</th>
  * <td rowspan="2">Indicates that the alternative catalogs including those
  * specified in delegate entries or nextCatalog are not read until they are
  * needed. The default value is true.</td>
@@ -111,7 +111,7 @@ import jdk.xml.internal.SecuritySupport;
  * </tr>
  *
  * <tr>
- * <th rowspan="3" scope="row" style="font-weight:normal">RESOLVE</th>
+ * <th rowspan="3" scope="row" style="font-weight:normal" id="RESOLVE">RESOLVE</th>
  * <td rowspan="3">Determines the action if there is no matching entry found after
  * all of the specified catalogs are exhausted. The default is strict.</td>
  * <td rowspan="3">javax.xml.catalog.resolve [4]</td>
diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java
index afa1d1809a9..21ed157f3bb 100644
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java
@@ -34,7 +34,7 @@ import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
 
 /**
  * Factory that creates new {@code javax.xml.datatype} {@code Object}s that map XML to/from Java {@code Object}s.
- * <p>
+ * <p id="DatatypeFactory.newInstance">
  * A new instance of the {@code DatatypeFactory} is created through the {@link #newInstance()} method
  * that uses the following implementation resolution mechanisms to determine an implementation:
  * <ol>
diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/package-info.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/package-info.java
index 3a440a5eafb..15c427e67ee 100644
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/package-info.java
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/package-info.java
@@ -149,23 +149,13 @@
  *     <li>xs:unsignedShort</li>
  * </ul>
  *
- * <hr>
- *
- * <ul>
- *     <li>Author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a></li>
- *     <li>See <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">
+ * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @see <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">
  *             W3C XML Schema 1.0 Part 2, Section 3.2.7-14</a>
- *     </li>
- *     <li>See <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
+ * @see <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
  *             XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</a>
- *     </li>
- *     <li>See <a href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthDuration">
+ * @see <a href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthDuration">
  *             XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</a>
- *     </li>
- *     <li>Since 1.5</li>
- * </ul>
- *
- * <hr>
  * @since 1.5
  */