changeset 10186:546c0ebfbf56

8025840: Fix all the doclint warnings about trademark Reviewed-by: art
author cl
date Mon, 07 Oct 2013 11:34:44 -0700
parents 72afa269fa3b
children bdc8abbce9c1
files src/share/classes/javax/swing/AbstractAction.java src/share/classes/javax/swing/AbstractButton.java src/share/classes/javax/swing/AbstractCellEditor.java src/share/classes/javax/swing/AbstractListModel.java src/share/classes/javax/swing/Box.java src/share/classes/javax/swing/BoxLayout.java src/share/classes/javax/swing/ButtonGroup.java src/share/classes/javax/swing/CellRendererPane.java src/share/classes/javax/swing/DefaultBoundedRangeModel.java src/share/classes/javax/swing/DefaultButtonModel.java src/share/classes/javax/swing/DefaultCellEditor.java src/share/classes/javax/swing/DefaultListCellRenderer.java src/share/classes/javax/swing/DefaultListModel.java src/share/classes/javax/swing/DefaultListSelectionModel.java src/share/classes/javax/swing/DefaultSingleSelectionModel.java src/share/classes/javax/swing/ImageIcon.java src/share/classes/javax/swing/JApplet.java src/share/classes/javax/swing/JButton.java src/share/classes/javax/swing/JCheckBox.java src/share/classes/javax/swing/JCheckBoxMenuItem.java src/share/classes/javax/swing/JColorChooser.java src/share/classes/javax/swing/JComboBox.java src/share/classes/javax/swing/JComponent.java src/share/classes/javax/swing/JDesktopPane.java src/share/classes/javax/swing/JDialog.java src/share/classes/javax/swing/JEditorPane.java src/share/classes/javax/swing/JFormattedTextField.java src/share/classes/javax/swing/JFrame.java src/share/classes/javax/swing/JInternalFrame.java src/share/classes/javax/swing/JLabel.java src/share/classes/javax/swing/JLayeredPane.java src/share/classes/javax/swing/JList.java src/share/classes/javax/swing/JMenu.java src/share/classes/javax/swing/JMenuBar.java src/share/classes/javax/swing/JMenuItem.java src/share/classes/javax/swing/JOptionPane.java src/share/classes/javax/swing/JPanel.java src/share/classes/javax/swing/JPasswordField.java src/share/classes/javax/swing/JPopupMenu.java src/share/classes/javax/swing/JProgressBar.java src/share/classes/javax/swing/JRadioButton.java src/share/classes/javax/swing/JRadioButtonMenuItem.java src/share/classes/javax/swing/JRootPane.java src/share/classes/javax/swing/JScrollBar.java src/share/classes/javax/swing/JScrollPane.java src/share/classes/javax/swing/JSeparator.java src/share/classes/javax/swing/JSlider.java src/share/classes/javax/swing/JSpinner.java src/share/classes/javax/swing/JSplitPane.java src/share/classes/javax/swing/JTabbedPane.java src/share/classes/javax/swing/JTable.java src/share/classes/javax/swing/JTextArea.java src/share/classes/javax/swing/JTextField.java src/share/classes/javax/swing/JTextPane.java src/share/classes/javax/swing/JToggleButton.java src/share/classes/javax/swing/JToolBar.java src/share/classes/javax/swing/JToolTip.java src/share/classes/javax/swing/JTree.java src/share/classes/javax/swing/JViewport.java src/share/classes/javax/swing/JWindow.java src/share/classes/javax/swing/KeyStroke.java src/share/classes/javax/swing/OverlayLayout.java src/share/classes/javax/swing/ScrollPaneLayout.java src/share/classes/javax/swing/SizeRequirements.java src/share/classes/javax/swing/Spring.java src/share/classes/javax/swing/SpringLayout.java src/share/classes/javax/swing/Timer.java src/share/classes/javax/swing/UIDefaults.java src/share/classes/javax/swing/UIManager.java src/share/classes/javax/swing/UnsupportedLookAndFeelException.java src/share/classes/javax/swing/ViewportLayout.java src/share/classes/javax/swing/border/AbstractBorder.java src/share/classes/javax/swing/border/BevelBorder.java src/share/classes/javax/swing/border/CompoundBorder.java src/share/classes/javax/swing/border/EmptyBorder.java src/share/classes/javax/swing/border/EtchedBorder.java src/share/classes/javax/swing/border/LineBorder.java src/share/classes/javax/swing/border/MatteBorder.java src/share/classes/javax/swing/border/SoftBevelBorder.java src/share/classes/javax/swing/border/TitledBorder.java src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java src/share/classes/javax/swing/event/AncestorEvent.java src/share/classes/javax/swing/event/CaretEvent.java src/share/classes/javax/swing/event/ChangeEvent.java src/share/classes/javax/swing/event/EventListenerList.java src/share/classes/javax/swing/event/HyperlinkEvent.java src/share/classes/javax/swing/event/InternalFrameEvent.java src/share/classes/javax/swing/event/ListDataEvent.java src/share/classes/javax/swing/event/ListSelectionEvent.java src/share/classes/javax/swing/event/MenuDragMouseEvent.java src/share/classes/javax/swing/event/MenuEvent.java src/share/classes/javax/swing/event/MenuKeyEvent.java src/share/classes/javax/swing/event/PopupMenuEvent.java src/share/classes/javax/swing/event/TableColumnModelEvent.java src/share/classes/javax/swing/event/TableModelEvent.java src/share/classes/javax/swing/event/TreeExpansionEvent.java src/share/classes/javax/swing/event/TreeModelEvent.java src/share/classes/javax/swing/event/TreeSelectionEvent.java src/share/classes/javax/swing/event/UndoableEditEvent.java src/share/classes/javax/swing/plaf/BorderUIResource.java src/share/classes/javax/swing/plaf/ColorUIResource.java src/share/classes/javax/swing/plaf/DimensionUIResource.java src/share/classes/javax/swing/plaf/FontUIResource.java src/share/classes/javax/swing/plaf/IconUIResource.java src/share/classes/javax/swing/plaf/InsetsUIResource.java src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java src/share/classes/javax/swing/plaf/basic/BasicListUI.java src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java src/share/classes/javax/swing/plaf/basic/BasicTextUI.java src/share/classes/javax/swing/plaf/basic/ComboPopup.java src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java src/share/classes/javax/swing/table/AbstractTableModel.java src/share/classes/javax/swing/table/DefaultTableCellRenderer.java src/share/classes/javax/swing/table/DefaultTableColumnModel.java src/share/classes/javax/swing/table/DefaultTableModel.java src/share/classes/javax/swing/table/JTableHeader.java src/share/classes/javax/swing/table/TableColumn.java src/share/classes/javax/swing/text/AbstractDocument.java src/share/classes/javax/swing/text/BadLocationException.java src/share/classes/javax/swing/text/DateFormatter.java src/share/classes/javax/swing/text/DefaultCaret.java src/share/classes/javax/swing/text/DefaultEditorKit.java src/share/classes/javax/swing/text/DefaultFormatter.java src/share/classes/javax/swing/text/DefaultFormatterFactory.java src/share/classes/javax/swing/text/DefaultStyledDocument.java src/share/classes/javax/swing/text/InternationalFormatter.java src/share/classes/javax/swing/text/JTextComponent.java src/share/classes/javax/swing/text/MaskFormatter.java src/share/classes/javax/swing/text/NumberFormatter.java src/share/classes/javax/swing/text/PlainDocument.java src/share/classes/javax/swing/text/SimpleAttributeSet.java src/share/classes/javax/swing/text/StringContent.java src/share/classes/javax/swing/text/StyleContext.java src/share/classes/javax/swing/text/StyledEditorKit.java src/share/classes/javax/swing/text/TabSet.java src/share/classes/javax/swing/text/TabStop.java src/share/classes/javax/swing/text/TextAction.java src/share/classes/javax/swing/text/html/Option.java src/share/classes/javax/swing/tree/AbstractLayoutCache.java src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java src/share/classes/javax/swing/tree/DefaultTreeModel.java src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java src/share/classes/javax/swing/tree/TreePath.java src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java src/share/classes/javax/swing/undo/CannotRedoException.java src/share/classes/javax/swing/undo/CannotUndoException.java src/share/classes/javax/swing/undo/UndoManager.java
diffstat 189 files changed, 283 insertions(+), 283 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/swing/AbstractAction.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/AbstractAction.java	Mon Oct 07 11:34:44 2013 -0700
@@ -49,7 +49,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/AbstractButton.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/AbstractButton.java	Mon Oct 07 11:34:44 2013 -0700
@@ -66,7 +66,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1973,7 +1973,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -2379,7 +2379,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      * @since 1.4
--- a/src/share/classes/javax/swing/AbstractCellEditor.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/AbstractCellEditor.java	Mon Oct 07 11:34:44 2013 -0700
@@ -43,7 +43,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/AbstractListModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/AbstractListModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -38,7 +38,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/Box.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/Box.java	Mon Oct 07 11:34:44 2013 -0700
@@ -68,7 +68,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -298,7 +298,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/BoxLayout.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/BoxLayout.java	Mon Oct 07 11:34:44 2013 -0700
@@ -36,12 +36,12 @@
  * vertically or horizontally. The components will not wrap so, for
  * example, a vertical arrangement of components will stay vertically
  * arranged when the frame is resized.
