diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
index b45d497e19f..7addfb7d7e7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
@@ -31,7 +31,7 @@ import com.sun.org.apache.xerces.internal.util.IntStack;
  * This engine does not conform to the POSIX regular expression.
  *
  * <hr width="50%">
- * <h3>How to use</h3>
+ * <h2>How to use</h2>
  *
  * <dl>
  *   <dt>A. Standard way
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java
index d6739cb4b80..811985877b7 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java
@@ -164,7 +164,7 @@ import jdk.xml.internal.SecuritySupport;
  * set the property {@code javax.xml.catalog.defer} to false to allow the entire
  * catalog to be pre-loaded.
  *
- * <h3>Scope and Order</h3>
+ * <h2>Scope and Order</h2>
  * Features and properties can be set through the catalog file, the Catalog API,
  * system properties, and {@code jaxp.properties}, with a preference in the same order.
  * <p>
@@ -202,7 +202,7 @@ import jdk.xml.internal.SecuritySupport;
                         .build();
  * }</pre>
  *
- * <h3>JAXP XML Processor Support</h3>
+ * <h2>JAXP XML Processor Support</h2>
  * The Catalog Features are supported throughout the JAXP processors, including
  * SAX and DOM ({@link javax.xml.parsers}), and StAX parsers ({@link javax.xml.stream}),
  * Schema Validation ({@link javax.xml.validation}), and XML Transformation
@@ -246,7 +246,7 @@ import jdk.xml.internal.SecuritySupport;
  * The Catalog support is available for any process in the JAXP library that
  * supports a resolver. The following table lists all such processes.
  *
- * <h3><a id="ProcessesWithCatalogSupport">Processes with Catalog Support</a></h3>
+ * <h2><a id="ProcessesWithCatalogSupport">Processes with Catalog Support</a></h2>
  *
  * <table class="striped">
  * <caption>Processes with Catalog Support</caption>
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java
index bb2d2b4fe7c..f542f429c0a 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java
@@ -54,7 +54,7 @@ import org.xml.sax.InputSource;
  * no further attempt will be made. Only if there is no match in the current
  * catalog, will alternate catalogs including delegate and next catalogs be considered.
  *
- * <h3>Search Order</h3>
+ * <h2>Search Order</h2>
  * The resolver will first search the system-type of entries with the specified
  * {@code systemId}. The system entries include {@code system},
  * {@code rewriteSystem} and {@code systemSuffix} entries.
@@ -75,7 +75,7 @@ import org.xml.sax.InputSource;
  * with the specified {@code systemId} or {@code href}. The {@code uri} entries
  * include {@code uri}, {@code rewriteURI}, and {@code uriSuffix} entries.
  *
- * <h3>Error Handling</h3>
+ * <h2>Error Handling</h2>
  * The interfaces that the CatalogResolver extend specified checked exceptions, including:
  * <ul>
  * <li>
