diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html b/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html
index be95841191d..9afd476f247 100644
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/package.html
@@ -2,7 +2,7 @@
 <head>
     <title>RMI connector</title>
 <!--
-Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ questions.
     <p>Addresses are covered in more detail below.</p>
 
 
-    <h3>Creating an RMI connector server</h3>
+    <h2>Creating an RMI connector server</h2>
 
     <p>The usual way to create an RMI connector server is to supply an
       RMI connector address to the method {@link
@@ -86,7 +86,7 @@ questions.
       RMIConnectorServer}, explicitly or through the MBean server's
       <code>createMBean</code> method.</p>
 
-    <h4>Choosing the RMI transport</h4>
+    <h3>Choosing the RMI transport</h3>
 
     <p>You can choose the RMI transport by specifying
       <code>rmi</code> in the <code><em>protocol</em></code> part of the
@@ -98,8 +98,8 @@ questions.
       constructor.</p>
 
 
-    <h4><a id="servergen">Connector addresses generated by the
-	server</a></h4>
+    <h3><a id="servergen">Connector addresses generated by the
+	server</a></h3>
 
     <p>If the <code>serviceURL</code> you specify has an empty URL
       path (after the optional host and port), or if you do not
@@ -157,8 +157,8 @@ questions.
       <code><em>port</em></code>.</p>
 
 
-    <h4><a id="directory">Connector addresses based on directory
-	entries</a></h4>
+    <h3><a id="directory">Connector addresses based on directory
+	entries</a></h3>
 
     <p>As an alternative to the generated addresses just described,
       the <code>serviceURL</code> address supplied when creating a
@@ -264,7 +264,7 @@ questions.
       from the name of the directory host.</p>
 
 
-    <h4>Connector server attributes</h4>
+    <h3>Connector server attributes</h3>
 
     <p>When using the default JRMP transport, RMI socket factories can
       be specified using the attributes
@@ -278,7 +278,7 @@ questions.
       factories are used when creating the RMI objects associated with
       the connector.</p>
 
-    <h3>Creating an RMI connector client</h3>
+    <h2>Creating an RMI connector client</h2>
 
     <p>An RMI connector client is usually constructed using {@link
       javax.management.remote.JMXConnectorFactory}, with a
@@ -311,7 +311,7 @@ questions.
       constructor of {@link javax.management.remote.rmi.RMIConnector
       RMIConnector}.</p>
 
-    <h3>Dynamic code downloading</h3>
+    <h2>Dynamic code downloading</h2>
 
     <p>If an RMI connector client or server receives from its peer an
       instance of a class that it does not know, and if dynamic code
diff --git a/src/java.management/share/classes/java/lang/management/LockInfo.java b/src/java.management/share/classes/java/lang/management/LockInfo.java
index ada956a1694..e6dae96e75f 100644
--- a/src/java.management/share/classes/java/lang/management/LockInfo.java
+++ b/src/java.management/share/classes/java/lang/management/LockInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ import sun.management.LockInfoCompositeData;
  * the read-lock) of {@link ReentrantReadWriteLock ReentrantReadWriteLock} are
  * two examples of ownable synchronizers provided by the platform.
  *