- * <TABLE ALIGN="RIGHT" BORDER="0" SUMMARY="layout">
+ * <TABLE STYLE="FLOAT:RIGHT" BORDER="0" SUMMARY="layout">
  *    <TR>
  *      <TD ALIGN="CENTER">
- *         <P ALIGN="CENTER"><IMG SRC="doc-files/BoxLayout-1.gif"
+ *         <P STYLE="TEXT-ALIGN:CENTER"><IMG SRC="doc-files/BoxLayout-1.gif"
  *          alt="The following text describes this graphic."
- *          WIDTH="191" HEIGHT="201" ALIGN="BOTTOM" BORDER="0">
+ *          WIDTH="191" HEIGHT="201" STYLE="FLOAT:BOTTOM; BORDER:0">
  *      </TD>
  *    </TR>
  * </TABLE>
@@ -124,7 +124,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/ButtonGroup.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/ButtonGroup.java	Mon Oct 07 11:34:44 2013 -0700
@@ -59,7 +59,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/CellRendererPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/CellRendererPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -57,7 +57,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/DefaultBoundedRangeModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/DefaultBoundedRangeModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -37,7 +37,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/DefaultButtonModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/DefaultButtonModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -39,7 +39,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/DefaultCellEditor.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/DefaultCellEditor.java	Mon Oct 07 11:34:44 2013 -0700
@@ -43,7 +43,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/DefaultListCellRenderer.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/DefaultListCellRenderer.java	Mon Oct 07 11:34:44 2013 -0700
@@ -63,7 +63,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -337,7 +337,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/DefaultListModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/DefaultListModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/DefaultListSelectionModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/DefaultListSelectionModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/DefaultSingleSelectionModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/DefaultSingleSelectionModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -37,7 +37,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/ImageIcon.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/ImageIcon.java	Mon Oct 07 11:34:44 2013 -0700
@@ -59,7 +59,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -555,7 +555,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      * @since 1.3
--- a/src/share/classes/javax/swing/JApplet.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JApplet.java	Mon Oct 07 11:34:44 2013 -0700
@@ -77,7 +77,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/JButton.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JButton.java	Mon Oct 07 11:34:44 2013 -0700
@@ -65,7 +65,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -304,7 +304,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JCheckBox.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JCheckBox.java	Mon Oct 07 11:34:44 2013 -0700
@@ -63,7 +63,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -330,7 +330,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JCheckBoxMenuItem.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JCheckBoxMenuItem.java	Mon Oct 07 11:34:44 2013 -0700
@@ -77,7 +77,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -289,7 +289,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JColorChooser.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JColorChooser.java	Mon Oct 07 11:34:44 2013 -0700
@@ -69,7 +69,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/JComboBox.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JComboBox.java	Mon Oct 07 11:34:44 2013 -0700
@@ -57,7 +57,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1608,7 +1608,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JComponent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JComponent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -163,7 +163,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -3653,7 +3653,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JDesktopPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JDesktopPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -76,7 +76,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -612,7 +612,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JDialog.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JDialog.java	Mon Oct 07 11:34:44 2013 -0700
@@ -77,7 +77,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the {@code java.beans} package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/JEditorPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JEditorPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -179,7 +179,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1636,7 +1636,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1690,7 +1690,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JFormattedTextField.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JFormattedTextField.java	Mon Oct 07 11:34:44 2013 -0700
@@ -54,7 +54,7 @@
  * configuring what action should be taken when focus is lost. The possible
  * configurations are:
  * <table summary="Possible JFormattedTextField configurations and their descriptions">