diff --git a/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java b/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java
index f9ea6c3ada1..c69c08e402b 100644
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java
@@ -183,7 +183,7 @@ public abstract class DatatypeFactory {
      * it can use the factory to configure and obtain datatype instances.
      *
      *
-     * <h2>Tip for Trouble-shooting</h2>
+     * <h4>Tip for Trouble-shooting</h4>
      * <p>Setting the {@code jaxp.debug} system property will cause
      * this method to print a lot of debug messages
      * to {@code System.err} about what it is doing and where it is looking at.
diff --git a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java
index 311fd1acb7d..17012cf487d 100644
--- a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java
+++ b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java
@@ -118,7 +118,7 @@ public abstract class DocumentBuilderFactory {
      * configure and obtain parser instances.
      *
      *
-     * <h2>Tip for Trouble-shooting</h2>
+     * <h4>Tip for Trouble-shooting</h4>
      * <p>
      * Setting the {@code jaxp.debug} system property will cause
      * this method to print a lot of debug messages
@@ -154,7 +154,7 @@ public abstract class DocumentBuilderFactory {
      * it can use the factory to configure and obtain parser instances.
      *
      *
-     * <h2>Tip for Trouble-shooting</h2>
+     * <h4>Tip for Trouble-shooting</h4>
      * <p>Setting the {@code jaxp.debug} system property will cause
      * this method to print a lot of debug messages
      * to {@code System.err} about what it is doing and where it is looking at.
@@ -549,7 +549,7 @@ public abstract class DocumentBuilderFactory {
      * exception when the {@link #newDocumentBuilder()} is invoked.
      *
      *
-     * <h3>Note for implementors</h3>
+     * <h4>Note for implementors</h4>
      *
      * <p>
      * A parser must be able to work with any {@link Schema}
diff --git a/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java b/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java
index 2e78ba47892..e0abc4573f1 100644
--- a/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java
+++ b/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java
@@ -123,7 +123,7 @@ public abstract class SAXParserFactory {
      *
      *
      *
-     * <h2>Tip for Trouble-shooting</h2>
+     * <h4>Tip for Trouble-shooting</h4>
      * <p>
      * Setting the {@code jaxp.debug} system property will cause
      * this method to print a lot of debug messages
@@ -161,7 +161,7 @@ public abstract class SAXParserFactory {
      * it can use the factory to configure and obtain parser instances.
      *
      *
-     * <h2>Tip for Trouble-shooting</h2>
+     * <h4>Tip for Trouble-shooting</h4>
      * <p>Setting the {@code jaxp.debug} system property will cause
      * this method to print a lot of debug messages
      * to {@code System.err} about what it is doing and where it is looking at.
@@ -389,7 +389,7 @@ public abstract class SAXParserFactory {
      * Such configuration will cause a {@link SAXException}
      * exception when those properties are set on a {@link SAXParser}.
      *
-     * <h3>Note for implementors</h3>
+     * <h4>Note for implementors</h4>
      * <p>
      * A parser must be able to work with any {@link Schema}
      * implementation. However, parsers and schemas are allowed
diff --git a/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java b/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java
index 42d8e0e59ea..42410d7629a 100644
--- a/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java
+++ b/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java
@@ -140,7 +140,7 @@ public abstract class TransformerFactory {
      * {@code TransformerFactory} it can use the factory to configure
      * and obtain transformer instances.
      *
-     * <h2>Tip for Trouble-shooting</h2>
+     * <h4>Tip for Trouble-shooting</h4>
      * <p>Setting the {@code jaxp.debug} system property will cause
      * this method to print a lot of debug messages
      * to {@code System.err} about what it is doing and where it is looking at.
diff --git a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java
index ebff5fdbf21..cf853e7f737 100644
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java
@@ -206,7 +206,7 @@ public abstract class SchemaFactory {
      *
      * <p>If everything fails, {@link IllegalArgumentException} will be thrown.
      *
-     * <p><strong>Tip for Trouble-shooting:</strong>
+     * <h4>Tip for Trouble-shooting:</h4>
      * <p>See {@link java.util.Properties#load(java.io.InputStream)} for
      * exactly how a property file is parsed. In particular, colons ':'
      * need to be escaped in a property file, so make sure schema language
@@ -259,7 +259,7 @@ public abstract class SchemaFactory {
      * It gives more control to the application as it can specify which provider
      * should be loaded.
      *
-     * <h2>Tip for Trouble-shooting</h2>
+     * <h4>Tip for Trouble-shooting</h4>
      * <p>Setting the {@code jaxp.debug} system property will cause
      * this method to print a lot of debug messages
      * to {@code System.err} about what it is doing and where it is looking at.
@@ -717,7 +717,7 @@ public abstract class SchemaFactory {
      * to abort the further processing by throwing it. If an error handler is not set,
      * the callee will throw the first error it finds in the sources.
      *
-     * <h2>W3C XML Schema 1.0</h2>
+     * <h4>W3C XML Schema 1.0</h4>
      * <p>
      * The resulting schema contains components from the specified sources.
      * The same result would be achieved if all these sources were
@@ -737,7 +737,7 @@ public abstract class SchemaFactory {
      * specified in the section 5.1 of the XML Schema spec, then
      * the error must be reported to the {@link ErrorHandler}.
      *
-     * <h2>RELAX NG</h2>
+     * <h4>RELAX NG</h4>
      *
      * <p>For RELAX NG, this method must throw {@link UnsupportedOperationException}
      * if {@code schemas.length!=1}.
@@ -797,7 +797,7 @@ public abstract class SchemaFactory {
      * make sure that features, such as secure processing, are explicitly
      * set in both places.
      *
-     * <h2>W3C XML Schema 1.0</h2>
+     * <h4>W3C XML Schema 1.0</h4>
      * <p>
      * For XML Schema, this method creates a {@link Schema} object that
      * performs validation by using location hints specified in documents.
@@ -815,7 +815,7 @@ public abstract class SchemaFactory {
      * vulnerability to denial-of-service attacks.
      *
      *
-     * <h2>RELAX NG</h2>
+     * <h4>RELAX NG</h4>
      * <p>
      * RELAX NG does not support this operation.
      *
diff --git a/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java b/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java
index ed063ad6b66..c45f1ca7480 100644
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java
@@ -239,7 +239,7 @@ public abstract class XPathFactory {
      * should be loaded.</p>
      *
      *
-     * <h2>Tip for Trouble-shooting</h2>
+     * <h4>Tip for Trouble-shooting</h4>
      * <p>Setting the <code>jaxp.debug</code> system property will cause
      * this method to print a lot of debug messages
      * to <code>System.err</code> about what it is doing and where it is looking at.</p>