- * <h3><a id="MappedType">MXBean Mapping</a></h3>
+ * <h2><a id="MappedType">MXBean Mapping</a></h2>
  * {@code LockInfo} is mapped to a {@link CompositeData CompositeData}
  * as specified in the {@link #from from} method.
  *
diff --git a/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
index e65cbab93ea..0ef7c9dadca 100644
--- a/src/java.management/share/classes/java/lang/management/ManagementFactory.java
+++ b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
@@ -67,7 +67,7 @@ import sun.management.spi.PlatformMBeanProvider.PlatformComponent;
  * the management interface of a component of the Java virtual
  * machine.
  *
- * <h3><a id="MXBean">Platform MXBeans</a></h3>
+ * <h2><a id="MXBean">Platform MXBeans</a></h2>
  * <p>
  * A platform MXBean is a <i>managed bean</i> that
  * conforms to the <a href="../../../javax/management/package-summary.html">JMX</a>
@@ -93,7 +93,7 @@ import sun.management.spi.PlatformMBeanProvider.PlatformComponent;
  *
  * <p>
  * An application can access a platform MXBean in the following ways:
- * <h4>1. Direct access to an MXBean interface</h4>
+ * <h3>1. Direct access to an MXBean interface</h3>
  * <blockquote>
  * <ul>
  *     <li>Get an MXBean instance by calling the
@@ -113,7 +113,7 @@ import sun.management.spi.PlatformMBeanProvider.PlatformComponent;
  *         an MXBean of another running virtual machine.
  *         </li>
  * </ul>
- * <h4>2. Indirect access to an MXBean interface via MBeanServer</h4>
+ * <h3>2. Indirect access to an MXBean interface via MBeanServer</h3>
  * <ul>
  *     <li>Go through the platform {@code MBeanServer} to access MXBeans
  *         locally or a specific {@code MBeanServerConnection} to access
diff --git a/src/java.management/share/classes/java/lang/management/MemoryMXBean.java b/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
index 510d5122b76..81dbd3abd6e 100644
--- a/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/MemoryMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ import javax.management.openmbean.CompositeData;
  * It can be obtained by calling the
  * {@link PlatformManagedObject#getObjectName} method.
  *
- * <h3> Memory </h3>
+ * <h2> Memory </h2>
  * The memory system of the Java virtual machine manages
  * the following kinds of memory:
  *
@@ -87,7 +87,7 @@ import javax.management.openmbean.CompositeData;
  * machine code translated from the Java virtual machine code for
  * high performance.
  *
- * <h3>Memory Pools and Memory Managers</h3>
+ * <h2>Memory Pools and Memory Managers</h2>
  * {@link MemoryPoolMXBean Memory pools} and
  * {@link MemoryManagerMXBean memory managers} are the abstract entities
  * that monitor and manage the memory system
@@ -105,7 +105,7 @@ import javax.management.openmbean.CompositeData;
  * add or remove memory managers during execution.
  * A memory pool can be managed by more than one memory manager.
  *
- * <h3>Memory Usage Monitoring</h3>
+ * <h2>Memory Usage Monitoring</h2>
  *
  * Memory usage is a very important monitoring attribute for the memory system.
  * The memory usage, for example, could indicate:
@@ -131,7 +131,7 @@ import javax.management.openmbean.CompositeData;
  * certain threshold. It is not intended for an application to detect
  * and recover from a low memory condition.
  *
- * <h3>Notifications</h3>
+ * <h2>Notifications</h2>
  *
  * <p>This {@code MemoryMXBean} is a
  * {@link javax.management.NotificationEmitter NotificationEmitter}
@@ -169,7 +169,7 @@ import javax.management.openmbean.CompositeData;
  * MemoryNotificationInfo}.
  *
  * <hr>
- * <h3>NotificationEmitter</h3>
+ * <h2>NotificationEmitter</h2>
  * The {@code MemoryMXBean} object returned by
  * {@link ManagementFactory#getMemoryMXBean} implements
  * the {@link javax.management.NotificationEmitter NotificationEmitter}
diff --git a/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java b/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java
index 06158979745..2d94c4d2239 100644
--- a/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ package java.lang.management;
  * It can be obtained by calling the
  * {@link PlatformManagedObject#getObjectName} method.
  *
- * <h3>Memory Type</h3>
+ * <h2>Memory Type</h2>
  * <p>The Java virtual machine has a heap for object allocation and also
  * maintains non-heap memory for the method area and the Java virtual
  * machine execution.  The Java virtual machine can have one or more
@@ -60,7 +60,7 @@ package java.lang.management;
  *   <li>{@link MemoryType#NON_HEAP non-heap}</li>
  * </ul>
  *
- * <h3>Memory Usage Monitoring</h3>
+ * <h2>Memory Usage Monitoring</h2>
  *
  * A memory pool has the following attributes:
  * <ul>
diff --git a/src/java.management/share/classes/java/lang/management/MemoryUsage.java b/src/java.management/share/classes/java/lang/management/MemoryUsage.java
index c79fc654a49..5c4dd29df87 100644
--- a/src/java.management/share/classes/java/lang/management/MemoryUsage.java
+++ b/src/java.management/share/classes/java/lang/management/MemoryUsage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@ import sun.management.MemoryUsageCompositeData;
  *                            max
  * </pre>
  *
- * <h3>MXBean Mapping</h3>
+ * <h2>MXBean Mapping</h2>
  * {@code MemoryUsage} is mapped to a {@link CompositeData CompositeData}
  * with attributes as specified in the {@link #from from} method.
  *
diff --git a/src/java.management/share/classes/java/lang/management/MonitorInfo.java b/src/java.management/share/classes/java/lang/management/MonitorInfo.java
index 453e1a2bb9d..2d0636233e4 100644
--- a/src/java.management/share/classes/java/lang/management/MonitorInfo.java
+++ b/src/java.management/share/classes/java/lang/management/MonitorInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import sun.management.MonitorInfoCompositeData;
  * Information about an object monitor lock.  An object monitor is locked
  * when entering a synchronization block or method on that object.
  *
- * <h3>MXBean Mapping</h3>
+ * <h2>MXBean Mapping</h2>
  * {@code MonitorInfo} is mapped to a {@link CompositeData CompositeData}
  * with attributes as specified in
  * the {@link #from from} method.
diff --git a/src/java.management/share/classes/java/lang/management/ThreadInfo.java b/src/java.management/share/classes/java/lang/management/ThreadInfo.java
index e7aff5d2a49..a7424d0771d 100644
--- a/src/java.management/share/classes/java/lang/management/ThreadInfo.java
+++ b/src/java.management/share/classes/java/lang/management/ThreadInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,14 +34,14 @@ import static java.lang.Thread.State.*;
 /**
  * Thread information. {@code ThreadInfo} contains the information
  * about a thread including:
- * <h3>General thread information</h3>
+ * <h2>General thread information</h2>
  * <ul>
  *   <li>Thread ID.</li>
  *   <li>Name of the thread.</li>
  *   <li>Whether a thread is a daemon thread</li>
  * </ul>
  *
- * <h3>Execution information</h3>
+ * <h2>Execution information</h2>
  * <ul>
  *   <li>Thread state.</li>
  *   <li>The object upon which the thread is blocked due to:
@@ -62,7 +62,7 @@ import static java.lang.Thread.State.*;
  *   <li>Thread priority</li>
  * </ul>
  *
- * <h4><a id="SyncStats">Synchronization Statistics</a></h4>
+ * <h3><a id="SyncStats">Synchronization Statistics</a></h3>
  * <ul>
  *   <li>The number of times that the thread has blocked for
  *       synchronization or waited for notification.</li>
@@ -80,7 +80,7 @@ import static java.lang.Thread.State.*;
  * <p>This thread information class is designed for use in monitoring of
  * the system, not for synchronization control.
  *
- * <h4>MXBean Mapping</h4>
+ * <h3>MXBean Mapping</h3>
  * {@code ThreadInfo} is mapped to a {@link CompositeData CompositeData}
  * with attributes as specified in
  * the {@link #from from} method.
diff --git a/src/java.management/share/classes/java/lang/management/ThreadMXBean.java b/src/java.management/share/classes/java/lang/management/ThreadMXBean.java
index f8b48736821..d557d6cabcb 100644
--- a/src/java.management/share/classes/java/lang/management/ThreadMXBean.java
+++ b/src/java.management/share/classes/java/lang/management/ThreadMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ import java.util.Map;
  * It can be obtained by calling the
  * {@link PlatformManagedObject#getObjectName} method.
  *
- * <h3>Thread ID</h3>
+ * <h2>Thread ID</h2>
  * Thread ID is a positive long value returned by calling the
  * {@link java.lang.Thread#getId} method for a thread.
  * The thread ID is unique during its lifetime.  When a thread
@@ -58,7 +58,7 @@ import java.util.Map;
  * <p> Some methods in this interface take a thread ID or an array
  * of thread IDs as the input parameter and return per-thread information.
  *
- * <h3>Thread CPU time</h3>
+ * <h2>Thread CPU time</h2>
  * A Java virtual machine implementation may support measuring
  * the CPU time for the current thread, for any thread, or for no threads.
  *
@@ -83,7 +83,7 @@ import java.util.Map;
  * Enabling thread CPU measurement could be expensive in some
  * Java virtual machine implementations.
  *
- * <h3>Thread Contention Monitoring</h3>
+ * <h2>Thread Contention Monitoring</h2>
  * Some Java virtual machines may support thread contention monitoring.
  * When thread contention monitoring is enabled, the accumulated elapsed
  * time that the thread has blocked for synchronization or waited for
@@ -96,7 +96,7 @@ import java.util.Map;
  * {@link #setThreadContentionMonitoringEnabled} method can be used to enable
  * thread contention monitoring.
  *
- * <h3>Synchronization Information and Deadlock Detection</h3>
+ * <h2>Synchronization Information and Deadlock Detection</h2>
  * Some Java virtual machines may support monitoring of
  * {@linkplain #isObjectMonitorUsageSupported object monitor usage} and
  * {@linkplain #isSynchronizerUsageSupported ownable synchronizer usage}.
diff --git a/src/java.management/share/classes/java/lang/management/package.html b/src/java.management/share/classes/java/lang/management/package.html
index 5c020fa0b09..ff95579fad9 100644
--- a/src/java.management/share/classes/java/lang/management/package.html
+++ b/src/java.management/share/classes/java/lang/management/package.html
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ Java virtual machine and other components in the Java runtime.
 It allows both local and remote
 monitoring and management of the running Java virtual machine.
 
-<h3><a id="MXBean">Platform MXBean</a></h3>
+<h2><a id="MXBean">Platform MXBean</a></h2>
 <p>
 A platform MXBean is a <i>managed bean</i> that
 conforms to the {@linkplain javax.management JMX}
@@ -40,7 +40,7 @@ Instrumentation Specification and only uses a set of basic data types.
 Each platform MXBean is a {@link java.lang.management.PlatformManagedObject}
 with a unique
 {@linkplain java.lang.management.PlatformManagedObject#getObjectName name}.
-<h3>ManagementFactory</h3>
+<h2>ManagementFactory</h2>
 
 <p>The {@link java.lang.management.ManagementFactory} class is the management
 factory class for the Java platform.  This class provides a set of
@@ -58,7 +58,7 @@ the specification of the management interface.
 This is a single MBeanServer that can be shared by different managed
 components running within the same Java virtual machine.
 
-<h3>Interoperability</h3>
+<h2>Interoperability</h2>
 
 <p>A management application and a platform MBeanServer of a running
 virtual machine can interoperate
@@ -72,7 +72,7 @@ open type when being accessed via MBeanServer interface.
 See the <a href="{@docRoot}/java.management/javax/management/MXBean.html#MXBean-spec">
 MXBean</a> specification for details.
 
-<h3><a id="examples">Ways to Access MXBeans</a></h3>
+<h2><a id="examples">Ways to Access MXBeans</a></h2>
 
 <p>An application can monitor the instrumentation of the
 Java virtual machine and the runtime in the following ways:
@@ -163,7 +163,7 @@ Java virtual machine and the runtime in the following ways:
 </ul>
 
 
-<h3><a id="extension">Platform Extension</a></h3>
+<h2><a id="extension">Platform Extension</a></h2>
 
 <p>A Java virtual machine implementation may add its platform extension to
 the management interface by defining platform-dependent
diff --git a/src/java.management/share/classes/javax/management/MXBean.java b/src/java.management/share/classes/javax/management/MXBean.java
index 73fb4e1703c..86f1be6ec8f 100644
--- a/src/java.management/share/classes/javax/management/MXBean.java
+++ b/src/java.management/share/classes/javax/management/MXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ import javax.management.openmbean.TabularType;
     public interface MisleadingMXBean {}
     </pre>
 
-    <h3 id="MXBean-spec">MXBean specification</h3>
+    <h2 id="MXBean-spec">MXBean specification</h2>
 
     <p>The MXBean concept provides a simple way to code an MBean
       that only references a predefined set of types, the ones defined
@@ -94,7 +94,7 @@ import javax.management.openmbean.TabularType;
       represented as a Standard MBean, and as an MXBean:</p>
 
     <div style="display:inline-block; margin: 0 3em">
-        <h4>Standard MBean</h4>
+        <h3>Standard MBean</h3>
         <pre>
 public interface MemoryPool<b>MBean</b> {
     String getName();
@@ -104,7 +104,7 @@ public interface MemoryPool<b>MBean</b> {
           </pre>
     </div>
     <div style="display:inline-block; margin: 0 3em">
-        <h4>MXBean</h4>
+        <h3>MXBean</h3>
         <pre>
 public interface MemoryPool<b>MXBean</b> {
     String getName();
@@ -133,7 +133,7 @@ public interface MemoryPool<b>MXBean</b> {
     <p>So, we might define <code>MemoryUsage</code> like this:</p>
 
     <div style="display:inline-block; margin: 0 3em">
-        <h4>Standard MBean</h4>
+        <h3>Standard MBean</h3>
         <pre>
 public class MemoryUsage <b>implements Serializable</b> {
     // standard JavaBean conventions with getters
@@ -148,7 +148,7 @@ public class MemoryUsage <b>implements Serializable</b> {
         </pre>
     </div>
     <div style="display:inline-block; margin: 0 3em">
-        <h4>MXBean</h4>
+        <h3>MXBean</h3>
         <pre>
 public class MemoryUsage {
     // standard JavaBean conventions with getters
@@ -194,7 +194,7 @@ public class MemoryUsage {
       models might look like:</p>
 
     <div style="display:inline-block; margin: 0 3em">
-        <h4>Standard MBean</h4>
+        <h3>Standard MBean</h3>
         <pre>
 String name = (String)
     mbeanServer.{@link MBeanServer#getAttribute
@@ -205,7 +205,7 @@ String name = (String)
         </pre>
     </div>
     <div style="display:inline-block; margin: 0 3em">
-        <h4>MXBean</h4>
+        <h3>MXBean</h3>
         <pre>
 String name = (String)
     mbeanServer.{@link MBeanServer#getAttribute
@@ -231,7 +231,7 @@ String name = (String)
       of whether you are using Standard MBeans or MXBeans:</p>
 
     <div style="display:inline-block; margin: 0 3em">
-        <h4>Standard MBean</h4>
+        <h3>Standard MBean</h3>
         <pre>
 MemoryPool<b>MBean</b> proxy =
     JMX.<b>{@link JMX#newMBeanProxy(MBeanServerConnection, ObjectName,
@@ -245,7 +245,7 @@ long used = usage.getUsed();
           </pre>
     </div>
     <div style="display:inline-block; margin: 0 3em">
-        <h4>MXBean</h4>
+        <h3>MXBean</h3>
         <pre>
 MemoryPool<b>MXBean</b> proxy =
     JMX.<b>{@link JMX#newMXBeanProxy(MBeanServerConnection, ObjectName,
@@ -263,7 +263,7 @@ long used = usage.getUsed();
       Standard MBeans and MXBeans.</p>
 
     <div style="display:inline-block; margin: 0 3em">
-        <h4>Standard MBean</h4>
+        <h3>Standard MBean</h3>
         <pre>
 public class MemoryPool
         implements MemoryPool<b>MBean</b> {
@@ -274,7 +274,7 @@ public class MemoryPool
         </pre>
     </div>
     <div style="display:inline-block; margin: 0 3em">
-        <h4>MXBean</h4>
+        <h3>MXBean</h3>
         <pre>
 public class MemoryPool
         implements MemoryPool<b>MXBean</b> {
@@ -289,7 +289,7 @@ public class MemoryPool
       in both cases:</p>
 
     <div style="display:inline-block; margin: 0 3em">
-        <h4>Standard MBean</h4>
+        <h3>Standard MBean</h3>
         <pre>
 {
     MemoryPool<b>MBean</b> pool = new MemoryPool();
@@ -299,7 +299,7 @@ public class MemoryPool
         </pre>
     </div>
     <div style="display:inline-block; margin: 0 3em">
-        <h4>MXBean</h4>
+        <h3>MXBean</h3>
         <pre>
 {
     MemoryPool<b>MXBean</b> pool = new MemoryPool();
diff --git a/src/java.management/share/classes/javax/management/NotificationBroadcaster.java b/src/java.management/share/classes/javax/management/NotificationBroadcaster.java
index 832ecaecd14..00c36639973 100644
--- a/src/java.management/share/classes/javax/management/NotificationBroadcaster.java
+++ b/src/java.management/share/classes/javax/management/NotificationBroadcaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ import java.util.concurrent.CopyOnWriteArrayList;  // for Javadoc
  * allows a listener to be registered with the MBean as a notification
  * listener.</p>
  *
- * <h3>Notification dispatch</h3>
+ * <h2>Notification dispatch</h2>
  *
  * <p>When an MBean emits a notification, it considers each listener that has been
  * added with {@link #addNotificationListener addNotificationListener} and not
diff --git a/src/java.management/share/classes/javax/management/NotificationEmitter.java b/src/java.management/share/classes/javax/management/NotificationEmitter.java
index a5e311206d2..0408122f0ba 100644
--- a/src/java.management/share/classes/javax/management/NotificationEmitter.java
+++ b/src/java.management/share/classes/javax/management/NotificationEmitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.util.concurrent.CopyOnWriteArrayList;  // for Javadoc
  * allows a listener to be registered with the MBean as a notification
  * listener.</p>
  *
- * <h3>Notification dispatch</h3>
+ * <h2>Notification dispatch</h2>
  *
  *<p>When an MBean emits a notification, it considers each listener that has been
  * added with {@link #addNotificationListener addNotificationListener} and not
diff --git a/src/java.management/share/classes/javax/management/remote/package.html b/src/java.management/share/classes/javax/management/remote/package.html
index 36902bbdfd1..fd441df4876 100644
--- a/src/java.management/share/classes/javax/management/remote/package.html
+++ b/src/java.management/share/classes/javax/management/remote/package.html
@@ -2,7 +2,7 @@
 <head>
     <title>JMX&trade; Remote API.</title>
 <!--
-Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ questions.
 	Reference Implementation</a></em>.</p>
 
 
-      <h3>Connector addresses</h3>
+      <h2>Connector addresses</h2>
 
       <p>Typically, a connector server has an address, represented by the
 	class {@link javax.management.remote.JMXServiceURL
@@ -92,7 +92,7 @@ questions.
 	as detailed in the documentation for the package
 	<code>{@link javax.management.remote.rmi}</code>.</p>
 
-      <h3>Creating a connector server</h3>
+      <h2>Creating a connector server</h2>
 
       <p>A connector server is created by constructing an instance of
 	a subclass of {@link
@@ -108,7 +108,7 @@ questions.
 	supplying the MBean server as a parameter when creating the
 	connector server.</p>
 
-      <h3>Creating a connector client</h3>
+      <h2>Creating a connector client</h2>
 
       <p>A connector client is usually created by supplying the
 	<code>JMXServiceURL</code> of the connector server to connect to 
@@ -123,7 +123,7 @@ questions.
 	javax.management.remote.rmi.RMIConnector
 	RMIConnector}.</p>
 
-      <h3>Additional client or server parameters</h3>
+      <h2>Additional client or server parameters</h2>
 
       <p>When creating a connector client or server, it is possible to
 	supply an object of type {@link java.util.Map Map} that defines
@@ -133,7 +133,7 @@ questions.
 	begin with the string "<code>jmx.remote.</code>".  The document
 	<em>JMX Remote API</em> lists these standard keys.</p>
 
-      <h3>Connection identifiers</h3>
+      <h2>Connection identifiers</h2>
 
       <p>Every connection opened by a connector server has a string
 	identifier, called its <b>connection id</b>.  This identifier
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBean.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBean.java
index 8b1231b2773..e7cd8d85416 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBean.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ import jdk.jfr.Recording;
  * See the package {@code jdk.jfr} documentation for descriptions of the settings
  * syntax and the {@link ConfigurationInfo} class documentation for configuration information.
  *
- * <h3>Recording options</h3>
+ * <h2>Recording options</h2>
  * <p>
  * The following table shows the options names to use with {@link #setRecordingOptions(long, Map)}
  * and {@link #getRecordingOptions(long)}.
diff --git a/src/jdk.management/share/classes/com/sun/management/GcInfo.java b/src/jdk.management/share/classes/com/sun/management/GcInfo.java
index 6f729bffcbc..d7e641ccb98 100644
--- a/src/jdk.management/share/classes/com/sun/management/GcInfo.java
+++ b/src/jdk.management/share/classes/com/sun/management/GcInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ import com.sun.management.internal.GcInfoBuilder;
  * interface.  This is a historical relic, and other classes should
  * not copy this pattern.  Use {@link CompositeDataView} instead.
  *
- * <h3>MXBean Mapping</h3>
+ * <h2>MXBean Mapping</h2>
  * {@code GcInfo} is mapped to a {@link CompositeData CompositeData}
  * with attributes as specified in the {@link #from from} method.
  *
