--- old/make/data/jdwp/jdwp.spec	2020-07-10 15:54:12.441864765 -0700
+++ new/make/data/jdwp/jdwp.spec	2020-07-10 15:54:12.057874797 -0700
@@ -530,7 +530,7 @@
         "returned for each class.  "
         "Generic signatures are described in the signature attribute "
         "section in "
-        "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+        "<cite>The Java Virtual Machine Specification</cite>. "
         "Since JDWP version 1.5."
         (Out
         )
@@ -643,7 +643,7 @@
         )
         (Reply
             (int modBits "Modifier bits as defined in Chapter 4 of "
-                         "<cite>The Java&trade; Virtual Machine Specification</cite>")
+                         "<cite>The Java Virtual Machine Specification</cite>")
         )
         (ErrorSet
             (Error INVALID_CLASS     "refType is not the ID of a reference "
@@ -671,7 +671,7 @@
                                  "which provide additional information on the  "
                                  "field declaration. Individual flag values are "
                                  "defined in Chapter 4 of "
-                                 "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+                                 "<cite>The Java Virtual Machine Specification</cite>. "
                                  "In addition, The <code>0xf0000000</code> bit identifies "
                                  "the field as synthetic, if the synthetic attribute "
                                  "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
@@ -706,7 +706,7 @@
                                  "which provide additional information on the  "
                                  "method declaration. Individual flag values are "
                                  "defined in Chapter 4 of "
-                                 "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+                                 "<cite>The Java Virtual Machine Specification</cite>. "
                                  "In addition, The <code>0xf0000000</code> bit identifies "
                                  "the method as synthetic, if the synthetic attribute "
                                  "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
@@ -793,7 +793,7 @@
         "Returns the current status of the reference type. The status "
         "indicates the extent to which the reference type has been "
         "initialized, as described in section 2.1.6 of "
-        "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+        "<cite>The Java Virtual Machine Specification</cite>. "
         "If the class is linked the PREPARED and VERIFIED bits in the returned status bits "
         "will be set. If the class is initialized the INITIALIZED bit in the returned "
         "status bits will be set. If an error occured during initialization then the "
@@ -872,7 +872,7 @@
         "generic signature if there is one.  "
         "Generic signatures are described in the signature attribute "
         "section in "
-        "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+        "<cite>The Java Virtual Machine Specification</cite>. "
         "Since JDWP version 1.5."
         (Out
             (referenceType refType "The reference type ID.")
@@ -900,7 +900,7 @@
         "Fields are returned in the order they occur in the class file.  "
         "Generic signatures are described in the signature attribute "
         "section in "
-        "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+        "<cite>The Java Virtual Machine Specification</cite>. "
         "Since JDWP version 1.5."
         (Out
             (referenceType refType "The reference type ID.")
@@ -917,7 +917,7 @@
                                  "which provide additional information on the  "
                                  "field declaration. Individual flag values are "
                                  "defined in Chapter 4 of "
-                                 "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+                                 "<cite>The Java Virtual Machine Specification</cite>. "
                                  "In addition, The <code>0xf0000000</code> bit identifies "
                                  "the field as synthetic, if the synthetic attribute "
                                  "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
@@ -942,7 +942,7 @@
         "Methods are returned in the order they occur in the class file.  "
         "Generic signatures are described in the signature attribute "
         "section in "
-        "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+        "<cite>The Java Virtual Machine Specification</cite>. "
         "Since JDWP version 1.5."
         (Out
             (referenceType refType "The reference type ID.")
@@ -959,7 +959,7 @@
                                  "which provide additional information on the  "
                                  "method declaration. Individual flag values are "
                                  "defined in Chapter 4 of "
-                                 "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+                                 "<cite>The Java Virtual Machine Specification</cite>. "
                                  "In addition, The <code>0xf0000000</code> bit identifies "
                                  "the method as synthetic, if the synthetic attribute "
                                  "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
@@ -1022,7 +1022,7 @@
     (Command ConstantPool=18
         "Return the raw bytes of the constant pool in the format of the "
         "constant_pool item of the Class File Format in "
-        "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+        "<cite>The Java Virtual Machine Specification</cite>. "
         "<p>Since JDWP version 1.6. Requires canGetConstantPool capability - see "
         "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>.""
         (Out
@@ -1032,7 +1032,7 @@
             (int count "Total number of constant pool entries plus one. This "
                        "corresponds to the constant_pool_count item of the "
                        "Class File Format in "
-                       "<cite>The Java&trade; Virtual Machine Specification</cite>. ")
+                       "<cite>The Java Virtual Machine Specification</cite>. ")
             (Repeat bytes
                 (byte cpbytes "Raw bytes of constant pool")
             )
@@ -1435,7 +1435,7 @@
     )
     (Command Bytecodes=3
         "Retrieve the method's bytecodes as defined in "
-        "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+        "<cite>The Java Virtual Machine Specification</cite>. "
         "Requires canGetBytecodes capability - see "
         "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
         (Out
@@ -1491,7 +1491,7 @@
         "table. Also, synthetic variables may be present. "
         "Generic signatures are described in the signature attribute "
         "section in "
-        "<cite>The Java&trade; Virtual Machine Specification</cite>. "
+        "<cite>The Java Virtual Machine Specification</cite>. "
         "Since JDWP version 1.5."
         (Out
             (referenceType refType "The class.")
@@ -2082,7 +2082,7 @@
         "The method which will return early is referred to as the "
         "called method. The called method is the current method (as "
         "defined by the Frames section in "
-        "<cite>The Java&trade; Virtual Machine Specification</cite>) "
+        "<cite>The Java Virtual Machine Specification</cite>) "
         "for the specified thread at the time this command "
         "is received. "
         "<p>"