--- a/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java	Thu Apr 27 17:43:13 2017 -0700
+++ b/jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole/JConsolePlugin.java	Fri Apr 28 15:41:38 2017 -0700
@@ -34,8 +34,8 @@
 
 /**
  * A JConsole plugin class.  JConsole uses the
- * <a href="{@docRoot}/../../../../api/java/util/ServiceLoader.html">
- * service provider</a> mechanism to search the JConsole plugins.
+ * {@link java.util.ServiceLoader service provider}
+ * mechanism to search the JConsole plugins.
  * Users can provide their JConsole plugins in a jar file
  * containing a file named
  *
@@ -67,8 +67,7 @@
  * call its {@link #getTabs getTabs} method and add the returned
  * tabs to the JConsole window.
  *
- * @see <a href="{@docRoot}/../../../../api/java/util/ServiceLoader.html">
- * java.util.ServiceLoader</a>
+ * @see java.util.ServiceLoader
  *
  * @since 1.6
  */

--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java	Thu Apr 27 17:43:13 2017 -0700
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ThreadGroupReference.java	Fri Apr 28 15:41:38 2017 -0700
@@ -92,7 +92,7 @@
      * Returns a List containing each active {@link ThreadGroupReference} in this
      * thread group. Only the active thread groups in this immediate thread group
      * (and not its subgroups) are returned.
-     * See <a href="{@docRoot}/../../../../api/java/lang/ThreadGroup.html">java.lang.ThreadGroup</a>
+     * See {@link java.lang.ThreadGroup}
      * for information about 'active' ThreadGroups.
      * @return a List of {@link ThreadGroupReference} objects mirroring the
      * active thread groups from this thread group in the target VM.

--- a/jdk/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java	Thu Apr 27 17:43:13 2017 -0700
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java	Fri Apr 28 15:41:38 2017 -0700
@@ -205,7 +205,7 @@
  * Virtual Machine is modified, the {@code DiagnosticCommandMBean} emits
  * a {@link javax.management.Notification} with a
  * {@linkplain javax.management.Notification#getType() type} of
- * <a href="{@docRoot}/../../../../api/javax/management/MBeanInfo.html#info-changed">
+ * <a href="{@docRoot}/javax/management/MBeanInfo.html#info-changed">
  * {@code "jmx.mbean.info.changed"}</a> and a
  * {@linkplain javax.management.Notification#getUserData() userData} that
  * is the new {@code MBeanInfo}.

--- a/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java	Thu Apr 27 17:43:13 2017 -0700
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java	Fri Apr 28 15:41:38 2017 -0700
@@ -26,15 +26,13 @@
 /**
  * This package contains Oracle Corporation's platform extension to
  * the implementation of the
- * <a href="{@docRoot}/../../../../api/java/lang/management/package-summary.html">
- * java.lang.management</a> API and also defines the management
+ * {@link java.lang.management} API and also defines the management
  * interface for some other components for the platform.
  *
  * <p>
  * All platform MBeans are registered in the <em>platform MBeanServer</em>
  * which can be obtained via the
- * <a href="{@docRoot}/../../../../api/java/lang/management/ManagementFactory.html#getPlatformMBeanServer()">
- * java.lang.management.ManagementFactory.getPlatformMBeanServer</a>
+ * {@link java.lang.management.ManagementFactory#getPlatformMBeanServer}
  *
  * @author  Mandy Chung
  * @since   1.5