--- old/src/sample/share/jmx/jmx-scandir/index.html	2015-05-19 12:02:56.907721887 -0700
+++ new/src/sample/share/jmx/jmx-scandir/index.html	2015-05-19 12:02:56.667721898 -0700
@@ -33,11 +33,11 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-    <title>JMX(TM) "scandir" Example</title>
+    <title>JMX&trade; "scandir" Example</title>
   </head>
   <body>
 
-  <h1><center>Java<font size="-1"><sup>TM</sup></font> Management Extensions (JMX<font size="-1"><sup>TM</sup></font>) <i>scandir</i> Example</center></h1>
+  <h1><center>Java&trade; Management Extensions (JMX&trade;) <i>scandir</i> Example</center></h1>
 
   <h2><a name="h2-Introduction">Introduction</a></h2>
   <ul>
@@ -1197,7 +1197,7 @@
        <p>Another common best practice when you want
           to improve interoperability is to use directly
           the Notification base classes provided in the
-          JMX<sup>TM</sup> API. Do not create your own
+          JMX&trade; API. Do not create your own
           subclasses of these standard classes.
        </p>
        <p>Indeed, if you code your own subclass, a generic
@@ -1974,7 +1974,7 @@
         More information on SSL authentication can be obtained from the <a
         href="http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#HowSSLWorks"
         title="How SSL Works"
-        >Java<sup>TM</sup> Secure Socket Extension (JSSE) Reference Guide</a>.
+        >Java&trade; Secure Socket Extension (JSSE) Reference Guide</a>.
     </p>
     <p>To start jconsole with our provided keystore and
     truststore, go to the scandir example root directory and
@@ -2202,13 +2202,13 @@
      <li><a
         href="http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#HowSSLWorks"
         title="The JSSE Reference Guide"
-        >Java<sup>TM</sup> Secure Socket Extension (JSSE) Reference Guide</a>:
-        comprehensive documentation about the Java<sup>TM</sup> Secure Socket
+        >Java&trade; Secure Socket Extension (JSSE) Reference Guide</a>:
+        comprehensive documentation about the Java&trade; Secure Socket
         Extension (JSSE)
      </li>
      <li><a href="http://java.sun.com/javase/6/docs/"
          >Java SE 6 Documentation Index</a>: This document covers the
-          Java<sup>TM</sup> Platform, Standard Edition 6 JDK.</li>
+          Java&trade; Platform, Standard Edition 6 JDK.</li>
   </ol>
   <p>
   <hr>
