--- a/jdk/src/demo/share/applets.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/demo/share/applets.html Tue May 19 13:30:03 2015 -0700
@@ -56,8 +56,7 @@
</TR>
<TR>
-<TD ALIGN=RIGHT COLSPAN="2"><!-- page headline --><!-------------------------------><!--EDIT THE PAGE HEADLINE HERE--><!------------BEGIN-HEADLINE-----><FONT SIZE=+2>JAVA</FONT><SUP><FONT SIZE=-2>TM</FONT></SUP><FONT SIZE=+2>
-PLUG-IN</FONT>
+<TD ALIGN=RIGHT COLSPAN="2"><!-- page headline --><!-------------------------------><!--EDIT THE PAGE HEADLINE HERE--><!------------BEGIN-HEADLINE-----><FONT SIZE=+2>JAVA™ PLUG-IN</FONT>
<BR><B>Demonstration Applets</B>
<BR><!-------------END-HEADLINE------><!-- END OF PAGE HEADLINE --><!-------------------------------></TD>
</TR>
--- a/jdk/src/demo/share/jvmti/index.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/demo/share/jvmti/index.html Tue May 19 13:30:03 2015 -0700
@@ -5,7 +5,7 @@
<p>
The
-Java<sup><font size=-2>TM</font></sup> Virtual Machine Tools Interface (JVM TI)
+Java™ Virtual Machine Tools Interface (JVM TI)
is a native tool interface provided in JDK 5.0 and newer.
Native libraries that use JVM TI and are loaded into the
Java Virtual Machine
--- a/jdk/src/java.base/share/classes/java/lang/Boolean.java Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/Boolean.java Tue May 19 13:30:03 2015 -0700
@@ -230,13 +230,12 @@
}
/**
- * Returns {@code true} if and only if the system property
- * named by the argument exists and is equal to the string
- * {@code "true"}. (Beginning with version 1.0.2 of the
- * Java<small><sup>TM</sup></small> platform, the test of
- * this string is case insensitive.) A system property is accessible
- * through {@code getProperty}, a method defined by the
- * {@code System} class.
+ * Returns {@code true} if and only if the system property named
+ * by the argument exists and is equal to the string {@code
+ * "true"}. (Beginning with version 1.0.2 of the Java™
+ * platform, the test of this string is case insensitive.) A
+ * system property is accessible through {@code getProperty}, a
+ * method defined by the {@code System} class.
* <p>
* If there is no property with the specified name, or if the specified
* name is empty or null, then {@code false} is returned.
--- a/jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html Tue May 19 13:30:03 2015 -0700
@@ -47,8 +47,7 @@
<ul>
<li><a href=
"{@docRoot}/../technotes/guides/security/crypto/HowToImplAProvider.html">
- <b>How to Implement a Provider for the
- Java<FONT SIZE=-2><SUP>TM</SUP></FONT> Cryptography Architecture
+ <b>How to Implement a Provider for the Java™ Cryptography Architecture
</b></a></li>
</ul>
@@ -66,8 +65,7 @@
<li>
<a href=
"{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html">
- <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT>
- Cryptography Architecture API Specification and Reference
+ <b>Java™ Cryptography Architecture API Specification and Reference
</b></a></li>
</ul>
--- a/jdk/src/java.base/share/classes/javax/crypto/spec/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.base/share/classes/javax/crypto/spec/package.html Tue May 19 13:30:03 2015 -0700
@@ -62,14 +62,13 @@
<li>
<a href=
"{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html">
- <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT>
- Cryptography Architecture API Specification and Reference
+ <b>Java™ Cryptography Architecture API Specification and Reference
</b></a></li>
<li>
<a href=
"{@docRoot}/../technotes/guides/security/crypto/HowToImplAProvider.html">
<b>How to Implement a Provider for the
- Java<FONT SIZE=-2><SUP>TM</SUP></FONT> Cryptography Architecture
+ Java™ Cryptography Architecture
</b></a></li>
</ul>
--- a/jdk/src/java.base/share/classes/javax/net/ssl/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/package.html Tue May 19 13:30:03 2015 -0700
@@ -38,8 +38,7 @@
<ul>
<li><a href="{@docRoot}/../technotes/guides/security/StandardNames.html">
- <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT>
- Cryptography Architecture Standard Algorithm Name
+ <b>Java™ Cryptography Architecture Standard Algorithm Name
Documentation</b></a></li>
</ul>
--- a/jdk/src/java.logging/share/classes/java/util/logging/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.logging/share/classes/java/util/logging/package.html Tue May 19 13:30:03 2015 -0700
@@ -30,8 +30,7 @@
<body bgcolor="white">
<P>
Provides the classes and interfaces of
-the Java<SUP><FONT SIZE="-2">TM</FONT></SUP> 2
- platform's core logging facilities.
+the Java™ 2 platform's core logging facilities.
The central goal of the logging APIs is to support maintaining and servicing
software at customer sites.
--- a/jdk/src/java.management/share/classes/javax/management/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.management/share/classes/javax/management/package.html Tue May 19 13:30:03 2015 -0700
@@ -30,7 +30,7 @@
<p>Provides the core classes for the Java Management Extensions.</p>
<p>The Java Management Extensions
- (JMX<sup><font size="-1">TM</font></sup>) API is a standard
+ (JMX™) API is a standard
API for management and monitoring. Typical uses include:</p>
<ul>
@@ -87,8 +87,7 @@
notion of <em>Standard MBeans</em>. A Standard MBean is one
whose attributes and operations are deduced from a Java
interface using certain naming patterns, similar to those used
- by JavaBeans<sup><font size="-1">TM</font></sup>. For
- example, consider an interface like this:</p>
+ by JavaBeans™. For example, consider an interface like this:</p>
<pre>
public interface ConfigurationMBean {
--- a/jdk/src/java.management/share/classes/javax/management/remote/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.management/share/classes/javax/management/remote/package.html Tue May 19 13:30:03 2015 -0700
@@ -1,6 +1,6 @@
<html>
<head>
- <title>JMX<sup><font size="-2">TM</font></sup> Remote API.</title>
+ <title>JMX™ Remote API.</title>
<!--
Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html Tue May 19 13:30:03 2015 -0700
@@ -387,12 +387,11 @@
@see <a href="{@docRoot}/../technotes/guides/rmi/index.html">
- Java<sup><font size="-1">TM</font></sup> Remote Method
+ Java™ Remote Method
Invocation (RMI)</a>
@see <a href="{@docRoot}/../technotes/guides/jndi/index.html">
- Java Naming and Directory Interface<sup><font
- size="-1">TM</font></sup> (JNDI)</a>
+ Java Naming and Directory Interface™ (JNDI)</a>
@see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045,
section 6.8, "Base64 Content-Transfer-Encoding"</a>
--- a/jdk/src/java.naming/share/classes/javax/naming/directory/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.naming/share/classes/javax/naming/directory/package.html Tue May 19 13:30:03 2015 -0700
@@ -33,7 +33,7 @@
<p>
This package defines the directory operations of the Java Naming and
-Directory Interface<font size=-2><sup>TM</sup></font> (JNDI).
+Directory Interface™ (JNDI).
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service
--- a/jdk/src/java.naming/share/classes/javax/naming/event/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.naming/share/classes/javax/naming/event/package.html Tue May 19 13:30:03 2015 -0700
@@ -33,7 +33,7 @@
<p>
This package defines the event notification operations of the Java Naming
-and Directory Interface<font size=-2><sup>TM</sup></font> (JNDI).
+and Directory Interface™ (JNDI).
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service
--- a/jdk/src/java.naming/share/classes/javax/naming/ldap/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.naming/share/classes/javax/naming/ldap/package.html Tue May 19 13:30:03 2015 -0700
@@ -33,7 +33,7 @@
<p>
This package extends the directory operations of the Java Naming and
-Directory Interface<font size=-2><sup>TM</sup></font> (JNDI).
+Directory Interface™ (JNDI).
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service
--- a/jdk/src/java.naming/share/classes/javax/naming/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.naming/share/classes/javax/naming/package.html Tue May 19 13:30:03 2015 -0700
@@ -32,7 +32,7 @@
<p>
This package defines the naming operations of the Java Naming and
-Directory Interface<font size=-2><sup>TM</sup></font> (JNDI).
+Directory Interface™ (JNDI).
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service
--- a/jdk/src/java.naming/share/classes/javax/naming/spi/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.naming/share/classes/javax/naming/spi/package.html Tue May 19 13:30:03 2015 -0700
@@ -34,7 +34,7 @@
<p>
This package defines the service provider interface (SPI) of the Java Naming
-and Directory Interface<font size=-2><sup>TM</sup></font> (JNDI).
+and Directory Interface™ (JNDI).
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service
--- a/jdk/src/java.scripting/share/classes/javax/script/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.scripting/share/classes/javax/script/package.html Tue May 19 13:30:03 2015 -0700
@@ -29,7 +29,7 @@
</head>
<body bgcolor="white">
<p>The scripting API consists of interfaces and classes that define
-Java <font size=1><sup>TM</sup></font> Scripting Engines and provides
+Java™ Scripting Engines and provides
a framework for their use in Java applications. This API is intended
for use by application programmers who wish to execute programs
written in scripting languages in their Java applications. The
--- 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™ 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™ 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™ 4.2 API Includes</h2>
+The JDBC™ 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™ Standard Edition (Java SE™), 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™ Enterprise Edition
+(Java EE™) 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™ 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™, 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™ 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™
(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
--- a/jdk/src/java.sql/share/classes/javax/sql/package.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/java.sql/share/classes/javax/sql/package.html Tue May 19 13:30:03 2015 -0700
@@ -33,7 +33,7 @@
<body bgcolor="white">
Provides the API for server side data source access and processing from
-the Java<sup><font size=-2>TM</font></sup> programming language.
+the Java™ programming language.
This package supplements the <code>java.sql</code>
package and, as of the version 1.4 release, is included in the
Java Platform, Standard Edition (Java SE™).
@@ -84,7 +84,7 @@
creates is a connection to that physical data source.
<P>
A logical name for the data source is registered with a naming service that
-uses the Java Naming and Directory Interface<sup><font size=-2>TM</font></sup>
+uses the Java Naming and Directory Interface™
(JNDI) API, usually by a system administrator or someone performing the
duties of a system administrator. An application can retrieve the
<code>DataSource</code> object it wants by doing a lookup on the logical
@@ -189,7 +189,7 @@
<LI>Event Notification
<UL>
<LI><code>RowSetListener</code><br>
-A <code>RowSet</code> object is a JavaBeans<sup><font size=-2>TM</font></sup>
+A <code>RowSet</code> object is a JavaBeans™
component because it has properties and participates in the JavaBeans
event notification mechanism. The <code>RowSetListener</code> interface
is implemented by a component that wants to be notified about events that
--- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java Tue May 19 13:30:03 2015 -0700
@@ -24,8 +24,7 @@
*/
/**
- * Provides the API to attach to a Java<sup><font size=-2>TM</font></sup>
- * virtual machine.
+ * Provides the API to attach to a Java™ virtual machine.
* <p>
* A tool, written in the Java Language, uses this API to attach to a target
* virtual machine (VM) and load its tool agent into the target VM. For
--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java Tue May 19 13:30:03 2015 -0700
@@ -40,8 +40,8 @@
public interface Accessible {
/**
- * Returns the Java<sup><font size=-2>TM</font></sup>
- * programming language modifiers, encoded in an integer.
+ * Returns the Java™ programming language modifiers, encoded
+ * in an integer.
* <p>
* The modifier encodings are defined in
* <cite>The Java™ Virtual Machine Specification</cite>
--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java Tue May 19 13:30:03 2015 -0700
@@ -45,7 +45,7 @@
* <li>There can be no guarantee that running the appropriate class
* loader won't cause a deadlock in loading the
* class. Class loaders can consist of arbitrary
- * Java<sup><font size=-2>TM</font></sup> programming language code and the
+ * Java™ programming language code and the
* class loading methods are usually synchronized. Most of the work
* done by a debugger happens when threads are suspended. If another
* application thread is suspended within the same class loader,
--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java Tue May 19 13:30:03 2015 -0700
@@ -36,10 +36,10 @@
@jdk.Exported
public interface Locatable {
/**
- * Returns the {@link Location} of this mirror, if there
- * is executable code associated with it. Note that both
- * Java<SUP><FONT SIZE="-2">TM</FONT></SUP> programming
- * language methods and native methods have executable code.
+ * Returns the {@link Location} of this mirror, if there is
+ * executable code associated with it. Note that both Java™
+ * programming language methods and native methods have executable
+ * code.
* Returns null for abstract methods, since abstract methods
* have no executable code.
*
--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java Tue May 19 13:30:03 2015 -0700
@@ -31,8 +31,7 @@
* Request for notification when the contents of a field are accessed
* in the target VM.
* This event will be triggered when the specified field is accessed
- * by Java<SUP><FONT SIZE="-2">TM</FONT></SUP> programming
- * language code or by a
+ * by Java™ programming language code or by a
* Java Native Interface (JNI) get function (<code>Get<Type>Field,
* GetStatic<Type>Field</code>).
* Access by JDI does not trigger this event.
--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java Tue May 19 13:30:03 2015 -0700
@@ -30,7 +30,7 @@
/**
* Request for notification when a field is set.
* This event will be triggered when a value is assigned to the specified
- * field with a Java<SUP><FONT SIZE="-2">TM</FONT></SUP> programming
+ * field with a Java™ programming
* language statement (assignment, increment, etc) or by a
* Java Native Interface (JNI) set function (<code>Set<Type>Field,
* SetStatic<Type>Field</code>).
--- a/jdk/src/jdk.jdi/share/classes/jdi-overview.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/jdk.jdi/share/classes/jdi-overview.html Tue May 19 13:30:03 2015 -0700
@@ -1,11 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
- <title>Java(tm) Debug Interface</title>
+ <title>Java™ Debug Interface</title>
</head>
<body>
- The Java<sup><font size="-2">TM</font></sup>
- Debug Interface (JDI) is a high level Java
+ The Java™ Debug Interface (JDI) is a high level Java
API providing information useful for debuggers and similar
systems needing access to the running state of a (usually remote)
virtual machine.
--- a/jdk/src/sample/share/jmx/jmx-scandir/index.html Tue May 19 11:40:00 2015 -0700
+++ b/jdk/src/sample/share/jmx/jmx-scandir/index.html Tue May 19 13:30:03 2015 -0700
@@ -33,11 +33,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
- <title>JMX(TM) "scandir" Example</title>
+ <title>JMX™ "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™ Management Extensions (JMX™) <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™ 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™ 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™ Secure Socket Extension (JSSE) Reference Guide</a>:
+ comprehensive documentation about the Java™ 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™ Platform, Standard Edition 6 JDK.</li>
</ol>
<p>
<hr>