diff --git a/make/docs/Makefile b/make/docs/Makefile
index 520272b5f5a5a3a0c2d777a5a681bb561471bcc0..273c664efd57aeab2e5c913a675038b3f7b7ed52 100644
--- a/make/docs/Makefile
+++ b/make/docs/Makefile
@@ -53,7 +53,7 @@ DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
# Url to Java Language Spec
-JLS3_URL = http://java.sun.com/docs/books/jls/
+#JLS3_URL = http://java.sun.com/docs/books/jls/
# Common Java trademark line
JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
@@ -293,8 +293,8 @@ COREAPI_HEADER = \
Java$(TRADEMARK) Platform
Standard Ed. $(JDK_MINOR_VERSION)
# Java language specification cite
-TAG_JLS3 = jls3:a:See \
-The Java Language Specification, Third Edition:
+TAG_JLS = jls:a:See \
+The Java™ Language Specification:
# Overview file for core apis
COREAPI_OVERVIEW = $(SHARE_SRC)/classes/overview-core.html
@@ -329,7 +329,7 @@ $(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
$(call OptionPair,-tag,specdefault:X) ; \
$(call OptionPair,-tag,Note:X) ; \
$(call OptionPair,-tag,ToDo:X) ; \
- $(call OptionPair,-tag,$(TAG_JLS3)) ; \
+ $(call OptionPair,-tag,$(TAG_JLS)) ; \
$(call OptionOnly,-splitIndex) ; \
$(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
$(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
@@ -1081,6 +1081,7 @@ $(TREEAPI_OPTIONS_FILE):
$(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
$(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
$(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-tag,$(TAG_JLS)) ; \
$(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
$(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
$(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
diff --git a/make/jpda/jdwp/jdwp.spec b/make/jpda/jdwp/jdwp.spec
index 0a3fd9faf978796be92d9454eb0cb6e8e899c675..86bce315226d5b41663250b592f990999c0c1b62 100644
--- a/make/jpda/jdwp/jdwp.spec
+++ b/make/jpda/jdwp/jdwp.spec
@@ -519,9 +519,8 @@ JDWP "Java(tm) Debug Wire Protocol"
"Both the JNI signature and the generic signature are "
"returned for each class. "
"Generic signatures are described in the signature attribute "
- "section in the "
- "
- "Java Virtual Machine Specification, 3rd Edition. "
+ "section in "
+ "The Java™ Virtual Machine Specification. "
"Since JDWP version 1.5."
(Out
)
@@ -623,8 +622,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(referenceType refType "The reference type ID.")
)
(Reply
- (int modBits "Modifier bits as defined in the "
- "VM Specification")
+ (int modBits "Modifier bits as defined in Chapter 4 of "
+ "The Java™ Virtual Machine Specification")
)
(ErrorSet
(Error INVALID_CLASS "refType is not the ID of a reference "
@@ -651,8 +650,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(int modBits "The modifier bit flags (also known as access flags) "
"which provide additional information on the "
"field declaration. Individual flag values are "
- "defined in the "
- "VM Specification."
+ "defined in Chapter 4 of "
+ "The Java™ Virtual Machine Specification. "
"In addition, The 0xf0000000 bit identifies "
"the field as synthetic, if the synthetic attribute "
"capability is available.")
@@ -686,8 +685,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(int modBits "The modifier bit flags (also known as access flags) "
"which provide additional information on the "
"method declaration. Individual flag values are "
- "defined in the "
- "VM Specification."
+ "defined in Chapter 4 of "
+ "The Java™ Virtual Machine Specification. "
"In addition, The 0xf0000000 bit identifies "
"the method as synthetic, if the synthetic attribute "
"capability is available.")
@@ -773,8 +772,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command Status=9
"Returns the current status of the reference type. The status "
"indicates the extent to which the reference type has been "
- "initialized, as described in the "
- "VM specification. "
+ "initialized, as described in section 2.1.6 of "
+ "The Java™ Virtual Machine Specification. "
"If the class is linked the PREPARED and VERIFIED bits in the returned status bits "
"will be set. If the class is initialized the INITIALIZED bit in the returned "
"status bits will be set. If an error occured during initialization then the "
@@ -852,9 +851,8 @@ JDWP "Java(tm) Debug Wire Protocol"
"Returns the JNI signature of a reference type along with the "
"generic signature if there is one. "
"Generic signatures are described in the signature attribute "
- "section in the "
- "
- "Java Virtual Machine Specification, 3rd Edition. "
+ "section in "
+ "The Java™ Virtual Machine Specification. "
"Since JDWP version 1.5."
"
(Out
@@ -882,9 +880,8 @@ JDWP "Java(tm) Debug Wire Protocol"
"by the compiler. "
"Fields are returned in the order they occur in the class file. "
"Generic signatures are described in the signature attribute "
- "section in the "
- "
- "Java Virtual Machine Specification, 3rd Edition. "
+ "section in "
+ "The Java™ Virtual Machine Specification. "
"Since JDWP version 1.5."
(Out
(referenceType refType "The reference type ID.")
@@ -900,8 +897,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(int modBits "The modifier bit flags (also known as access flags) "
"which provide additional information on the "
"field declaration. Individual flag values are "
- "defined in the "
- "VM Specification."
+ "defined in Chapter 4 of "
+ "The Java™ Virtual Machine Specification. "
"In addition, The 0xf0000000 bit identifies "
"the field as synthetic, if the synthetic attribute "
"capability is available.")
@@ -925,9 +922,8 @@ JDWP "Java(tm) Debug Wire Protocol"
"if present, and any synthetic methods created by the compiler. "
"Methods are returned in the order they occur in the class file. "
"Generic signatures are described in the signature attribute "
- "section in the "
- "
- "Java Virtual Machine Specification, 3rd Edition. "
+ "section in "
+ "The Java™ Virtual Machine Specification. "
"Since JDWP version 1.5."
(Out
(referenceType refType "The reference type ID.")
@@ -943,8 +939,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(int modBits "The modifier bit flags (also known as access flags) "
"which provide additional information on the "
"method declaration. Individual flag values are "
- "defined in the "
- "VM Specification."
+ "defined in Chapter 4 of "
+ "The Java™ Virtual Machine Specification. "
"In addition, The 0xf0000000 bit identifies "
"the method as synthetic, if the synthetic attribute "
"capability is available.")
@@ -1006,8 +1002,8 @@ JDWP "Java(tm) Debug Wire Protocol"
)
(Command ConstantPool=18
"Return the raw bytes of the constant pool in the format of the "
- "constant_pool item of the Class File Format in the "
- "Java Virtual Machine Specification. "
+ "constant_pool item of the Class File Format in "
+ "The Java™ Virtual Machine Specification. "
"
Since JDWP version 1.6. Requires canGetConstantPool capability - see " "CapabilitiesNew."" (Out @@ -1016,7 +1012,8 @@ JDWP "Java(tm) Debug Wire Protocol" (Reply (int count "Total number of constant pool entries plus one. This " "corresponds to the constant_pool_count item of the " - "Class File Format in the Java Virtual Machine Specification. ") + "Class File Format in " + "The Java™ Virtual Machine Specification. ") (Repeat bytes (byte cpbytes "Raw bytes of constant pool") ) @@ -1324,7 +1321,8 @@ JDWP "Java(tm) Debug Wire Protocol" ) ) (Command Bytecodes=3 - "Retrieve the method's bytecodes as defined in the JVM Specification." + "Retrieve the method's bytecodes as defined in " + "The Java™ Virtual Machine Specification. " "Requires canGetBytecodes capability - see " "CapabilitiesNew." (Out @@ -1379,9 +1377,8 @@ JDWP "Java(tm) Debug Wire Protocol" "instance methods, the \"this\" reference is included in the " "table. Also, synthetic variables may be present. " "Generic signatures are described in the signature attribute " - "section in the " - " - "Java Virtual Machine Specification, 3rd Edition. " + "section in " + "The Java™ Virtual Machine Specification. " "Since JDWP version 1.5." (Out (referenceType refType "The class.") @@ -1970,8 +1967,9 @@ JDWP "Java(tm) Debug Wire Protocol" "
" "The method which will return early is referred to as the " "called method. The called method is the current method (as " - "defined by the Frames section in the Java Virtual Machine " - "Specification) for the specified thread at the time this command " + "defined by the Frames section in " + "The Java™ Virtual Machine Specification) " + "for the specified thread at the time this command " "is received. " "
" "The specified thread must be suspended. " diff --git a/src/share/classes/com/sun/beans/TypeResolver.java b/src/share/classes/com/sun/beans/TypeResolver.java index a24d1af8e44fa3ce48fb632d58d5ac1af9b00a62..bd6a4f04fde4a914e8d1b79412cf9bd537042f16 100644 --- a/src/share/classes/com/sun/beans/TypeResolver.java +++ b/src/share/classes/com/sun/beans/TypeResolver.java @@ -175,8 +175,8 @@ public final class TypeResolver { /** * Converts the given {@code type} to the corresponding class. * This method implements the concept of type erasure, - * that is described in section 4.6 - * of Java Language Specification. + * that is described in section 4.6 of + * The Java™ Language Specification. * * @param type the array of types to convert * @return a corresponding class diff --git a/src/share/classes/com/sun/java/util/jar/pack/package.html b/src/share/classes/com/sun/java/util/jar/pack/package.html index 084e0df7e10cf59c01148470d622300a57e269e3..bf3fa743028d5d2d7bfe86645d7fb898b548afec 100644 --- a/src/share/classes/com/sun/java/util/jar/pack/package.html +++ b/src/share/classes/com/sun/java/util/jar/pack/package.html @@ -88,8 +88,8 @@ Jar File Specification : -http://java.sun.com/docs/books/vmspec/2nd-edition/html/ClassFile.doc.html +Class File Specification: Chapter 4 of +The Java™ Virtual Machine Specification
- * The modifier encodings are defined in the
- * Java Virtual Machine
- * Specification, in the access_flag tables for
- * classes,
- * fields, and
- * methods.
+ * The modifier encodings are defined in
+ * The Java™ Virtual Machine Specification
+ * in the access_flag tables for classes(section 4.1), fields(section 4.5), and methods(section 4.6).
*/
public int modifiers();
diff --git a/src/share/classes/com/sun/jdi/ArrayType.java b/src/share/classes/com/sun/jdi/ArrayType.java
index 8cf86f46a8ea84d78fbd18a69dfe30da7ea300fb..6e3c3f6f95f2de62d2d0e235f164b004a5713f78 100644
--- a/src/share/classes/com/sun/jdi/ArrayType.java
+++ b/src/share/classes/com/sun/jdi/ArrayType.java
@@ -77,11 +77,9 @@ public interface ArrayType extends ReferenceType {
* as specified in the array declaration.
*
* Note: The component type of a array will always be - * created or loaded before the array - see the - * Java Virtual - * Machine Specification, section - * 5.3.3 - * Creating Array Classes. + * created or loaded before the array - see + * The Java™ Virtual Machine Specification, + * section 5.3.3 - Creating Array Classes. * However, although the component type will be loaded it may * not yet be prepared, in which case the type will be returned * but attempts to perform some operations on the returned type diff --git a/src/share/classes/com/sun/jdi/ClassLoaderReference.java b/src/share/classes/com/sun/jdi/ClassLoaderReference.java index e0cdedd3e63c8676c2b0a5059090dab74d9cf982..cccf7c315f5c8dae088e9e3931b11c8ac7a7423e 100644 --- a/src/share/classes/com/sun/jdi/ClassLoaderReference.java +++ b/src/share/classes/com/sun/jdi/ClassLoaderReference.java @@ -71,11 +71,9 @@ public interface ClassLoaderReference extends ObjectReference { *
* No ordering of the returned list is guaranteed. *
- * See the revised - * Java - * Virtual Machine Specification section - * 5.3 - * Creation and Loading + * See + * The Java™ Virtual Machine Specification, + * section 5.3 - Creation and Loading * for more information on the initiating classloader. *
* Note that unlike {@link #definedClasses()} diff --git a/src/share/classes/com/sun/jdi/ClassNotLoadedException.java b/src/share/classes/com/sun/jdi/ClassNotLoadedException.java index f669a15f1de3a64f7f3a8102e9b1ef429433db26..b139b3f065b799a0085262b072ee8dd79a26ea44 100644 --- a/src/share/classes/com/sun/jdi/ClassNotLoadedException.java +++ b/src/share/classes/com/sun/jdi/ClassNotLoadedException.java @@ -60,9 +60,9 @@ package com.sun.jdi; * is visible to the class loader of enclosing class. (That is, the * class loader of the enclosing class must be an initiating class * loader for the class in question.) - * See the Java - * Virtual Machine Specification for - * more details. + * See + * The Java™ Virtual Machine Specification + * for more details. * * @author Gordon Hirsch * @since 1.3 diff --git a/src/share/classes/com/sun/jdi/ClassType.java b/src/share/classes/com/sun/jdi/ClassType.java index b5bc6532081d45d60b940f0a40b733cdb7c4381d..430832776b9df5e310884d108c732667f2c05f57 100644 --- a/src/share/classes/com/sun/jdi/ClassType.java +++ b/src/share/classes/com/sun/jdi/ClassType.java @@ -164,10 +164,8 @@ public interface ClassType extends ReferenceType { * component type is passed. The component type can be a primitive type. * Autoboxing is not supported. * - * See the - * Java Language Specification. - * section - * 5.2 + * See Section 5.2 of + * The Java™ Language Specification * for more information on assignment compatibility. *
* By default, all threads in the target VM are resumed while @@ -280,10 +278,8 @@ public interface ClassType extends ReferenceType { * component type is passed. The component type can be a primitive type. * Autoboxing is not supported. * - * See the - * Java Language Specification. - * section - * 5.2 + * See section 5.2 of + * The Java™ Language Specification * for more information on assignment compatibility. *
* By default, all threads in the target VM are resumed while
diff --git a/src/share/classes/com/sun/jdi/LocalVariable.java b/src/share/classes/com/sun/jdi/LocalVariable.java
index 23f0adbc0809e2728914bbdbab0c375bacc5e85a..fd0b9e4537b55c7c61e637f762be36e10b17e1cb 100644
--- a/src/share/classes/com/sun/jdi/LocalVariable.java
+++ b/src/share/classes/com/sun/jdi/LocalVariable.java
@@ -102,9 +102,7 @@ public interface LocalVariable extends Mirror, Comparable
* By default, the method is invoked using dynamic lookup as
- * documented in the
- *
- * Java Language Specification
- * second edition, section
- * 15.12.4.4;
+ * documented in section 15.12.4.4 of
+ * The Java™ Language Specification
* in particular, overriding based on the runtime type of the object
* mirrored by this {@link ObjectReference} will occur. This
* behavior can be changed by specifying the
diff --git a/src/share/classes/com/sun/jdi/ReferenceType.java b/src/share/classes/com/sun/jdi/ReferenceType.java
index 4baae6bb72e64f48630dd2915bb8b829d70a1a30..65accef7861597b3392f0628a23c43626e86db66 100644
--- a/src/share/classes/com/sun/jdi/ReferenceType.java
+++ b/src/share/classes/com/sun/jdi/ReferenceType.java
@@ -30,9 +30,8 @@ import java.util.Map;
/**
* The type of an object in a target VM. ReferenceType encompasses
- * classes, interfaces, and array types as defined in the
- *
- * JavaTM Language Specification.
+ * classes, interfaces, and array types as defined in
+ * The Java™ Language Specification.
* All ReferenceType objects belong to one of the following
* subinterfaces:
* {@link ClassType} for classes,
@@ -98,9 +97,7 @@ public interface ReferenceType
/**
* Gets the generic signature for this type if there is one.
* Generic signatures are described in the
- *
- * "JavaTM
- * Virtual Machine Specification, 3rd Edition.
+ * The Java™ Virtual Machine Specification.
*
* @return a string containing the generic signature, or null
* if there is no generic signature.
diff --git a/src/share/classes/com/sun/jdi/Method.java b/src/share/classes/com/sun/jdi/Method.java
index a34ad479b445d2d4bdedc399075658342182e150..ea1044f61971916baf1d567fd4e43e752029f0d3 100644
--- a/src/share/classes/com/sun/jdi/Method.java
+++ b/src/share/classes/com/sun/jdi/Method.java
@@ -164,10 +164,8 @@ public interface Method extends TypeComponent, Locatable, Comparabletrue if the method is a bridge method,
* false otherwise.
diff --git a/src/share/classes/com/sun/jdi/ObjectReference.java b/src/share/classes/com/sun/jdi/ObjectReference.java
index 557fc92e1bca044037107e2ce720c72a17a4bfd9..a184f25a13233ae3dd7b29e38ebd371294c9a8dd 100644
--- a/src/share/classes/com/sun/jdi/ObjectReference.java
+++ b/src/share/classes/com/sun/jdi/ObjectReference.java
@@ -118,10 +118,8 @@ public interface ObjectReference extends Value
* enclosing class's class loader). Primitive values must be
* either assignment compatible with the field type or must be
* convertible to the field type without loss of information.
- * See the
- * JavaTM Language Specification.
- * section
- * 5.2
+ * See section 5.2 of
+ * The Java™ Language Specification
* for more information on assignment
* compatibility.
*
@@ -182,18 +180,13 @@ public interface ObjectReference extends Value
* component type is passed. The component type can be a primitive type.
* Autoboxing is not supported.
*
- * See the
- * Java Language Specification.
- * section
- * 5.2
+ * See section 5.2 of
+ * The Java™ Language Specification
* for more information on assignment compatibility.
* null
* if there is no generic signature.
diff --git a/src/share/classes/com/sun/jdi/TypeComponent.java b/src/share/classes/com/sun/jdi/TypeComponent.java
index b1e02f5df8d28f05c731ef5467bceec90322bc77..6c6e28307356783ff5cf0eba3919413f19f0fd0a 100644
--- a/src/share/classes/com/sun/jdi/TypeComponent.java
+++ b/src/share/classes/com/sun/jdi/TypeComponent.java
@@ -74,9 +74,7 @@ public interface TypeComponent extends Mirror, Accessible {
/**
* Gets the generic signature for this TypeComponent if there is one.
* Generic signatures are described in the
- *
- * "JavaTM
- * Virtual Machine Specification, 3rd Edition.
+ * The Java™ Virtual Machine Specification.
*
* @return a string containing the generic signature, or null
* if there is no generic signature.
diff --git a/src/share/classes/java/awt/doc-files/AWTThreadIssues.html b/src/share/classes/java/awt/doc-files/AWTThreadIssues.html
index 33f64137dcdde7251ff2d8c6d36cb1ea6ce1b247..55099f44aa46c40df66924cade4d2e6db787d5fa 100644
--- a/src/share/classes/java/awt/doc-files/AWTThreadIssues.html
+++ b/src/share/classes/java/awt/doc-files/AWTThreadIssues.html
@@ -40,10 +40,9 @@ newly added listener is only notified on subsequent key events.
Auto-shutdown
-According to The
-JavaTM Virtual Machine Specification,
-Second edition (see §2.17.9
-and §2.19),
+According to
+The Java™ Virtual Machine Specification,
+sections 2.17.9 and 2.19,
the Java virtual machine (JVM) initially starts up with a single non-daemon
thread, which typically calls the main method of some class.
The virtual machine terminates all its activity and exits when
@@ -183,7 +182,8 @@ non-daemon thread that blocks forever.
<...>
-The Java Virtual Machine Specification guarantees
+The Java™ Virtual Machine Specification
+ guarantees
that the JVM doesn't exit until this thread terminates.