changeset 1031:694ff82ca68e

7032975: API files in javax.annotation.processing need to be updated for references to JLS 7032972: API files in javax.tools need to updated for references to JVM Spec with editions/hyperlinks 7032978: API files in javax.tools need to be updated for references to JLS with editions/hyperlinks Summary: Removed URLs and 'edition' references Reviewed-by: jjg, darcy
author jjh
date Wed, 13 Apr 2011 11:35:43 -0700
parents bfbc197b560f
children 5ed971fce27c
files make/build.properties make/build.xml src/share/classes/com/sun/javadoc/ClassDoc.java src/share/classes/com/sun/source/tree/AnnotationTree.java src/share/classes/com/sun/source/tree/ArrayAccessTree.java src/share/classes/com/sun/source/tree/ArrayTypeTree.java src/share/classes/com/sun/source/tree/AssertTree.java src/share/classes/com/sun/source/tree/AssignmentTree.java src/share/classes/com/sun/source/tree/BinaryTree.java src/share/classes/com/sun/source/tree/BlockTree.java src/share/classes/com/sun/source/tree/BreakTree.java src/share/classes/com/sun/source/tree/CaseTree.java src/share/classes/com/sun/source/tree/CatchTree.java src/share/classes/com/sun/source/tree/ClassTree.java src/share/classes/com/sun/source/tree/CompilationUnitTree.java src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java src/share/classes/com/sun/source/tree/ContinueTree.java src/share/classes/com/sun/source/tree/DoWhileLoopTree.java src/share/classes/com/sun/source/tree/EmptyStatementTree.java src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java src/share/classes/com/sun/source/tree/ExpressionStatementTree.java src/share/classes/com/sun/source/tree/ExpressionTree.java src/share/classes/com/sun/source/tree/ForLoopTree.java src/share/classes/com/sun/source/tree/IdentifierTree.java src/share/classes/com/sun/source/tree/IfTree.java src/share/classes/com/sun/source/tree/ImportTree.java src/share/classes/com/sun/source/tree/InstanceOfTree.java src/share/classes/com/sun/source/tree/LabeledStatementTree.java src/share/classes/com/sun/source/tree/LiteralTree.java src/share/classes/com/sun/source/tree/MemberSelectTree.java src/share/classes/com/sun/source/tree/MethodInvocationTree.java src/share/classes/com/sun/source/tree/MethodTree.java src/share/classes/com/sun/source/tree/ModifiersTree.java src/share/classes/com/sun/source/tree/NewArrayTree.java src/share/classes/com/sun/source/tree/NewClassTree.java src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java src/share/classes/com/sun/source/tree/ParenthesizedTree.java src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java src/share/classes/com/sun/source/tree/ReturnTree.java src/share/classes/com/sun/source/tree/StatementTree.java src/share/classes/com/sun/source/tree/SwitchTree.java src/share/classes/com/sun/source/tree/SynchronizedTree.java src/share/classes/com/sun/source/tree/ThrowTree.java src/share/classes/com/sun/source/tree/TryTree.java src/share/classes/com/sun/source/tree/TypeCastTree.java src/share/classes/com/sun/source/tree/TypeParameterTree.java src/share/classes/com/sun/source/tree/UnaryTree.java src/share/classes/com/sun/source/tree/VariableTree.java src/share/classes/com/sun/source/tree/WhileLoopTree.java src/share/classes/com/sun/source/tree/WildcardTree.java src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java src/share/classes/com/sun/tools/classfile/AccessFlags.java src/share/classes/com/sun/tools/classfile/Annotation.java src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java src/share/classes/com/sun/tools/classfile/ClassFile.java src/share/classes/com/sun/tools/classfile/Code_attribute.java src/share/classes/com/sun/tools/classfile/ConstantPool.java src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java src/share/classes/com/sun/tools/classfile/Descriptor.java src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java src/share/classes/com/sun/tools/classfile/Instruction.java src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java src/share/classes/com/sun/tools/classfile/Opcode.java src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/Signature.java src/share/classes/com/sun/tools/classfile/Signature_attribute.java src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java src/share/classes/com/sun/tools/classfile/package.html src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java src/share/classes/com/sun/tools/javac/code/Symbol.java src/share/classes/com/sun/tools/javac/code/Types.java src/share/classes/com/sun/tools/javac/comp/Attr.java src/share/classes/com/sun/tools/javac/comp/Check.java src/share/classes/com/sun/tools/javac/comp/Flow.java src/share/classes/com/sun/tools/javac/comp/Resolve.java src/share/classes/com/sun/tools/javac/jvm/Gen.java src/share/classes/javax/annotation/processing/Processor.java src/share/classes/javax/lang/model/SourceVersion.java src/share/classes/javax/lang/model/element/Element.java src/share/classes/javax/lang/model/element/Modifier.java src/share/classes/javax/lang/model/element/PackageElement.java src/share/classes/javax/lang/model/element/TypeElement.java src/share/classes/javax/lang/model/element/VariableElement.java src/share/classes/javax/lang/model/type/DeclaredType.java src/share/classes/javax/lang/model/type/TypeVariable.java src/share/classes/javax/lang/model/util/Elements.java src/share/classes/javax/lang/model/util/Types.java src/share/classes/javax/tools/JavaCompiler.java src/share/classes/javax/tools/JavaFileManager.java src/share/classes/javax/tools/JavaFileObject.java src/share/sample/javac/processing/src/CheckNamesProcessor.java
diffstat 107 files changed, 184 insertions(+), 171 deletions(-) [+]
line wrap: on
line diff
--- a/make/build.properties	Tue Apr 12 20:58:06 2011 -0700
+++ b/make/build.properties	Wed Apr 13 11:35:43 2011 -0700
@@ -71,9 +71,18 @@
 javac.lint.opts = -Xlint:all,-deprecation -Werror
 
 # options for the <javadoc> task for javac
