--- a/jdk/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java	Sun Jun 18 23:10:33 2017 +0100
+++ b/jdk/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java	Mon Jun 19 07:19:27 2017 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2017, 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
@@ -104,10 +104,8 @@
  * sees fit.
  *
  * <p> For more details on declaring service providers, and the JAR
- * format in general, see the <a
- * href="{@docRoot}/../technotes/guides/jar/jar.html">
- * JAR File Specification</a>.
- *
+ * format in general, see the
+ * <a href="{@docRoot}/../specs/jar/jar.html">JAR File Specification</a>.
  */
 public final class IIORegistry extends ServiceRegistry {
 

--- a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java	Sun Jun 18 23:10:33 2017 +0100
+++ b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java	Mon Jun 19 07:19:27 2017 +0300
@@ -104,9 +104,8 @@
  * sees fit, so long as it has the appropriate runtime permission.
  *
  * <p> For more details on declaring service providers, and the JAR
- * format in general, see the <a
- * href="../../../../technotes/guides/jar/jar.html">
- * JAR File Specification</a>.
+ * format in general, see the
+ * <a href="{@docRoot}/../specs/jar/jar.html">JAR File Specification</a>.
  *
  * @see RegisterableService
  * @see java.util.ServiceLoader

--- a/jdk/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java	Sun Jun 18 23:10:33 2017 +0100
+++ b/jdk/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java	Mon Jun 19 07:19:27 2017 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -44,9 +44,7 @@
  * A typical output document format may be Postscript(TM).
  * <p>
  * This class is implemented by a service and located by the
- * implementation using the
- * <a href="../../../technotes/guides/jar/jar.html#Service%20Provider">
- * SPI JAR File specification</a>.
+ * implementation using the {@link java.util.ServiceLoader} facility.
  * <p>
  * Applications locate instances of this class by calling the
  * {@link #lookupStreamPrintServiceFactories(DocFlavor, String)} method.

--- a/jdk/src/java.desktop/share/classes/javax/print/package-info.java	Sun Jun 18 23:10:33 2017 +0100
+++ b/jdk/src/java.desktop/share/classes/javax/print/package-info.java	Mon Jun 19 07:19:27 2017 +0300
@@ -46,8 +46,7 @@
  * IPP printers or JINI printers, a print-service provider can write
  * implementations of {@code PrintServiceLookup}. The print-service provider can
  * dynamically install these {@code PrintServiceLookup} implementations using
- * the <a href="../../../technotes/guides/jar/jar.html#Service%20Provider">
- * SPI JAR file specification</a>.
+ * the {@link java.util.ServiceLoader} facility.
  *
  * <h3>Attribute Definitions</h3>
  * The {@link javax.print.attribute} and {@link javax.print.attribute.standard}

--- a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/package-info.java	Sun Jun 18 23:10:33 2017 +0100
+++ b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/package-info.java	Mon Jun 19 07:19:27 2017 +0300
@@ -42,10 +42,8 @@
  *     <li><a href="http://docs.oracle.com/javase/tutorial/uiswing/components/filechooser.html"
  *     target="_top">How to Use File Choosers</a>,
  *     a section in <em>The Java Tutorial</em></li>
- *     <li><a href="../../../../technotes/guides/intl/index.html"
- *     target="_top">Internationalization Documentation</a></li>
- *     <li><a href="../../../../technotes/guides/imf/index.html"
- *     target="_top">Input Method Framework Documentation</a></li>
+ *     <li>{@extLink i18n_overview Internationalization Overview}</li>
+ *     <li>{@extLink imf_overview Input Method Framework Overview}</li>
  * </ul>
  *
  * @since 1.2