From d4dc57a24306cdf83d35834092dad0193021b838 Mon Sep 17 00:00:00 2001
From: yan <unknown>
Date: Wed, 25 Sep 2013 17:35:22 +0400
Subject: [PATCH] 8025085: [javadoc] some errors in javax/swing Reviewed-by:
 alexsch Contributed-by: Dmitry Zinkevich <dmitry.zinkevich@oracle.com>

---
 src/share/classes/javax/swing/JButton.java    |  4 +-
 src/share/classes/javax/swing/JCheckBox.java  |  4 +-
 .../javax/swing/JCheckBoxMenuItem.java        |  2 +-
 .../classes/javax/swing/JColorChooser.java    | 10 ++---
 src/share/classes/javax/swing/JComboBox.java  | 10 ++---
 src/share/classes/javax/swing/JComponent.java |  4 +-
 .../classes/javax/swing/JDesktopPane.java     | 14 +++----
 src/share/classes/javax/swing/JMenuItem.java  |  4 +-
 .../classes/javax/swing/JToggleButton.java    |  4 +-
 .../classes/javax/swing/SpinnerDateModel.java |  4 +-
 .../classes/javax/swing/SpinnerListModel.java |  6 +--
 .../javax/swing/SpinnerNumberModel.java       |  6 +--
 .../classes/javax/swing/SpringLayout.java     |  2 +-
 .../classes/javax/swing/TransferHandler.java  |  2 +-
 src/share/classes/javax/swing/UIDefaults.java |  2 +-
 .../UnsupportedLookAndFeelException.java      |  2 +-
 .../classes/javax/swing/ViewportLayout.java   |  3 +-
 .../classes/javax/swing/plaf/LayerUI.java     | 40 +++++++++----------
 .../javax/swing/plaf/basic/BasicBorders.java  |  2 +-
 .../swing/plaf/basic/BasicDesktopIconUI.java  |  2 +-
 .../swing/plaf/basic/BasicDesktopPaneUI.java  |  2 +-
 .../swing/plaf/basic/BasicFileChooserUI.java  |  2 +-
 .../swing/plaf/basic/BasicGraphicsUtils.java  |  2 +-
 .../swing/plaf/basic/BasicIconFactory.java    |  2 +-
 .../basic/BasicInternalFrameTitlePane.java    | 18 ++++-----
 .../plaf/basic/BasicInternalFrameUI.java      |  2 +-
 .../javax/swing/plaf/basic/BasicLabelUI.java  |  2 +-
 .../javax/swing/plaf/basic/BasicListUI.java   |  4 +-
 .../swing/plaf/basic/BasicMenuBarUI.java      |  2 +-
 .../javax/swing/plaf/basic/BasicMenuUI.java   |  2 +-
 .../swing/plaf/basic/BasicOptionPaneUI.java   |  6 +--
 .../plaf/basic/BasicPopupMenuSeparatorUI.java |  2 +-
 .../swing/plaf/basic/BasicPopupMenuUI.java    |  2 +-
 .../swing/plaf/basic/BasicProgressBarUI.java  |  2 +-
 .../swing/plaf/basic/BasicScrollPaneUI.java   |  2 +-
 .../swing/plaf/basic/BasicSeparatorUI.java    |  2 +-
 .../javax/swing/plaf/basic/BasicSliderUI.java | 14 +++----
 .../swing/plaf/basic/BasicSplitPaneUI.java    |  4 +-
 .../swing/plaf/basic/BasicTabbedPaneUI.java   |  4 +-
 .../plaf/basic/BasicToolBarSeparatorUI.java   |  2 +-
 .../swing/plaf/basic/BasicToolBarUI.java      |  2 +-
 .../swing/plaf/basic/BasicToolTipUI.java      |  2 +-
 .../javax/swing/plaf/basic/BasicTreeUI.java   |  2 +-
 .../swing/plaf/basic/DefaultMenuLayout.java   |  2 +-
 .../javax/swing/plaf/metal/MetalBorders.java  |  2 +-
 .../swing/plaf/metal/MetalFileChooserUI.java  |  2 +-
 .../javax/swing/plaf/metal/MetalLabelUI.java  |  2 +-
 .../swing/plaf/metal/MetalLookAndFeel.java    |  3 +-
 .../plaf/metal/MetalPopupMenuSeparatorUI.java |  2 +-
 .../swing/plaf/metal/MetalScrollPaneUI.java   |  2 +-
 .../swing/plaf/metal/MetalSeparatorUI.java    |  2 +-
 .../javax/swing/plaf/metal/MetalSliderUI.java |  2 +-
 .../swing/plaf/metal/MetalTabbedPaneUI.java   |  4 +-
 .../swing/plaf/metal/MetalToolTipUI.java      |  2 +-
 .../plaf/nimbus/AbstractRegionPainter.java    |  6 +--
 .../swing/plaf/nimbus/NimbusLookAndFeel.java  |  6 +--
 .../javax/swing/plaf/nimbus/NimbusStyle.java  | 16 ++++----
 .../javax/swing/plaf/synth/Region.java        |  6 +--
 .../javax/swing/text/html/HTMLEditorKit.java  |  1 -
 .../javax/swing/text/html/ImageView.java      |  4 +-
 .../javax/swing/text/html/InlineView.java     | 10 ++---
 .../javax/swing/text/html/StyleSheet.java     |  4 +-
 .../swing/text/html/parser/ContentModel.java  |  4 +-
 .../text/html/parser/DocumentParser.java      |  4 +-
 .../javax/swing/text/html/parser/Parser.java  |  8 ++--
 .../javax/swing/tree/AbstractLayoutCache.java |  2 +-
 .../swing/tree/DefaultTreeCellEditor.java     |  4 +-
 .../swing/tree/DefaultTreeCellRenderer.java   |  3 +-
 .../javax/swing/tree/DefaultTreeModel.java    |  4 +-
 .../javax/swing/tree/TreeCellRenderer.java    |  4 +-
 .../classes/javax/swing/tree/TreeModel.java   |  4 +-
 .../classes/javax/swing/undo/UndoManager.java | 16 ++++----
 72 files changed, 170 insertions(+), 172 deletions(-)

