diff --git a/make/data/jdwp/jdwp.spec b/make/data/jdwp/jdwp.spec
--- a/make/data/jdwp/jdwp.spec
+++ b/make/data/jdwp/jdwp.spec
@@ -533,1 +533,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -646,1 +646,1 @@
- "The Java™ Virtual Machine Specification")
+ "The Java Virtual Machine Specification")
@@ -674,1 +674,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -709,1 +709,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -796,1 +796,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -875,1 +875,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -903,1 +903,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -920,1 +920,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -945,1 +945,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -962,1 +962,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -1025,1 +1025,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -1035,1 +1035,1 @@
- "The Java™ Virtual Machine Specification. ")
+ "The Java Virtual Machine Specification. ")
@@ -1438,1 +1438,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -1494,1 +1494,1 @@
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
@@ -2085,1 +2085,1 @@
- "The Java™ Virtual Machine Specification) "
+ "The Java Virtual Machine Specification) "
diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java
--- a/src/java.base/share/classes/java/io/Console.java
+++ b/src/java.base/share/classes/java/io/Console.java
@@ -155,1 +155,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -195,1 +195,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -228,1 +228,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -292,1 +292,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
diff --git a/src/java.base/share/classes/java/io/PrintStream.java b/src/java.base/share/classes/java/io/PrintStream.java
--- a/src/java.base/share/classes/java/io/PrintStream.java
+++ b/src/java.base/share/classes/java/io/PrintStream.java
@@ -1083,1 +1083,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -1135,1 +1135,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -1180,1 +1180,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -1239,1 +1239,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
diff --git a/src/java.base/share/classes/java/io/PrintWriter.java b/src/java.base/share/classes/java/io/PrintWriter.java
--- a/src/java.base/share/classes/java/io/PrintWriter.java
+++ b/src/java.base/share/classes/java/io/PrintWriter.java
@@ -866,1 +866,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -919,1 +919,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -963,1 +963,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -1023,1 +1023,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
diff --git a/src/java.base/share/classes/java/lang/AssertionError.java b/src/java.base/share/classes/java/lang/AssertionError.java
--- a/src/java.base/share/classes/java/lang/AssertionError.java
+++ b/src/java.base/share/classes/java/lang/AssertionError.java
@@ -38,1 +38,1 @@
- * The Java™ Language Specification),
+ * The Java Language Specification),
@@ -66,1 +66,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -84,1 +84,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -96,1 +96,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -108,1 +108,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -120,1 +120,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -132,1 +132,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -144,1 +144,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.base/share/classes/java/lang/Byte.java b/src/java.base/share/classes/java/lang/Byte.java
--- a/src/java.base/share/classes/java/lang/Byte.java
+++ b/src/java.base/share/classes/java/lang/Byte.java
@@ -293,1 +293,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -416,1 +416,1 @@
- * 12.3}, and {@jls 12.4} of The Java™ Language
+ * 12.3}, and {@jls 12.4} of The Java Language
@@ -425,1 +425,1 @@
- * 12.4} of The Java™ Language
+ * 12.4} of The Java Language
@@ -703,1 +703,1 @@
- * or via a widening reference conversion. See The Java™ Language
+ * or via a widening reference conversion. See The Java Language
@@ -955,1 +955,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
@@ -1003,1 +1003,1 @@
- * section {@jvms 4.7.9} of The Java™ Virtual
+ * section {@jvms 4.7.9} of The Java Virtual
@@ -1200,1 +1200,1 @@
- * Java™ Virtual Machine Specification
+ * Java Virtual Machine Specification
@@ -1272,1 +1272,1 @@
- * of The Java™ Virtual Machine Specification.
+ * of The Java Virtual Machine Specification.
@@ -1681,1 +1681,1 @@
- * defined by The Java™ Language Specification.
+ * defined by The Java Language Specification.
@@ -2481,1 +2481,1 @@
- * See The Java™ Language Specification,
+ *
See The Java Language Specification,
diff --git a/src/java.base/share/classes/java/lang/ClassLoader.java b/src/java.base/share/classes/java/lang/ClassLoader.java
--- a/src/java.base/share/classes/java/lang/ClassLoader.java
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -210,1 +210,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -223,1 +223,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -768,1 +768,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -841,1 +841,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -975,1 +975,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -1059,1 +1059,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -1216,1 +1216,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -2535,1 +2535,1 @@
- * The Java™ Language Specification.)
+ * The Java Language Specification.)
diff --git a/src/java.base/share/classes/java/lang/Double.java b/src/java.base/share/classes/java/lang/Double.java
--- a/src/java.base/share/classes/java/lang/Double.java
+++ b/src/java.base/share/classes/java/lang/Double.java
@@ -406,1 +406,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/java.base/share/classes/java/lang/Enum.java b/src/java.base/share/classes/java/lang/Enum.java
--- a/src/java.base/share/classes/java/lang/Enum.java
+++ b/src/java.base/share/classes/java/lang/Enum.java
@@ -47,1 +47,1 @@
- * found in section {@jls 8.9} of The Java™ Language
+ * found in section {@jls 8.9} of The Java Language
diff --git a/src/java.base/share/classes/java/lang/Float.java b/src/java.base/share/classes/java/lang/Float.java
--- a/src/java.base/share/classes/java/lang/Float.java
+++ b/src/java.base/share/classes/java/lang/Float.java
@@ -365,1 +365,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -1380,1 +1380,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -1232,1 +1232,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java
--- a/src/java.base/share/classes/java/lang/Module.java
+++ b/src/java.base/share/classes/java/lang/Module.java
@@ -88,1 +88,1 @@
- * section 6.5.3 of The Java™ Language Specification, for
+ * section 6.5.3 of The Java Language Specification, for
@@ -675,1 +675,1 @@
- * @apiNote As specified in section 5.4.3 of the The Java™
+ * @apiNote As specified in section 5.4.3 of the The Java
diff --git a/src/java.base/share/classes/java/lang/Number.java b/src/java.base/share/classes/java/lang/Number.java
--- a/src/java.base/share/classes/java/lang/Number.java
+++ b/src/java.base/share/classes/java/lang/Number.java
@@ -40,1 +40,1 @@
- * as defined in The Java™ Language Specification
+ * as defined in The Java Language Specification
diff --git a/src/java.base/share/classes/java/lang/Object.java b/src/java.base/share/classes/java/lang/Object.java
--- a/src/java.base/share/classes/java/lang/Object.java
+++ b/src/java.base/share/classes/java/lang/Object.java
@@ -465,1 +465,1 @@
- * if and when the Java™ virtual
+ * if and when the Java virtual
diff --git a/src/java.base/share/classes/java/lang/Package.java b/src/java.base/share/classes/java/lang/Package.java
--- a/src/java.base/share/classes/java/lang/Package.java
+++ b/src/java.base/share/classes/java/lang/Package.java
@@ -125,1 +125,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/java.base/share/classes/java/lang/Record.java b/src/java.base/share/classes/java/lang/Record.java
--- a/src/java.base/share/classes/java/lang/Record.java
+++ b/src/java.base/share/classes/java/lang/Record.java
@@ -41,1 +41,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -44,1 +44,1 @@
- * a fixed set of values, called the record components. The Java™
+ * a fixed set of values, called the record components. The Java
diff --git a/src/java.base/share/classes/java/lang/Short.java b/src/java.base/share/classes/java/lang/Short.java
--- a/src/java.base/share/classes/java/lang/Short.java
+++ b/src/java.base/share/classes/java/lang/Short.java
@@ -298,1 +298,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -93,1 +93,1 @@
- * concatenation and conversion, see The Java™ Language Specification.
+ * concatenation and conversion, see The Java Language Specification.
@@ -116,1 +116,1 @@
- * to The Java™ Language Specification. For example, the {@code javac} compiler
+ * to The Java Language Specification. For example, the {@code javac} compiler
@@ -3272,1 +3272,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -3313,1 +3313,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -3537,1 +3537,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.base/share/classes/java/lang/annotation/Annotation.java b/src/java.base/share/classes/java/lang/annotation/Annotation.java
--- a/src/java.base/share/classes/java/lang/annotation/Annotation.java
+++ b/src/java.base/share/classes/java/lang/annotation/Annotation.java
@@ -35,1 +35,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
--- a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
+++ b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
@@ -1492,1 +1492,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java
--- a/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java
@@ -422,1 +422,1 @@
- * of The Java™ Language Specification) that
+ * of The Java Language Specification) that
diff --git a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
--- a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
+++ b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
@@ -443,1 +443,1 @@
- * specified in The Java™ Language Specification,
+ * specified in The Java Language Specification,
diff --git a/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java
--- a/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java
+++ b/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java
@@ -48,1 +48,1 @@
- * As defined by The Java™ Language Specification
+ * As defined by The Java Language Specification
diff --git a/src/java.base/share/classes/java/lang/reflect/Constructor.java b/src/java.base/share/classes/java/lang/reflect/Constructor.java
--- a/src/java.base/share/classes/java/lang/reflect/Constructor.java
+++ b/src/java.base/share/classes/java/lang/reflect/Constructor.java
@@ -440,1 +440,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java
--- a/src/java.base/share/classes/java/lang/reflect/Executable.java
+++ b/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -220,1 +220,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
@@ -279,1 +279,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
@@ -477,1 +477,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
@@ -518,1 +518,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.base/share/classes/java/lang/reflect/Field.java b/src/java.base/share/classes/java/lang/reflect/Field.java
--- a/src/java.base/share/classes/java/lang/reflect/Field.java
+++ b/src/java.base/share/classes/java/lang/reflect/Field.java
@@ -258,1 +258,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
diff --git a/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java b/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
--- a/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
+++ b/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
@@ -46,1 +46,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
diff --git a/src/java.base/share/classes/java/lang/reflect/Method.java b/src/java.base/share/classes/java/lang/reflect/Method.java
--- a/src/java.base/share/classes/java/lang/reflect/Method.java
+++ b/src/java.base/share/classes/java/lang/reflect/Method.java
@@ -280,1 +280,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
diff --git a/src/java.base/share/classes/java/lang/reflect/Modifier.java b/src/java.base/share/classes/java/lang/reflect/Modifier.java
--- a/src/java.base/share/classes/java/lang/reflect/Modifier.java
+++ b/src/java.base/share/classes/java/lang/reflect/Modifier.java
@@ -36,1 +36,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -204,1 +204,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -250,1 +250,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
diff --git a/src/java.base/share/classes/java/lang/reflect/Parameter.java b/src/java.base/share/classes/java/lang/reflect/Parameter.java
--- a/src/java.base/share/classes/java/lang/reflect/Parameter.java
+++ b/src/java.base/share/classes/java/lang/reflect/Parameter.java
@@ -115,1 +115,1 @@
- * recommended by The Java™ Language
+ * recommended by The Java Language
@@ -250,1 +250,1 @@
- * declared as defined by The Java™ Language
+ * declared as defined by The Java Language
@@ -265,1 +265,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.base/share/classes/java/lang/reflect/RecordComponent.java b/src/java.base/share/classes/java/lang/reflect/RecordComponent.java
--- a/src/java.base/share/classes/java/lang/reflect/RecordComponent.java
+++ b/src/java.base/share/classes/java/lang/reflect/RecordComponent.java
@@ -123,1 +123,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
diff --git a/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java b/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
--- a/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
+++ b/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
@@ -51,1 +51,1 @@
- * Java™ compiler implementations to implement the bodies of {@link Object}
+ * Java compiler implementations to implement the bodies of {@link Object}
diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java
--- a/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/src/java.base/share/classes/java/math/BigDecimal.java
@@ -3458,1 +3458,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
@@ -3496,1 +3496,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
@@ -3594,1 +3594,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
@@ -3678,1 +3678,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
@@ -3723,1 +3723,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java
--- a/src/java.base/share/classes/java/math/BigInteger.java
+++ b/src/java.base/share/classes/java/math/BigInteger.java
@@ -57,1 +57,1 @@
- * arithmetic operators, as defined in The Java™ Language Specification.
+ * arithmetic operators, as defined in The Java Language Specification.
@@ -4155,1 +4155,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
@@ -4177,1 +4177,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
@@ -4201,1 +4201,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
@@ -4286,1 +4286,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
diff --git a/src/java.base/share/classes/java/security/SecureClassLoader.java b/src/java.base/share/classes/java/security/SecureClassLoader.java
--- a/src/java.base/share/classes/java/security/SecureClassLoader.java
+++ b/src/java.base/share/classes/java/security/SecureClassLoader.java
@@ -131,1 +131,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -168,1 +168,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
diff --git a/src/java.base/share/classes/java/util/Formatter.java b/src/java.base/share/classes/java/util/Formatter.java
--- a/src/java.base/share/classes/java/util/Formatter.java
+++ b/src/java.base/share/classes/java/util/Formatter.java
@@ -1901,1 +1901,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -2592,1 +2592,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -2631,1 +2631,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
diff --git a/src/java.base/share/classes/java/util/Properties.java b/src/java.base/share/classes/java/util/Properties.java
--- a/src/java.base/share/classes/java/util/Properties.java
+++ b/src/java.base/share/classes/java/util/Properties.java
@@ -98,1 +98,1 @@
- * The Java™ Language Specification;
+ * The Java Language Specification;
@@ -340,1 +340,1 @@
- * The Java™ Language Specification).
+ * The Java Language Specification).
@@ -394,1 +394,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.base/share/classes/java/util/PropertyResourceBundle.java b/src/java.base/share/classes/java/util/PropertyResourceBundle.java
--- a/src/java.base/share/classes/java/util/PropertyResourceBundle.java
+++ b/src/java.base/share/classes/java/util/PropertyResourceBundle.java
@@ -123,1 +123,1 @@
- * 3.3 of The Java™ Language Specification
+ * 3.3 of The Java Language Specification
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/Lock.java b/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
--- a/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
@@ -126,1 +126,1 @@
- * The Java™ Language Specification:
+ * The Java Language Specification:
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java b/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
--- a/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
@@ -135,1 +135,1 @@
- * Chapter 17 of The Java™ Language Specification.
+ * Chapter 17 of The Java Language Specification.
diff --git a/src/java.base/share/classes/java/util/concurrent/package-info.java b/src/java.base/share/classes/java/util/concurrent/package-info.java
--- a/src/java.base/share/classes/java/util/concurrent/package-info.java
+++ b/src/java.base/share/classes/java/util/concurrent/package-info.java
@@ -230,1 +230,1 @@
- * The Java™ Language Specification defines the
+ * The Java Language Specification defines the
diff --git a/src/java.base/share/classes/java/util/doc-files/coll-index.html b/src/java.base/share/classes/java/util/doc-files/coll-index.html
--- a/src/java.base/share/classes/java/util/doc-files/coll-index.html
+++ b/src/java.base/share/classes/java/util/doc-files/coll-index.html
@@ -56,1 +56,1 @@
-the Java™ Platform, Standard Edition API Specification.
+the Java Platform, Standard Edition API Specification.
diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -398,1 +398,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
@@ -547,1 +547,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.base/share/classes/javax/net/ssl/package-info.java b/src/java.base/share/classes/javax/net/ssl/package-info.java
--- a/src/java.base/share/classes/javax/net/ssl/package-info.java
+++ b/src/java.base/share/classes/javax/net/ssl/package-info.java
@@ -35,1 +35,1 @@
- * Java™ Security Standard Algorithm Names Specification
+ * Java Security Standard Algorithm Names Specification
diff --git a/src/java.base/share/classes/javax/security/auth/login/package-info.java b/src/java.base/share/classes/javax/security/auth/login/package-info.java
--- a/src/java.base/share/classes/javax/security/auth/login/package-info.java
+++ b/src/java.base/share/classes/javax/security/auth/login/package-info.java
@@ -32,1 +32,1 @@
- * Java™ Security Standard Algorithm Names Specification
+ * Java Security Standard Algorithm Names Specification
diff --git a/src/java.base/share/classes/jdk/internal/module/Modules.java b/src/java.base/share/classes/jdk/internal/module/Modules.java
--- a/src/java.base/share/classes/jdk/internal/module/Modules.java
+++ b/src/java.base/share/classes/jdk/internal/module/Modules.java
@@ -59,1 +59,1 @@
- * names of the packages as defined in section 6.5.3 of The Java™
+ * names of the packages as defined in section 6.5.3 of The Java
diff --git a/src/java.compiler/share/classes/javax/annotation/processing/Processor.java b/src/java.compiler/share/classes/javax/annotation/processing/Processor.java
--- a/src/java.compiler/share/classes/javax/annotation/processing/Processor.java
+++ b/src/java.compiler/share/classes/javax/annotation/processing/Processor.java
@@ -289,1 +289,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
diff --git a/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java b/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
--- a/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
+++ b/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
@@ -42,1 +42,1 @@
- * As defined by The Java™ Language Specification
+ * As defined by The Java Language Specification
@@ -77,1 +77,1 @@
- * governed by rules given in the The Java™ Language
+ * governed by rules given in the The Java Language
diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
@@ -33,1 +33,1 @@
- * Source versions of the Java™ programming language.
+ * Source versions of the Java programming language.
@@ -36,1 +36,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
@@ -72,1 +72,1 @@
- * The Java™ Language Specification, First Edition.
+ * The Java Language Specification, First Edition.
@@ -80,1 +80,1 @@
- * The Java™ Language Specification, First Edition.
+ * The Java Language Specification, First Edition.
@@ -89,1 +89,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
@@ -116,1 +116,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java b/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
--- a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
@@ -54,1 +54,1 @@
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java b/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
--- a/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
@@ -33,1 +33,1 @@
- * future versions of the Java™ programming language.
+ * future versions of the Java programming language.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java b/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
--- a/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
@@ -46,1 +46,1 @@
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java b/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
--- a/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
@@ -110,1 +110,1 @@
- * Java™ Language Specification.
+ * Java Language Specification.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java b/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java
--- a/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java
@@ -137,1 +137,1 @@
- * future versions of the Java™ programming language.
+ * future versions of the Java programming language.
@@ -216,1 +216,1 @@
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java
--- a/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java
@@ -34,1 +34,1 @@
- * future versions of the Java™ programming language.
+ * future versions of the Java programming language.
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
--- a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
@@ -42,1 +42,1 @@
- * The Java™ Language Specification).
+ * The Java Language Specification).
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
--- a/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
@@ -47,1 +47,1 @@
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
@@ -45,1 +45,1 @@
- * the Java™ programming language. Therefore, methods whose
+ * the Java programming language. Therefore, methods whose
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
@@ -44,1 +44,1 @@
- * Java™ programming language. Therefore, methods whose names
+ * Java programming language. Therefore, methods whose names
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
@@ -42,1 +42,1 @@
- * language structures added to future versions of the Java™
+ * language structures added to future versions of the Java
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
@@ -55,1 +55,1 @@
- * future versions of the Java™ programming language.
+ * future versions of the Java programming language.
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
@@ -66,1 +66,1 @@
- * added to future versions of the Java™ programming language.
+ * added to future versions of the Java programming language.
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
@@ -52,1 +52,1 @@
- * the Java™ programming language. Therefore, methods whose
+ * the Java programming language. Therefore, methods whose
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
@@ -55,1 +55,1 @@
- * Java™ programming language. Therefore, methods whose names
+ * Java programming language. Therefore, methods whose names
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
@@ -53,1 +53,1 @@
- * language structures added to future versions of the Java™
+ * language structures added to future versions of the Java
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
--- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
@@ -53,1 +53,1 @@
- * versions of the Java™ programming language. Therefore,
+ * versions of the Java programming language. Therefore,
diff --git a/src/java.compiler/share/classes/javax/tools/Diagnostic.java b/src/java.compiler/share/classes/javax/tools/Diagnostic.java
--- a/src/java.compiler/share/classes/javax/tools/Diagnostic.java
+++ b/src/java.compiler/share/classes/javax/tools/Diagnostic.java
@@ -74,1 +74,1 @@
- * specification. For example, the Java™ Language
+ * specification. For example, the Java Language
diff --git a/src/java.compiler/share/classes/javax/tools/DocumentationTool.java b/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
--- a/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
+++ b/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
@@ -34,1 +34,1 @@
- * Interface to invoke Java™ programming language documentation tools from
+ * Interface to invoke Java programming language documentation tools from
diff --git a/src/java.compiler/share/classes/javax/tools/JavaCompiler.java b/src/java.compiler/share/classes/javax/tools/JavaCompiler.java
--- a/src/java.compiler/share/classes/javax/tools/JavaCompiler.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaCompiler.java
@@ -35,1 +35,1 @@
- * Interface to invoke Java™ programming language compilers from
+ * Interface to invoke Java programming language compilers from
@@ -59,1 +59,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
@@ -61,1 +61,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
--- a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
@@ -38,1 +38,1 @@
- * File manager for tools operating on Java™ programming language
+ * File manager for tools operating on Java programming language
@@ -55,1 +55,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
@@ -62,1 +62,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
@@ -225,1 +225,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileObject.java b/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
--- a/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
@@ -33,1 +33,1 @@
- * File abstraction for tools operating on Java™ programming language
+ * File abstraction for tools operating on Java programming language
@@ -97,1 +97,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/java.compiler/share/classes/javax/tools/Tool.java b/src/java.compiler/share/classes/javax/tools/Tool.java
--- a/src/java.compiler/share/classes/javax/tools/Tool.java
+++ b/src/java.compiler/share/classes/javax/tools/Tool.java
@@ -79,1 +79,1 @@
- * Returns the source versions of the Java™ programming language
+ * Returns the source versions of the Java programming language
diff --git a/src/java.compiler/share/classes/javax/tools/ToolProvider.java b/src/java.compiler/share/classes/javax/tools/ToolProvider.java
--- a/src/java.compiler/share/classes/javax/tools/ToolProvider.java
+++ b/src/java.compiler/share/classes/javax/tools/ToolProvider.java
@@ -54,1 +54,1 @@
- * Returns the Java™ programming language compiler provided
+ * Returns the Java programming language compiler provided
@@ -75,1 +75,1 @@
- * Returns the Java™ programming language documentation tool provided
+ * Returns the Java programming language documentation tool provided
diff --git a/src/java.compiler/share/classes/javax/tools/package-info.java b/src/java.compiler/share/classes/javax/tools/package-info.java
--- a/src/java.compiler/share/classes/javax/tools/package-info.java
+++ b/src/java.compiler/share/classes/javax/tools/package-info.java
@@ -31,1 +31,1 @@
- * Java™ Platform, Standard Edition (Java SE),
+ * Java Platform, Standard Edition (Java SE),
diff --git a/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
--- a/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
+++ b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
@@ -227,1 +227,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
--- a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
@@ -163,1 +163,1 @@
- * the Java™ Runtime Environment can
+ * the Java Runtime Environment can
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
--- a/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
@@ -50,1 +50,1 @@
-The Java™ Virtual Machine Specification,
+The Java Virtual Machine Specification,
@@ -193,1 +193,1 @@
-The Java™ Virtual Machine Specification
+The Java Virtual Machine Specification
diff --git a/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
--- a/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
+++ b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
@@ -39,1 +39,1 @@
- * classes that follow the JavaBeans™ conventions without any class specific
+ * classes that follow the JavaBeans conventions without any class specific
diff --git a/src/java.desktop/share/classes/java/beans/DesignMode.java b/src/java.desktop/share/classes/java/beans/DesignMode.java
--- a/src/java.desktop/share/classes/java/beans/DesignMode.java
+++ b/src/java.desktop/share/classes/java/beans/DesignMode.java
@@ -34,1 +34,1 @@
- * The JavaBeans™ specification defines the notion of design time as is a
+ * The JavaBeans specification defines the notion of design time as is a
diff --git a/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java b/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
--- a/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
+++ b/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
@@ -29,1 +29,1 @@
- * conforms to the JavaBeans™ specification (a "bean") changes a bound
+ * conforms to the JavaBeans specification (a "bean") changes a bound
diff --git a/src/java.desktop/share/classes/java/beans/Introspector.java b/src/java.desktop/share/classes/java/beans/Introspector.java
--- a/src/java.desktop/share/classes/java/beans/Introspector.java
+++ b/src/java.desktop/share/classes/java/beans/Introspector.java
@@ -90,1 +90,1 @@
- * JavaBeans™ specification.
+ * JavaBeans specification.
@@ -1125,1 +1125,1 @@
- // according to the section 9.3 of JavaBeans™ specification
+ // according to the section 9.3 of JavaBeans specification
diff --git a/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java b/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
--- a/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
@@ -44,1 +44,1 @@
- * the rules and recommendations laid out in the JavaBeans™ specification:
+ * the rules and recommendations laid out in the JavaBeans specification:
diff --git a/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java b/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
--- a/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
+++ b/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
@@ -44,1 +44,1 @@
- * the rules and recommendations laid out in the JavaBeans™ specification:
+ * the rules and recommendations laid out in the JavaBeans specification:
diff --git a/src/java.desktop/share/classes/java/beans/package-info.java b/src/java.desktop/share/classes/java/beans/package-info.java
--- a/src/java.desktop/share/classes/java/beans/package-info.java
+++ b/src/java.desktop/share/classes/java/beans/package-info.java
@@ -28,1 +28,1 @@
- * the JavaBeans™ architecture. A few of the classes are used by beans
+ * the JavaBeans architecture. A few of the classes are used by beans
diff --git a/src/java.desktop/share/classes/javax/accessibility/package-info.java b/src/java.desktop/share/classes/javax/accessibility/package-info.java
--- a/src/java.desktop/share/classes/javax/accessibility/package-info.java
+++ b/src/java.desktop/share/classes/javax/accessibility/package-info.java
@@ -60,1 +60,1 @@
- * JavaBeans™ property change support is also included to allow assistive
+ * JavaBeans property change support is also included to allow assistive
diff --git a/src/java.desktop/share/classes/javax/print/attribute/package-info.java b/src/java.desktop/share/classes/javax/print/attribute/package-info.java
--- a/src/java.desktop/share/classes/javax/print/attribute/package-info.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/package-info.java
@@ -27,1 +27,1 @@
- * Provides classes and interfaces that describe the types of Java™ Print
+ * Provides classes and interfaces that describe the types of Java Print
diff --git a/src/java.desktop/share/classes/javax/print/package-info.java b/src/java.desktop/share/classes/javax/print/package-info.java
--- a/src/java.desktop/share/classes/javax/print/package-info.java
+++ b/src/java.desktop/share/classes/javax/print/package-info.java
@@ -27,1 +27,1 @@
- * Provides the principal classes and interfaces for the Java™ Print
+ * Provides the principal classes and interfaces for the Java Print
diff --git a/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java b/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
--- a/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
+++ b/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
@@ -51,1 +51,1 @@
- * However, because Java™ uses signed bytes, the Java Sound API uses
+ * However, because Java uses signed bytes, the Java Sound API uses
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractAction.java b/src/java.desktop/share/classes/javax/swing/AbstractAction.java
--- a/src/java.desktop/share/classes/javax/swing/AbstractAction.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractAction.java
@@ -52,1 +52,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractButton.java b/src/java.desktop/share/classes/javax/swing/AbstractButton.java
--- a/src/java.desktop/share/classes/javax/swing/AbstractButton.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractButton.java
@@ -65,1 +65,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1921,1 +1921,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -2344,1 +2344,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java b/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
--- a/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractListModel.java b/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
--- a/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
@@ -41,1 +41,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/Box.java b/src/java.desktop/share/classes/javax/swing/Box.java
--- a/src/java.desktop/share/classes/javax/swing/Box.java
+++ b/src/java.desktop/share/classes/javax/swing/Box.java
@@ -68,1 +68,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -300,1 +300,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/BoxLayout.java b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
--- a/src/java.desktop/share/classes/javax/swing/BoxLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
@@ -124,1 +124,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/ButtonGroup.java b/src/java.desktop/share/classes/javax/swing/ButtonGroup.java
--- a/src/java.desktop/share/classes/javax/swing/ButtonGroup.java
+++ b/src/java.desktop/share/classes/javax/swing/ButtonGroup.java
@@ -62,1 +62,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/CellRendererPane.java b/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
--- a/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
+++ b/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
@@ -60,1 +60,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java b/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
--- a/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
@@ -40,1 +40,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java b/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
--- a/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
@@ -42,1 +42,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java b/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
--- a/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java b/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
--- a/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
@@ -66,1 +66,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -346,1 +346,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
--- a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java b/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
--- a/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java b/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
--- a/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
@@ -40,1 +40,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/ImageIcon.java b/src/java.desktop/share/classes/javax/swing/ImageIcon.java
--- a/src/java.desktop/share/classes/javax/swing/ImageIcon.java
+++ b/src/java.desktop/share/classes/javax/swing/ImageIcon.java
@@ -63,1 +63,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -590,1 +590,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JApplet.java b/src/java.desktop/share/classes/javax/swing/JApplet.java
--- a/src/java.desktop/share/classes/javax/swing/JApplet.java
+++ b/src/java.desktop/share/classes/javax/swing/JApplet.java
@@ -88,1 +88,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JButton.java b/src/java.desktop/share/classes/javax/swing/JButton.java
--- a/src/java.desktop/share/classes/javax/swing/JButton.java
+++ b/src/java.desktop/share/classes/javax/swing/JButton.java
@@ -63,1 +63,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -297,1 +297,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JCheckBox.java b/src/java.desktop/share/classes/javax/swing/JCheckBox.java
--- a/src/java.desktop/share/classes/javax/swing/JCheckBox.java
+++ b/src/java.desktop/share/classes/javax/swing/JCheckBox.java
@@ -64,1 +64,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -328,1 +328,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java b/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
--- a/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
+++ b/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
@@ -86,1 +86,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -301,1 +301,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JColorChooser.java b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
--- a/src/java.desktop/share/classes/javax/swing/JColorChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
@@ -72,1 +72,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JComboBox.java b/src/java.desktop/share/classes/javax/swing/JComboBox.java
--- a/src/java.desktop/share/classes/javax/swing/JComboBox.java
+++ b/src/java.desktop/share/classes/javax/swing/JComboBox.java
@@ -62,1 +62,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1643,1 +1643,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -158,1 +158,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -3677,1 +3677,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JDesktopPane.java b/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
--- a/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
@@ -78,1 +78,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -623,1 +623,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JDialog.java b/src/java.desktop/share/classes/javax/swing/JDialog.java
--- a/src/java.desktop/share/classes/javax/swing/JDialog.java
+++ b/src/java.desktop/share/classes/javax/swing/JDialog.java
@@ -83,1 +83,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
--- a/src/java.desktop/share/classes/javax/swing/JEditorPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -181,1 +181,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1655,1 +1655,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1710,1 +1710,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java b/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
--- a/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
+++ b/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
@@ -188,1 +188,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JFrame.java b/src/java.desktop/share/classes/javax/swing/JFrame.java
--- a/src/java.desktop/share/classes/javax/swing/JFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JFrame.java
@@ -107,1 +107,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
--- a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
@@ -92,1 +92,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -2006,1 +2006,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -2122,1 +2122,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -2297,1 +2297,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JLabel.java b/src/java.desktop/share/classes/javax/swing/JLabel.java
--- a/src/java.desktop/share/classes/javax/swing/JLabel.java
+++ b/src/java.desktop/share/classes/javax/swing/JLabel.java
@@ -92,1 +92,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1038,1 +1038,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JLayeredPane.java b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
--- a/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
@@ -151,1 +151,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -762,1 +762,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JList.java b/src/java.desktop/share/classes/javax/swing/JList.java
--- a/src/java.desktop/share/classes/javax/swing/JList.java
+++ b/src/java.desktop/share/classes/javax/swing/JList.java
@@ -257,1 +257,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -2886,1 +2886,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JMenu.java b/src/java.desktop/share/classes/javax/swing/JMenu.java
--- a/src/java.desktop/share/classes/javax/swing/JMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenu.java
@@ -89,1 +89,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1151,1 +1151,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1390,1 +1390,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JMenuBar.java b/src/java.desktop/share/classes/javax/swing/JMenuBar.java
--- a/src/java.desktop/share/classes/javax/swing/JMenuBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenuBar.java
@@ -68,1 +68,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -505,1 +505,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JMenuItem.java b/src/java.desktop/share/classes/javax/swing/JMenuItem.java
--- a/src/java.desktop/share/classes/javax/swing/JMenuItem.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenuItem.java
@@ -72,1 +72,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -822,1 +822,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
--- a/src/java.desktop/share/classes/javax/swing/JOptionPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
@@ -298,1 +298,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -2543,1 +2543,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JPanel.java b/src/java.desktop/share/classes/javax/swing/JPanel.java
--- a/src/java.desktop/share/classes/javax/swing/JPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/JPanel.java
@@ -55,1 +55,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -229,1 +229,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JPasswordField.java b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
--- a/src/java.desktop/share/classes/javax/swing/JPasswordField.java
+++ b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
@@ -66,1 +66,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -403,1 +403,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -70,1 +70,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JProgressBar.java b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
--- a/src/java.desktop/share/classes/javax/swing/JProgressBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
@@ -115,1 +115,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -629,1 +629,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1006,1 +1006,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JRadioButton.java b/src/java.desktop/share/classes/javax/swing/JRadioButton.java
--- a/src/java.desktop/share/classes/javax/swing/JRadioButton.java
+++ b/src/java.desktop/share/classes/javax/swing/JRadioButton.java
@@ -74,1 +74,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -281,1 +281,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java b/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
--- a/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
+++ b/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
@@ -80,1 +80,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -275,1 +275,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JRootPane.java b/src/java.desktop/share/classes/javax/swing/JRootPane.java
--- a/src/java.desktop/share/classes/javax/swing/JRootPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JRootPane.java
@@ -181,1 +181,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -843,1 +843,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1009,1 +1009,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JScrollBar.java b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
--- a/src/java.desktop/share/classes/javax/swing/JScrollBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
@@ -67,1 +67,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -850,1 +850,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JScrollPane.java b/src/java.desktop/share/classes/javax/swing/JScrollPane.java
--- a/src/java.desktop/share/classes/javax/swing/JScrollPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JScrollPane.java
@@ -147,1 +147,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -659,1 +659,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1404,1 +1404,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JSeparator.java b/src/java.desktop/share/classes/javax/swing/JSeparator.java
--- a/src/java.desktop/share/classes/javax/swing/JSeparator.java
+++ b/src/java.desktop/share/classes/javax/swing/JSeparator.java
@@ -62,1 +62,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -273,1 +273,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JSlider.java b/src/java.desktop/share/classes/javax/swing/JSlider.java
--- a/src/java.desktop/share/classes/javax/swing/JSlider.java
+++ b/src/java.desktop/share/classes/javax/swing/JSlider.java
@@ -72,1 +72,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1410,1 +1410,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JSpinner.java b/src/java.desktop/share/classes/javax/swing/JSpinner.java
--- a/src/java.desktop/share/classes/javax/swing/JSpinner.java
+++ b/src/java.desktop/share/classes/javax/swing/JSpinner.java
@@ -109,1 +109,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
--- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
@@ -87,1 +87,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1131,1 +1131,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
--- a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
@@ -120,1 +120,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1924,1 +1924,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -209,1 +209,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -6654,1 +6654,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JTextArea.java b/src/java.desktop/share/classes/javax/swing/JTextArea.java
--- a/src/java.desktop/share/classes/javax/swing/JTextArea.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextArea.java
@@ -110,1 +110,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -779,1 +779,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JTextField.java b/src/java.desktop/share/classes/javax/swing/JTextField.java
--- a/src/java.desktop/share/classes/javax/swing/JTextField.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextField.java
@@ -150,1 +150,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -946,1 +946,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JTextPane.java b/src/java.desktop/share/classes/javax/swing/JTextPane.java
--- a/src/java.desktop/share/classes/javax/swing/JTextPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextPane.java
@@ -68,1 +68,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JToggleButton.java b/src/java.desktop/share/classes/javax/swing/JToggleButton.java
--- a/src/java.desktop/share/classes/javax/swing/JToggleButton.java
+++ b/src/java.desktop/share/classes/javax/swing/JToggleButton.java
@@ -67,1 +67,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -312,1 +312,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -475,1 +475,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JToolBar.java b/src/java.desktop/share/classes/javax/swing/JToolBar.java
--- a/src/java.desktop/share/classes/javax/swing/JToolBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JToolBar.java
@@ -72,1 +72,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JToolTip.java b/src/java.desktop/share/classes/javax/swing/JToolTip.java
--- a/src/java.desktop/share/classes/javax/swing/JToolTip.java
+++ b/src/java.desktop/share/classes/javax/swing/JToolTip.java
@@ -63,1 +63,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -257,1 +257,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JTree.java b/src/java.desktop/share/classes/javax/swing/JTree.java
--- a/src/java.desktop/share/classes/javax/swing/JTree.java
+++ b/src/java.desktop/share/classes/javax/swing/JTree.java
@@ -137,1 +137,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -3315,1 +3315,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -3437,1 +3437,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -3957,1 +3957,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -4193,1 +4193,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JViewport.java b/src/java.desktop/share/classes/javax/swing/JViewport.java
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java
@@ -105,1 +105,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1401,1 +1401,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1872,1 +1872,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/JWindow.java b/src/java.desktop/share/classes/javax/swing/JWindow.java
--- a/src/java.desktop/share/classes/javax/swing/JWindow.java
+++ b/src/java.desktop/share/classes/javax/swing/JWindow.java
@@ -78,1 +78,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/KeyStroke.java b/src/java.desktop/share/classes/javax/swing/KeyStroke.java
--- a/src/java.desktop/share/classes/javax/swing/KeyStroke.java
+++ b/src/java.desktop/share/classes/javax/swing/KeyStroke.java
@@ -55,1 +55,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/OverlayLayout.java b/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
--- a/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
@@ -48,1 +48,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
--- a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
@@ -51,1 +51,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/SizeRequirements.java b/src/java.desktop/share/classes/javax/swing/SizeRequirements.java
--- a/src/java.desktop/share/classes/javax/swing/SizeRequirements.java
+++ b/src/java.desktop/share/classes/javax/swing/SizeRequirements.java
@@ -84,1 +84,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/Spring.java b/src/java.desktop/share/classes/javax/swing/Spring.java
--- a/src/java.desktop/share/classes/javax/swing/Spring.java
+++ b/src/java.desktop/share/classes/javax/swing/Spring.java
@@ -120,1 +120,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/SpringLayout.java b/src/java.desktop/share/classes/javax/swing/SpringLayout.java
--- a/src/java.desktop/share/classes/javax/swing/SpringLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/SpringLayout.java
@@ -175,1 +175,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/Timer.java b/src/java.desktop/share/classes/javax/swing/Timer.java
--- a/src/java.desktop/share/classes/javax/swing/Timer.java
+++ b/src/java.desktop/share/classes/javax/swing/Timer.java
@@ -133,1 +133,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/UIDefaults.java b/src/java.desktop/share/classes/javax/swing/UIDefaults.java
--- a/src/java.desktop/share/classes/javax/swing/UIDefaults.java
+++ b/src/java.desktop/share/classes/javax/swing/UIDefaults.java
@@ -70,1 +70,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/UIManager.java b/src/java.desktop/share/classes/javax/swing/UIManager.java
--- a/src/java.desktop/share/classes/javax/swing/UIManager.java
+++ b/src/java.desktop/share/classes/javax/swing/UIManager.java
@@ -171,1 +171,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java b/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java
--- a/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java
+++ b/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java
@@ -36,1 +36,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/ViewportLayout.java b/src/java.desktop/share/classes/javax/swing/ViewportLayout.java
--- a/src/java.desktop/share/classes/javax/swing/ViewportLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/ViewportLayout.java
@@ -53,1 +53,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java b/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java
@@ -43,1 +43,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java b/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
@@ -41,1 +41,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java b/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java
@@ -51,1 +51,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java b/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java
@@ -43,1 +43,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java b/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/LineBorder.java b/src/java.desktop/share/classes/javax/swing/border/LineBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/LineBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/LineBorder.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java b/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java
@@ -43,1 +43,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java b/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java
@@ -43,1 +43,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java b/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java
@@ -45,1 +45,1 @@
- * As of 1.4, support for long term storage of all JavaBeans™
+ * As of 1.4, support for long term storage of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java b/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
--- a/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
@@ -68,1 +68,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
@@ -40,1 +40,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
@@ -49,1 +49,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
@@ -48,1 +48,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java b/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java
@@ -40,1 +40,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java b/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java
@@ -39,1 +39,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java b/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java
@@ -39,1 +39,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
--- a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
+++ b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
@@ -92,1 +92,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java b/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java
@@ -42,1 +42,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java b/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java
@@ -45,1 +45,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java b/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java
@@ -39,1 +39,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java b/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java
@@ -45,1 +45,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java b/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java b/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java
@@ -40,1 +40,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java b/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java b/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java
@@ -38,1 +38,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java
@@ -41,1 +41,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
@@ -60,1 +60,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java
@@ -45,1 +45,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
@@ -45,1 +45,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
@@ -43,1 +43,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java b/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java
--- a/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java
@@ -38,1 +38,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
@@ -54,1 +54,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java
@@ -40,1 +40,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java
@@ -43,1 +43,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java
@@ -42,1 +42,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java
@@ -42,1 +42,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
@@ -172,1 +172,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -142,1 +142,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java
@@ -58,1 +58,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
@@ -45,1 +45,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
@@ -51,1 +51,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java
@@ -1569,1 +1569,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1683,1 +1683,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1743,1 +1743,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1812,1 +1812,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -100,1 +100,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
@@ -56,1 +56,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -700,1 +700,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
@@ -48,1 +48,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
@@ -100,1 +100,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/ComboPopup.java
@@ -43,1 +43,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
@@ -82,1 +82,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java
@@ -43,1 +43,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -136,1 +136,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
@@ -41,1 +41,1 @@
- * the Java™ look and feel (Metal).
+ * the Java look and feel (Metal).
@@ -57,1 +57,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1642,1 +1642,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1736,1 +1736,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1756,1 +1756,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1856,1 +1856,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -74,1 +74,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java
@@ -41,1 +41,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
@@ -49,1 +49,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
@@ -55,1 +55,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollButton.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
@@ -42,1 +42,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java
@@ -40,1 +40,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
@@ -52,1 +52,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
@@ -48,1 +48,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java
@@ -50,1 +50,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java
@@ -43,1 +43,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java b/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java
--- a/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java
@@ -53,1 +53,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
@@ -78,1 +78,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -395,1 +395,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
@@ -53,1 +53,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
--- a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
+++ b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
@@ -56,1 +56,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -804,1 +804,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/table/TableColumn.java b/src/java.desktop/share/classes/javax/swing/table/TableColumn.java
--- a/src/java.desktop/share/classes/javax/swing/table/TableColumn.java
+++ b/src/java.desktop/share/classes/javax/swing/table/TableColumn.java
@@ -70,1 +70,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
@@ -94,1 +94,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1778,1 +1778,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -2248,1 +2248,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -2503,1 +2503,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/BadLocationException.java b/src/java.desktop/share/classes/javax/swing/text/BadLocationException.java
--- a/src/java.desktop/share/classes/javax/swing/text/BadLocationException.java
+++ b/src/java.desktop/share/classes/javax/swing/text/BadLocationException.java
@@ -36,1 +36,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/DateFormatter.java b/src/java.desktop/share/classes/javax/swing/text/DateFormatter.java
--- a/src/java.desktop/share/classes/javax/swing/text/DateFormatter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DateFormatter.java
@@ -42,1 +42,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
@@ -101,1 +101,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
@@ -842,1 +842,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -901,1 +901,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -950,1 +950,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -993,1 +993,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1275,1 +1275,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1312,1 +1312,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1350,1 +1350,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1386,1 +1386,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatter.java
@@ -53,1 +53,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultFormatterFactory.java
@@ -67,1 +67,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
@@ -65,1 +65,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1135,1 +1135,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1167,1 +1167,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1403,1 +1403,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java b/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java
--- a/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/InternationalFormatter.java
@@ -86,1 +86,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
--- a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
@@ -288,1 +288,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1133,1 +1133,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -2557,1 +2557,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java b/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java
--- a/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java
@@ -154,1 +154,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java b/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java
--- a/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/NumberFormatter.java
@@ -88,1 +88,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java b/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
--- a/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
@@ -51,1 +51,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java b/src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java
--- a/src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java
+++ b/src/java.desktop/share/classes/javax/swing/text/SimpleAttributeSet.java
@@ -45,1 +45,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/StringContent.java b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
--- a/src/java.desktop/share/classes/javax/swing/text/StringContent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
@@ -47,1 +47,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/StyleContext.java b/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
--- a/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
@@ -59,1 +59,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -1279,1 +1279,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
--- a/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
@@ -379,1 +379,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -499,1 +499,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -556,1 +556,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -624,1 +624,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -691,1 +691,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -742,1 +742,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -782,1 +782,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
@@ -822,1 +822,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/TabSet.java b/src/java.desktop/share/classes/javax/swing/text/TabSet.java
--- a/src/java.desktop/share/classes/javax/swing/text/TabSet.java
+++ b/src/java.desktop/share/classes/javax/swing/text/TabSet.java
@@ -40,1 +40,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/TabStop.java b/src/java.desktop/share/classes/javax/swing/text/TabStop.java
--- a/src/java.desktop/share/classes/javax/swing/text/TabStop.java
+++ b/src/java.desktop/share/classes/javax/swing/text/TabStop.java
@@ -40,1 +40,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/TextAction.java b/src/java.desktop/share/classes/javax/swing/text/TextAction.java
--- a/src/java.desktop/share/classes/javax/swing/text/TextAction.java
+++ b/src/java.desktop/share/classes/javax/swing/text/TextAction.java
@@ -55,1 +55,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
@@ -265,1 +265,1 @@
- * support for long term storage of all JavaBeans™
+ * support for long term storage of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/Option.java b/src/java.desktop/share/classes/javax/swing/text/html/Option.java
--- a/src/java.desktop/share/classes/javax/swing/text/html/Option.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/Option.java
@@ -41,1 +41,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java b/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
--- a/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
@@ -38,1 +38,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
@@ -80,1 +80,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
@@ -52,1 +52,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -122,1 +122,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
@@ -44,1 +44,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -56,1 +56,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java b/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
--- a/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
@@ -45,1 +45,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/tree/TreePath.java b/src/java.desktop/share/classes/javax/swing/tree/TreePath.java
--- a/src/java.desktop/share/classes/javax/swing/tree/TreePath.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/TreePath.java
@@ -77,1 +77,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java b/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
--- a/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
@@ -46,1 +46,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java b/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java
--- a/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java
+++ b/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java
@@ -35,1 +35,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java b/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java
--- a/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java
+++ b/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java
@@ -36,1 +36,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java b/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java
--- a/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java
+++ b/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java
@@ -134,1 +134,1 @@
- * of all JavaBeans™
+ * of all JavaBeans
diff --git a/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java b/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
--- a/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
+++ b/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
@@ -159,1 +159,1 @@
- * The Java™ Virtual Machine Specification, to mean a
+ * The Java Virtual Machine Specification, to mean a
diff --git a/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java b/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
--- a/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
+++ b/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
@@ -453,1 +453,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
@@ -507,1 +507,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
@@ -700,1 +700,1 @@
- * The Java™ Language Specification , for example, {@code
+ * The Java Language Specification , for example, {@code
diff --git a/src/java.logging/share/classes/java/util/logging/package-info.java b/src/java.logging/share/classes/java/util/logging/package-info.java
--- a/src/java.logging/share/classes/java/util/logging/package-info.java
+++ b/src/java.logging/share/classes/java/util/logging/package-info.java
@@ -28,1 +28,1 @@
- * the Java™ 2 platform's core logging facilities.
+ * the Java 2 platform's core logging facilities.
diff --git a/src/java.management/share/classes/javax/management/package.html b/src/java.management/share/classes/javax/management/package.html
--- a/src/java.management/share/classes/javax/management/package.html
+++ b/src/java.management/share/classes/javax/management/package.html
@@ -33,1 +33,1 @@
- (JMX™) API is a standard
+ (JMX) API is a standard
@@ -90,1 +90,1 @@
- by JavaBeans™. For example, consider an interface like this:
+ by JavaBeans. For example, consider an interface like this:
diff --git a/src/java.management/share/classes/javax/management/remote/package.html b/src/java.management/share/classes/javax/management/remote/package.html
--- a/src/java.management/share/classes/javax/management/remote/package.html
+++ b/src/java.management/share/classes/javax/management/remote/package.html
@@ -3,1 +3,1 @@
- JMX™ Remote API.
+ JMX Remote API.
@@ -158,1 +158,1 @@
- The Java™ Language Specification):
+ The Java Language Specification):
diff --git a/src/java.naming/share/classes/javax/naming/directory/package.html b/src/java.naming/share/classes/javax/naming/directory/package.html
--- a/src/java.naming/share/classes/javax/naming/directory/package.html
+++ b/src/java.naming/share/classes/javax/naming/directory/package.html
@@ -36,1 +36,1 @@
-Directory Interface™ (JNDI).
+Directory Interface (JNDI).
diff --git a/src/java.naming/share/classes/javax/naming/event/package.html b/src/java.naming/share/classes/javax/naming/event/package.html
--- a/src/java.naming/share/classes/javax/naming/event/package.html
+++ b/src/java.naming/share/classes/javax/naming/event/package.html
@@ -36,1 +36,1 @@
-and Directory Interface™ (JNDI).
+and Directory Interface (JNDI).
diff --git a/src/java.naming/share/classes/javax/naming/ldap/package.html b/src/java.naming/share/classes/javax/naming/ldap/package.html
--- a/src/java.naming/share/classes/javax/naming/ldap/package.html
+++ b/src/java.naming/share/classes/javax/naming/ldap/package.html
@@ -36,1 +36,1 @@
-Directory Interface™ (JNDI).
+Directory Interface (JNDI).
diff --git a/src/java.naming/share/classes/javax/naming/package.html b/src/java.naming/share/classes/javax/naming/package.html
--- a/src/java.naming/share/classes/javax/naming/package.html
+++ b/src/java.naming/share/classes/javax/naming/package.html
@@ -35,1 +35,1 @@
-Directory Interface™ (JNDI).
+Directory Interface (JNDI).
diff --git a/src/java.naming/share/classes/javax/naming/spi/package.html b/src/java.naming/share/classes/javax/naming/spi/package.html
--- a/src/java.naming/share/classes/javax/naming/spi/package.html
+++ b/src/java.naming/share/classes/javax/naming/spi/package.html
@@ -37,1 +37,1 @@
-and Directory Interface™ (JNDI).
+and Directory Interface (JNDI).
diff --git a/src/java.scripting/share/classes/javax/script/package-info.java b/src/java.scripting/share/classes/javax/script/package-info.java
--- a/src/java.scripting/share/classes/javax/script/package-info.java
+++ b/src/java.scripting/share/classes/javax/script/package-info.java
@@ -29,1 +29,1 @@
-Java™ Scripting Engines and provides
+Java Scripting Engines and provides
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
@@ -40,1 +40,1 @@
- * which all JavaBeans™ components must implement.
+ * which all JavaBeans components must implement.
@@ -95,1 +95,1 @@
- * Interface™ (JNDI) API. This registration
+ * Interface (JNDI) API. This registration
@@ -108,1 +108,1 @@
- * CachedRowSet
™
+ * CachedRowSet
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java
@@ -49,1 +49,1 @@
- * JavaBeans™ component and is scrollable,
+ * JavaBeans component and is scrollable,
@@ -413,1 +413,1 @@
- * Interface™ (JNDI) API. This registration
+ * Interface (JNDI) API. This registration
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java
@@ -54,1 +54,1 @@
- * CachedRowSet
™ class. The
+ * CachedRowSet
class. The
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java
@@ -41,1 +41,1 @@
- * to use the result set as a JavaBeans™
+ * to use the result set as a JavaBeans
@@ -116,1 +116,1 @@
- * CachedRowSet
™
+ * CachedRowSet
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java
@@ -141,1 +141,1 @@
- * Sub-interfaces such as the CachedRowSet
™
+ * Sub-interfaces such as the CachedRowSet
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java
@@ -38,1 +38,1 @@
- * CachedRowSet
™,
+ * CachedRowSet
,
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java
@@ -92,1 +92,1 @@
- * the {@code CachedRowSet}™ interface
+ * the {@code CachedRowSet} interface
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java
@@ -59,1 +59,1 @@
- * JavaBeans™ component. Thus,
+ * JavaBeans component. Thus,
@@ -70,2 +70,2 @@
- * {@code CachedRowSet}™
- * - A {@code CachedRowSet} object is a JavaBeans™
+ * {@code CachedRowSet}
+ * - A {@code CachedRowSet} object is a JavaBeans
diff --git a/src/java.sql/share/classes/java/sql/Blob.java b/src/java.sql/share/classes/java/sql/Blob.java
--- a/src/java.sql/share/classes/java/sql/Blob.java
+++ b/src/java.sql/share/classes/java/sql/Blob.java
@@ -32,1 +32,1 @@
- * the Java™ programming language of an SQL
+ * the Java programming language of an SQL
diff --git a/src/java.sql/share/classes/java/sql/Clob.java b/src/java.sql/share/classes/java/sql/Clob.java
--- a/src/java.sql/share/classes/java/sql/Clob.java
+++ b/src/java.sql/share/classes/java/sql/Clob.java
@@ -31,1 +31,1 @@
- * The mapping in the Java™ programming language
+ * The mapping in the Java programming language
diff --git a/src/java.sql/share/classes/java/sql/DatabaseMetaData.java b/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
--- a/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
+++ b/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
@@ -34,1 +34,1 @@
- * the driver based on JDBC™ technology
+ * the driver based on JDBC technology
diff --git a/src/java.sql/share/classes/java/sql/Driver.java b/src/java.sql/share/classes/java/sql/Driver.java
--- a/src/java.sql/share/classes/java/sql/Driver.java
+++ b/src/java.sql/share/classes/java/sql/Driver.java
@@ -148,1 +148,1 @@
- * Compliant™ driver.
+ * Compliant driver.
diff --git a/src/java.sql/share/classes/java/sql/NClob.java b/src/java.sql/share/classes/java/sql/NClob.java
--- a/src/java.sql/share/classes/java/sql/NClob.java
+++ b/src/java.sql/share/classes/java/sql/NClob.java
@@ -29,1 +29,1 @@
- * The mapping in the Java™ programming language
+ * The mapping in the Java programming language
diff --git a/src/java.sql/share/classes/java/sql/ResultSet.java b/src/java.sql/share/classes/java/sql/ResultSet.java
--- a/src/java.sql/share/classes/java/sql/ResultSet.java
+++ b/src/java.sql/share/classes/java/sql/ResultSet.java
@@ -93,1 +93,1 @@
- * in the JDBC 2.0 API (Java™ 2 SDK,
+ * in the JDBC 2.0 API (Java 2 SDK,
diff --git a/src/java.sql/share/classes/java/sql/package-info.java b/src/java.sql/share/classes/java/sql/package-info.java
--- a/src/java.sql/share/classes/java/sql/package-info.java
+++ b/src/java.sql/share/classes/java/sql/package-info.java
@@ -30,1 +30,1 @@
- * Java™ programming language.
+ * Java programming language.
@@ -33,1 +33,1 @@
- * Although the JDBC™ API is mainly geared
+ * Although the JDBC API is mainly geared
@@ -41,2 +41,2 @@
- * What the JDBC™ 4.3 API Includes
- * The JDBC™ 4.3 API includes both
+ * What the JDBC 4.3 API Includes
+ * The JDBC 4.3 API includes both
@@ -46,1 +46,1 @@
- * is included in the Java™ Standard Edition (Java SE™), version 7.
+ * is included in the Java Standard Edition (Java SE), version 7.
@@ -49,2 +49,2 @@
- * of the Java™ Enterprise Edition
- * (Java EE™) technology.
+ * of the Java Enterprise Edition
+ * (Java EE) technology.
@@ -70,1 +70,1 @@
- * Javadoc™ comments for the JDBC API,
+ * Javadoc comments for the JDBC API,
@@ -86,1 +86,1 @@
- * the JDK™, version 1.1
+ * the JDK, version 1.1
@@ -95,1 +95,1 @@
- * Java™ 2 SDK, Standard Edition,
+ * Java 2 SDK, Standard Edition,
@@ -291,1 +291,1 @@
- * Java Naming and Directory Interface™
+ * Java Naming and Directory Interface
@@ -337,1 +337,1 @@
- * Lesson:JDBC Basics(The Javaxx Tutorials > JDBC™ Database Access)
+ * Lesson:JDBC Basics(The Javaxx Tutorials > JDBC Database Access)
@@ -339,1 +339,1 @@
- * “JDBC™ API Tutorial and Reference, Third Edition”
+ * “JDBC API Tutorial and Reference, Third Edition”
diff --git a/src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java b/src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java
--- a/src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java
+++ b/src/java.sql/share/classes/javax/sql/ConnectionPoolDataSource.java
@@ -36,1 +36,1 @@
- * Java™ Naming and Directory Interface
+ * Java Naming and Directory Interface
diff --git a/src/java.sql/share/classes/javax/sql/DataSource.java b/src/java.sql/share/classes/javax/sql/DataSource.java
--- a/src/java.sql/share/classes/javax/sql/DataSource.java
+++ b/src/java.sql/share/classes/javax/sql/DataSource.java
@@ -41,1 +41,1 @@
- * Java™ Naming and Directory (JNDI) API.
+ * Java Naming and Directory (JNDI) API.
diff --git a/src/java.sql/share/classes/javax/sql/RowSet.java b/src/java.sql/share/classes/javax/sql/RowSet.java
--- a/src/java.sql/share/classes/javax/sql/RowSet.java
+++ b/src/java.sql/share/classes/javax/sql/RowSet.java
@@ -35,1 +35,1 @@
- * JavaBeans™ component model.
+ * JavaBeans component model.
diff --git a/src/java.sql/share/classes/javax/sql/XADataSource.java b/src/java.sql/share/classes/javax/sql/XADataSource.java
--- a/src/java.sql/share/classes/javax/sql/XADataSource.java
+++ b/src/java.sql/share/classes/javax/sql/XADataSource.java
@@ -34,1 +34,1 @@
- * Java Naming and Directory Interface™
+ * Java Naming and Directory Interface
diff --git a/src/java.sql/share/classes/javax/sql/package-info.java b/src/java.sql/share/classes/javax/sql/package-info.java
--- a/src/java.sql/share/classes/javax/sql/package-info.java
+++ b/src/java.sql/share/classes/javax/sql/package-info.java
@@ -28,1 +28,1 @@
- * the Java™ programming language.
+ * the Java programming language.
@@ -31,1 +31,1 @@
- * Java Platform, Standard Edition (Java SE™).
+ * Java Platform, Standard Edition (Java SE).
@@ -33,1 +33,1 @@
- * (Java EE™).
+ * (Java EE).
@@ -79,1 +79,1 @@
- * uses the Java Naming and Directory Interface™
+ * uses the Java Naming and Directory Interface
@@ -184,1 +184,1 @@
- * A {@code RowSet} object is a JavaBeans™
+ * A {@code RowSet} object is a JavaBeans
diff --git a/src/java.xml/share/classes/javax/xml/datatype/package-info.java b/src/java.xml/share/classes/javax/xml/datatype/package-info.java
--- a/src/java.xml/share/classes/javax/xml/datatype/package-info.java
+++ b/src/java.xml/share/classes/javax/xml/datatype/package-info.java
@@ -129,1 +129,1 @@
- * JSR 31: Java™ Architecture for XML Binding (JAXB) Specification, Binding XML Schema to Java Representations.
+ * JSR 31: Java Architecture for XML Binding (JAXB) Specification, Binding XML Schema to Java Representations.
diff --git a/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java b/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java
--- a/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java
+++ b/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java
@@ -27,1 +27,1 @@
- * Provides the API to attach to a Java™ virtual machine.
+ * Provides the API to attach to a Java virtual machine.
diff --git a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/DocTreeVisitor.java
@@ -44,1 +44,1 @@
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
@@ -32,1 +32,1 @@
- * subject to change as the Java™ programming language evolves.
+ * subject to change as the Java programming language evolves.
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
@@ -43,1 +43,1 @@
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java
@@ -59,1 +59,1 @@
- * Section {@jls 14.20.3} of The Java™ Language Specification. Inside the try-with-resources block, we initialize
+ * Section {@jls 14.20.3} of The Java Language Specification. Inside the try-with-resources block, we initialize
@@ -84,1 +84,1 @@
- * Section {@jls 15.10.4} of The Java™ Language Specification.
+ * Section {@jls 15.10.4} of The Java Language Specification.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Doclet.java
@@ -74,1 +74,1 @@
- * without white spaces, as defined in The Java™ Language Specification,
+ * without white spaces, as defined in The Java Language Specification,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -1680,1 +1680,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
@@ -286,1 +286,1 @@
- * The Java™ Language Specification,
+ * The Java Language Specification,
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/package-info.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/package-info.java
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/package-info.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/package-info.java
@@ -29,1 +29,1 @@
- The Java™ Virtual Machine Specification (JVMS).
+ The Java Virtual Machine Specification (JVMS).
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java b/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java
@@ -42,1 +42,1 @@
- * Returns the Java™ programming language modifiers, encoded
+ * Returns the Java programming language modifiers, encoded
@@ -46,1 +46,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java
@@ -79,1 +79,1 @@
- * The Java™ Virtual Machine Specification,
+ * The Java Virtual Machine Specification,
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java
@@ -48,1 +48,1 @@
- * Java™ programming language code and the
+ * Java programming language code and the
@@ -64,1 +64,1 @@
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java
@@ -169,1 +169,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
@@ -280,1 +280,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java b/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java
@@ -120,1 +120,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java b/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/LocalVariable.java
@@ -105,1 +105,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java b/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java
@@ -40,1 +40,1 @@
- * executable code associated with it. Note that both Java™
+ * executable code associated with it. Note that both Java
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/Method.java b/src/jdk.jdi/share/classes/com/sun/jdi/Method.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/Method.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/Method.java
@@ -179,1 +179,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java
@@ -125,1 +125,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
@@ -187,1 +187,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
@@ -192,1 +192,1 @@
- * The Java™ Language Specification
+ * The Java Language Specification
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java
@@ -37,1 +37,1 @@
- * The Java™ Language Specification.
+ * The Java Language Specification.
@@ -99,1 +99,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java b/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/TypeComponent.java
@@ -77,1 +77,1 @@
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
@@ -36,1 +36,1 @@
- * by Java™ programming language code or by a
+ * by Java programming language code or by a
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
--- a/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
@@ -35,1 +35,1 @@
- * field with a Java™ programming
+ * field with a Java programming
diff --git a/src/jdk.jdi/share/classes/module-info.java b/src/jdk.jdi/share/classes/module-info.java
--- a/src/jdk.jdi/share/classes/module-info.java
+++ b/src/jdk.jdi/share/classes/module-info.java
@@ -29,1 +29,1 @@
- * The Java™ Debug Interface (JDI) is a high level Java API providing
+ * The Java Debug Interface (JDI) is a high level Java API providing
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java b/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java
--- a/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/tool/package-info.java
@@ -27,1 +27,1 @@
- * Provides a mechanism to launch an instance of a Java™ shell tool.
+ * Provides a mechanism to launch an instance of a Java shell tool.