3 files changed, 15 insertions, 13 deletions
diff --git a/src/share/classes/javax/tools/JavaCompiler.java b/src/share/classes/javax/tools/JavaCompiler.java
index 7bc019a6..8d0dcf92 100644
--- a/src/share/classes/javax/tools/JavaCompiler.java
+++ b/src/share/classes/javax/tools/JavaCompiler.java
@@ -58,9 +58,11 @@ import javax.annotation.processing.Processor;
  * standard file manager such as the one returned by {@linkplain
  * #getStandardFileManager getStandardFileManager}.
  *
- * <p>An instance implementing this interface must conform to the Java
- * Language Specification and generate class files conforming to the
- * Java Virtual Machine specification.  The versions of these
+ * <p>An instance implementing this interface must conform to
+ * <cite>The Java&trade; Language Specification</cite>
+ * and generate class files conforming to
+ * <cite>The Java&trade; Virtual Machine Specification</cite>.
+ * The versions of these
  * specifications are defined in the {@linkplain Tool} interface.
  *
  * Additionally, an instance of this interface supporting {@link
diff --git a/src/share/classes/javax/tools/JavaFileManager.java b/src/share/classes/javax/tools/JavaFileManager.java
index f289d095..d519a5c9 100644
--- a/src/share/classes/javax/tools/JavaFileManager.java
+++ b/src/share/classes/javax/tools/JavaFileManager.java
@@ -49,17 +49,16 @@ import static javax.tools.JavaFileObject.Kind;
  * names must be given in the Java Virtual Machine internal form of
  * fully qualified class and interface names.  For convenience '.'
  * and '/' are interchangeable.  The internal form is defined in
- * chapter four of the
- * <a href="http://java.sun.com/docs/books/vmspec/2nd-edition/jvms-maintenance.html">Java
- * Virtual Machine Specification</a>.
+ * chapter four of
+ * <cite>The Java&trade; Virtual Machine Specification</cite>.
 
  * <blockquote><p>
  *   <i>Discussion:</i> this means that the names
  *   "java/lang.package-info", "java/lang/package-info",
  *   "java.lang.package-info", are valid and equivalent.  Compare to
- *   binary name as defined in the
- *   <a href="http://java.sun.com/docs/books/jls/">Java Language
- *   Specification (JLS)</a> section 13.1 "The Form of a Binary".
+ *   binary name as defined in
+ *   <cite>The Java&trade; Language Specification</cite>,
+ *   section 13.1 "The Form of a Binary".
  * </p></blockquote>
  *
  * <p>The case of names is significant.  All names should be treated
@@ -173,7 +172,8 @@ public interface JavaFileManager extends Closeable, Flushable, OptionChecker {
 
     /**
      * Infers a binary name of a file object based on a location.  The
-     * binary name returned might not be a valid JLS binary name.
+     * binary name returned might not be a valid binary name according to
+     * <cite>The Java&trade; Language Specification</cite>.
      *
      * @param location a location
      * @param file a file object
diff --git a/src/share/classes/javax/tools/JavaFileObject.java b/src/share/classes/javax/tools/JavaFileObject.java
index 21d0d075..9e84b3c5 100644
--- a/src/share/classes/javax/tools/JavaFileObject.java
+++ b/src/share/classes/javax/tools/JavaFileObject.java
@@ -99,9 +99,9 @@ public interface JavaFileObject extends FileObject {
     /**
      * Checks if this file object is compatible with the specified
      * simple name and kind.  A simple name is a single identifier
-     * (not qualified) as defined in the <a
-     * href="http://java.sun.com/docs/books/jls/">Java Language
-     * Specification</a> 3rd ed., section 6.2 "Names and Identifiers".
+     * (not qualified) as defined in
+     * <cite>The Java&trade; Language Specification</cite>,
+     * section 6.2 "Names and Identifiers".
      *
      * @param simpleName a simple name of a class
      * @param kind a kind