-javadoc.jls3.url=http://java.sun.com/docs/books/jls/
-javadoc.jls3.cite=&lt;a href=&quot;${javadoc.jls3.url}&quot;&gt;The Java Language Specification, Third Edition&lt;/a&gt;
-javadoc.jls3.option=-tag "jls3:a:See &lt;cite&gt;${javadoc.jls3.cite}&lt;/cite&gt;:"
+#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
+#javadoc.jls3.cite=&lt;a href=&quot;${javadoc.jls3.url}&quot;&gt;The Java Language Specification, Third Edition&lt;/a&gt;
+#javadoc.jls3.option=-tag "jls3:a:See &lt;cite&gt;${javadoc.jls3.cite}&lt;/cite&gt;:"
+
+
+javadoc.jls.cite=The Java&trade; Language Specification
+
+javadoc.jls.option=-tag "jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"
+
+
+
+
 
 # jtreg, used to run the JDK regression tests
 # See http://openjdk.java.net/jtreg/
--- a/make/build.xml	Tue Apr 12 20:58:06 2011 -0700
+++ b/make/build.xml	Wed Apr 13 11:35:43 2011 -0700
@@ -464,7 +464,7 @@
     </target>
 
     <target name="javadoc-javac" depends="build-javac,-def-javadoc-tool">
-        <javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls3.option}"/>
+        <javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls.option}"/>
     </target>
 
     <target name="jtreg-javac" depends="build-javac,build-javap,-def-jtreg">