- * <tr><th><p align="left">Value</p></th><th><p align="left">Description</p></th></tr>
+ * <tr><th><p style="text-align:left">Value</p></th><th><p style="text-align:left">Description</p></th></tr>
  * <tr><td>JFormattedTextField.REVERT
  *            <td>Revert the display to match that of <code>getValue</code>,
  *                possibly losing the current edit.
@@ -171,7 +171,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/JFrame.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JFrame.java	Mon Oct 07 11:34:44 2013 -0700
@@ -93,7 +93,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/JInternalFrame.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JInternalFrame.java	Mon Oct 07 11:34:44 2013 -0700
@@ -90,7 +90,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -2029,7 +2029,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -2144,7 +2144,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -2318,7 +2318,7 @@
          * future Swing releases. The current serialization support is
          * appropriate for short term storage or RMI between applications running
          * the same version of Swing.  As of 1.4, support for long term storage
-         * of all JavaBeans<sup><font size="-2">TM</font></sup>
+         * of all JavaBeans&trade;
          * has been added to the <code>java.beans</code> package.
          * Please see {@link java.beans.XMLEncoder}.
          */
--- a/src/share/classes/javax/swing/JLabel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JLabel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -94,7 +94,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1064,7 +1064,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JLayeredPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JLayeredPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -148,7 +148,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -765,7 +765,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JList.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JList.java	Mon Oct 07 11:34:44 2013 -0700
@@ -253,7 +253,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  * <p>
@@ -970,7 +970,7 @@
      *
      * <table border="1"
      *  summary="Describes layouts VERTICAL, HORIZONTAL_WRAP, and VERTICAL_WRAP">
