--- a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java	Wed Mar 16 18:48:00 2011 +0300
+++ b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java	Thu Mar 17 18:22:54 2011 +0300
@@ -35,7 +35,7 @@
  * is the delegate used by default for classes about
  * which no information is available. The <code>DefaultPersistenceDelegate</code>
  * provides, version resilient, public API-based persistence for
- * classes that follow the JavaBeans conventions without any class specific
+ * classes that follow the JavaBeans&trade; conventions without any class specific
  * configuration.
  * <p>
  * The key assumptions are that the class has a nullary constructor

--- a/jdk/src/share/classes/java/beans/DesignMode.java	Wed Mar 16 18:48:00 2011 +0300
+++ b/jdk/src/share/classes/java/beans/DesignMode.java	Thu Mar 17 18:22:54 2011 +0300
@@ -31,7 +31,7 @@
  * of java.beans.beancontext.BeanContext, in order to propagate to its nested hierarchy
  * of java.beans.beancontext.BeanContextChild instances, the current "designTime" property.
  * <p>
- * The JavaBeans specification defines the notion of design time as is a
+ * The JavaBeans&trade; specification defines the notion of design time as is a
  * mode in which JavaBeans instances should function during their composition
  * and customization in a interactive design, composition or construction tool,
  * as opposed to runtime when the JavaBean is part of an applet, application,

--- a/jdk/src/share/classes/java/beans/IndexedPropertyChangeEvent.java	Wed Mar 16 18:48:00 2011 +0300
+++ b/jdk/src/share/classes/java/beans/IndexedPropertyChangeEvent.java	Thu Mar 17 18:22:54 2011 +0300
@@ -26,7 +26,7 @@
 
 /**
  * An "IndexedPropertyChange" event gets delivered whenever a component that
- * conforms to the JavaBeans<TM> specification (a "bean") changes a bound
+ * conforms to the JavaBeans&trade; specification (a "bean") changes a bound
  * indexed property. This class is an extension of <code>PropertyChangeEvent</code>
  * but contains the index of the property that has changed.
  * <P>

--- a/jdk/src/share/classes/java/beans/Introspector.java	Wed Mar 16 18:48:00 2011 +0300
+++ b/jdk/src/share/classes/java/beans/Introspector.java	Thu Mar 17 18:22:54 2011 +0300
@@ -87,7 +87,7 @@
  * <p>
  * For more information about introspection and design patterns, please
  * consult the
- *  <a href="http://java.sun.com/products/javabeans/docs/index.html">JavaBeans specification</a>.
+ *  <a href="http://java.sun.com/products/javabeans/docs/index.html">JavaBeans&trade; specification</a>.
  */
 
 public class Introspector {
@@ -1245,7 +1245,7 @@
         try {
             type = ClassFinder.findClass(name, type.getClassLoader());
             // Each customizer should inherit java.awt.Component and implement java.beans.Customizer
-            // according to the section 9.3 of JavaBeans specification
+            // according to the section 9.3 of JavaBeans&trade; specification
             if (Component.class.isAssignableFrom(type) && Customizer.class.isAssignableFrom(type)) {
                 return type;
             }

--- a/jdk/src/share/classes/java/beans/package.html	Wed Mar 16 18:48:00 2011 +0300
+++ b/jdk/src/share/classes/java/beans/package.html	Thu Mar 17 18:22:54 2011 +0300
@@ -29,7 +29,7 @@
 
 Contains classes related to developing
 <em>beans</em> -- components
-based on the JavaBeans<sup><font size=-2>TM</font></sup> architecture.
+based on the JavaBeans&trade; architecture.
 A few of the
 classes are used by beans while they run in an application. 
 For example, the event classes are