Merge

src/java.base/share/classes/java/util/Formatter.java

@@ -1898,7 +1898,7 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  *
  * <p> The maximum number of arguments is limited by the maximum dimension of a
  * Java array as defined by
- * <cite>The Java&trade; Virtual Machine Specification</cite>.
+ * <cite>The Java Virtual Machine Specification</cite>.
  * If the argument index does not correspond to an
  * available argument, then a {@link MissingFormatArgumentException} is thrown.
  *
@@ -2589,7 +2589,7 @@ public final class Formatter implements Closeable, Flushable {
      *         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
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
+     *         <cite>The Java Virtual Machine Specification</cite>.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format
@@ -2628,7 +2628,7 @@ public final class Formatter implements Closeable, Flushable {
      *         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
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
+     *         <cite>The Java Virtual Machine Specification</cite>.
      *
      * @throws  IllegalFormatException
      *          If a format string contains an illegal syntax, a format

src/java.base/share/classes/java/util/Properties.java

@@ -95,7 +95,7 @@ import jdk.internal.util.xml.PropertiesDefaultHandler;
  * the input/output stream is encoded in ISO 8859-1 character encoding.
  * Characters that cannot be directly represented in this encoding can be written using
  * Unicode escapes as defined in section 3.3 of
- * <cite>The Java&trade; Language Specification</cite>;
+ * <cite>The Java Language Specification</cite>;
  * only a single 'u' character is allowed in an escape
  * sequence.
  *
@@ -337,7 +337,7 @@ public class Properties extends Hashtable<Object,Object> {
      * Characters in keys and elements can be represented in escape
      * sequences similar to those used for character and string literals
      * (see sections 3.3 and 3.10.6 of
-     * <cite>The Java&trade; Language Specification</cite>).
+     * <cite>The Java Language Specification</cite>).
      *
      * The differences from the character escape sequences and Unicode
      * escapes used for characters and strings are:
@@ -391,7 +391,7 @@ public class Properties extends Hashtable<Object,Object> {
      * character. Characters not in Latin1, and certain special characters,
      * are represented in keys and elements using Unicode escapes as defined in
      * section 3.3 of
-     * <cite>The Java&trade; Language Specification</cite>.
+     * <cite>The Java Language Specification</cite>.
      * <p>
      * The specified stream remains open after this method returns.
      *

src/java.base/share/classes/java/util/PropertyResourceBundle.java

@@ -120,7 +120,7 @@ import sun.util.ResourceBundleEnumeration;
  * and throws the exception if it encounters an invalid sequence.
  * If "ISO-8859-1" is specified, characters that cannot be represented in
  * ISO-8859-1 encoding must be represented by Unicode Escapes as defined in section
- * 3.3 of <cite>The Java&trade; Language Specification</cite>
+ * 3.3 of <cite>The Java Language Specification</cite>
  * whereas the other constructor which takes a {@code Reader} does not have that limitation.
  * Other encoding values are ignored for this system property.
  * The system property is read and evaluated when initializing this class.

src/java.base/share/classes/java/util/concurrent/locks/Lock.java

@@ -123,7 +123,7 @@ import java.util.concurrent.TimeUnit;
  * memory synchronization semantics as provided by the built-in monitor
  * lock, as described in
  * Chapter 17 of
- * <cite>The Java&trade; Language Specification</cite>:
+ * <cite>The Java Language Specification</cite>:
  * <ul>
  * <li>A successful {@code lock} operation has the same memory
  * synchronization effects as a successful <em>Lock</em> action.

src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java

@@ -132,7 +132,7 @@ import jdk.internal.vm.annotation.ReservedStackAccess;
  * <p><b>Memory Synchronization.</b> Methods with the effect of
  * successfully locking in any mode have the same memory
  * synchronization effects as a <em>Lock</em> action, as described in
- * Chapter 17 of <cite>The Java&trade; Language Specification</cite>.
+ * Chapter 17 of <cite>The Java Language Specification</cite>.
  * Methods successfully unlocking in write mode have the same memory
  * synchronization effects as an <em>Unlock</em> action.  In optimistic
  * read usages, actions prior to the most recent write mode unlock action

src/java.base/share/classes/java/util/concurrent/package-info.java

@@ -227,7 +227,7 @@
  * <h2 id="MemoryVisibility">Memory Consistency Properties</h2>
  *
  * Chapter 17 of
- * <cite>The Java&trade; Language Specification</cite> defines the
+ * <cite>The Java Language Specification</cite> defines the
  * <i>happens-before</i> relation on memory operations such as reads and
  * writes of shared variables.  The results of a write by one thread are
  * guaranteed to be visible to a read by another thread only if the write

src/java.base/share/classes/java/util/doc-files/coll-index.html

@@ -53,7 +53,7 @@ framework is based on more than a dozen collection interfaces. It
 includes implementations of these interfaces and algorithms to
 manipulate them.</p>
 <p>The documents in this section are non-normative portions of
-the Java&trade; Platform, Standard Edition API Specification.</p>
+the Java Platform, Standard Edition API Specification.</p>
 <ul>
 <li><b><a href="coll-overview.html">Overview</a></b> - An overview of
 the collections framework.</li>

src/java.base/share/classes/java/util/regex/Pattern.java

@@ -395,7 +395,7 @@ import jdk.internal.util.ArraysSupport;
  *
  * <p> Backslashes within string literals in Java source code are interpreted
  * as required by
- * <cite>The Java&trade; Language Specification</cite>
+ * <cite>The Java Language Specification</cite>
  * as either Unicode escapes (section 3.3) or other character escapes (section 3.10.6)
  * It is therefore necessary to double backslashes in string
  * literals that represent regular expressions to protect them from
@@ -544,7 +544,7 @@ import jdk.internal.util.ArraysSupport;
  * <p>
  * <b>Unicode escape sequences</b> such as <code>&#92;u2014</code> in Java source code
  * are processed as described in section 3.3 of
- * <cite>The Java&trade; Language Specification</cite>.
+ * <cite>The Java Language Specification</cite>.
  * Such escape sequences are also implemented directly by the regular-expression
  * parser so that Unicode escapes can be used in expressions that are read from
  * files or from the keyboard.  Thus the strings <code>"&#92;u2014"</code> and