--- old/make/data/jdwp/jdwp.spec 2020-07-10 15:54:12.441864765 -0700 +++ new/make/data/jdwp/jdwp.spec 2020-07-10 15:54:12.057874797 -0700 @@ -530,7 +530,7 @@ "returned for each class. " "Generic signatures are described in the signature attribute " "section in " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "Since JDWP version 1.5." (Out ) @@ -643,7 +643,7 @@ ) (Reply (int modBits "Modifier bits as defined in Chapter 4 of " - "The Java™ Virtual Machine Specification") + "The Java Virtual Machine Specification") ) (ErrorSet (Error INVALID_CLASS "refType is not the ID of a reference " @@ -671,7 +671,7 @@ "which provide additional information on the " "field declaration. Individual flag values are " "defined in Chapter 4 of " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "In addition, The 0xf0000000 bit identifies " "the field as synthetic, if the synthetic attribute " "capability is available.") @@ -706,7 +706,7 @@ "which provide additional information on the " "method declaration. Individual flag values are " "defined in Chapter 4 of " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "In addition, The 0xf0000000 bit identifies " "the method as synthetic, if the synthetic attribute " "capability is available.") @@ -793,7 +793,7 @@ "Returns the current status of the reference type. The status " "indicates the extent to which the reference type has been " "initialized, as described in section 2.1.6 of " - "The Java™ Virtual Machine Specification. " + "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 " @@ -872,7 +872,7 @@ "generic signature if there is one. " "Generic signatures are described in the signature attribute " "section in " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "Since JDWP version 1.5." (Out (referenceType refType "The reference type ID.") @@ -900,7 +900,7 @@ "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. " + "The Java Virtual Machine Specification. " "Since JDWP version 1.5." (Out (referenceType refType "The reference type ID.") @@ -917,7 +917,7 @@ "which provide additional information on the " "field declaration. Individual flag values are " "defined in Chapter 4 of " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "In addition, The 0xf0000000 bit identifies " "the field as synthetic, if the synthetic attribute " "capability is available.") @@ -942,7 +942,7 @@ "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. " + "The Java Virtual Machine Specification. " "Since JDWP version 1.5." (Out (referenceType refType "The reference type ID.") @@ -959,7 +959,7 @@ "which provide additional information on the " "method declaration. Individual flag values are " "defined in Chapter 4 of " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "In addition, The 0xf0000000 bit identifies " "the method as synthetic, if the synthetic attribute " "capability is available.") @@ -1022,7 +1022,7 @@ (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. " + "The Java Virtual Machine Specification. " "

Since JDWP version 1.6. Requires canGetConstantPool capability - see " "CapabilitiesNew."" (Out @@ -1032,7 +1032,7 @@ (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. ") + "The Java Virtual Machine Specification. ") (Repeat bytes (byte cpbytes "Raw bytes of constant pool") ) @@ -1435,7 +1435,7 @@ ) (Command Bytecodes=3 "Retrieve the method's bytecodes as defined in " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "Requires canGetBytecodes capability - see " "CapabilitiesNew." (Out @@ -1491,7 +1491,7 @@ "table. Also, synthetic variables may be present. " "Generic signatures are described in the signature attribute " "section in " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "Since JDWP version 1.5." (Out (referenceType refType "The class.") @@ -2082,7 +2082,7 @@ "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) " + "The Java Virtual Machine Specification) " "for the specified thread at the time this command " "is received. " "

" --- old/src/java.base/share/classes/java/io/Console.java 2020-07-10 15:54:13.885827040 -0700 +++ new/src/java.base/share/classes/java/io/Console.java 2020-07-10 15:54:13.345841148 -0700 @@ -152,7 +152,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. @@ -192,7 +192,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. @@ -225,7 +225,7 @@ * string. If there are more arguments than format specifiers, the * extra arguments are ignored. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * * @throws IllegalFormatException * If a format string contains an illegal syntax, a format @@ -289,7 +289,7 @@ * string. If there are more arguments than format specifiers, the * extra arguments are ignored. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * * @throws IllegalFormatException * If a format string contains an illegal syntax, a format --- old/src/java.base/share/classes/java/io/PrintStream.java 2020-07-10 15:54:14.909800287 -0700 +++ new/src/java.base/share/classes/java/io/PrintStream.java 2020-07-10 15:54:14.533810110 -0700 @@ -1080,7 +1080,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. @@ -1132,7 +1132,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. @@ -1177,7 +1177,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. @@ -1236,7 +1236,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. --- old/src/java.base/share/classes/java/io/PrintWriter.java 2020-07-10 15:54:16.477759323 -0700 +++ new/src/java.base/share/classes/java/io/PrintWriter.java 2020-07-10 15:54:15.925773744 -0700 @@ -863,7 +863,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. @@ -916,7 +916,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. @@ -960,7 +960,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. @@ -1020,7 +1020,7 @@ * extra arguments are ignored. The number of arguments is * variable and may be zero. The maximum number of arguments is * limited by the maximum dimension of a Java array as defined by - * The Java™ Virtual Machine Specification. + * The Java Virtual Machine Specification. * The behaviour on a * {@code null} argument depends on the conversion. --- old/src/java.base/share/classes/java/lang/AssertionError.java 2020-07-10 15:54:17.505732465 -0700 +++ new/src/java.base/share/classes/java/lang/AssertionError.java 2020-07-10 15:54:17.129742288 -0700 @@ -35,7 +35,7 @@ * * has as its detail message the string conversion of * expression (as defined in section 15.18.1.1 of - * The Java™ Language Specification), + * The Java Language Specification), * regardless of the type of expression. * * @since 1.4 @@ -63,7 +63,7 @@ * Constructs an AssertionError with its detail message derived * from the specified object, which is converted to a string as * defined in section 15.18.1.1 of - * The Java™ Language Specification. + * The Java Language Specification. *

* If the specified object is an instance of {@code Throwable}, it * becomes the cause of the newly constructed assertion error. @@ -81,7 +81,7 @@ * Constructs an AssertionError with its detail message derived * from the specified {@code boolean}, which is converted to * a string as defined in section 15.18.1.1 of - * The Java™ Language Specification. + * The Java Language Specification. * * @param detailMessage value to be used in constructing detail message */ @@ -93,7 +93,7 @@ * Constructs an AssertionError with its detail message derived * from the specified {@code char}, which is converted to a * string as defined in section 15.18.1.1 of - * The Java™ Language Specification. + * The Java Language Specification. * * @param detailMessage value to be used in constructing detail message */ @@ -105,7 +105,7 @@ * Constructs an AssertionError with its detail message derived * from the specified {@code int}, which is converted to a * string as defined in section 15.18.1.1 of - * The Java™ Language Specification. + * The Java Language Specification. * * @param detailMessage value to be used in constructing detail message */ @@ -117,7 +117,7 @@ * Constructs an AssertionError with its detail message derived * from the specified {@code long}, which is converted to a * string as defined in section 15.18.1.1 of - * The Java™ Language Specification. + * The Java Language Specification. * * @param detailMessage value to be used in constructing detail message */ @@ -129,7 +129,7 @@ * Constructs an AssertionError with its detail message derived * from the specified {@code float}, which is converted to a * string as defined in section 15.18.1.1 of - * The Java™ Language Specification. + * The Java Language Specification. * * @param detailMessage value to be used in constructing detail message */ @@ -141,7 +141,7 @@ * Constructs an AssertionError with its detail message derived * from the specified {@code double}, which is converted to a * string as defined in section 15.18.1.1 of - * The Java™ Language Specification. + * The Java Language Specification. * * @param detailMessage value to be used in constructing detail message */ --- old/src/java.base/share/classes/java/lang/Byte.java 2020-07-10 15:54:18.493706653 -0700 +++ new/src/java.base/share/classes/java/lang/Byte.java 2020-07-10 15:54:18.121716372 -0700 @@ -290,7 +290,7 @@ * * DecimalNumeral, HexDigits, and OctalDigits * are as defined in section 3.10.1 of - * The Java™ Language Specification, + * The Java Language Specification, * except that underscores are not accepted between digits. * *

The sequence of characters following an optional --- old/src/java.base/share/classes/java/lang/Class.java 2020-07-10 15:54:19.801672481 -0700 +++ new/src/java.base/share/classes/java/lang/Class.java 2020-07-10 15:54:19.261686589 -0700 @@ -413,7 +413,7 @@ * * Note that this method throws errors related to loading, linking * or initializing as specified in Sections {@jls 12.2}, {@jls - * 12.3}, and {@jls 12.4} of The Java™ Language + * 12.3}, and {@jls 12.4} of The Java Language * Specification. * Note that this method does not check whether the requested class * is accessible to its caller. @@ -422,7 +422,7 @@ * @param initialize if {@code true} the class will be initialized * (which implies linking). See Section {@jls - * 12.4} of The Java™ Language + * 12.4} of The Java Language * Specification. * @param loader class loader from which the class must be loaded * @return class object representing the desired class @@ -700,7 +700,7 @@ *

Specifically, this method tests whether the type represented by the * specified {@code Class} parameter can be converted to the type * represented by this {@code Class} object via an identity conversion - * or via a widening reference conversion. See The Java™ Language + * or via a widening reference conversion. See The Java Language * Specification, sections {@jls 5.1.1} and {@jls 5.1.4}, * for details. * @@ -952,7 +952,7 @@ * @throws java.lang.reflect.GenericSignatureFormatError if the generic * signature of this generic declaration does not conform to * the format specified in section {@jvms 4.7.9} of - * The Java™ Virtual Machine Specification + * The Java Virtual Machine Specification * @since 1.5 */ @SuppressWarnings("unchecked") @@ -1000,7 +1000,7 @@ * * @throws java.lang.reflect.GenericSignatureFormatError if the generic * class signature does not conform to the format specified in - * section {@jvms 4.7.9} of The Java™ Virtual + * section {@jvms 4.7.9} of The Java Virtual * Machine Specification * @throws TypeNotPresentException if the generic superclass * refers to a non-existent type declaration @@ -1197,7 +1197,7 @@ * @throws java.lang.reflect.GenericSignatureFormatError * if the generic class signature does not conform to the * format specified in section {@jvms 4.7.9} of The - * Java™ Virtual Machine Specification + * Java Virtual Machine Specification * @throws TypeNotPresentException if any of the generic * superinterfaces refers to a non-existent type declaration * @throws java.lang.reflect.MalformedParameterizedTypeException @@ -1269,7 +1269,7 @@ * by this specification. * *

The modifier encodings are defined in section {@jvms 4.1} - * of The Java™ Virtual Machine Specification. + * of The Java Virtual Machine Specification. * * @return the {@code int} representing the modifiers for this class * @see java.lang.reflect.Modifier @@ -1678,7 +1678,7 @@ /** * Returns the canonical name of the underlying class as - * defined by The Java™ Language Specification. + * defined by The Java Language Specification. * Returns {@code null} if the underlying class does not have a canonical * name. Classes without canonical names include: *