--- a/src/java.desktop/share/classes/java/awt/Font.java	Sun Jun 09 17:46:05 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/Font.java	Mon Jun 10 10:52:11 2019 +0530
@@ -2144,9 +2144,10 @@
      * Checks if this {@code Font} has a glyph for the specified
      * character.
      *
-     * <p> <b>Note:</b> This method cannot handle <a
-     * href="../../java/lang/Character.html#supplementary"> supplementary
-     * characters</a>. To support all Unicode characters, including
+     * <p> <b>Note:</b> This method cannot handle
+     * <a href="../../../java.base/java/lang/Character.html#supplementary">
+     * supplementary characters</a>.
+     * To support all Unicode characters, including
      * supplementary characters, use the {@link #canDisplay(int)}
      * method or {@code canDisplayUpTo} methods.
      *

--- a/src/java.desktop/share/classes/java/awt/FontMetrics.java	Sun Jun 09 17:46:05 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/FontMetrics.java	Mon Jun 10 10:52:11 2019 +0530
@@ -317,8 +317,9 @@
      * of its characters.
      *
      * <p><b>Note:</b> This method cannot handle <a
-     * href="../lang/Character.html#supplementary"> supplementary
-     * characters</a>. To support all Unicode characters, including
+     * href="../../../java.base/java/lang/Character.html#supplementary">
+     * supplementary characters</a>.
+     * To support all Unicode characters, including
      * supplementary characters, use the {@link #charWidth(int)} method.
      *
      * @param ch the character to be measured

--- a/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html	Sun Jun 09 17:46:05 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html	Mon Jun 10 10:52:11 2019 +0530
@@ -65,12 +65,12 @@
 </tr>
 <tr>
 <td><A href="#awt.font.desktophints">awt.font.desktophints</A></td>
-<td><a href="../../util/Map.html">java.util.Map</a></td>
+<td>{@link java.util.Map java.util.Map}</td>
 <td>Font smoothing (text antialiasing) settings.</td>
 </tr>
 <tr>
 <td><A href="#sun.awt.enableExtraMouseButtons">sun.awt.enableExtraMouseButtons</A></td>
-<td><a href="../../lang/Boolean.html">java.lang.Boolean</a></td>
+<td>{@link java.lang.Boolean java.lang.Boolean}</td>
 <td>Controls if mouse events from extra buttons are to be generated or not</td>
 </tr>
 </table>

--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html	Sun Jun 09 17:46:05 2019 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html	Mon Jun 10 10:52:11 2019 +0530
@@ -191,7 +191,7 @@
 with the ICC profile-based color space, then a second
 <code>ImageTypeSpecifier</code> derived from this inferred color
 space will be included in the
-<a href="../../../../java/util/Iterator.html">Iterator</a> returned by
+{@link java.util.Iterator Iterator} returned by
 <code>ImageReader.getImageTypes</code>. If the iterator contains
 more than one type, the first one will be based on the ICC profile and the
 second on the inferred color space.</p>

--- a/src/java.desktop/share/classes/javax/print/DocFlavor.java	Sun Jun 09 17:46:05 2019 -0700
+++ b/src/java.desktop/share/classes/javax/print/DocFlavor.java	Mon Jun 10 10:52:11 2019 +0530
@@ -44,9 +44,9 @@
  *   the IANA MIME-preferred name, or its canonical name if no preferred name is
  *   specified. Additionally a few historical names supported by earlier
  *   versions of the Java platform may be recognized. See
- *   <a href="../../java/lang/package-summary.html#charenc">character encodings
- *   </a> for more information on the character encodings supported on the Java
- *   platform.
+ *   <a href="../../../java.base/java/lang/package-summary.html#charenc">
+ *   character encodings</a> for more information on the character encodings
+ *   supported on the Java platform.
  *   <li><b>Representation class name.</b> This specifies the fully-qualified
  *   name of the class of the object from which the actual print data comes, as
  *   returned by the {@link Class#getName() Class.getName()} method. (Thus the

--- a/src/java.desktop/share/classes/javax/print/attribute/package-info.java	Sun Jun 09 17:46:05 2019 -0700
+++ b/src/java.desktop/share/classes/javax/print/attribute/package-info.java	Mon Jun 10 10:52:11 2019 +0530
@@ -137,7 +137,7 @@
  * <a href="AttributeSet.html">AttributeSet</a> interface.
  * <p>
  * The {@code AttributeSet} interface is similar to the
- * <a href="../../../java/util/Map.html">Map</a> interface: it provides a map of
+ * {@link java.util.Map Map} interface: it provides a map of
  * key to values, in which each key is unique and can contain no more than one
  * value. However, the {@code AttributeSet} interface is designed to
  * specifically support the needs of the Java Print Service API. An