-     *   <tr><th><p align="left">Value</p></th><th><p align="left">Description</p></th></tr>
+     *   <tr><th><p style="text-align:left">Value</p></th><th><p style="text-align:left">Description</p></th></tr>
      *   <tr><td><code>VERTICAL</code>
      *       <td>Cells are layed out vertically in a single column.
      *   <tr><td><code>HORIZONTAL_WRAP</code>
@@ -2877,7 +2877,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JMenu.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JMenu.java	Mon Oct 07 11:34:44 2013 -0700
@@ -93,7 +93,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1149,7 +1149,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1386,7 +1386,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JMenuBar.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JMenuBar.java	Mon Oct 07 11:34:44 2013 -0700
@@ -67,7 +67,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  * <p>
@@ -502,7 +502,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JMenuItem.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JMenuItem.java	Mon Oct 07 11:34:44 2013 -0700
@@ -72,7 +72,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -826,7 +826,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JOptionPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JOptionPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -298,7 +298,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -2573,7 +2573,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JPanel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JPanel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -52,7 +52,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -229,7 +229,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JPasswordField.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JPasswordField.java	Mon Oct 07 11:34:44 2013 -0700
@@ -64,7 +64,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -399,7 +399,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JPopupMenu.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JPopupMenu.java	Mon Oct 07 11:34:44 2013 -0700
@@ -71,7 +71,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/JProgressBar.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JProgressBar.java	Mon Oct 07 11:34:44 2013 -0700
@@ -114,7 +114,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -643,7 +643,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1031,7 +1031,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JRadioButton.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JRadioButton.java	Mon Oct 07 11:34:44 2013 -0700
@@ -74,7 +74,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -280,7 +280,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JRadioButtonMenuItem.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JRadioButtonMenuItem.java	Mon Oct 07 11:34:44 2013 -0700
@@ -71,7 +71,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -262,7 +262,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JRootPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JRootPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -49,7 +49,7 @@
  * <p>
  * The following image shows the relationships between
  * the classes that use root panes.
