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
Removed URLs and 'edition' references
Reviewed-by: jjg, darcy
diff --git a/langtools/make/build.properties b/langtools/make/build.properties
index ad48717..5c4ad09 100644
--- a/langtools/make/build.properties
+++ b/langtools/make/build.properties
@@ -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=<a href="${javadoc.jls3.url}">The Java Language Specification, Third Edition</a>
-javadoc.jls3.option=-tag "jls3:a:See <cite>${javadoc.jls3.cite}</cite>:"
+#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
+#javadoc.jls3.cite=<a href="${javadoc.jls3.url}">The Java Language Specification, Third Edition</a>
+#javadoc.jls3.option=-tag "jls3:a:See <cite>${javadoc.jls3.cite}</cite>:"
+
+
+javadoc.jls.cite=The Java™ Language Specification
+
+javadoc.jls.option=-tag "jls:a:See <cite>${javadoc.jls.cite}</cite>:"
+
+
+
+
# jtreg, used to run the JDK regression tests
# See http://openjdk.java.net/jtreg/
diff --git a/langtools/make/build.xml b/langtools/make/build.xml
index 6e9687b..5141cfd 100644
--- a/langtools/make/build.xml
+++ b/langtools/make/build.xml
@@ -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">
diff --git a/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java b/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java
index 03ce11c..8eda69b 100644
--- a/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java
+++ b/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java
@@ -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™ 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™ Language Specification</cite>.
*
* @return an array of PackageDoc representing the imported packages.
*
diff --git a/langtools/src/share/classes/com/sun/source/tree/AnnotationTree.java b/langtools/src/share/classes/com/sun/source/tree/AnnotationTree.java
index 2ab8afb..5a9074b 100644
--- a/langtools/src/share/classes/com/sun/source/tree/AnnotationTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/AnnotationTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ArrayAccessTree.java b/langtools/src/share/classes/com/sun/source/tree/ArrayAccessTree.java
index b52307e..7e5fc2c 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ArrayAccessTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ArrayAccessTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ArrayTypeTree.java b/langtools/src/share/classes/com/sun/source/tree/ArrayTypeTree.java
index bd6ef6c..0c58a71 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ArrayTypeTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ArrayTypeTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/AssertTree.java b/langtools/src/share/classes/com/sun/source/tree/AssertTree.java
index 1212f7f..fce758e 100644
--- a/langtools/src/share/classes/com/sun/source/tree/AssertTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/AssertTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/AssignmentTree.java b/langtools/src/share/classes/com/sun/source/tree/AssignmentTree.java
index 0224d63..9c5480d 100644
--- a/langtools/src/share/classes/com/sun/source/tree/AssignmentTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/AssignmentTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java b/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java
index 21875f3..d24497a 100644
--- a/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/BlockTree.java b/langtools/src/share/classes/com/sun/source/tree/BlockTree.java
index 1013f96..330309a 100644
--- a/langtools/src/share/classes/com/sun/source/tree/BlockTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/BlockTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/BreakTree.java b/langtools/src/share/classes/com/sun/source/tree/BreakTree.java
index ae40b15..e287a98 100644
--- a/langtools/src/share/classes/com/sun/source/tree/BreakTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/BreakTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/CaseTree.java b/langtools/src/share/classes/com/sun/source/tree/CaseTree.java
index 717f00d..a273c2f 100644
--- a/langtools/src/share/classes/com/sun/source/tree/CaseTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/CaseTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/CatchTree.java b/langtools/src/share/classes/com/sun/source/tree/CatchTree.java
index 2974386..9c34e86 100644
--- a/langtools/src/share/classes/com/sun/source/tree/CatchTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/CatchTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ClassTree.java b/langtools/src/share/classes/com/sun/source/tree/ClassTree.java
index 4ff167a..81c7c2f 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ClassTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ClassTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java b/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java
index 6f130fc..66b585c 100644
--- a/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java
@@ -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é
* @since 1.6
diff --git a/langtools/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java b/langtools/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java
index 37a292c..86eb99c 100644
--- a/langtools/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java b/langtools/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java
index 6c9fb8c..4492611 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ContinueTree.java b/langtools/src/share/classes/com/sun/source/tree/ContinueTree.java
index 0d141d8..98db354 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ContinueTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ContinueTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java b/langtools/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java
index 70d9833..4a6e20b 100644
--- a/langtools/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/EmptyStatementTree.java b/langtools/src/share/classes/com/sun/source/tree/EmptyStatementTree.java
index d8b072a..baf13c1 100644
--- a/langtools/src/share/classes/com/sun/source/tree/EmptyStatementTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/EmptyStatementTree.java
@@ -33,7 +33,7 @@
* ;
* </pre>
*
- * @see "The Java Language Specification, 3rd ed, section 14.6"
+ * @jls section 14.6
*
* @author Peter von der Ahé
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java b/langtools/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java
index be486ac..f550bfa 100644
--- a/langtools/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java b/langtools/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java
index 099e938..f3661c1 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ExpressionTree.java b/langtools/src/share/classes/com/sun/source/tree/ExpressionTree.java
index 71ead42..1ef4349 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ExpressionTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ExpressionTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ForLoopTree.java b/langtools/src/share/classes/com/sun/source/tree/ForLoopTree.java
index 7e0f60a..12e21b7 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ForLoopTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ForLoopTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/IdentifierTree.java b/langtools/src/share/classes/com/sun/source/tree/IdentifierTree.java
index 4a973cf..1d2d8ad 100644
--- a/langtools/src/share/classes/com/sun/source/tree/IdentifierTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/IdentifierTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/IfTree.java b/langtools/src/share/classes/com/sun/source/tree/IfTree.java
index 30d225d..f600946 100644
--- a/langtools/src/share/classes/com/sun/source/tree/IfTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/IfTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ImportTree.java b/langtools/src/share/classes/com/sun/source/tree/ImportTree.java
index 4a176ec..1fd027d 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ImportTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ImportTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/InstanceOfTree.java b/langtools/src/share/classes/com/sun/source/tree/InstanceOfTree.java
index 5fb307b..20d95e7 100644
--- a/langtools/src/share/classes/com/sun/source/tree/InstanceOfTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/InstanceOfTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/LabeledStatementTree.java b/langtools/src/share/classes/com/sun/source/tree/LabeledStatementTree.java
index d7d7a35..ba58dd4 100644
--- a/langtools/src/share/classes/com/sun/source/tree/LabeledStatementTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/LabeledStatementTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/LiteralTree.java b/langtools/src/share/classes/com/sun/source/tree/LiteralTree.java
index 76a9155..a8be528 100644
--- a/langtools/src/share/classes/com/sun/source/tree/LiteralTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/LiteralTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/MemberSelectTree.java b/langtools/src/share/classes/com/sun/source/tree/MemberSelectTree.java
index d0332c0..e5beec5 100644
--- a/langtools/src/share/classes/com/sun/source/tree/MemberSelectTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/MemberSelectTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/MethodInvocationTree.java b/langtools/src/share/classes/com/sun/source/tree/MethodInvocationTree.java
index 1d1cbab..4728d99 100644
--- a/langtools/src/share/classes/com/sun/source/tree/MethodInvocationTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/MethodInvocationTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/MethodTree.java b/langtools/src/share/classes/com/sun/source/tree/MethodTree.java
index 074c8c0..8dfd0ba 100644
--- a/langtools/src/share/classes/com/sun/source/tree/MethodTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/MethodTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ModifiersTree.java b/langtools/src/share/classes/com/sun/source/tree/ModifiersTree.java
index 8aeee84..3189651 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ModifiersTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ModifiersTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/NewArrayTree.java b/langtools/src/share/classes/com/sun/source/tree/NewArrayTree.java
index bff2108..cdd5cd5 100644
--- a/langtools/src/share/classes/com/sun/source/tree/NewArrayTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/NewArrayTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/NewClassTree.java b/langtools/src/share/classes/com/sun/source/tree/NewClassTree.java
index aed47b0..06d713b 100644
--- a/langtools/src/share/classes/com/sun/source/tree/NewClassTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/NewClassTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java b/langtools/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java
index 7f88ddf..aef328d 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java
@@ -35,7 +35,7 @@
* <em>type</em> < <em>typeArguments</em> >
* </pre>
*
- * @see "The Java Language Specification, 3rd ed, section 4.5.1"
+ * @jls section 4.5.1
*
* @author Peter von der Ahé
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ParenthesizedTree.java b/langtools/src/share/classes/com/sun/source/tree/ParenthesizedTree.java
index 9290fd2..d68516f 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ParenthesizedTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ParenthesizedTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java b/langtools/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java
index 0e1f95f..f6cd566 100644
--- a/langtools/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ReturnTree.java b/langtools/src/share/classes/com/sun/source/tree/ReturnTree.java
index e785be6..62a51cb 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ReturnTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ReturnTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/StatementTree.java b/langtools/src/share/classes/com/sun/source/tree/StatementTree.java
index 24b8bd3..47dba7d 100644
--- a/langtools/src/share/classes/com/sun/source/tree/StatementTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/StatementTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/SwitchTree.java b/langtools/src/share/classes/com/sun/source/tree/SwitchTree.java
index 5cc5186..c5a87c4 100644
--- a/langtools/src/share/classes/com/sun/source/tree/SwitchTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/SwitchTree.java
@@ -37,7 +37,7 @@
* }
* </pre>
*
- * @see "The Java Language Specification, 3rd ed, section 14.11"
+ * @jls section 14.11
*
* @author Peter von der Ahé
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/SynchronizedTree.java b/langtools/src/share/classes/com/sun/source/tree/SynchronizedTree.java
index 17d1441..20c9a44 100644
--- a/langtools/src/share/classes/com/sun/source/tree/SynchronizedTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/SynchronizedTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/ThrowTree.java b/langtools/src/share/classes/com/sun/source/tree/ThrowTree.java
index e30e31b..a91f63b 100644
--- a/langtools/src/share/classes/com/sun/source/tree/ThrowTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/ThrowTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/TryTree.java b/langtools/src/share/classes/com/sun/source/tree/TryTree.java
index 24c185d..f2510bd 100644
--- a/langtools/src/share/classes/com/sun/source/tree/TryTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/TryTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/TypeCastTree.java b/langtools/src/share/classes/com/sun/source/tree/TypeCastTree.java
index 682b540..43dc619 100644
--- a/langtools/src/share/classes/com/sun/source/tree/TypeCastTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/TypeCastTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java b/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java
index 66e8757..6a60338 100644
--- a/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/UnaryTree.java b/langtools/src/share/classes/com/sun/source/tree/UnaryTree.java
index ed843c9..7b4d9e8 100644
--- a/langtools/src/share/classes/com/sun/source/tree/UnaryTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/UnaryTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/VariableTree.java b/langtools/src/share/classes/com/sun/source/tree/VariableTree.java
index 6d7f65f..ea73f23 100644
--- a/langtools/src/share/classes/com/sun/source/tree/VariableTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/VariableTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/WhileLoopTree.java b/langtools/src/share/classes/com/sun/source/tree/WhileLoopTree.java
index aec05f4..fd4a832 100644
--- a/langtools/src/share/classes/com/sun/source/tree/WhileLoopTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/WhileLoopTree.java
@@ -35,7 +35,7 @@
* </pre>
*
*
- * @see "The Java Language Specification, 3rd ed, section 14.12"
+ * @jls section 14.12
*
* @author Peter von der Ahé
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/source/tree/WildcardTree.java b/langtools/src/share/classes/com/sun/source/tree/WildcardTree.java
index e6a98d0..d3f62fd 100644
--- a/langtools/src/share/classes/com/sun/source/tree/WildcardTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/WildcardTree.java
@@ -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é
* @author Jonathan Gibbons
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java
index 7373804..02f59ff 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java
@@ -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™ 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™ Language Specification</cite>
*/
public boolean overrides(MethodDeclaration sub, MethodDeclaration sup) {
MethodSymbol overrider = ((MethodDeclarationImpl) sub).sym;
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java b/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java
index e7ab896..bb8faf3 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Annotation.java b/langtools/src/share/classes/com/sun/tools/classfile/Annotation.java
index 98eadc6..8192d1a 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Annotation.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Annotation.java
@@ -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)
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java
index 091a8fa..1ca7fc4 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
index 59b00f1..3804333 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java b/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java
index affcad0..9a68f61 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java
index bc21154..af34c2a 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java b/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
index c9a48bf..29a5ce3 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java
index 94a88cb..df40def 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java
index 646ed3d..dbf6442 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java b/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java
index ff194c9..28db331 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
index 2296810..bdebe41 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java
index 05c301b..a56db00 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java
index 2033a9e..153a7ed 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java b/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java
index d6ca812..a2d36f5 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
index e07c9ec..58595b7 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
index 9aa060a..1e4465f 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
index b917b0f..8332cbe 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java b/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java
index b5a0086..9f27645 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java
index c0ec09d..859cec4 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java
index b1a2e65..ed70082 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java
index 340383c..57de543 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java
index 2258438..904010f 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java
index 51075d6..c7a4439 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java
index 649fe85..24214e7 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Signature.java b/langtools/src/share/classes/com/sun/tools/classfile/Signature.java
index ccc17ba..19c52f8 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Signature.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Signature.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java
index 89c4893..acb9475 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java
index 6ed4f01..ba1f2aa 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java
index 168a447..c3b7509 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
index bdb39a9..13c43e4 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java
index f1995d2..0b7f933 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java
@@ -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.
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/package.html b/langtools/src/share/classes/com/sun/tools/classfile/package.html
index d065ba5..765dfb1 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/package.html
+++ b/langtools/src/share/classes/com/sun/tools/classfile/package.html
@@ -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™ Virtual Machine Specification</cite> (JVMS).
</body>
</html>
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
index 60609b4..80cc01b 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
@@ -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™ 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();
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
index fde2c3c..1e6186b 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
@@ -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™ 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();
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
index e5521027..381edd2 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -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;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
index 6408a06..355f56f 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
@@ -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) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
index 03d6180..ad075a0 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -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
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
index c54d686..c8537ef 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
@@ -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)) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
index 1c199ea..d58106e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -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
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
index 94ddd16..6626cb4 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -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);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
index 55e1a9d..bbde8d9 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -283,7 +283,7 @@
}
// leave alone methods inherited from Object
- // JLS2 13.1.
+ // JLS 13.1.
if (sym.owner == syms.objectType.tsym)
return sym;
diff --git a/langtools/src/share/classes/javax/annotation/processing/Processor.java b/langtools/src/share/classes/javax/annotation/processing/Processor.java
index f5169ce..a466bdd 100644
--- a/langtools/src/share/classes/javax/annotation/processing/Processor.java
+++ b/langtools/src/share/classes/javax/annotation/processing/Processor.java
@@ -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™ 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();
diff --git a/langtools/src/share/classes/javax/lang/model/SourceVersion.java b/langtools/src/share/classes/javax/lang/model/SourceVersion.java
index 0c2dd66..5097672 100644
--- a/langtools/src/share/classes/javax/lang/model/SourceVersion.java
+++ b/langtools/src/share/classes/javax/lang/model/SourceVersion.java
@@ -32,10 +32,9 @@
/**
* Source versions of the Java™ 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™ Language
- * Specification</i>, including updates and clarifications.
+ * See the appropriate edition of
+ * <cite>The Java™ 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™ Language Specification</i>.
+ * The language described in
+ * <cite>The Java™ 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™ 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™ Language
- * Specification, Second Edition</i>, which includes the {@code
+ * The language described in
+ * <cite>The Java™ 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™ Language
- * Specification, Third Edition</i>. First release to support
+ * The language described in
+ * <cite>The Java™ 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();
diff --git a/langtools/src/share/classes/javax/lang/model/element/Element.java b/langtools/src/share/classes/javax/lang/model/element/Element.java
index f46c2cf..06500d2 100644
--- a/langtools/src/share/classes/javax/lang/model/element/Element.java
+++ b/langtools/src/share/classes/javax/lang/model/element/Element.java
@@ -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();
diff --git a/langtools/src/share/classes/javax/lang/model/element/Modifier.java b/langtools/src/share/classes/javax/lang/model/element/Modifier.java
index 5d7ac37..2b6d8ac 100644
--- a/langtools/src/share/classes/javax/lang/model/element/Modifier.java
+++ b/langtools/src/share/classes/javax/lang/model/element/Modifier.java
@@ -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,
diff --git a/langtools/src/share/classes/javax/lang/model/element/PackageElement.java b/langtools/src/share/classes/javax/lang/model/element/PackageElement.java
index 437633b..66f1386 100644
--- a/langtools/src/share/classes/javax/lang/model/element/PackageElement.java
+++ b/langtools/src/share/classes/javax/lang/model/element/PackageElement.java
@@ -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();
diff --git a/langtools/src/share/classes/javax/lang/model/element/TypeElement.java b/langtools/src/share/classes/javax/lang/model/element/TypeElement.java
index 0405aec..d73adfe 100644
--- a/langtools/src/share/classes/javax/lang/model/element/TypeElement.java
+++ b/langtools/src/share/classes/javax/lang/model/element/TypeElement.java
@@ -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();
diff --git a/langtools/src/share/classes/javax/lang/model/element/VariableElement.java b/langtools/src/share/classes/javax/lang/model/element/VariableElement.java
index dd08122..77451fa 100644
--- a/langtools/src/share/classes/javax/lang/model/element/VariableElement.java
+++ b/langtools/src/share/classes/javax/lang/model/element/VariableElement.java
@@ -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();
}
diff --git a/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java b/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java
index 63cefe1..c1f500ee 100644
--- a/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java
+++ b/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java
@@ -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();
diff --git a/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java b/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java
index cbecb02..993bba6 100644
--- a/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java
+++ b/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java
@@ -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™ Language Specification</cite>).
*
* @author Joseph D. Darcy
* @author Scott Seligman
diff --git a/langtools/src/share/classes/javax/lang/model/util/Elements.java b/langtools/src/share/classes/javax/lang/model/util/Elements.java
index 7c68b4f..035fcfb 100644
--- a/langtools/src/share/classes/javax/lang/model/util/Elements.java
+++ b/langtools/src/share/classes/javax/lang/model/util/Elements.java
@@ -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);
diff --git a/langtools/src/share/classes/javax/lang/model/util/Types.java b/langtools/src/share/classes/javax/lang/model/util/Types.java
index 67924ce..a53e66a 100644
--- a/langtools/src/share/classes/javax/lang/model/util/Types.java
+++ b/langtools/src/share/classes/javax/lang/model/util/Types.java
@@ -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);
diff --git a/langtools/src/share/classes/javax/tools/JavaCompiler.java b/langtools/src/share/classes/javax/tools/JavaCompiler.java
index 7bc019a..8d0dcf9 100644
--- a/langtools/src/share/classes/javax/tools/JavaCompiler.java
+++ b/langtools/src/share/classes/javax/tools/JavaCompiler.java
@@ -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™ Language Specification</cite>
+ * and generate class files conforming to
+ * <cite>The Java™ 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/langtools/src/share/classes/javax/tools/JavaFileManager.java b/langtools/src/share/classes/javax/tools/JavaFileManager.java
index f289d09..d519a5c 100644
--- a/langtools/src/share/classes/javax/tools/JavaFileManager.java
+++ b/langtools/src/share/classes/javax/tools/JavaFileManager.java
@@ -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™ 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™ 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™ Language Specification</cite>.
*
* @param location a location
* @param file a file object
diff --git a/langtools/src/share/classes/javax/tools/JavaFileObject.java b/langtools/src/share/classes/javax/tools/JavaFileObject.java
index 21d0d07..9e84b3c 100644
--- a/langtools/src/share/classes/javax/tools/JavaFileObject.java
+++ b/langtools/src/share/classes/javax/tools/JavaFileObject.java
@@ -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™ Language Specification</cite>,
+ * section 6.2 "Names and Identifiers".
*
* @param simpleName a simple name of a class
* @param kind a kind
diff --git a/langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java b/langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java
index 280acfd..dc224f0 100644
--- a/langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java
+++ b/langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java
@@ -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™ 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™ 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.
*/