diff --git a/src/share/classes/javax/swing/JButton.java b/src/share/classes/javax/swing/JButton.java
index afa1bf0e7..45e875731 100644
--- a/src/share/classes/javax/swing/JButton.java
+++ b/src/share/classes/javax/swing/JButton.java
@@ -149,7 +149,7 @@ public class JButton extends AbstractButton implements Accessible {
 
 
     /**
-     * Returns a string that specifies the name of the L&F class
+     * Returns a string that specifies the name of the L&amp;F class
      * that renders this component.
      *
      * @return the string "ButtonUI"
@@ -157,7 +157,7 @@ public class JButton extends AbstractButton implements Accessible {
      * @see UIDefaults#getUI
      * @beaninfo
      *        expert: true
-     *   description: A string that specifies the name of the L&F class.
+     *   description: A string that specifies the name of the L&amp;F class.
      */
     public String getUIClassID() {
         return uiClassID;
diff --git a/src/share/classes/javax/swing/JCheckBox.java b/src/share/classes/javax/swing/JCheckBox.java
index 242d95aa0..4d80e9549 100644
--- a/src/share/classes/javax/swing/JCheckBox.java
+++ b/src/share/classes/javax/swing/JCheckBox.java
@@ -230,7 +230,7 @@ public class JCheckBox extends JToggleButton implements Accessible {
 
 
     /**
-     * Returns a string that specifies the name of the L&F class
+     * Returns a string that specifies the name of the L&amp;F class
      * that renders this component.
      *
      * @return the string "CheckBoxUI"
@@ -238,7 +238,7 @@ public class JCheckBox extends JToggleButton implements Accessible {
      * @see UIDefaults#getUI
      * @beaninfo
      *        expert: true
-     *   description: A string that specifies the name of the L&F class
+     *   description: A string that specifies the name of the L&amp;F class
      */
     public String getUIClassID() {
         return uiClassID;
diff --git a/src/share/classes/javax/swing/JCheckBoxMenuItem.java b/src/share/classes/javax/swing/JCheckBoxMenuItem.java
index 260ca01b1..8b42b729f 100644
--- a/src/share/classes/javax/swing/JCheckBoxMenuItem.java
+++ b/src/share/classes/javax/swing/JCheckBoxMenuItem.java
@@ -168,7 +168,7 @@ public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants,
     }
 
     /**
-     * Returns the name of the L&F class
+     * Returns the name of the L&amp;F class
      * that renders this component.
      *
      * @return "CheckBoxMenuItemUI"
diff --git a/src/share/classes/javax/swing/JColorChooser.java b/src/share/classes/javax/swing/JColorChooser.java
index 07a72791f..eb3aff69a 100644
--- a/src/share/classes/javax/swing/JColorChooser.java
+++ b/src/share/classes/javax/swing/JColorChooser.java
@@ -216,7 +216,7 @@ public class JColorChooser extends JComponent implements Accessible {
     }
 
     /**
-     * Returns the L&F object that renders this component.
+     * Returns the L&amp;F object that renders this component.
      *
      * @return the <code>ColorChooserUI</code> object that renders
      *          this component
@@ -226,9 +226,9 @@ public class JColorChooser extends JComponent implements Accessible {
     }
 
     /**
-     * Sets the L&F object that renders this component.
+     * Sets the L&amp;F object that renders this component.
      *
-     * @param ui  the <code>ColorChooserUI</code> L&F object
+     * @param ui  the <code>ColorChooserUI</code> L&amp;F object
      * @see UIDefaults#getUI
      *
      * @beaninfo
@@ -241,7 +241,7 @@ public class JColorChooser extends JComponent implements Accessible {
     }
 
     /**
-     * Notification from the <code>UIManager</code> that the L&F has changed.
+     * Notification from the <code>UIManager</code> that the L&amp;F has changed.
      * Replaces the current UI object with the latest version from the
      * <code>UIManager</code>.
      *
@@ -252,7 +252,7 @@ public class JColorChooser extends JComponent implements Accessible {
     }
 
     /**
-     * Returns the name of the L&F class that renders this component.
+     * Returns the name of the L&amp;F class that renders this component.
      *
      * @return the string "ColorChooserUI"
      * @see JComponent#getUIClassID
diff --git a/src/share/classes/javax/swing/JComboBox.java b/src/share/classes/javax/swing/JComboBox.java
index 8ac710910..ba3bb8abb 100644
--- a/src/share/classes/javax/swing/JComboBox.java
+++ b/src/share/classes/javax/swing/JComboBox.java
@@ -242,9 +242,9 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
     }
 
     /**
-     * Sets the L&F object that renders this component.
+     * Sets the L&amp;F object that renders this component.
      *
-     * @param ui  the <code>ComboBoxUI</code> L&F object
+     * @param ui  the <code>ComboBoxUI</code> L&amp;F object
      * @see UIDefaults#getUI
      *
      * @beaninfo
@@ -273,7 +273,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
 
 
     /**
-     * Returns the name of the L&F class that renders this component.
+     * Returns the name of the L&amp;F class that renders this component.
      *
      * @return the string "ComboBoxUI"
      * @see JComponent#getUIClassID
@@ -285,7 +285,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
 
 
     /**
-     * Returns the L&F object that renders this component.
+     * Returns the L&amp;F object that renders this component.
      *
      * @return the ComboBoxUI object that renders this component
      */
@@ -607,7 +607,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
      *
      * @param anIndex an integer specifying the list item to select,
      *                  where 0 specifies the first item in the list and -1 indicates no selection
-     * @exception IllegalArgumentException if <code>anIndex</code> < -1 or
+     * @exception IllegalArgumentException if <code>anIndex</code> &lt; -1 or
      *                  <code>anIndex</code> is greater than or equal to size
      * @beaninfo
      *   preferred: true
diff --git a/src/share/classes/javax/swing/JComponent.java b/src/share/classes/javax/swing/JComponent.java
index dac623a37..13576590a 100644
--- a/src/share/classes/javax/swing/JComponent.java
+++ b/src/share/classes/javax/swing/JComponent.java
@@ -86,7 +86,7 @@ import sun.swing.UIClientPropertyKey;
  * <ul>
  * <li>The base class for both standard and custom components
  *     that use the Swing architecture.
- * <li>A "pluggable look and feel" (L&F) that can be specified by the
+ * <li>A "pluggable look and feel" (L&amp;F) that can be specified by the
  *     programmer or (optionally) selected by the user at runtime.
  *     The look and feel for each component is provided by a
  *     <em>UI delegate</em> -- an object that descends from
@@ -4523,7 +4523,7 @@ public abstract class JComponent extends Container implements Serializable,
      * @param propertyName  the name of the property that was listened on
      * @param oldValue  the old value of the property
      * @param newValue  the new value of the property
-     * @exception PropertyVetoException when the attempt to set the
+     * @exception java.beans.PropertyVetoException when the attempt to set the
      *          property is vetoed by the component
      */
     protected void fireVetoableChange(String propertyName, Object oldValue, Object newValue)
diff --git a/src/share/classes/javax/swing/JDesktopPane.java b/src/share/classes/javax/swing/JDesktopPane.java
index c7201000a..8d5342f47 100644
--- a/src/share/classes/javax/swing/JDesktopPane.java
+++ b/src/share/classes/javax/swing/JDesktopPane.java
@@ -50,13 +50,13 @@ import java.util.TreeSet;
  * <code>JLayeredPane</code> to manage the potentially overlapping internal
  * frames. It also maintains a reference to an instance of
  * <code>DesktopManager</code> that is set by the UI
- * class for the current look and feel (L&F).  Note that <code>JDesktopPane</code>
+ * class for the current look and feel (L&amp;F).  Note that <code>JDesktopPane</code>
  * does not support borders.
  * <p>
  * This class is normally used as the parent of <code>JInternalFrames</code>
  * to provide a pluggable <code>DesktopManager</code> object to the
  * <code>JInternalFrames</code>. The <code>installUI</code> of the
- * L&F specific implementation is responsible for setting the
+ * L&amp;F specific implementation is responsible for setting the
  * <code>desktopManager</code> variable appropriately.
  * When the parent of a <code>JInternalFrame</code> is a <code>JDesktopPane</code>,
  * it should delegate most of its behavior to the <code>desktopManager</code>
@@ -146,7 +146,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible
     }
 
     /**
-     * Returns the L&F object that renders this component.
+     * Returns the L&amp;F object that renders this component.
      *
      * @return the <code>DesktopPaneUI</code> object that
      *   renders this component
@@ -156,9 +156,9 @@ public class JDesktopPane extends JLayeredPane implements Accessible
     }
 
     /**
-     * Sets the L&F object that renders this component.
+     * Sets the L&amp;F object that renders this component.
      *
-     * @param ui  the DesktopPaneUI L&F object
+     * @param ui  the DesktopPaneUI L&amp;F object
      * @see UIDefaults#getUI
      * @beaninfo
      *        bound: true
@@ -232,7 +232,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible
     }
 
     /**
-     * Notification from the <code>UIManager</code> that the L&F has changed.
+     * Notification from the <code>UIManager</code> that the L&amp;F has changed.
      * Replaces the current UI object with the latest version from the
      * <code>UIManager</code>.
      *
@@ -244,7 +244,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible
 
 
     /**
-     * Returns the name of the L&F class that renders this component.
+     * Returns the name of the L&amp;F class that renders this component.
      *
      * @return the string "DesktopPaneUI"
      * @see JComponent#getUIClassID
diff --git a/src/share/classes/javax/swing/JMenuItem.java b/src/share/classes/javax/swing/JMenuItem.java
index 1e616869f..e13dc8b5b 100644
--- a/src/share/classes/javax/swing/JMenuItem.java
+++ b/src/share/classes/javax/swing/JMenuItem.java
@@ -229,7 +229,7 @@ public class JMenuItem extends AbstractButton implements Accessible,MenuElement
     /**
      * Sets the look and feel object that renders this component.
      *
-     * @param ui  the <code>JMenuItemUI</code> L&F object
+     * @param ui  the <code>JMenuItemUI</code> L&amp;F object
      * @see UIDefaults#getUI
      * @beaninfo
      *        bound: true
@@ -252,7 +252,7 @@ public class JMenuItem extends AbstractButton implements Accessible,MenuElement
 
 
     /**
-     * Returns the suffix used to construct the name of the L&F class used to
+     * Returns the suffix used to construct the name of the L&amp;F class used to
      * render this component.
      *
      * @return the string "MenuItemUI"
diff --git a/src/share/classes/javax/swing/JToggleButton.java b/src/share/classes/javax/swing/JToggleButton.java
index d76daab95..bda38db5e 100644
--- a/src/share/classes/javax/swing/JToggleButton.java
+++ b/src/share/classes/javax/swing/JToggleButton.java
@@ -186,14 +186,14 @@ public class JToggleButton extends AbstractButton implements Accessible {
     }
 
     /**
-     * Returns a string that specifies the name of the l&f class
+     * Returns a string that specifies the name of the l&amp;f class
      * that renders this component.
      *
      * @return String "ToggleButtonUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      * @beaninfo
-     *  description: A string that specifies the name of the L&F class
+     *  description: A string that specifies the name of the L&amp;F class
      */
     public String getUIClassID() {
         return uiClassID;
diff --git a/src/share/classes/javax/swing/SpinnerDateModel.java b/src/share/classes/javax/swing/SpinnerDateModel.java
index cc41864a9..3eec041ca 100644
--- a/src/share/classes/javax/swing/SpinnerDateModel.java
+++ b/src/share/classes/javax/swing/SpinnerDateModel.java
@@ -221,7 +221,7 @@ public class SpinnerDateModel extends AbstractSpinnerModel implements Serializab
      * MyStartDate implements Comparable {
      *     long t = 12345;
      *     public int compareTo(Date d) {
-     *            return (t < d.getTime() ? -1 : (t == d.getTime() ? 0 : 1));
+     *            return (t &lt; d.getTime() ? -1 : (t == d.getTime() ? 0 : 1));
      *     }
      *     public int compareTo(Object o) {
      *            return compareTo((Date)o);
@@ -435,7 +435,7 @@ public class SpinnerDateModel extends AbstractSpinnerModel implements Serializab
      * If <code>value</code> is <code>null</code>,
      * an <code>IllegalArgumentException</code> is thrown.  No bounds
      * checking is done here:
-     * the new value may invalidate the <code>(start &lt= value &lt end)</code>
+     * the new value may invalidate the <code>(start &lt;= value &lt; end)</code>
      * invariant enforced by the constructors.  Naturally, one should ensure
      * that the <code>(start &lt;= value &lt;= maximum)</code> invariant is true
      * before calling the <code>nextValue</code>, <code>previousValue</code>,
diff --git a/src/share/classes/javax/swing/SpinnerListModel.java b/src/share/classes/javax/swing/SpinnerListModel.java
index 14b379ea6..58f19e37a 100644
--- a/src/share/classes/javax/swing/SpinnerListModel.java
+++ b/src/share/classes/javax/swing/SpinnerListModel.java
@@ -71,7 +71,7 @@ public class SpinnerListModel extends AbstractSpinnerModel implements Serializab
      * size, an <code>IllegalArugmentException</code> is thrown.
      *
      * @param values the sequence this model represents
-     * @throws IllegalArugmentException if <code>values</code> is
+     * @throws IllegalArgumentException if <code>values</code> is
      *    <code>null</code> or zero size
      */
     public SpinnerListModel(List<?> values) {
@@ -88,10 +88,10 @@ public class SpinnerListModel extends AbstractSpinnerModel implements Serializab
      * is defined by the specified array.  The initial value of the model
      * will be <code>values[0]</code>.  If <code>values</code> is
      * <code>null</code> or has zero length, an
-     * <code>IllegalArugmentException</code> is thrown.
+     * <code>IllegalArgumentException</code> is thrown.
      *
      * @param values the sequence this model represents
-     * @throws IllegalArugmentException if <code>values</code> is
+     * @throws IllegalArgumentException if <code>values</code> is
      *    <code>null</code> or zero length
      */
     public SpinnerListModel(Object[] values) {
diff --git a/src/share/classes/javax/swing/SpinnerNumberModel.java b/src/share/classes/javax/swing/SpinnerNumberModel.java
index 0c0c1738c..220161257 100644
--- a/src/share/classes/javax/swing/SpinnerNumberModel.java
+++ b/src/share/classes/javax/swing/SpinnerNumberModel.java
@@ -180,7 +180,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel implements Serializ
      * If <code>minimum</code> is <code>null</code>,
      * then there is no lower bound.  No bounds checking is done here;
      * the new <code>minimum</code> value may invalidate the
-     * <code>(minimum &lt;= value &lt= maximum)</code>
+     * <code>(minimum &lt;= value &lt;= maximum)</code>
      * invariant enforced by the constructors.  This is to simplify updating
      * the model, naturally one should ensure that the invariant is true
      * before calling the <code>getNextValue</code>,
@@ -196,7 +196,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel implements Serializ
      * MyDate extends Date {  // Date already implements Comparable
      *     public int compareTo(Long o) {
      *         long t = getTime();
-     *         return (t < o.longValue() ? -1 : (t == o.longValue() ? 0 : 1));
+     *         return (t &lt; o.longValue() ? -1 : (t == o.longValue() ? 0 : 1));
      *     }
      * }
      * </pre>
@@ -235,7 +235,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel implements Serializ
      * If <code>maximum</code> is <code>null</code>, then there
      * is no upper bound.  No bounds checking is done here; the new
      * <code>maximum</code> value may invalidate the
-     * <code>(minimum <= value < maximum)</code>
+     * <code>(minimum &lt;= value &lt; maximum)</code>
      * invariant enforced by the constructors.  This is to simplify updating
      * the model, naturally one should ensure that the invariant is true
      * before calling the <code>next</code>, <code>previous</code>,
diff --git a/src/share/classes/javax/swing/SpringLayout.java b/src/share/classes/javax/swing/SpringLayout.java
index 7686fc562..72de45661 100644
--- a/src/share/classes/javax/swing/SpringLayout.java
+++ b/src/share/classes/javax/swing/SpringLayout.java
@@ -727,7 +727,7 @@ public class SpringLayout implements LayoutManager2 {
         * For any other <code>String</code> value passed as the edge,
         * no action is taken. For a <code>null</code> edge, a
         * <code>NullPointerException</code> is thrown.
-        * <p/>
+        * <p>
         * <b>Note:</b> This method can affect {@code x} and {@code y} values
         * previously set for this {@code Constraints}.
         *
diff --git a/src/share/classes/javax/swing/TransferHandler.java b/src/share/classes/javax/swing/TransferHandler.java
index f5d85408e..b169a8edc 100644
--- a/src/share/classes/javax/swing/TransferHandler.java
+++ b/src/share/classes/javax/swing/TransferHandler.java
@@ -502,7 +502,7 @@ public class TransferHandler implements Serializable {
          * the action with the source drop actions, and then compare the result
          * against the original action. For example:
          * <pre>
-         * boolean copySupported = (COPY & getSourceDropActions()) == COPY;
+         * boolean copySupported = (COPY &amp; getSourceDropActions()) == COPY;
          * </pre>
          * <p>
          * This method is only for use with drag and drop transfers.
diff --git a/src/share/classes/javax/swing/UIDefaults.java b/src/share/classes/javax/swing/UIDefaults.java
index 9f304e742..51cbd9cb5 100644
--- a/src/share/classes/javax/swing/UIDefaults.java
+++ b/src/share/classes/javax/swing/UIDefaults.java
@@ -706,7 +706,7 @@ public class UIDefaults extends Hashtable<Object,Object>
 
 
     /**
-     * Returns the L&F class that renders this component.
+     * Returns the L&amp;F class that renders this component.
      *
      * @param uiClassID a string containing the class ID
      * @return the Class object returned by
diff --git a/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java b/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java
index d1271f3fa..3ebf75751 100644
--- a/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java
+++ b/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java
@@ -25,7 +25,7 @@
 package javax.swing;
 
 /**
- * An exception that indicates the requested look & feel
+ * An exception that indicates the requested look &amp; feel
  * management classes are not present on the user's system.
  * <p>
  * <strong>Warning:</strong>
diff --git a/src/share/classes/javax/swing/ViewportLayout.java b/src/share/classes/javax/swing/ViewportLayout.java
index 11f3f151c..b72c37d39 100644
--- a/src/share/classes/javax/swing/ViewportLayout.java
+++ b/src/share/classes/javax/swing/ViewportLayout.java
@@ -25,6 +25,7 @@
 
 package javax.swing;
 
+import java.awt.AWTError;
 import java.awt.LayoutManager;
 import java.awt.Component;
 import java.awt.Container;
@@ -116,7 +117,7 @@ public class ViewportLayout implements LayoutManager, Serializable
      *
      * @param parent  the container to lay out
      *
-     * @exception AWTError  if the target isn't the container specified to the
+     * @throws AWTError if the target isn't the container specified to the
      *                      <code>BoxLayout</code> constructor
      */
     public void layoutContainer(Container parent)
diff --git a/src/share/classes/javax/swing/plaf/LayerUI.java b/src/share/classes/javax/swing/plaf/LayerUI.java
index f9a93d32e..e8eafdfda 100644
--- a/src/share/classes/javax/swing/plaf/LayerUI.java
+++ b/src/share/classes/javax/swing/plaf/LayerUI.java
@@ -35,17 +35,17 @@ import java.io.Serializable;
 
 /**
  * The base class for all {@link javax.swing.JLayer}'s UI delegates.
- * <p/>
+ * <p>
  * {@link #paint(java.awt.Graphics, javax.swing.JComponent)} method performs the
  * painting of the {@code JLayer}
  * and {@link #eventDispatched(AWTEvent, JLayer)} method is notified
  * about any {@code AWTEvent}s which have been generated by a {@code JLayer}
  * or any of its subcomponents.
- * <p/>
+ * <p>
  * The {@code LayerUI} differs from the UI delegates of the other components,
  * because it is LookAndFeel independent and is not updated by default when
  * the system LookAndFeel is changed.
- * <p/>
+ * <p>
  * The subclasses of {@code LayerUI} can either be stateless and shareable
  * by multiple {@code JLayer}s or not shareable.
  *
@@ -69,7 +69,7 @@ public class LayerUI<V extends Component>
      * Subclasses should override this method and use
      * the specified {@code Graphics} object to
      * render the content of the component.
-     * <p/>
+     * <p>
      * The default implementation paints the passed component as is.
      *
      * @param g the {@code Graphics} context in which to paint
@@ -82,7 +82,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes {@code AWTEvent}s for {@code JLayer}
      * and <b>all its descendants</b> to this {@code LayerUI} instance.
-     * <p/>
+     * <p>
      * To enable the {@code AWTEvent}s of a particular type,
      * you call {@link JLayer#setLayerEventMask}
      * in {@link #installUI(javax.swing.JComponent)}
@@ -91,7 +91,7 @@ public class LayerUI<V extends Component>
      * By default this  method calls the appropriate
      * {@code process&lt;event&nbsp;type&gt;Event}
      * method for the given class of event.
-     * <p/>
+     * <p>
      * <b>Note:</b> Events are processed only for displayable {@code JLayer}s.
      *
      * @param e the event to be dispatched
@@ -151,7 +151,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes component events occurring on the {@link JLayer}
      * or any of its subcomponents.
-     * <p/>
+     * <p>
      * This method is not called unless component events are
      * enabled for the {@code JLayer} objects, this {@code LayerUI} is set to.
      * Component events are enabled in the overridden {@link #installUI} method
@@ -183,7 +183,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes focus events occurring on the {@link JLayer}
      * or any of its subcomponents.
-     * <p/>
+     * <p>
      * This method is not called unless focus events are
      * enabled for the {@code JLayer} objects, this {@code LayerUI} is set to.
      * Focus events are enabled in the overridden {@link #installUI} method
@@ -215,7 +215,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes key events occurring on the {@link JLayer}
      * or any of its subcomponents.
-     * <p/>
+     * <p>
      * This method is not called unless key events are
      * enabled for the {@code JLayer} objects, this {@code LayerUI} is set to.
      * Key events are enabled in the overridden {@link #installUI} method
@@ -247,7 +247,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes mouse events occurring on the {@link JLayer}
      * or any of its subcomponents.
-     * <p/>
+     * <p>
      * This method is not called unless mouse events are
      * enabled for the {@code JLayer} objects, this {@code LayerUI} is set to.
      * Mouse events are enabled in the overridden {@link #installUI} method
@@ -279,7 +279,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes mouse motion event occurring on the {@link JLayer}
      * or any of its subcomponents.
-     * <p/>
+     * <p>
      * This method is not called unless mouse motion events are
      * enabled for the {@code JLayer} objects, this {@code LayerUI} is set to.
      * Mouse motion events are enabled in the overridden {@link #installUI} method
@@ -311,7 +311,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes mouse wheel event occurring on the {@link JLayer}
      * or any of its subcomponents.
-     * <p/>
+     * <p>
      * This method is not called unless mouse wheel events are
      * enabled for the {@code JLayer} objects, this {@code LayerUI} is set to.
      * Mouse wheel events are enabled in the overridden {@link #installUI} method
@@ -343,7 +343,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes input event occurring on the {@link JLayer}
      * or any of its subcomponents.
-     * <p/>
+     * <p>
      * This method is not called unless input events are
      * enabled for the {@code JLayer} objects, this {@code LayerUI} is set to.
      * Input events are enabled in the overridden {@link #installUI} method
@@ -375,7 +375,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes hierarchy event occurring on the {@link JLayer}
      * or any of its subcomponents.
-     * <p/>
+     * <p>
      * This method is not called unless hierarchy events are
      * enabled for the {@code JLayer} objects, this {@code LayerUI} is set to.
      * Hierarchy events are enabled in the overridden {@link #installUI} method
@@ -407,7 +407,7 @@ public class LayerUI<V extends Component>
     /**
      * Processes hierarchy bounds event occurring on the {@link JLayer}
      * or any of its subcomponents.
-     * <p/>
+     * <p>
      * This method is not called unless hierarchy bounds events are
      * enabled for the {@code JLayer} objects, this {@code LayerUI} is set to.
      * Hierarchy bounds events are enabled in the overridden {@link #installUI}
@@ -471,7 +471,7 @@ public class LayerUI<V extends Component>
     /**
      * Adds a PropertyChangeListener to the listener list. The listener is
      * registered for all bound properties of this class.
-     * <p/>
+     * <p>
      * If {@code listener} is {@code null},
      * no exception is thrown and no action is performed.
      *
@@ -488,7 +488,7 @@ public class LayerUI<V extends Component>
      * Removes a PropertyChangeListener from the listener list. This method
      * should be used to remove PropertyChangeListeners that were registered
      * for all bound properties of this class.
-     * <p/>
+     * <p>
      * If {@code listener} is {@code null},
      * no exception is thrown and no action is performed.
      *
@@ -519,7 +519,7 @@ public class LayerUI<V extends Component>
     /**
      * Adds a PropertyChangeListener to the listener list for a specific
      * property.
-     * <p/>
+     * <p>
      * If {@code propertyName} or {@code listener} is {@code null},
      * no exception is thrown and no action is taken.
      *
@@ -539,7 +539,7 @@ public class LayerUI<V extends Component>
      * list for a specific property. This method should be used to remove
      * {@code PropertyChangeListener}s
      * that were registered for a specific bound property.
-     * <p/>
+     * <p>
      * If {@code propertyName} or {@code listener} is {@code null},
      * no exception is thrown and no action is taken.
      *
@@ -702,7 +702,7 @@ public class LayerUI<V extends Component>
 
     /**
      * Paints the specified region in the {@code JLayer} this {@code LayerUI} is set to, immediately.
-     * <p/>
+     * <p>
      * This method is to be overridden when the dirty region needs to be changed.
      * The default implementation delegates its functionality to {@link JComponent#paintImmediately(int, int, int, int)}.
      *
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicBorders.java b/src/share/classes/javax/swing/plaf/basic/BasicBorders.java
index 19253dd71..b9773ff09 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicBorders.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicBorders.java
@@ -38,7 +38,7 @@ import java.awt.Color;
 import java.awt.Graphics;
 
 /**
- * Factory object that can vend Borders appropriate for the basic L & F.
+ * Factory object that can vend Borders appropriate for the basic L &amp; F.
  * @author Georges Saab
  * @author Amy Fowler
  */
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java b/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
index e1435a561..97ecb62ea 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
@@ -34,7 +34,7 @@ import javax.swing.plaf.*;
 import java.beans.*;
 
 /**
- * Basic L&F for a minimized window on a desktop.
+ * Basic L&amp;F for a minimized window on a desktop.
  *
  * @author David Kloba
  * @author Steve Wilson
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java b/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java
index 4b38e865f..18aa6dcd5 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java
@@ -42,7 +42,7 @@ import sun.swing.UIAction;
 import sun.awt.AppContext;
 
 /**
- * Basic L&F for a desktop.
+ * Basic L&amp;F for a desktop.
  *
  * @author Steve Wilson
  */
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
index 1f3d97edf..21be1269e 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
@@ -43,7 +43,7 @@ import sun.swing.*;
 import sun.swing.SwingUtilities2;
 
 /**
- * Basic L&F implementation of a FileChooser.
+ * Basic L&amp;F implementation of a FileChooser.
  *
  * @author Jeff Dinkins
  */
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java b/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java
index cba226a96..826b02473 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java
@@ -231,7 +231,7 @@ public class BasicGraphicsUtils
      * just like <code>g.drawString</code> would.
      * The character at index <code>underlinedIndex</code>
      * in text will be underlined. If <code>index</code> is beyond the
-     * bounds of <code>text</code> (including < 0), nothing will be
+     * bounds of <code>text</code> (including &lt; 0), nothing will be
      * underlined.
      *
      * @param g Graphics to draw with
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java b/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
index 9bcf814ba..ddf9aec99 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
@@ -35,7 +35,7 @@ import java.awt.Polygon;
 import java.io.Serializable;
 
 /**
- * Factory object that can vend Icons appropriate for the basic L & F.
+ * Factory object that can vend Icons appropriate for the basic L &amp; F.
  * <p>
  * <strong>Warning:</strong>
  * Serialized objects of this class will not be compatible with
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
index 20618e9fd..c6600b483 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
@@ -553,7 +553,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
     /**
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class PropertyChangeHandler implements PropertyChangeListener {
         // NOTE: This class exists only for backward compatability. All
@@ -567,7 +567,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
     /**
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class TitlePaneLayout implements LayoutManager {
         // NOTE: This class exists only for backward compatability. All
@@ -597,7 +597,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
     /**
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class CloseAction extends AbstractAction {
         public CloseAction() {
@@ -614,7 +614,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
     /**
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class MaximizeAction extends AbstractAction {
         public MaximizeAction() {
@@ -643,7 +643,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
     /**
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class IconifyAction extends AbstractAction {
         public IconifyAction() {
@@ -664,7 +664,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
     /**
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class RestoreAction extends AbstractAction {
         public RestoreAction() {
@@ -691,7 +691,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
     /**
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class MoveAction extends AbstractAction {
         public MoveAction() {
@@ -725,7 +725,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
     /**
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class SizeAction extends AbstractAction {
         public SizeAction() {
@@ -741,7 +741,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
     /**
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class SystemMenuBar extends JMenuBar {
         public boolean isFocusTraversable() { return false; }
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java b/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
index c2b03f1dd..f5cdaef24 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
@@ -35,7 +35,7 @@ import sun.swing.DefaultLookup;
 import sun.swing.UIAction;
 
 /**
- * A basic L&F implementation of JInternalFrame.
+ * A basic L&amp;F implementation of JInternalFrame.
  *
  * @author David Kloba
  * @author Rich Schiavi
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java b/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
index 4bbb2eba2..43fdb364a 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
@@ -50,7 +50,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
 /**
- * A Windows L&F implementation of LabelUI.  This implementation
+ * A Windows L&amp;F implementation of LabelUI.  This implementation
  * is completely static, i.e. there's only one UIView implementation
  * that's shared by all JLabel objects.
  *
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java
index a4160f962..28066de61 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java
@@ -537,7 +537,7 @@ public class BasicListUI extends ListUI
      *   <td>JList.VERTICAL_WRAP
      *   <td>If the visible row count is greater than zero, the preferredHeight
      *       is the maximum cell height * visibleRowCount. If the visible row
-     *       count is <= 0, the preferred height is either the current height
+     *       count is &lt;= 0, the preferred height is either the current height
      *       of the list, or the maximum cell height, whichever is
      *       bigger. The preferred width is than the maximum cell width *
      *       number of columns needed. Where the number of columns needs is
@@ -556,7 +556,7 @@ public class BasicListUI extends ListUI
      *       longer need 8 rows to display this, you only need 5, thus
      *       the adjustedRowCount is 5.
      *       <p>If the visible row
-     *       count is <= 0, the preferred height is dictated by the
+     *       count is &lt;= 0, the preferred height is dictated by the
      *       number of columns, which will be as many as can fit in the width
      *       of the <code>JList</code> (width / max cell width), with at
      *       least one column.  The preferred height then becomes the
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java b/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java
index df17b263e..837fb9884 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java
@@ -46,7 +46,7 @@ import javax.swing.plaf.*;
 
 
 /**
- * A default L&F implementation of MenuBarUI.  This implementation
+ * A default L&amp;F implementation of MenuBarUI.  This implementation
  * is a "combined" view/controller.
  *
  * @author Georges Saab
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java b/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java
index 01f2a4539..72b25eada 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java
@@ -39,7 +39,7 @@ import java.util.ArrayList;
 
 
 /**
- * A default L&F implementation of MenuUI.  This implementation
+ * A default L&amp;F implementation of MenuUI.  This implementation
  * is a "combined" view/controller.
  *
  * @author Georges Saab
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java b/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
index 444b903dd..4f784fa07 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -131,7 +131,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
     }
 
     /**
-      * Installs the receiver as the L&F for the passed in
+      * Installs the receiver as the L&amp;F for the passed in
       * <code>JOptionPane</code>.
       */
     public void installUI(JComponent c) {
@@ -144,7 +144,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
     }
 
     /**
-      * Removes the receiver from the L&F controller of the passed in split
+      * Removes the receiver from the L&amp;F controller of the passed in split
       * pane.
       */
     public void uninstallUI(JComponent c) {
@@ -827,7 +827,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
     }
 
     /**
-     * Returns true, basic L&F wants all the buttons to have the same
+     * Returns true, basic L&amp;F wants all the buttons to have the same
      * width.
      */
     protected boolean getSizeButtonsToSameWidth() {
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java b/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
index 9d28306df..41f4f89f5 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
@@ -34,7 +34,7 @@ import java.awt.Rectangle;
 import javax.swing.plaf.ComponentUI;
 
 /**
- * A Basic L&F implementation of PopupMenuSeparatorUI.  This implementation
+ * A Basic L&amp;F implementation of PopupMenuSeparatorUI.  This implementation
  * is a "combined" view/controller.
  *
  * @author Jeff Shapiro
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java b/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
index 371d91be8..e7d739a73 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
@@ -53,7 +53,7 @@ import sun.swing.UIAction;
 import sun.awt.AppContext;
 
 /**
- * A Windows L&F implementation of PopupMenuUI.  This implementation
+ * A Windows L&amp;F implementation of PopupMenuUI.  This implementation
  * is a "combined" view/controller.
  *
  * @author Georges Saab
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java b/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
index 09a45f876..94e47d043 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
@@ -38,7 +38,7 @@ import java.io.Serializable;
 import sun.swing.DefaultLookup;
 
 /**
- * A Basic L&F implementation of ProgressBarUI.
+ * A Basic L&amp;F implementation of ProgressBarUI.
  *
  * @author Michael C. Albers
  * @author Kathy Walrath
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java b/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
index 726b41db0..355f5fce2 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
@@ -45,7 +45,7 @@ import java.awt.Graphics;
 import java.awt.event.*;
 
 /**
- * A default L&F implementation of ScrollPaneUI.
+ * A default L&amp;F implementation of ScrollPaneUI.
  *
  * @author Hans Muller
  */
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java b/src/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java
index cbf7102fb..cd53a7c8b 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java
@@ -36,7 +36,7 @@ import javax.swing.plaf.SeparatorUI;
 
 
 /**
- * A Basic L&F implementation of SeparatorUI.  This implementation
+ * A Basic L&amp;F implementation of SeparatorUI.  This implementation
  * is a "combined" view/controller.
  *
  * @author Georges Saab
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java b/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
index 2c9b803d9..7ca5c22cc 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
@@ -39,7 +39,7 @@ import sun.swing.UIAction;
 
 
 /**
- * A Basic L&F implementation of SliderUI.
+ * A Basic L&amp;F implementation of SliderUI.
  *
  * @author Tom Santos
  */
@@ -1542,7 +1542,7 @@ public class BasicSliderUI extends SliderUI{
      * Data model listener.
      *
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class ChangeHandler implements ChangeListener {
         // NOTE: This class exists only for backward compatability. All
@@ -1561,7 +1561,7 @@ public class BasicSliderUI extends SliderUI{
      * Track mouse movements.
      *
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class TrackListener extends MouseInputAdapter {
         protected transient int offset;
@@ -1805,7 +1805,7 @@ public class BasicSliderUI extends SliderUI{
      * Scroll-event listener.
      *
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class ScrollListener implements ActionListener {
         // changed this class to public to avoid bogus IllegalAccessException
@@ -1849,7 +1849,7 @@ public class BasicSliderUI extends SliderUI{
      * Listener for resizing events.
      * <p>
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class ComponentHandler extends ComponentAdapter {
         // NOTE: This class exists only for backward compatability. All
@@ -1865,7 +1865,7 @@ public class BasicSliderUI extends SliderUI{
      * Focus-change listener.
      * <p>
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class FocusHandler implements FocusListener {
         // NOTE: This class exists only for backward compatability. All
@@ -1892,7 +1892,7 @@ public class BasicSliderUI extends SliderUI{
      * Please refer to the key bindings specification for further details.
      * <p>
      * This class should be treated as a &quot;protected&quot; inner class.
-     * Instantiate it only within subclasses of <Foo>.
+     * Instantiate it only within subclasses of <code>Foo</code>.
      */
     public class ActionScroller extends AbstractAction {
         // NOTE: This class exists only for backward compatability. All
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java b/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
index 3920ae8d8..ba9ef818a 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
@@ -44,7 +44,7 @@ import sun.swing.SwingUtilities2;
 
 
 /**
- * A Basic L&F implementation of the SplitPaneUI.
+ * A Basic L&amp;F implementation of the SplitPaneUI.
  *
  * @author Scott Violet
  * @author Steve Wilson
@@ -1060,7 +1060,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
 
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public void paint(Graphics g, JComponent jc) {
         if (!painted && splitPane.getDividerLocation()<0) {
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index 495edfb14..b239cd702 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -43,7 +43,7 @@ import sun.swing.DefaultLookup;
 import sun.swing.UIAction;
 
 /**
- * A Basic L&F implementation of TabbedPaneUI.
+ * A Basic L&amp;F implementation of TabbedPaneUI.
  *
  * @author Amy Fowler
  * @author Philip Milne
@@ -669,7 +669,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants {
      *
      * @param tab index of tab to get baseline for
      * @exception IndexOutOfBoundsException if index is out of range
-     *            (index < 0 || index >= tab count)
+     *            (index &lt; 0 || index &gt;= tab count)
      * @return baseline or a value &lt; 0 indicating there is no reasonable
      *                  baseline
      * @since 1.6
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java b/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
index a5c67b324..2324f0715 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
@@ -37,7 +37,7 @@ import javax.swing.plaf.basic.BasicSeparatorUI;
 
 
 /**
- * A Basic L&F implementation of ToolBarSeparatorUI.  This implementation
+ * A Basic L&amp;F implementation of ToolBarSeparatorUI.  This implementation
  * is a "combined" view/controller.
  * <p>
  *
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java b/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
index 1d5f535a9..7f1d05af8 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
@@ -42,7 +42,7 @@ import sun.swing.UIAction;
 
 
 /**
- * A Basic L&F implementation of ToolBarUI.  This implementation
+ * A Basic L&amp;F implementation of ToolBarUI.  This implementation
  * is a "combined" view/controller.
  * <p>
  *
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java b/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
index cb7d97848..8309dd6aa 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
@@ -40,7 +40,7 @@ import javax.swing.text.View;
 
 
 /**
- * Standard tool tip L&F.
+ * Standard tool tip L&amp;F.
  * <p>
  *
  * @author Dave Moore
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
index b91deec48..de739dc1e 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
@@ -49,7 +49,7 @@ import sun.swing.DefaultLookup;
 import sun.swing.UIAction;
 
 /**
- * The basic L&F for a hierarchical data structure.
+ * The basic L&amp;F for a hierarchical data structure.
  * <p>
  *
  * @author Scott Violet
diff --git a/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java b/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java
index b57d8764c..b8ee3cfba 100644
--- a/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java
+++ b/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java
@@ -34,7 +34,7 @@ import java.awt.Dimension;
 /**
  * The default layout manager for Popup menus and menubars.  This
  * class is an extension of BoxLayout which adds the UIResource tag
- * so that pluggable L&Fs can distinguish it from user-installed
+ * so that pluggable L&amp;Fs can distinguish it from user-installed
  * layout managers on menus.
  *
  * @author Georges Saab
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalBorders.java b/src/share/classes/javax/swing/plaf/metal/MetalBorders.java
index 60cc845fb..36a99ac8c 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalBorders.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalBorders.java
@@ -43,7 +43,7 @@ import sun.swing.StringUIClientPropertyKey;
 
 
 /**
- * Factory object that can vend Borders appropriate for the metal L & F.
+ * Factory object that can vend Borders appropriate for the metal L &amp; F.
  * @author Steve Wilson
  */
 
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
index 07a57f003..8d4e9f451 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
@@ -46,7 +46,7 @@ import sun.awt.shell.ShellFolder;
 import sun.swing.*;
 
 /**
- * Metal L&F implementation of a FileChooser.
+ * Metal L&amp;F implementation of a FileChooser.
  *
  * @author Jeff Dinkins
  */
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java b/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
index 8b6a5cd33..bb200c1be 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
@@ -37,7 +37,7 @@ import java.awt.*;
 
 
 /**
- * A Windows L&F implementation of LabelUI.  This implementation
+ * A Windows L&amp;F implementation of LabelUI.  This implementation
  * is completely static, i.e. there's only one UIView implementation
  * that's shared by all JLabel objects.
  *
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java b/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
index 23debc1e6..0ca32d24a 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -291,8 +291,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
      * Populates {@code table} with system colors. The following values are
      * added to {@code table}:
      * <table border="1" cellpadding="1" cellspacing="0"
-     *         summary="Metal's system color mapping"
-     *         valign="top" >
+     *         summary="Metal's system color mapping">
      *  <tr valign="top"  align="left">
      *    <th bgcolor="#CCCCFF" align="left">Key
      *    <th bgcolor="#CCCCFF" align="left">Value
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java b/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java
index a2a5b8065..74583f220 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java
@@ -35,7 +35,7 @@ import javax.swing.plaf.*;
 
 
 /**
- * A Metal L&F implementation of PopupMenuSeparatorUI.  This implementation
+ * A Metal L&amp;F implementation of PopupMenuSeparatorUI.  This implementation
  * is a "combined" view/controller.
  *
  * @author Jeff Shapiro
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java b/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
index d45161321..b4eadab6e 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
@@ -37,7 +37,7 @@ import java.awt.event.*;
 
 
 /**
- * A Metal L&F implementation of ScrollPaneUI.
+ * A Metal L&amp;F implementation of ScrollPaneUI.
  * <p>
  * <strong>Warning:</strong>
  * Serialized objects of this class will not be compatible with
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java b/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
index 58631c134..07d723eb5 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
@@ -36,7 +36,7 @@ import javax.swing.plaf.basic.BasicSeparatorUI;
 
 
 /**
- * A Metal L&F implementation of SeparatorUI.  This implementation
+ * A Metal L&amp;F implementation of SeparatorUI.  This implementation
  * is a "combined" view/controller.
  * <p>
  * <strong>Warning:</strong>
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java b/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
index 577ee0119..99d078c4d 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
@@ -37,7 +37,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 
 /**
- * A Java L&F implementation of SliderUI.
+ * A Java L&amp;F implementation of SliderUI.
  * <p>
  * <strong>Warning:</strong>
  * Serialized objects of this class will not be compatible with
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java b/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
index 1602ad6fe..667ccc5c3 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
@@ -776,7 +776,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI {
     }
 
     /**
-     * Overridden to do nothing for the Java L&F.
+     * Overridden to do nothing for the Java L&amp;F.
      */
     protected int getTabLabelShiftX( int tabPlacement, int tabIndex, boolean isSelected ) {
         return 0;
@@ -784,7 +784,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI {
 
 
     /**
-     * Overridden to do nothing for the Java L&F.
+     * Overridden to do nothing for the Java L&amp;F.
      */
     protected int getTabLabelShiftY( int tabPlacement, int tabIndex, boolean isSelected ) {
         return 0;
diff --git a/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java b/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
index 5bac3c922..914502e32 100644
--- a/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
@@ -38,7 +38,7 @@ import javax.swing.text.View;
 
 
 /**
- * A Metal L&F extension of BasicToolTipUI.
+ * A Metal L&amp;F extension of BasicToolTipUI.
  * <p>
  * <strong>Warning:</strong>
  * Serialized objects of this class will not be compatible with
diff --git a/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java b/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
index e79e337a7..355e68e95 100644
--- a/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
+++ b/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
@@ -137,7 +137,7 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
     protected AbstractRegionPainter() { }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     @Override
     public final void paint(Graphics2D g, JComponent c, int w, int h) {
@@ -535,11 +535,11 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
          * @param maxH The maximium scale in the horizontal direction to use before punting and redrawing from scratch.
          *             For example, if maxH is 2, then we will attempt to scale any cached images up to 2x the canvas
          *             width before redrawing from scratch. Reasonable maxH values may improve painting performance.
-         *             If set too high, then you may get poor looking graphics at higher zoom levels. Must be >= 1.
+         *             If set too high, then you may get poor looking graphics at higher zoom levels. Must be &gt;= 1.
          * @param maxV The maximium scale in the vertical direction to use before punting and redrawing from scratch.
          *             For example, if maxV is 2, then we will attempt to scale any cached images up to 2x the canvas
          *             height before redrawing from scratch. Reasonable maxV values may improve painting performance.
-         *             If set too high, then you may get poor looking graphics at higher zoom levels. Must be >= 1.
+         *             If set too high, then you may get poor looking graphics at higher zoom levels. Must be &gt;= 1.
          */
         public PaintContext(Insets insets, Dimension canvasSize, boolean inverted,
                             CacheMode cacheMode, double maxH, double maxV) {
diff --git a/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java b/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
index 402a68859..a8aa256e4 100644
--- a/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
+++ b/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
@@ -124,7 +124,7 @@ public class NimbusLookAndFeel extends SynthLookAndFeel {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     @Override public UIDefaults getDefaults() {
         if (uiDefaults == null){
@@ -261,7 +261,7 @@ public class NimbusLookAndFeel extends SynthLookAndFeel {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      * @return {@code true}
      */
     @Override public boolean shouldUpdateStyleOnAncestorChanged() {
@@ -269,7 +269,7 @@ public class NimbusLookAndFeel extends SynthLookAndFeel {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * <p>Overridden to return {@code true} when one of the following
      * properties change:
diff --git a/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java b/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
index 89a28c2ae..fcb8cdb6a 100644
--- a/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
+++ b/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
@@ -218,7 +218,7 @@ public final class NimbusStyle extends SynthStyle {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * Overridden to cause this style to populate itself with data from
      * UIDefaults, if necessary.
@@ -472,7 +472,7 @@ public final class NimbusStyle extends SynthStyle {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * Overridden to cause this style to populate itself with data from
      * UIDefaults, if necessary.
@@ -519,7 +519,7 @@ public final class NimbusStyle extends SynthStyle {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * <p>Overridden to cause this style to populate itself with data from
      * UIDefaults, if necessary.</p>
@@ -562,7 +562,7 @@ public final class NimbusStyle extends SynthStyle {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * Overridden to cause this style to populate itself with data from
      * UIDefaults, if necessary. If a value named "font" is not found in
@@ -590,7 +590,7 @@ public final class NimbusStyle extends SynthStyle {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * Returns the SynthPainter for this style, which ends up delegating to
      * the Painters installed in this style.
@@ -600,7 +600,7 @@ public final class NimbusStyle extends SynthStyle {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * Overridden to cause this style to populate itself with data from
      * UIDefaults, if necessary. If opacity is not specified in UI defaults,
@@ -616,7 +616,7 @@ public final class NimbusStyle extends SynthStyle {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * <p>Overridden to cause this style to populate itself with data from
      * UIDefaults, if necessary.</p>
@@ -628,7 +628,7 @@ public final class NimbusStyle extends SynthStyle {
      * Button.opacity
      * Button.Enabled.foreground
      * Button.Enabled+Selected.background
-     * </pre></p>
+     * </pre>
      *
      * <p>In this example, suppose you were in the Enabled+Selected state and
      * searched for "foreground". In this case, we first check for
diff --git a/src/share/classes/javax/swing/plaf/synth/Region.java b/src/share/classes/javax/swing/plaf/synth/Region.java
index 21b541968..a98b39137 100644
--- a/src/share/classes/javax/swing/plaf/synth/Region.java
+++ b/src/share/classes/javax/swing/plaf/synth/Region.java
@@ -62,10 +62,10 @@ import javax.swing.UIDefaults;
  * The following <a href="doc-files/synthFileFormat.html">xml</a>
  * accomplishes the same thing:
  * <pre>
- * &lt;style id="splitPaneStyle">
+ * &lt;style id="splitPaneStyle"&gt;
  *   ...
- * &lt;/style>
- * &lt;bind style="splitPaneStyle" type="region" key="SplitPane"/>
+ * &lt;/style&gt;
+ * &lt;bind style="splitPaneStyle" type="region" key="SplitPane"/&gt;
  * </pre>
  *
  * @since 1.5
diff --git a/src/share/classes/javax/swing/text/html/HTMLEditorKit.java b/src/share/classes/javax/swing/text/html/HTMLEditorKit.java
index fd79af9b4..a2b3bb158 100644
--- a/src/share/classes/javax/swing/text/html/HTMLEditorKit.java
+++ b/src/share/classes/javax/swing/text/html/HTMLEditorKit.java
@@ -55,7 +55,6 @@ import java.lang.ref.*;
  * an effect upon the way that HTML is modeled.  These
  * have influenced its design in a substantial way.
  * <dl>
- * <p>
  * <dt>
  * Support editing
  * <dd>
diff --git a/src/share/classes/javax/swing/text/html/ImageView.java b/src/share/classes/javax/swing/text/html/ImageView.java
index b4d15055a..99f7d4dc0 100644
--- a/src/share/classes/javax/swing/text/html/ImageView.java
+++ b/src/share/classes/javax/swing/text/html/ImageView.java
@@ -554,8 +554,8 @@ public class ImageView extends View {
      * Sets the size of the view.  This should cause
      * layout of the view if it has any layout duties.
      *
-     * @param width the width >= 0
-     * @param height the height >= 0
+     * @param width the width &gt;= 0
+     * @param height the height &gt;= 0
      */
     public void setSize(float width, float height) {
         sync();
diff --git a/src/share/classes/javax/swing/text/html/InlineView.java b/src/share/classes/javax/swing/text/html/InlineView.java
index 3da43c340..810fdf9a0 100644
--- a/src/share/classes/javax/swing/text/html/InlineView.java
+++ b/src/share/classes/javax/swing/text/html/InlineView.java
@@ -130,10 +130,10 @@ public class InlineView extends LabelView {
      *
      * @param axis may be either View.X_AXIS or View.Y_AXIS
      * @param pos the potential location of the start of the
-     *   broken view >= 0.  This may be useful for calculating tab
+     *   broken view &gt;= 0.  This may be useful for calculating tab
      *   positions.
      * @param len specifies the relative length from <em>pos</em>
-     *   where a potential break is desired >= 0.
+     *   where a potential break is desired &gt;= 0.
      * @return the weight, which should be a value between
      *   ForcedBreakWeight and BadBreakWeight.
      * @see LabelView
@@ -162,14 +162,14 @@ public class InlineView extends LabelView {
      * @param axis may be either <code>View.X_AXIS</code> or
      *          <code>View.Y_AXIS</code>
      * @param offset the location in the document model
-     *   that a broken fragment would occupy >= 0.  This
+     *   that a broken fragment would occupy &gt;= 0.  This
      *   would be the starting offset of the fragment
      *   returned
      * @param pos the position along the axis that the
-     *  broken view would occupy >= 0.  This may be useful for
+     *  broken view would occupy &gt;= 0.  This may be useful for
      *  things like tab calculations
      * @param len specifies the distance along the axis
-     *  where a potential break is desired >= 0
+     *  where a potential break is desired &gt;= 0
      * @return the fragment of the view that represents the
      *  given span.
      * @since 1.5
diff --git a/src/share/classes/javax/swing/text/html/StyleSheet.java b/src/share/classes/javax/swing/text/html/StyleSheet.java
index f86bbc1b0..576b04768 100644
--- a/src/share/classes/javax/swing/text/html/StyleSheet.java
+++ b/src/share/classes/javax/swing/text/html/StyleSheet.java
@@ -74,7 +74,7 @@ import javax.swing.text.*;
  * is stored to translate the context of an element to a
  * rule quickly.  The following code fragment will display
  * the named styles, and therefore the CSS rules contained.
- * <code><pre>
+ * <pre><code>
  * &nbsp;
  * &nbsp; import java.util.*;
  * &nbsp; import javax.swing.text.*;
@@ -97,7 +97,7 @@ import javax.swing.text.*;
  * &nbsp;     }
  * &nbsp; }
  * &nbsp;
- * </pre></code>
+ * </code></pre>
  * <p>
  * The semantics for when a CSS style should overide visual attributes
  * defined by an element are not well defined. For example, the html
diff --git a/src/share/classes/javax/swing/text/html/parser/ContentModel.java b/src/share/classes/javax/swing/text/html/parser/ContentModel.java
index a60f225b7..4ca2c583e 100644
--- a/src/share/classes/javax/swing/text/html/parser/ContentModel.java
+++ b/src/share/classes/javax/swing/text/html/parser/ContentModel.java
@@ -42,7 +42,7 @@ import java.io.*;
  */
 public final class ContentModel implements Serializable {
     /**
-     * Type. Either '*', '?', '+', ',', '|', '&'.
+     * Type. Either '*', '?', '+', ',', '|', '&amp;'.
      */
     public int type;
 
@@ -52,7 +52,7 @@ public final class ContentModel implements Serializable {
     public Object content;
 
     /**
-     * The next content model (in a ',', '|' or '&' expression).
+     * The next content model (in a ',', '|' or '&amp;' expression).
      */
     public ContentModel next;
 
diff --git a/src/share/classes/javax/swing/text/html/parser/DocumentParser.java b/src/share/classes/javax/swing/text/html/parser/DocumentParser.java
index 3ca4802b6..7db408fde 100644
--- a/src/share/classes/javax/swing/text/html/parser/DocumentParser.java
+++ b/src/share/classes/javax/swing/text/html/parser/DocumentParser.java
@@ -48,8 +48,8 @@ import java.net.*;
  *     <li><i>handleStartTag(head, ...)</i></li>
  *     <li><i>handleEndTag(head)</i></li>
  *     <li><i>handleStartTag(body, ...)</i></li>
- *     <li>handleStartTag(p, ...)</i></li>
- *     <li>handleText(...)</li>
+ *     <li><i>handleStartTag(p, ...)</i></li>
+ *     <li><i>handleText(...)</i></li>
  *     <li><i>handleEndTag(p)</i></li>
  *     <li><i>handleEndTag(body)</i></li>
  *     <li><i>handleEndTag(html)</i></li>
diff --git a/src/share/classes/javax/swing/text/html/parser/Parser.java b/src/share/classes/javax/swing/text/html/parser/Parser.java
index d511109c1..5c9b21309 100644
--- a/src/share/classes/javax/swing/text/html/parser/Parser.java
+++ b/src/share/classes/javax/swing/text/html/parser/Parser.java
@@ -58,12 +58,12 @@ import sun.misc.MessageUtils;
  * space should be used here, but I am using &amp;nbsp to force the space to
  * be displayed):
  * <p>
- * '&lt;b>blah&nbsp;&lt;i>&nbsp;&lt;strike>&nbsp;foo' which can be treated as:
- * '&lt;b>blah&nbsp;&lt;i>&lt;strike>foo'
+ * '&lt;b&gt;blah&nbsp;&lt;i&gt;&nbsp;&lt;strike&gt;&nbsp;foo' which can be treated as:
+ * '&lt;b&gt;blah&nbsp;&lt;i&gt;&lt;strike&gt;foo'
  * <p>as well as:
- * '&lt;p>&lt;a href="xx">&nbsp;&lt;em>Using&lt;/em>&lt;/a>&lt;/p>'
+ * '&lt;p&gt;&lt;a href="xx"&gt;&nbsp;&lt;em&gt;Using&lt;/em&gt;&lt;/a&gt;&lt;/p&gt;'
  * which appears to be treated as:
- * '&lt;p>&lt;a href="xx">&lt;em>Using&lt;/em>&lt;/a>&lt;/p>'
+ * '&lt;p&gt;&lt;a href="xx"&gt;&lt;em&gt;Using&lt;/em&gt;&lt;/a&gt;&lt;/p&gt;'
  * <p>
  * If <code>strict</code> is false, when a tag that breaks flow,
  * (<code>TagElement.breaksFlows</code>) or trailing whitespace is
diff --git a/src/share/classes/javax/swing/tree/AbstractLayoutCache.java b/src/share/classes/javax/swing/tree/AbstractLayoutCache.java
index 28f18b294..8db55e672 100644
--- a/src/share/classes/javax/swing/tree/AbstractLayoutCache.java
+++ b/src/share/classes/javax/swing/tree/AbstractLayoutCache.java
@@ -60,7 +60,7 @@ public abstract class AbstractLayoutCache implements RowMapper {
     protected boolean            rootVisible;
 
     /**
-      * Height to use for each row.  If this is <= 0 the renderer will be
+      * Height to use for each row.  If this is &lt;= 0 the renderer will be
       * used to determine the height for each row.
       */
     protected int                rowHeight;
diff --git a/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java b/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
index b6427bcb7..5745a3c3d 100644
--- a/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
@@ -430,7 +430,7 @@ public class DefaultTreeCellEditor implements ActionListener, TreeCellEditor,
 
     /**
      * Returns true if <code>event</code> is <code>null</code>,
-     * or it is a <code>MouseEvent</code> with a click count > 2
+     * or it is a <code>MouseEvent</code> with a click count &gt; 2
      * and <code>inHitRegion</code> returns true.
      * @param event the event being studied
      */
@@ -448,7 +448,7 @@ public class DefaultTreeCellEditor implements ActionListener, TreeCellEditor,
     /**
      * Returns true if the passed in location is a valid mouse location
      * to start editing from. This is implemented to return false if
-     * <code>x</code> is <= the width of the icon and icon gap displayed
+     * <code>x</code> is &lt;= the width of the icon and icon gap displayed
      * by the renderer. In other words this returns true if the user
      * clicks over the text part displayed by the renderer, and false
      * otherwise.
diff --git a/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java b/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
index d8b261c3f..d4b582608 100644
--- a/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -60,8 +60,7 @@ import sun.swing.DefaultLookup;
  * that have a value of type {@code UIResource} are refreshed from the
  * defaults table. The following table lists the mapping between
  * {@code DefaultTreeCellRenderer} property and defaults table key:
- * <table border="1" cellpadding="1" cellspacing="0"
- *         valign="top" >
+ * <table border="1" cellpadding="1" cellspacing="0" summary="">
  *   <tr valign="top"  align="left">
  *     <th bgcolor="#CCCCFF" align="left">Property:
  *     <th bgcolor="#CCCCFF" align="left">Key:
diff --git a/src/share/classes/javax/swing/tree/DefaultTreeModel.java b/src/share/classes/javax/swing/tree/DefaultTreeModel.java
index 3d09ffef7..794f11baa 100644
--- a/src/share/classes/javax/swing/tree/DefaultTreeModel.java
+++ b/src/share/classes/javax/swing/tree/DefaultTreeModel.java
@@ -164,8 +164,8 @@ public class DefaultTreeModel implements Serializable, TreeModel {
      * Returns the child of <I>parent</I> at index <I>index</I> in the parent's
      * child array.  <I>parent</I> must be a node previously obtained from
      * this data source. This should not return null if <i>index</i>
-     * is a valid index for <i>parent</i> (that is <i>index</i> >= 0 &&
-     * <i>index</i> < getChildCount(<i>parent</i>)).
+     * is a valid index for <i>parent</i> (that is <i>index</i> &gt;= 0 &amp;&amp;
+     * <i>index</i> &lt; getChildCount(<i>parent</i>)).
      *
      * @param   parent  a node in the tree, obtained from this data source
      * @return  the child of <I>parent</I> at index <I>index</I>
diff --git a/src/share/classes/javax/swing/tree/TreeCellRenderer.java b/src/share/classes/javax/swing/tree/TreeCellRenderer.java
index 8ff93d454..8c352cb1f 100644
--- a/src/share/classes/javax/swing/tree/TreeCellRenderer.java
+++ b/src/share/classes/javax/swing/tree/TreeCellRenderer.java
@@ -59,8 +59,8 @@ public interface TreeCellRenderer {
      * <pre>
      *     JTree.DropLocation dropLocation = tree.getDropLocation();
      *     if (dropLocation != null
-     *             && dropLocation.getChildIndex() == -1
-     *             && tree.getRowForPath(dropLocation.getPath()) == row) {
+     *             &amp;&amp; dropLocation.getChildIndex() == -1
+     *             &amp;&amp; tree.getRowForPath(dropLocation.getPath()) == row) {
      *
      *         // this row represents the current drop location
      *         // so render it specially, perhaps with a different color
diff --git a/src/share/classes/javax/swing/tree/TreeModel.java b/src/share/classes/javax/swing/tree/TreeModel.java
index 105918bf6..b5a998c55 100644
--- a/src/share/classes/javax/swing/tree/TreeModel.java
+++ b/src/share/classes/javax/swing/tree/TreeModel.java
@@ -76,8 +76,8 @@ public interface TreeModel
      * child array.  <code>parent</code> must be a node previously obtained
      * from this data source. This should not return <code>null</code>
      * if <code>index</code>
-     * is a valid index for <code>parent</code> (that is <code>index >= 0 &&
-     * index < getChildCount(parent</code>)).
+     * is a valid index for <code>parent</code> (that is <code>index &gt;= 0 &amp;&amp;
+     * index &lt; getChildCount(parent</code>)).
      *
      * @param   parent  a node in the tree, obtained from this data source
      * @return  the child of <code>parent</code> at index <code>index</code>
diff --git a/src/share/classes/javax/swing/undo/UndoManager.java b/src/share/classes/javax/swing/undo/UndoManager.java
index 968529cda..0d9553fd3 100644
--- a/src/share/classes/javax/swing/undo/UndoManager.java
+++ b/src/share/classes/javax/swing/undo/UndoManager.java
@@ -57,9 +57,9 @@ import java.util.*;
  * and italicized are insignificant.
  * <p>
  * <a name="figure1"></a>
- * <table border=0>
+ * <table border=0 summary="">
  * <tr><td>
- *     <img src="doc-files/UndoManager-1.gif">
+ *     <img src="doc-files/UndoManager-1.gif" alt="">
  * <tr><td align=center>Figure 1
  * </table>
  * <p>
@@ -70,9 +70,9 @@ import java.util.*;
  * figure.
  * <p>
  * <a name="figure2"></a>
- * <table border=0>
+ * <table border=0 summary="">
  * <tr><td>
- *     <img src="doc-files/UndoManager-2.gif">
+ *     <img src="doc-files/UndoManager-2.gif" alt="">
  * <tr><td align=center>Figure 2
  * </table>
  * <p>
@@ -82,9 +82,9 @@ import java.util.*;
  * next edit to 0, as shown in the following figure.
  * <p>
  * <a name="figure3"></a>
- * <table border=0>
+ * <table border=0 summary="">
  * <tr><td>
- *     <img src="doc-files/UndoManager-3.gif">
+ *     <img src="doc-files/UndoManager-3.gif" alt="">
  * <tr><td align=center>Figure 3
  * </table>
  * <p>
@@ -108,9 +108,9 @@ import java.util.*;
  * figure.
  * <p>
  * <a name="figure4"></a>
- * <table border=0>
+ * <table border=0 summary="">
  * <tr><td>
- *     <img src="doc-files/UndoManager-4.gif">
+ *     <img src="doc-files/UndoManager-4.gif" alt="">
  * <tr><td align=center>Figure 4
  * </table>
  * <p>
-- 
GitLab