diff -r 59b772a18fac -r a8b7fd8ede97 jdk/src/java.sql/share/classes/java/sql/package.html
--- a/jdk/src/java.sql/share/classes/java/sql/package.html	Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.sql/share/classes/java/sql/package.html	Tue May 19 13:30:03 2015 -0700
@@ -34,10 +34,10 @@
 
 Provides the API for accessing and processing data stored in a 
 data source (usually a relational database) using the 
-Java<sup><font size=-2>TM</font></sup> programming language. 
+Java&trade; programming language. 
 This API includes a framework whereby different
 drivers can be installed dynamically to access different data sources.
-Although the JDBC<sup><font size=-2>TM</font></sup> API is mainly geared 
+Although the JDBC&trade; API is mainly geared 
 to passing SQL statements to a database, it provides for reading and
 writing data from any data source with a tabular format.
 The reader/writer facility, available through the 
@@ -45,17 +45,16 @@
 use and update data from a spread sheet, flat file, or any other tabular 
 data source.
 
-<h2>What the JDBC<sup><font size=-2>TM</font></sup> 4.2 API Includes</h2>
-The JDBC<sup><font size=-2>TM</font></sup> 4.2 API includes both
+<h2>What the JDBC&trade; 4.2 API Includes</h2>
+The JDBC&trade; 4.2 API includes both
 the <code>java.sql</code> package, referred to as the JDBC core API,
 and the <code>javax.sql</code> package, referred to as the JDBC Optional
 Package API. This complete JDBC API
-is included in the Java<sup><font size=-2>TM</font></sup>  
-Standard Edition (Java SE<sup><font size=-2>TM</font></sup>), version 7.
+is included in the Java&trade; Standard Edition (Java SE&trade;), version 7.
 The <code>javax.sql</code> package extends the functionality of the JDBC API 
 from a client-side API to a server-side API, and it is an essential part
-of the Java<sup><font size=-2>TM</font></sup>  Enterprise Edition
-(Java EE<sup><font size=-2>TM</font></sup>) technology. 
+of the Java&trade;  Enterprise Edition
+(Java EE&trade;) technology. 
 
 <h2>Versions</h2>
 The JDBC 4.2 API incorporates all of the previous JDBC API versions:
@@ -74,7 +73,7 @@
 Classes, interfaces, methods, fields, constructors, and exceptions 
 have the following "since" tags that indicate when they were introduced 
 into the Java platform. When these "since" tags are used in
-Javadoc<sup><font size=-2>TM</font></sup> comments for the JDBC API,
+Javadoc&trade; comments for the JDBC API,
 they indicate the following:
 <UL>
     <LI>Since 1.8 -- new in the JDBC 4.2 API and part of the Java SE platform,
@@ -88,7 +87,7 @@
  <LI>Since 1.2 -- new in the JDBC 2.0 API and part of the J2SE platform, 
      version 1.2</li>
  <LI>Since 1.1 or no "since" tag -- in the original JDBC 1.0 API and part of
-     the JDK<sup><font size=-2>TM</font></sup>, version 1.1</li>
+     the JDK&trade;, version 1.1</li>
 </UL>
 <P>
 <b>NOTE:</b> Many of the new features are optional; consequently, there is 
@@ -97,7 +96,7 @@
 you try to use it.
 <P>
 <b>NOTE:</b> The class <code>SQLPermission</code> was added in the
-Java<sup><font size=-2>TM</font></sup> 2 SDK, Standard Edition, 
+Java&trade; 2 SDK, Standard Edition, 
 version 1.3 release. This class is used to prevent unauthorized
 access to the logging stream associated with the <code>DriverManager</code>,
 which may contain information such as table names, column data, and so on.
@@ -277,7 +276,7 @@
 Package API</h3>
 <UL>
   <LI>The <code>DataSource</code> interface as a means of making a connection.  The
-      Java Naming and Directory Interface<sup><font size=-2>TM</font></sup>
+      Java Naming and Directory Interface&trade;
       (JNDI) is used for registering a <code>DataSource</code> object with a 
       naming service and also for  retrieving it.
   <LI>Pooled connections -- allowing connections to be used and reused