- * <p align=center><img src="doc-files/JRootPane-1.gif"
+ * <p style="text-align:center"><img src="doc-files/JRootPane-1.gif"
  * alt="The following text describes this graphic."
  * HEIGHT=484 WIDTH=629></p>
  * The &quot;heavyweight&quot; components (those that delegate to a peer, or native
@@ -69,7 +69,7 @@
  * can be used to obtain the <code>JRootPane</code> that contains
  * a given component.
  * </blockquote>
- * <table align="right" border="0" summary="layout">
+ * <table style="float:right" border="0" summary="layout">
  * <tr>
  * <td align="center">
  * <img src="doc-files/JRootPane-2.gif"
@@ -179,7 +179,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -898,7 +898,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1064,7 +1064,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JScrollBar.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JScrollBar.java	Mon Oct 07 11:34:44 2013 -0700
@@ -67,7 +67,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -838,7 +838,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JScrollPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JScrollPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -146,7 +146,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -677,7 +677,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -1437,7 +1437,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JSeparator.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JSeparator.java	Mon Oct 07 11:34:44 2013 -0700
@@ -60,7 +60,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -276,7 +276,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JSlider.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JSlider.java	Mon Oct 07 11:34:44 2013 -0700
@@ -68,7 +68,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1425,7 +1425,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JSpinner.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JSpinner.java	Mon Oct 07 11:34:44 2013 -0700
@@ -106,7 +106,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/JSplitPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JSplitPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -89,7 +89,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1152,7 +1152,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JTabbedPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JTabbedPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -91,7 +91,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1885,7 +1885,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JTable.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JTable.java	Mon Oct 07 11:34:44 2013 -0700
@@ -200,7 +200,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -6575,7 +6575,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JTextArea.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JTextArea.java	Mon Oct 07 11:34:44 2013 -0700
@@ -112,7 +112,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -783,7 +783,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JTextField.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JTextField.java	Mon Oct 07 11:34:44 2013 -0700
@@ -148,7 +148,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -939,7 +939,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JTextPane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JTextPane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -68,7 +68,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/JToggleButton.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JToggleButton.java	Mon Oct 07 11:34:44 2013 -0700
@@ -64,7 +64,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -218,7 +218,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -380,7 +380,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JToolBar.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JToolBar.java	Mon Oct 07 11:34:44 2013 -0700
@@ -74,7 +74,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/JToolTip.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JToolTip.java	Mon Oct 07 11:34:44 2013 -0700
@@ -58,7 +58,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -254,7 +254,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JTree.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JTree.java	Mon Oct 07 11:34:44 2013 -0700
@@ -130,7 +130,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *</p>
@@ -3238,7 +3238,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -3360,7 +3360,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -3861,7 +3861,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -4093,7 +4093,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JViewport.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JViewport.java	Mon Oct 07 11:34:44 2013 -0700
@@ -94,7 +94,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1292,7 +1292,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1761,7 +1761,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/JWindow.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/JWindow.java	Mon Oct 07 11:34:44 2013 -0700
@@ -76,7 +76,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/KeyStroke.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/KeyStroke.java	Mon Oct 07 11:34:44 2013 -0700
@@ -51,7 +51,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/OverlayLayout.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/OverlayLayout.java	Mon Oct 07 11:34:44 2013 -0700
@@ -45,7 +45,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/ScrollPaneLayout.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/ScrollPaneLayout.java	Mon Oct 07 11:34:44 2013 -0700
@@ -48,7 +48,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/SizeRequirements.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/SizeRequirements.java	Mon Oct 07 11:34:44 2013 -0700
@@ -81,7 +81,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/Spring.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/Spring.java	Mon Oct 07 11:34:44 2013 -0700
@@ -117,7 +117,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/SpringLayout.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/SpringLayout.java	Mon Oct 07 11:34:44 2013 -0700
@@ -172,7 +172,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/Timer.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/Timer.java	Mon Oct 07 11:34:44 2013 -0700
@@ -137,7 +137,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/UIDefaults.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/UIDefaults.java	Mon Oct 07 11:34:44 2013 -0700
@@ -64,7 +64,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/UIManager.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/UIManager.java	Mon Oct 07 11:34:44 2013 -0700
@@ -167,7 +167,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java	Mon Oct 07 11:34:44 2013 -0700
@@ -33,7 +33,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/ViewportLayout.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/ViewportLayout.java	Mon Oct 07 11:34:44 2013 -0700
@@ -50,7 +50,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/border/AbstractBorder.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/border/AbstractBorder.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/border/BevelBorder.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/border/BevelBorder.java	Mon Oct 07 11:34:44 2013 -0700
@@ -38,7 +38,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/border/CompoundBorder.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/border/CompoundBorder.java	Mon Oct 07 11:34:44 2013 -0700
@@ -48,7 +48,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/border/EmptyBorder.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/border/EmptyBorder.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/border/EtchedBorder.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/border/EtchedBorder.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/border/LineBorder.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/border/LineBorder.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/border/MatteBorder.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/border/MatteBorder.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/border/SoftBevelBorder.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/border/SoftBevelBorder.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/border/TitledBorder.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/border/TitledBorder.java	Mon Oct 07 11:34:44 2013 -0700
@@ -60,7 +60,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java	Mon Oct 07 11:34:44 2013 -0700
@@ -37,7 +37,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -46,7 +46,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -45,7 +45,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/AncestorEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/AncestorEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -37,7 +37,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/CaretEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/CaretEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -36,7 +36,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/ChangeEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/ChangeEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -36,7 +36,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/EventListenerList.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/EventListenerList.java	Mon Oct 07 11:34:44 2013 -0700
@@ -88,7 +88,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/HyperlinkEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/HyperlinkEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -39,7 +39,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/InternalFrameEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/InternalFrameEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -42,7 +42,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/ListDataEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/ListDataEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -36,7 +36,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/ListSelectionEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/ListSelectionEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -42,7 +42,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/MenuDragMouseEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/MenuDragMouseEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/MenuEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/MenuEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -37,7 +37,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/MenuKeyEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/MenuKeyEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/PopupMenuEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/PopupMenuEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -35,7 +35,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/TableColumnModelEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/TableColumnModelEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -38,7 +38,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/TableModelEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/TableModelEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -57,7 +57,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/TreeExpansionEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/TreeExpansionEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -42,7 +42,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/TreeModelEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/TreeModelEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -42,7 +42,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/TreeSelectionEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/TreeSelectionEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/event/UndoableEditEvent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/event/UndoableEditEvent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -35,7 +35,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/BorderUIResource.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/BorderUIResource.java	Mon Oct 07 11:34:44 2013 -0700
@@ -51,7 +51,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/ColorUIResource.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/ColorUIResource.java	Mon Oct 07 11:34:44 2013 -0700
@@ -37,7 +37,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/DimensionUIResource.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/DimensionUIResource.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/FontUIResource.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/FontUIResource.java	Mon Oct 07 11:34:44 2013 -0700
@@ -39,7 +39,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/IconUIResource.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/IconUIResource.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/InsetsUIResource.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/InsetsUIResource.java	Mon Oct 07 11:34:44 2013 -0700
@@ -39,7 +39,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java	Mon Oct 07 11:34:44 2013 -0700
@@ -39,7 +39,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -43,7 +43,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java	Mon Oct 07 11:34:44 2013 -0700
@@ -160,7 +160,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -135,7 +135,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java	Mon Oct 07 11:34:44 2013 -0700
@@ -53,7 +53,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java	Mon Oct 07 11:34:44 2013 -0700
@@ -42,7 +42,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java	Mon Oct 07 11:34:44 2013 -0700
@@ -50,7 +50,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -1488,7 +1488,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -1592,7 +1592,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -1650,7 +1650,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -1717,7 +1717,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
--- a/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -96,7 +96,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java	Mon Oct 07 11:34:44 2013 -0700
@@ -53,7 +53,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -671,7 +671,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -43,7 +43,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -45,7 +45,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -93,7 +93,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/basic/ComboPopup.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/ComboPopup.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java	Mon Oct 07 11:34:44 2013 -0700
@@ -79,7 +79,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -129,7 +129,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -43,7 +43,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java	Mon Oct 07 11:34:44 2013 -0700
@@ -36,7 +36,7 @@
 
 /**
  * Factory object that vends <code>Icon</code>s for
- * the Java<sup><font size="-2">TM</font></sup> look and feel (Metal).
+ * the Java&trade; look and feel (Metal).
  * These icons are used extensively in Metal via the defaults mechanism.
  * While other look and feels often use GIFs for icons, creating icons
  * in code facilitates switching to other themes.
@@ -52,7 +52,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1550,7 +1550,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1632,7 +1632,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1651,7 +1651,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1736,7 +1736,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -72,7 +72,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -38,7 +38,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -46,7 +46,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -56,7 +56,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java	Mon Oct 07 11:34:44 2013 -0700
@@ -43,7 +43,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java	Mon Oct 07 11:34:44 2013 -0700
@@ -39,7 +39,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -37,7 +37,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -49,7 +49,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -45,7 +45,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -47,7 +47,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -43,7 +43,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java	Mon Oct 07 11:34:44 2013 -0700
@@ -40,7 +40,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/table/AbstractTableModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/table/AbstractTableModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -50,7 +50,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java	Mon Oct 07 11:34:44 2013 -0700
@@ -75,7 +75,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -387,7 +387,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/table/DefaultTableColumnModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/table/DefaultTableColumnModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/table/DefaultTableModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/table/DefaultTableModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -50,7 +50,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/table/JTableHeader.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/table/JTableHeader.java	Mon Oct 07 11:34:44 2013 -0700
@@ -52,7 +52,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -776,7 +776,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/table/TableColumn.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/table/TableColumn.java	Mon Oct 07 11:34:44 2013 -0700
@@ -67,7 +67,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/AbstractDocument.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/AbstractDocument.java	Mon Oct 07 11:34:44 2013 -0700
@@ -90,7 +90,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1778,7 +1778,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -2247,7 +2247,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -2501,7 +2501,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
--- a/src/share/classes/javax/swing/text/BadLocationException.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/BadLocationException.java	Mon Oct 07 11:34:44 2013 -0700
@@ -33,7 +33,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/DateFormatter.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/DateFormatter.java	Mon Oct 07 11:34:44 2013 -0700
@@ -39,7 +39,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/DefaultCaret.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/DefaultCaret.java	Mon Oct 07 11:34:44 2013 -0700
@@ -98,7 +98,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/DefaultEditorKit.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/DefaultEditorKit.java	Mon Oct 07 11:34:44 2013 -0700
@@ -840,7 +840,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -899,7 +899,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -947,7 +947,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -989,7 +989,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -1265,7 +1265,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -1301,7 +1301,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -1338,7 +1338,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
@@ -1373,7 +1373,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      *
--- a/src/share/classes/javax/swing/text/DefaultFormatter.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/DefaultFormatter.java	Mon Oct 07 11:34:44 2013 -0700
@@ -50,7 +50,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/DefaultFormatterFactory.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/DefaultFormatterFactory.java	Mon Oct 07 11:34:44 2013 -0700
@@ -64,7 +64,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/DefaultStyledDocument.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/DefaultStyledDocument.java	Mon Oct 07 11:34:44 2013 -0700
@@ -61,7 +61,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1124,7 +1124,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1155,7 +1155,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -1390,7 +1390,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/text/InternationalFormatter.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/InternationalFormatter.java	Mon Oct 07 11:34:44 2013 -0700
@@ -83,7 +83,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/JTextComponent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/JTextComponent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -281,7 +281,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1122,7 +1122,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -2539,7 +2539,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/text/MaskFormatter.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/MaskFormatter.java	Mon Oct 07 11:34:44 2013 -0700
@@ -143,7 +143,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/NumberFormatter.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/NumberFormatter.java	Mon Oct 07 11:34:44 2013 -0700
@@ -83,7 +83,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/PlainDocument.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/PlainDocument.java	Mon Oct 07 11:34:44 2013 -0700
@@ -48,7 +48,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/SimpleAttributeSet.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/SimpleAttributeSet.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/StringContent.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/StringContent.java	Mon Oct 07 11:34:44 2013 -0700
@@ -44,7 +44,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/StyleContext.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/StyleContext.java	Mon Oct 07 11:34:44 2013 -0700
@@ -56,7 +56,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
@@ -1240,7 +1240,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/text/StyledEditorKit.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/StyledEditorKit.java	Mon Oct 07 11:34:44 2013 -0700
@@ -371,7 +371,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -490,7 +490,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -546,7 +546,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -613,7 +613,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -679,7 +679,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -729,7 +729,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -768,7 +768,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
@@ -807,7 +807,7 @@
      * future Swing releases. The current serialization support is
      * appropriate for short term storage or RMI between applications running
      * the same version of Swing.  As of 1.4, support for long term storage
-     * of all JavaBeans<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
      * has been added to the <code>java.beans</code> package.
      * Please see {@link java.beans.XMLEncoder}.
      */
--- a/src/share/classes/javax/swing/text/TabSet.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/TabSet.java	Mon Oct 07 11:34:44 2013 -0700
@@ -37,7 +37,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/TabStop.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/TabStop.java	Mon Oct 07 11:34:44 2013 -0700
@@ -37,7 +37,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/TextAction.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/TextAction.java	Mon Oct 07 11:34:44 2013 -0700
@@ -52,7 +52,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/text/html/Option.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/text/html/Option.java	Mon Oct 07 11:34:44 2013 -0700
@@ -38,7 +38,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/tree/AbstractLayoutCache.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/tree/AbstractLayoutCache.java	Mon Oct 07 11:34:44 2013 -0700
@@ -36,7 +36,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java	Mon Oct 07 11:34:44 2013 -0700
@@ -76,7 +76,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java	Mon Oct 07 11:34:44 2013 -0700
@@ -52,7 +52,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java	Mon Oct 07 11:34:44 2013 -0700
@@ -95,7 +95,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/tree/DefaultTreeModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/tree/DefaultTreeModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -41,7 +41,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java	Mon Oct 07 11:34:44 2013 -0700
@@ -53,7 +53,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java	Mon Oct 07 11:34:44 2013 -0700
@@ -42,7 +42,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/tree/TreePath.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/tree/TreePath.java	Mon Oct 07 11:34:44 2013 -0700
@@ -74,7 +74,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java	Mon Oct 07 11:34:44 2013 -0700
@@ -43,7 +43,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/undo/CannotRedoException.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/undo/CannotRedoException.java	Mon Oct 07 11:34:44 2013 -0700
@@ -32,7 +32,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/undo/CannotUndoException.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/undo/CannotUndoException.java	Mon Oct 07 11:34:44 2013 -0700
@@ -33,7 +33,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *
--- a/src/share/classes/javax/swing/undo/UndoManager.java	Mon Oct 07 16:42:29 2013 +0400
+++ b/src/share/classes/javax/swing/undo/UndoManager.java	Mon Oct 07 11:34:44 2013 -0700
@@ -126,7 +126,7 @@
  * future Swing releases. The current serialization support is
  * appropriate for short term storage or RMI between applications running
  * the same version of Swing.  As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
  * has been added to the <code>java.beans</code> package.
  * Please see {@link java.beans.XMLEncoder}.
  *