--- a/src/share/classes/com/sun/javadoc/ClassDoc.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/javadoc/ClassDoc.java	Wed Apr 13 11:35:43 2011 -0700
@@ -311,8 +311,8 @@
 
     /**
      * Get the list of classes and interfaces declared as imported.
-     * These are called "single-type-import declarations" in the
-     * Java Language Specification.
+     * These are called "single-type-import declarations" in
+     * <cite>The Java&trade; Language Specification</cite>.
      *
      * @return an array of ClassDoc representing the imported classes.
      *
@@ -325,8 +325,8 @@
 
     /**
      * Get the list of packages declared as imported.
-     * These are called "type-import-on-demand declarations" in the
-     * Java Language Specification.
+     * These are called "type-import-on-demand declarations" in
+     * <cite>The Java&trade; Language Specification</cite>.
      *
      * @return an array of PackageDoc representing the imported packages.
      *
--- a/src/share/classes/com/sun/source/tree/AnnotationTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/AnnotationTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -36,7 +36,7 @@
  *    {@code @}<em>annotationType</em> ( <em>arguments</em> )
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 9.7"
+ * @jls section 9.7
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ArrayAccessTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ArrayAccessTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  *   <em>expression</em> [ <em>index</em> ]
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.13"
+ * @jls section 15.13
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ArrayTypeTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ArrayTypeTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  *   <em>type</em> []
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 10.1"
+ * @jls section 10.1
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/AssertTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/AssertTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,7 +35,7 @@
  *   assert <em>condition</em> : <em>detail</em> ;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.10"
+ * @jls section 14.10
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/AssignmentTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/AssignmentTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  *   <em>variable</em> = <em>expression</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.26.1"
+ * @jls section 15.26.1
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/BinaryTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/BinaryTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -34,7 +34,7 @@
  *   <em>leftOperand</em> <em>operator</em> <em>rightOperand</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, sections 15.17 to 15.24"
+ * @jls sections 15.17 to 15.24
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/BlockTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/BlockTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -39,7 +39,7 @@
  *   static { <em>statements</em> }
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.2"
+ * @jls section 14.2
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/BreakTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/BreakTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -37,7 +37,7 @@
  *   break <em>label</em> ;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.15"
+ * @jls section 14.15
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/CaseTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/CaseTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -39,7 +39,7 @@
  *       <em>statements</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.11"
+ * @jls section 14.11
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/CatchTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/CatchTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -34,7 +34,7 @@
  *       <em>block</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.20"
+ * @jls section 14.20
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ClassTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ClassTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -42,8 +42,7 @@
  *   }
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed,
- * sections 8.1, 8.9, 9.1, and 9.6"
+ * @jls sections 8.1, 8.9, 9.1, and 9.6
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/CompilationUnitTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/CompilationUnitTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  * Represents the abstract syntax tree for compilation units (source
  * files) and package declarations (package-info.java).
  *
- * @see "The Java Language Specification, 3rd ed, sections 7.3, and 7.4"
+ * @jls sections 7.3, and 7.4
  *
  * @author Peter von der Ah&eacute;
  * @since 1.6
--- a/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -34,7 +34,7 @@
  *   <em>variable</em> <em>operator</em> <em>expression</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.26.2"
+ * @jls section 15.26.2
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  *   <em>condition</em> ? <em>trueExpression</em> : <em>falseExpression</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.25"
+ * @jls section 15.25
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ContinueTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ContinueTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -36,7 +36,7 @@
  *   continue <em>label</em> ;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.16"
+ * @jls section 14.16
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,7 +35,7 @@
  *   while ( <em>expression</em> );
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.13"
+ * @jls section 14.13
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/EmptyStatementTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/EmptyStatementTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  *    ;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.6"
+ * @jls section 14.6
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -34,7 +34,7 @@
  *       <em>statement</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.14.2"
+ * @jls section 14.14.2
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  *   <em>expression</em> ;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.8"
+ * @jls section 14.8
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ExpressionTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ExpressionTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -29,7 +29,7 @@
  * A tree node used as the base class for the different types of
  * expressions.
  *
- * @see "The Java Language Specification, 3rd ed, chapter 15"
+ * @jls chapter 15
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ForLoopTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ForLoopTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -36,7 +36,7 @@
  *       <em>statement</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.14.1"
+ * @jls section 14.14.1
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/IdentifierTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/IdentifierTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,7 +35,7 @@
  *   <em>name</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 6.5.6.1"
+ * @jls section 6.5.6.1
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/IfTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/IfTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -39,7 +39,7 @@
  *       <em>elseStatement</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.9"
+ * @jls section 14.9
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ImportTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ImportTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,7 +35,7 @@
  *   static import <em>qualifiedIdentifier</em> ;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 7.5"
+ * @jls section 7.5
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/InstanceOfTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/InstanceOfTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  *   <em>expression</em> instanceof <em>type</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.20.2"
+ * @jls section 15.20.2
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/LabeledStatementTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/LabeledStatementTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,7 +35,7 @@
  *   <em>label</em> : <em>statement</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.7"
+ * @jls section 14.7
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/LiteralTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/LiteralTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -34,7 +34,7 @@
  *   <em>value</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.28"
+ * @jls section 15.28
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/MemberSelectTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/MemberSelectTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,8 +35,7 @@
  *   <em>expression</em> . <em>identifier</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, sections 6.5,
- * 15.11, and 15.12"
+ * @jls sections 6.5, 15.11,and 15.12
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/MethodInvocationTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/MethodInvocationTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -37,7 +37,7 @@
  *   this . <em>typeArguments</em> <em>identifier</em> ( <em>arguments</em> )
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.12"
+ * @jls section 15.12
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/MethodTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/MethodTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -40,8 +40,7 @@
  *   <em>modifiers</em> <em>type</em> <em>name</em> () default <em>defaultValue</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, sections 8.4, 8.6, 8.7,
- * 9.4, and 9.6"
+ * @jls sections 8.4, 8.6, 8.7, 9.4, and 9.6
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ModifiersTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ModifiersTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -39,8 +39,7 @@
  *   <em>flags</em> <em>annotations</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, sections
- * 8.1.1, 8.3.1, 8.4.3, 8.5.1, 8.8.3, 9.1.1, and 9.7"
+ * @jls sections 8.1.1, 8.3.1, 8.4.3, 8.5.1, 8.8.3, 9.1.1, and 9.7
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/NewArrayTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/NewArrayTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -37,7 +37,7 @@
  *   new <em>type</em> <em>dimensions</em> [ ] <em>initializers</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.10"
+ * @jls section 15.10
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/NewClassTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/NewClassTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -42,7 +42,7 @@
  *   <em>enclosingExpression</em>.new <em>identifier</em> ( <em>arguments</em> )
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.9"
+ * @jls section 15.9
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,7 +35,7 @@
  *   <em>type</em> &lt; <em>typeArguments</em> &gt;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 4.5.1"
+ * @jls section 4.5.1
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ParenthesizedTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ParenthesizedTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -34,7 +34,7 @@
  *   ( <em>expression</em> )
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.8.5"
+ * @jls section 15.8.5
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,7 +35,7 @@
  *   <em>primitiveTypeKind</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 4.2"
+ * @jls section 4.2
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ReturnTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ReturnTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -34,7 +34,7 @@
  *   return <em>expression</em>;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.17"
+ * @jls section 14.17
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/StatementTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/StatementTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -29,7 +29,7 @@
  * A tree node used as the base class for the different kinds of
  * statements.
  *
- * @see "The Java Language Specification, 3rd ed, chapter 14"
+ * @jls chapter 14
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/SwitchTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/SwitchTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -37,7 +37,7 @@
  *   }
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.11"
+ * @jls section 14.11
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/SynchronizedTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/SynchronizedTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -34,7 +34,7 @@
  *       </em>block</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.19"
+ * @jls section 14.19
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/ThrowTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/ThrowTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  *   throw <em>expression</em>;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.18"
+ * @jls section 14.18
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/TryTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/TryTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -39,7 +39,7 @@
  *       <em>finallyBlock</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 14.20"
+ * @jls section 14.20
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/TypeCastTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/TypeCastTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
  *   ( <em>type</em> ) <em>expression</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 15.16"
+ * @jls section 15.16
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/TypeParameterTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/TypeParameterTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -38,7 +38,7 @@
  *   <em>name</em> extends <em>bounds</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 4.4"
+ * @jls section 4.4
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/UnaryTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/UnaryTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -36,7 +36,7 @@
  *   <em>expression</em> <em>operator</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, sections 15.14 and 15.15"
+ * @jls sections 15.14 and 15.15
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/VariableTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/VariableTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,7 +35,7 @@
  *   <em>modifiers</em> <em>type</em> <em>name</em> <em>initializer</em> ;
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, sections 8.3 and 14.4"
+ * @jls sections 8.3 and 14.4
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/WhileLoopTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/WhileLoopTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -35,7 +35,7 @@
  * </pre>
  *
  *
- * @see "The Java Language Specification, 3rd ed, section 14.12"
+ * @jls section 14.12
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/source/tree/WildcardTree.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/WildcardTree.java	Wed Apr 13 11:35:43 2011 -0700
@@ -38,7 +38,7 @@
  *   ? super <em>bound</em>
  * </pre>
  *
- * @see "The Java Language Specification, 3rd ed, section 4.5.1"
+ * @jls section 4.5.1
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
--- a/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java	Wed Apr 13 11:35:43 2011 -0700
@@ -67,7 +67,8 @@
 
     /**
      * {@inheritDoc}
-     * See JLS 2 sections 8.3 and 8.4.6.
+     * See sections 8.3 and 8.4.6 of
+     * <cite>The Java&trade; Language Specification</cite>
      */
     public boolean hides(MemberDeclaration sub, MemberDeclaration sup) {
         Symbol hider = ((DeclarationImpl) sub).sym;
@@ -107,7 +108,8 @@
 
     /**
      * {@inheritDoc}
-     * See JLS 2 section 8.4.6.1.
+     * See section 8.4.6.1 of
+     * <cite>The Java&trade; Language Specification</cite>
      */
     public boolean overrides(MethodDeclaration sub, MethodDeclaration sup) {
         MethodSymbol overrider = ((MethodDeclarationImpl) sub).sym;
--- a/src/share/classes/com/sun/tools/classfile/AccessFlags.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/AccessFlags.java	Wed Apr 13 11:35:43 2011 -0700
@@ -30,7 +30,7 @@
 import java.util.Set;
 
 /**
- * See JVMS3, sections 4.2, 4.6, 4.7.
+ * See JVMS, sections 4.2, 4.6, 4.7.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Annotation.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Annotation.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.16.
+ * See JVMS, section 4.8.16.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
@@ -71,7 +71,7 @@
     public final element_value_pair element_value_pairs[];
 
     /**
-     * See JVMS3, section 4.8.16.1.
+     * See JVMS, section 4.8.16.1.
      */
     public static abstract class element_value {
         public static element_value read(ClassReader cr)
--- a/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.15.
+ * See JVMS, section 4.8.15.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3 <TBD>
+ * See JVMS <TBD>
  * http://cr.openjdk.java.net/~jrose/pres/indy-javadoc-mlvm/
  *
  *  <p><b>This is NOT part of any supported API.
--- a/src/share/classes/com/sun/tools/classfile/ClassFile.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/ClassFile.java	Wed Apr 13 11:35:43 2011 -0700
@@ -33,7 +33,7 @@
 import static com.sun.tools.classfile.AccessFlags.*;
 
 /**
- * See JVMS3, section 4.2.
+ * See JVMS, section 4.2.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Code_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Code_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -30,7 +30,7 @@
 import java.util.NoSuchElementException;
 
 /**
- * See JVMS3, section 4.8.3.
+ * See JVMS, section 4.8.3.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/ConstantPool.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/ConstantPool.java	Wed Apr 13 11:35:43 2011 -0700
@@ -31,7 +31,7 @@
 import java.util.Iterator;
 
 /**
- * See JVMS3, section 4.5.
+ * See JVMS, section 4.5.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.2.
+ * See JVMS, section 4.8.2.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.15.
+ * See JVMS, section 4.8.15.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Descriptor.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Descriptor.java	Wed Apr 13 11:35:43 2011 -0700
@@ -29,7 +29,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.4.
+ * See JVMS, section 4.4.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -29,7 +29,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.7.
+ * See JVMS, section 4.8.7.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.5.
+ * See JVMS, section 4.8.5.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -30,7 +30,7 @@
 import com.sun.tools.classfile.ConstantPool.*;
 
 /**
- * See JVMS3, section 4.8.6.
+ * See JVMS, section 4.8.6.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Instruction.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Instruction.java	Wed Apr 13 11:35:43 2011 -0700
@@ -26,7 +26,7 @@
 package com.sun.tools.classfile;
 
 /**
- * See JVMS3, chapter 6.
+ * See JVMS, chapter 6.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.12.
+ * See JVMS, section 4.8.12.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.13.
+ * See JVMS, section 4.8.13.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.14.
+ * See JVMS, section 4.8.14.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Opcode.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Opcode.java	Wed Apr 13 11:35:43 2011 -0700
@@ -29,7 +29,7 @@
 import static com.sun.tools.classfile.Opcode.Set.*;
 
 /**
- * See JVMS3, chapter 6.
+ * See JVMS, chapter 6.
  *
  * <p>In addition to providing all the standard opcodes defined in JVMS,
  * this class also provides legacy support for the PicoJava extensions.
--- a/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.16 and 4.8.17.
+ * See JVMS, section 4.8.16 and 4.8.17.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.17.
+ * See JVMS, section 4.8.17.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.18.
+ * See JVMS, section 4.8.18.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.18 and 4.8.19.
+ * See JVMS, section 4.8.18 and 4.8.19.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.16.
+ * See JVMS, section 4.8.16.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.18.
+ * See JVMS, section 4.8.18.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Signature.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Signature.java	Wed Apr 13 11:35:43 2011 -0700
@@ -30,7 +30,7 @@
 import com.sun.tools.classfile.Type.*;
 
 /**
- * See JVMS3 4.4.4.
+ * See JVMS 4.4.4.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Signature_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Signature_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.9.
+ * See JVMS, section 4.8.9.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -30,7 +30,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.15.
+ * See JVMS, section 4.8.15.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.10.
+ * See JVMS, section 4.8.10.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.4.
+ * See JVMS, section 4.8.4.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java	Wed Apr 13 11:35:43 2011 -0700
@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * See JVMS3, section 4.8.8.
+ * See JVMS, section 4.8.8.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/classfile/package.html	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/package.html	Wed Apr 13 11:35:43 2011 -0700
@@ -6,7 +6,7 @@
   </head>
   <body>
     A minimalist library to read and write class files into objects closely 
-    based on the corresponding definitions in the Java Virtual Machine 
-    Specification (JVMS).
+    based on the corresponding definitions in 
+    <cite>The Java&trade; Virtual Machine Specification</cite> (JVMS).
   </body>
 </html>
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Wed Apr 13 11:35:43 2011 -0700
@@ -2523,8 +2523,9 @@
     }
 
     /**
-     * According to the Java Language Specifications, all the outer classes
-     * and static nested classes are core classes.
+     * According to
+     * <cite>The Java&trade; Language Specification</cite>,
+     * all the outer classes and static nested classes are core classes.
      */
     public boolean isCoreClass(ClassDoc cd) {
         return cd.containingClass() == null || cd.isStatic();
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java	Wed Apr 13 11:35:43 2011 -0700
@@ -175,8 +175,9 @@
     }
 
     /**
-     * According to the Java Language Specifications, all the outer classes
-     * and static inner classes are core classes.
+     * According to
+     * <cite>The Java&trade; Language Specification</cite>,
+     * all the outer classes and static inner classes are core classes.
      */
     public static boolean isCoreClass(ClassDoc cd) {
         return cd.containingClass() == null || cd.isStatic();
--- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Wed Apr 13 11:35:43 2011 -0700
@@ -1193,7 +1193,7 @@
         }
 
         private boolean isOverridableIn(TypeSymbol origin) {
-            // JLS3 8.4.6.1
+            // JLS 8.4.6.1
             switch ((int)(flags_field & Flags.AccessFlags)) {
             case Flags.PRIVATE:
                 return false;
--- a/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Wed Apr 13 11:35:43 2011 -0700
@@ -1985,7 +1985,7 @@
      * signature</em> of the other.  This is <b>not</b> an equivalence
      * relation.
      *
-     * @see "The Java Language Specification, Third Ed. (8.4.2)."
+     * @jls section 8.4.2.
      * @see #overrideEquivalent(Type t, Type s)
      * @param t first signature (possibly raw).
      * @param s second signature (could be subjected to erasure).
@@ -2004,7 +2004,7 @@
      * equivalence</em>.  This is the natural extension of
      * isSubSignature to an equivalence relation.
      *
-     * @see "The Java Language Specification, Third Ed. (8.4.2)."
+     * @jls section 8.4.2.
      * @see #isSubSignature(Type t, Type s)
      * @param t a signature (possible raw, could be subjected to
      * erasure).
@@ -3049,8 +3049,7 @@
 
     /**
      * Return-Type-Substitutable.
-     * @see <a href="http://java.sun.com/docs/books/jls/">The Java
-     * Language Specification, Third Ed. (8.4.5)</a>
+     * @jls section 8.4.5
      */
     public boolean returnTypeSubstitutable(Type r1, Type r2) {
         if (hasSameArgs(r1, r2))
@@ -3130,7 +3129,7 @@
 
     // <editor-fold defaultstate="collapsed" desc="Capture conversion">
     /*
-     * JLS 3rd Ed. 5.1.10 Capture Conversion:
+     * JLS 5.1.10 Capture Conversion:
      *
      * Let G name a generic type declaration with n formal type
      * parameters A1 ... An with corresponding bounds U1 ... Un. There
@@ -3163,7 +3162,7 @@
      * Capture conversion is not applied recursively.
      */
     /**
-     * Capture conversion as specified by JLS 3rd Ed.
+     * Capture conversion as specified by the JLS.
      */
 
     public List<Type> capture(List<Type> ts) {
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed Apr 13 11:35:43 2011 -0700
@@ -2632,10 +2632,10 @@
          * @param tree    The tree making up the variable reference.
          * @param env     The current environment.
          * @param v       The variable's symbol.
-         * @see JLS 3rd Ed. (8.9 Enums)
+         * @jls  section 8.9 Enums
          */
         private void checkEnumInitializer(JCTree tree, Env<AttrContext> env, VarSymbol v) {
-            // JLS 3rd Ed.:
+            // JLS:
             //
             // "It is a compile-time error to reference a static field
             // of an enum type that is not a compile-time constant
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Wed Apr 13 11:35:43 2011 -0700
@@ -2271,7 +2271,7 @@
      * that of any public or protected method declared in class Object
      * or in the interface annotation.Annotation."
      *
-     * @jls3 9.6 Annotation Types
+     * @jls 9.6 Annotation Types
      */
     void validateAnnotationMethod(DiagnosticPosition pos, MethodSymbol m) {
         for (Type sup = syms.annotationType; sup.tag == CLASS; sup = types.supertype(sup)) {
--- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java	Wed Apr 13 11:35:43 2011 -0700
@@ -51,7 +51,7 @@
  *  unassignment analysis ensures that no final variable is assigned
  *  more than once.
  *
- *  <p>The second edition of the JLS has a number of problems in the
+ *  <p>The JLS has a number of problems in the
  *  specification of these flow analysis problems. This implementation
  *  attempts to address those issues.
  *
@@ -126,7 +126,7 @@
  *  don't have to worry about the return expression because this
  *  concept is only used for construcrors.
  *
- *  <p>There is no spec in JLS2 for when a variable is definitely
+ *  <p>There is no spec in the JLS for when a variable is definitely
  *  assigned at the end of a constructor, which is needed for final
  *  fields (8.3.1.2).  We implement the rule that V is DA at the end
  *  of the constructor iff it is DA and the end of the body of the
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Apr 13 11:35:43 2011 -0700
@@ -346,7 +346,7 @@
         if (typeargtypes == null) typeargtypes = List.nil();
         if (mt.tag != FORALL && typeargtypes.nonEmpty()) {
             // This is not a polymorphic method, but typeargs are supplied
-            // which is fine, see JLS3 15.12.2.1
+            // which is fine, see JLS 15.12.2.1
         } else if (mt.tag == FORALL && typeargtypes.nonEmpty()) {
             ForAll pmt = (ForAll) mt;
             if (typeargtypes.length() != pmt.tvars.length())
@@ -1769,7 +1769,7 @@
 
     /**
      * Resolve an appropriate implicit this instance for t's container.
-     * JLS2 8.8.5.1 and 15.9.2
+     * JLS 8.8.5.1 and 15.9.2
      */
     Type resolveImplicitThis(DiagnosticPosition pos, Env<AttrContext> env, Type t) {
         return resolveImplicitThis(pos, env, t, false);
--- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Wed Apr 13 11:35:43 2011 -0700
@@ -283,7 +283,7 @@
         }
 
         // leave alone methods inherited from Object
-        // JLS2 13.1.
+        // JLS 13.1.
         if (sym.owner == syms.objectType.tsym)
             return sym;
 
--- a/src/share/classes/javax/annotation/processing/Processor.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/annotation/processing/Processor.java	Wed Apr 13 11:35:43 2011 -0700
@@ -225,12 +225,13 @@
      * </dl>
      * </blockquote>
      *
-     * where <i>TypeName</i> is as defined in the <i>Java Language Specification</i>.
+     * where <i>TypeName</i> is as defined in
+     * <cite>The Java&trade; Language Specification</cite>.
      *
      * @return the names of the annotation types supported by this processor
      * @see javax.annotation.processing.SupportedAnnotationTypes
-     * @jls3 3.8 Identifiers
-     * @jls3 6.5.5 Meaning of Type Names
+     * @jls 3.8 Identifiers
+     * @jls 6.5.5 Meaning of Type Names
      */
     Set<String> getSupportedAnnotationTypes();
 
--- a/src/share/classes/javax/lang/model/SourceVersion.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/SourceVersion.java	Wed Apr 13 11:35:43 2011 -0700
@@ -32,10 +32,9 @@
 /**
  * Source versions of the Java&trade; programming language.
  *
- * See <a
- * href="http://java.sun.com/docs/books/jls/">http://java.sun.com/docs/books/jls/</a>
- * for information on editions of <i>The Java&trade; Language
- * Specification</i>, including updates and clarifications.
+ * See the appropriate edition of
+ * <cite>The Java&trade; Language Specification</cite>
+ * for information about a particular source version.
  *
  * <p>Note that additional source version constants will be added to
  * model future releases of the language.
@@ -59,17 +58,16 @@
     /**
      * The original version.
      *
-     * The language described in the first edition of <i>The
-     * Java&trade; Language Specification</i>.
+     * The language described in
+     * <cite>The Java&trade; Language Specification, First Edition</cite>.
      */
     RELEASE_0,
 
     /**
      * The version recognized by the Java Platform 1.1.
      *
-     * The language is {@code RELEASE_0} <a
-     * href="http://java.sun.com/docs/books/jls/first_edition/html/1.1Update.html">augmented</a>
-     * with nested classes.
+     * The language is {@code RELEASE_0} augmented with nested classes as described in the 1.1 update to
+     * <cite>The Java&trade; Language Specification, First Edition</cite>.
      */
     RELEASE_1,
 
@@ -77,8 +75,9 @@
      * The version recognized by the Java 2 Platform, Standard Edition,
      * v 1.2.
      *
-     * The language described in <i>The Java&trade; Language
-     * Specification, Second Edition</i>, which includes the {@code
+     * The language described in
+     * <cite>The Java&trade; Language Specification,
+     * Second Edition</cite>, which includes the {@code
      * strictfp} modifier.
      */
     RELEASE_2,
@@ -103,8 +102,9 @@
      * The version recognized by the Java 2 Platform, Standard
      * Edition 5.0.
      *
-     * The language described in <i>The Java&trade; Language
-     * Specification, Third Edition</i>.  First release to support
+     * The language described in
+     * <cite>The Java&trade; Language Specification,
+     * Third Edition</cite>.  First release to support
      * generics, annotations, autoboxing, var-args, enhanced {@code
      * for} loop, and hexadecimal floating-point literals.
      */
@@ -210,7 +210,7 @@
      * @param name the string to check
      * @return {@code true} if this string is a
      * syntactically valid name, {@code false} otherwise.
-     * @jls3 6.2 Names and Identifiers
+     * @jls 6.2 Names and Identifiers
      */
     public static boolean isName(CharSequence name) {
         String id = name.toString();
--- a/src/share/classes/javax/lang/model/element/Element.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/element/Element.java	Wed Apr 13 11:35:43 2011 -0700
@@ -232,8 +232,8 @@
      *
      * @return the enclosed elements, or an empty list if none
      * @see Elements#getAllMembers
-     * @jls3 8.8.9 Default Constructor
-     * @jls3 8.9 Enums
+     * @jls 8.8.9 Default Constructor
+     * @jls 8.9 Enums
      */
     List<? extends Element> getEnclosedElements();
 
--- a/src/share/classes/javax/lang/model/element/Modifier.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/element/Modifier.java	Wed Apr 13 11:35:43 2011 -0700
@@ -46,7 +46,7 @@
 
 public enum Modifier {
 
-    // See JLS2 sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1.
+    // See JLS sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1.
     // java.lang.reflect.Modifier includes INTERFACE, but that's a VMism.
 
     /** The modifier {@code public} */          PUBLIC,
--- a/src/share/classes/javax/lang/model/element/PackageElement.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/element/PackageElement.java	Wed Apr 13 11:35:43 2011 -0700
@@ -43,7 +43,7 @@
      *
      * @return the fully qualified name of this package, or an
      * empty name if this is an unnamed package
-     * @jls3 6.7 Fully Qualified Names and Canonical Names
+     * @jls 6.7 Fully Qualified Names and Canonical Names
      */
     Name getQualifiedName();
 
@@ -63,7 +63,7 @@
      *
      * @return {@code true} is this is an unnamed package and {@code
      * false} otherwise
-     * @jls3 7.4.2 Unnamed Packages
+     * @jls 7.4.2 Unnamed Packages
      */
     boolean isUnnamed();
 
--- a/src/share/classes/javax/lang/model/element/TypeElement.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/element/TypeElement.java	Wed Apr 13 11:35:43 2011 -0700
@@ -101,7 +101,7 @@
      * an empty name if none
      *
      * @see Elements#getBinaryName
-     * @jls3 6.7 Fully Qualified Names and Canonical Names
+     * @jls 6.7 Fully Qualified Names and Canonical Names
      */
     Name getQualifiedName();
 
--- a/src/share/classes/javax/lang/model/element/VariableElement.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/element/VariableElement.java	Wed Apr 13 11:35:43 2011 -0700
@@ -59,8 +59,8 @@
      * otherwise
      *
      * @see Elements#getConstantExpression(Object)
-     * @jls3 15.28 Constant Expression
-     * @jls3 4.12.4 final Variables
+     * @jls 15.28 Constant Expression
+     * @jls 4.12.4 final Variables
      */
     Object getConstantValue();
 }
--- a/src/share/classes/javax/lang/model/type/DeclaredType.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/type/DeclaredType.java	Wed Apr 13 11:35:43 2011 -0700
@@ -79,8 +79,8 @@
      * enclosing instance.
      *
      * @return a type mirror for the enclosing type
-     * @jls3 8.1.3 Inner Classes and Enclosing Instances
-     * @jls3 15.9.2 Determining Enclosing Instances
+     * @jls 8.1.3 Inner Classes and Enclosing Instances
+     * @jls 15.9.2 Determining Enclosing Instances
      */
     TypeMirror getEnclosingType();
 
--- a/src/share/classes/javax/lang/model/type/TypeVariable.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/type/TypeVariable.java	Wed Apr 13 11:35:43 2011 -0700
@@ -38,8 +38,8 @@
  * type, method, or constructor.
  * A type variable may also be declared implicitly, as by
  * the capture conversion of a wildcard type argument
- * (see chapter 5 of <i>The Java Language Specification, Third
- * Edition</i>).
+ * (see chapter 5 of
+ * <cite>The Java&trade; Language Specification</cite>).
  *
  * @author Joseph D. Darcy
  * @author Scott Seligman
--- a/src/share/classes/javax/lang/model/util/Elements.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/util/Elements.java	Wed Apr 13 11:35:43 2011 -0700
@@ -95,7 +95,7 @@
      * @param e  the element being examined
      * @return the documentation comment of the element, or {@code null}
      *          if there is none
-     * @jls3 3.6 White Space
+     * @jls 3.6 White Space
      */
     String getDocComment(Element e);
 
@@ -114,7 +114,7 @@
      * @return the binary name
      *
      * @see TypeElement#getQualifiedName
-     * @jls3 13.1 The Form of a Binary
+     * @jls 13.1 The Form of a Binary
      */
     Name getBinaryName(TypeElement type);
 
@@ -210,8 +210,8 @@
      * @param type   the type of which the first method is a member
      * @return {@code true} if and only if the first method overrides
      *          the second
-     * @jls3 8.4.8 Inheritance, Overriding, and Hiding
-     * @jls3 9.4.1 Inheritance and Overriding
+     * @jls 8.4.8 Inheritance, Overriding, and Hiding
+     * @jls 9.4.1 Inheritance and Overriding
      */
     boolean overrides(ExecutableElement overrider, ExecutableElement overridden,
                       TypeElement type);
--- a/src/share/classes/javax/lang/model/util/Types.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/lang/model/util/Types.java	Wed Apr 13 11:35:43 2011 -0700
@@ -81,7 +81,7 @@
      * @return {@code true} if and only if the first type is a subtype
      *          of the second
      * @throws IllegalArgumentException if given an executable or package type
-     * @jls3 4.10 Subtyping
+     * @jls 4.10 Subtyping
      */
     boolean isSubtype(TypeMirror t1, TypeMirror t2);
 
@@ -93,7 +93,7 @@
      * @return {@code true} if and only if the first type is assignable
      *          to the second
      * @throws IllegalArgumentException if given an executable or package type
-     * @jls3 5.2 Assignment Conversion
+     * @jls 5.2 Assignment Conversion
      */
     boolean isAssignable(TypeMirror t1, TypeMirror t2);
 
@@ -104,7 +104,7 @@
      * @param t2  the second type
      * @return {@code true} if and only if the first type contains the second
      * @throws IllegalArgumentException if given an executable or package type
-     * @jls3 4.5.1.1 Type Argument Containment and Equivalence
+     * @jls 4.5.1.1 Type Argument Containment and Equivalence
      */
     boolean contains(TypeMirror t1, TypeMirror t2);
 
@@ -116,7 +116,7 @@
      * @param m2  the second method
      * @return {@code true} if and only if the first signature is a
      *          subsignature of the second
-     * @jls3 8.4.2 Method Signature
+     * @jls 8.4.2 Method Signature
      */
     boolean isSubsignature(ExecutableType m1, ExecutableType m2);
 
@@ -136,7 +136,7 @@
      * @param t  the type to be erased
      * @return the erasure of the given type
      * @throws IllegalArgumentException if given a package type
-     * @jls3 4.6 Type Erasure
+     * @jls 4.6 Type Erasure
      */
     TypeMirror erasure(TypeMirror t);
 
@@ -146,7 +146,7 @@
      *
      * @param p  the primitive type to be converted
      * @return the class of a boxed value of type {@code p}
-     * @jls3 5.1.7 Boxing Conversion
+     * @jls 5.1.7 Boxing Conversion
      */
     TypeElement boxedClass(PrimitiveType p);
 
@@ -158,7 +158,7 @@
      * @return the type of an unboxed value of type {@code t}
      * @throws IllegalArgumentException if the given type has no
      *          unboxing conversion
-     * @jls3 5.1.8 Unboxing Conversion
+     * @jls 5.1.8 Unboxing Conversion
      */
     PrimitiveType unboxedType(TypeMirror t);
 
@@ -168,7 +168,7 @@
      * @param t  the type to be converted
      * @return the result of applying capture conversion
      * @throws IllegalArgumentException if given an executable or package type
-     * @jls3 5.1.10 Capture Conversion
+     * @jls 5.1.10 Capture Conversion
      */
     TypeMirror capture(TypeMirror t);
 
--- a/src/share/classes/javax/tools/JavaCompiler.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/tools/JavaCompiler.java	Wed Apr 13 11:35:43 2011 -0700
@@ -58,9 +58,11 @@
  * 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
--- a/src/share/classes/javax/tools/JavaFileManager.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/tools/JavaFileManager.java	Wed Apr 13 11:35:43 2011 -0700
@@ -49,17 +49,16 @@
  * 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 @@
 
     /**
      * 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
--- a/src/share/classes/javax/tools/JavaFileObject.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/classes/javax/tools/JavaFileObject.java	Wed Apr 13 11:35:43 2011 -0700
@@ -99,9 +99,9 @@
     /**
      * 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
--- a/src/share/sample/javac/processing/src/CheckNamesProcessor.java	Tue Apr 12 20:58:06 2011 -0700
+++ b/src/share/sample/javac/processing/src/CheckNamesProcessor.java	Wed Apr 13 11:35:43 2011 -0700
@@ -152,7 +152,8 @@
      * Provide checks that an element and its enclosed elements follow
      * the usual naming conventions.
      *
-     * <p> Conventions from JLSv3 section 6.8:
+     * <p> Conventions from section 6.8 of
+     *     <cite>The Java&trade; Language Specification</cite>
      *
      * <ul>
      * <li> Classes and interfaces: camel case, first letter is uppercase
@@ -163,7 +164,8 @@
      * <li> non-final: camel case, initial lowercase
      * <li> constant: uppercase separated by underscores
      * </ul>
-     * <li> Packages: checks left as exercise for the reader, see JLSv3 section 7.7
+     * <li> Packages: checks left as exercise for the reader, see section 7.7 of
+     * <cite>The Java&trade; Language Specification</cite>.
      * </ul>
      */
     private static class NameChecker {
@@ -286,7 +288,7 @@
             public Void visitPackage(PackageElement e, Void p) {
                 /*
                  * Implementing the checks of package names is left
-                 * as an exercise for the reader, see JLSv3 section
+                 * as an exercise for the reader, see JLS section
                  * 7.7 for conventions.
                  */