diff --git a/jdk/src/share/classes/javax/swing/JComboBox.java b/jdk/src/share/classes/javax/swing/JComboBox.java
index 937c13376cc..ceec992b31d 100644
--- a/jdk/src/share/classes/javax/swing/JComboBox.java
+++ b/jdk/src/share/classes/javax/swing/JComboBox.java
@@ -65,7 +65,7 @@ import javax.accessibility.*;
  * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/combobox.html">How to Use Combo Boxes</a>
  * in <a href="http://docs.oracle.com/javase/tutorial/"><em>The Java Tutorial</em></a>
  * for further information.
- * <p>
+ *
  * @see ComboBoxModel
  * @see DefaultComboBoxModel
  *
diff --git a/jdk/src/share/classes/javax/swing/JFrame.java b/jdk/src/share/classes/javax/swing/JFrame.java
index 2077eb76249..c773a3b66a8 100644
--- a/jdk/src/share/classes/javax/swing/JFrame.java
+++ b/jdk/src/share/classes/javax/swing/JFrame.java
@@ -123,7 +123,7 @@ public class JFrame  extends Frame implements WindowConstants,
      * has this set as the close operation and is closed in an applet,
      * a <code>SecurityException</code> may be thrown.
      * It is recommended you only use this in an application.
-     * <p>
+     *
      * @since 1.3
      */
     public static final int EXIT_ON_CLOSE = 3;
diff --git a/jdk/src/share/classes/javax/swing/JList.java b/jdk/src/share/classes/javax/swing/JList.java
index 6503887247e..8088396fcc3 100644
--- a/jdk/src/share/classes/javax/swing/JList.java
+++ b/jdk/src/share/classes/javax/swing/JList.java
@@ -260,7 +260,7 @@ import static sun.swing.SwingUtilities2.Section.*;
  * See <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/list.html">How to Use Lists</a>
  * in <a href="http://docs.oracle.com/javase/tutorial/"><em>The Java Tutorial</em></a>
  * for further documentation.
- * <p>
+ *
  * @see ListModel
  * @see AbstractListModel
  * @see DefaultListModel
diff --git a/jdk/src/share/classes/javax/swing/JOptionPane.java b/jdk/src/share/classes/javax/swing/JOptionPane.java
index 58d38669e9c..e3458d037c0 100644
--- a/jdk/src/share/classes/javax/swing/JOptionPane.java
+++ b/jdk/src/share/classes/javax/swing/JOptionPane.java
@@ -259,7 +259,7 @@ import static javax.swing.ClientPropertyKey.PopupFactory_FORCE_HEAVYWEIGHT_POPUP
  *             "Choose one", "Input",
  *             JOptionPane.INFORMATION_MESSAGE, null,
  *             possibleValues, possibleValues[0]);
- * </pre><p>
+ * </pre>
  * </dl>
  * <b>Direct Use:</b><br>
  * To create and use an <code>JOptionPane</code> directly, the
diff --git a/jdk/src/share/classes/javax/swing/JTable.java b/jdk/src/share/classes/javax/swing/JTable.java
index e811fa80d5a..089da6c4e30 100644
--- a/jdk/src/share/classes/javax/swing/JTable.java
+++ b/jdk/src/share/classes/javax/swing/JTable.java
@@ -661,7 +661,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * with the following code:
      *
      * <pre>((Vector)rowData.elementAt(1)).elementAt(5);</pre>
-     * <p>
+     *
      * @param rowData           the data for the new table
      * @param columnNames       names of each column
      */
@@ -678,7 +678,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * <pre> rowData[1][5]; </pre>
      * <p>
      * All rows must be of the same length as <code>columnNames</code>.
-     * <p>
+     *
      * @param rowData           the data for the new table
      * @param columnNames       names of each column
      */
diff --git a/jdk/src/share/classes/javax/swing/RowSorter.java b/jdk/src/share/classes/javax/swing/RowSorter.java
index bd375a779f6..5ca809e82a1 100644
--- a/jdk/src/share/classes/javax/swing/RowSorter.java
+++ b/jdk/src/share/classes/javax/swing/RowSorter.java
@@ -42,10 +42,10 @@ import java.util.*;
  * <p>
  * The view invokes the following methods on the <code>RowSorter</code>:
  * <ul>
- * <li><code>toggleSortOrder</code> &#151; The view invokes this when the
+ * <li><code>toggleSortOrder</code> &#8212; The view invokes this when the
  *     appropriate user gesture has occurred to trigger a sort.  For example,
  *     the user clicked a column header in a table.
- * <li>One of the model change methods &#151; The view invokes a model
+ * <li>One of the model change methods &#8212; The view invokes a model
  *     change method when the underlying model
  *     has changed.  There may be order dependencies in how the events are
  *     delivered, so a <code>RowSorter</code> should not update its mapping
@@ -59,10 +59,10 @@ import java.util.*;
  * <code>RowSorter</code> provides notification of changes by way of
  * <code>RowSorterListener</code>.  Two types of notification are sent:
  * <ul>
- * <li><code>RowSorterEvent.Type.SORT_ORDER_CHANGED</code> &#151; notifies
+ * <li><code>RowSorterEvent.Type.SORT_ORDER_CHANGED</code> &#8212; notifies
  *     listeners that the sort order has changed.  This is typically followed
  *     by a notification that the sort has changed.
- * <li><code>RowSorterEvent.Type.SORTED</code> &#151; notifies listeners that
+ * <li><code>RowSorterEvent.Type.SORTED</code> &#8212; notifies listeners that
  *     the mapping maintained by the <code>RowSorter</code> has changed in
  *     some way.
  * </ul>
diff --git a/jdk/src/share/classes/javax/swing/SpringLayout.java b/jdk/src/share/classes/javax/swing/SpringLayout.java
index fdaa55cf339..c03090242c4 100644
--- a/jdk/src/share/classes/javax/swing/SpringLayout.java
+++ b/jdk/src/share/classes/javax/swing/SpringLayout.java
@@ -991,7 +991,7 @@ public class SpringLayout implements LayoutManager2 {
      * If <code>constraints</code> is an instance of
      * <code>SpringLayout.Constraints</code>,
      * associates the constraints with the specified component.
-     * <p>
+     *
      * @param   component the component being added
      * @param   constraints the component's constraints
      *
@@ -1029,7 +1029,7 @@ public class SpringLayout implements LayoutManager2 {
      * <pre>
      *     value(e1, c1) = value(e2, c2) + pad</pre>
      * to take place during all subsequent layout operations.
-     * <p>
+     *
      * @param   e1 the edge of the dependent
      * @param   c1 the component of the dependent
      * @param   pad the fixed distance between dependent and anchor
@@ -1056,7 +1056,7 @@ public class SpringLayout implements LayoutManager2 {
      * <code>SpringLayout.VERTICAL_CENTER</code>,
      * <code>SpringLayout.HORIZONTAL_CENTER</code> or
      * <code>SpringLayout.BASELINE</code>.
-     * <p>
+     *
      * @param   e1 the edge of the dependent
      * @param   c1 the component of the dependent
      * @param   s the spring linking dependent and anchor
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
index 252ef03a13a..34595149b95 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
@@ -325,7 +325,7 @@ public class BasicButtonUI extends ButtonUI{
 
     /**
      * Method which renders the text of the current button.
-     * <p>
+     *
      * @param g Graphics context
      * @param b Current button to render
      * @param textRect Bounding rectangle to render the text.
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
index 1a876fc6ce5..42b9a0b6c8b 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
@@ -39,7 +39,7 @@ import sun.swing.DefaultLookup;
 
 /**
  * Provides the basic look and feel for a JColorChooser.
- * <p>
+ *
  * @author Tom Santos
  * @author Steve Wilson
  */
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java
index 1c6f496ba44..9562a2089d6 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java
@@ -664,7 +664,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
     /**
      * Renders the text of the current menu item.
-     * <p>
+     *
      * @param g graphics context
      * @param menuItem menu item to render
      * @param textRect bounding rectangle for rendering the text
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
index ddeba1db653..163a5cd2b46 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
@@ -39,7 +39,6 @@ import javax.swing.text.View;
 
 /**
  * BasicToggleButton implementation
- * <p>
  *
  * @author Jeff Dinkins
  */
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
index f0a88e000ba..1f2aac7e597 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
@@ -39,7 +39,6 @@ import javax.swing.plaf.basic.BasicSeparatorUI;
 /**
  * A Basic L&amp;F implementation of ToolBarSeparatorUI.  This implementation
  * is a "combined" view/controller.
- * <p>
  *
  * @author Jeff Shapiro
  */
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
index 506a8a63b38..b301f200bc9 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
@@ -44,7 +44,6 @@ import sun.swing.UIAction;
 /**
  * A Basic L&amp;F implementation of ToolBarUI.  This implementation
  * is a "combined" view/controller.
- * <p>
  *
  * @author Georges Saab
  * @author Jeff Shapiro
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
index d54d470db88..95a951cc6f9 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
@@ -41,7 +41,6 @@ import javax.swing.text.View;
 
 /**
  * Standard tool tip L&amp;F.
- * <p>
  *
  * @author Dave Moore
  */
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
index 66097d8a1e9..208bd8aaab4 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
@@ -50,7 +50,6 @@ import sun.swing.UIAction;
 
 /**
  * The basic L&amp;F for a hierarchical data structure.
- * <p>
  *
  * @author Scott Violet
  * @author Shannon Hickey (drag and drop)
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java b/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java
index 3c0979dc38a..c8b75e88ac8 100644
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java
@@ -37,7 +37,6 @@ import javax.swing.plaf.*;
 
 /**
  * Metal implementation of JInternalFrame.
- * <p>
  *
  * @author Steve Wilson
  */
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java b/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java
index 0bc74bd5c03..882fad9c63e 100644
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java
@@ -56,7 +56,6 @@ import javax.swing.plaf.basic.BasicScrollBarUI;
 
 /**
  * Implementation of ScrollBarUI for the Metal Look and Feel
- * <p>
  *
  * @author Tom Santos
  * @author Steve Wilson
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java b/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
index 5f5ea59e54b..6fe5250cc18 100644
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
@@ -50,7 +50,6 @@ import javax.swing.plaf.basic.*;
 /**
  * A Metal Look and Feel implementation of ToolBarUI.  This implementation
  * is a "combined" view/controller.
- * <p>
  *
  * @author Jeff Shapiro
  */
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html b/jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
index 67048cf1087..22efa38b5eb 100644
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html
@@ -5,7 +5,7 @@
 </head>
 <body>
 <h1 id="primaryColors">Primary Colors</h1>
-<table>
+<table summary="Nimbus primary colors">
 <tr><th>Key</th><th>Value</th><th>Preview</th></tr>
 <tr>
 <td width="250"><code>control</code></td>
@@ -86,7 +86,7 @@
 </table>
 
 <h1 id="secondaryColors">Secondary Colors</h1>
-<table>
+<table summary="Nimbus secondary colors">
 <tr><th>Key</th><th>Value</th><th>Preview</th></tr>
 <tr>
 <td width="250"><code>activeCaption</code></td>
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html b/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
index e4ab4e24030..224e543a1ba 100644
--- a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
@@ -49,7 +49,7 @@ In       addition to the <a
  href="#buttonProperties">Button 	properties</a>, ArrowButton supports
 the following properties: </p>
 <h5>ArrowButton Specific Properties</h5>
-<table border="1">
+<table border="1" summary="ArrowButton specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -71,7 +71,7 @@ the following properties: </p>
 to the <a href="#buttonProperties">Button 	properties</a>, JButton
 supports the following property: </p>
 <h5>JButton Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JButton specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -94,7 +94,7 @@ button that is 	    receiving focus. </td>
 addition to the <a href="#buttonProperties">Button 	properties</a>,
 JCheckBox supports the following property: </p>
 <h5>JCheckBox Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JCheckBox specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -114,7 +114,7 @@ JCheckBox supports the following property: </p>
 <h4><a name="JComboBox">JComboBox</a></h4>
 <p> JComboBox is a composite component that consists of the following
 child Components: </p>
-<table border="1">
+<table border="1" summary="JComboBox child components">
   <thead><tr>
     <th>Name</th>
     <th>Type</th>
@@ -159,9 +159,9 @@ the renderer is a UIResource. 	</td>
     </tr>
   </tbody>
 </table>
-<p> </p>
+
 <h5>JComboBox Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JComboBox specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -181,7 +181,7 @@ with the keyboard. </td>
 <br>
 <h4>JFileChooser</h4>
 <h5>JFileChooser Specific Properties</h5>
-<table cellpadding="2" cellspacing="2" border="1"
+<table cellpadding="2" cellspacing="2" border="1" summary="JFileChooser specific properties"
  style="width: 100%; text-align: left;">
   <tbody>
     <tr>
@@ -341,7 +341,7 @@ of the file chooser.<br>
 <br>
 <h4><a name="JInternalFrame"></a>JInternalFrame</h4>
 <h5>JInternalFrame Specific Properties</h5>
-<table cellpadding="2" cellspacing="2" border="1"
+<table cellpadding="2" cellspacing="2" border="1" summary="JInternalFrame specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
     <tr>
@@ -374,7 +374,7 @@ the system menu will be shown.<br>
 internal frame similar to that found in a frame.<br>
 </p>
 <h5>JInternalFrameTitlePane Specific Properties</h5>
-<table cellpadding="2" cellspacing="2" border="1"
+<table cellpadding="2" cellspacing="2" border="1" summary="JInternalFrameTitlePane specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
     <tr>
@@ -473,7 +473,7 @@ abililty to close the internal frame.
 <p> JList's sets the name of the renderer to List.renderer.       JList
 supports the following properties: </p>
 <h5>JList Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JList specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -516,7 +516,7 @@ specific to the       component and Region.MENU_ITEM_ACCELERATOR.
 MENU_ITEM_ACCELERATOR is used for painting the accelerator. Both Regions
 paint text using the TEXT_FOREGROUND ColorType. The following set of
 properties are supported: </p>
-<table border="1">
+<table border="1" summary="Menu classes common properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -570,7 +570,7 @@ this is used. </td>
 <p> <code>Prefix</code> is one of: CheckBoxMenuItem, Menu, MenuItem, or
 RadioButtonMenuItem. </p>
 <p> JMenu also supports the following properties: </p>
-<table border="1">
+<table border="1" summary="JMenu specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -599,7 +599,7 @@ components, they are: OptionPane.button, OptionPane.label,
 OptionPane.comboBox, OptionPane.scrollPane, OptionPane.list,
 OptionPane.textField, OptionPane.iconLabel. </p>
 <h5>JOptionPane Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JOptionPane specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -713,7 +713,7 @@ it follows the other buttons. 	</td>
 </h4>
 <h5>JProgressBar Specific Properties<br>
 </h5>
-<table cellpadding="2" cellspacing="2" border="1"
+<table cellpadding="2" cellspacing="2" border="1" summary="JProgressBar specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
     <tr>
@@ -754,7 +754,7 @@ the bouncing box per frame when the progress bar is indeterminate.<br>
 addition to the <a href="#buttonProperties">Button 	properties</a>,
 JRadioButton supports the following property: </p>
 <h5>JRadioButton Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JRadioButton specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -774,7 +774,7 @@ JRadioButton supports the following property: </p>
 <h4><a name="JScrollBar">JScrollBar</a></h4>
 <p> JScrollBar is a composite component that consists of the following
 child Components: </p>
-<table border="1">
+<table border="1" summary="JScrollBar child components">
   <thead><tr>
     <th>Name</th>
     <th>Type</th>
@@ -788,9 +788,9 @@ child Components: </p>
     </tr>
   </tbody>
 </table>
-<p> </p>
+
 <h5>JScrollBar Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JScrollBar specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -844,7 +844,7 @@ will be made equal. 	</td>
 <h4><a name="Separator">Separators</a></h4>
 <p> All of the separator classes, JSeparator, JPopupMenu.Separator and
 JToolBar.Separator use the same property: </p>
-<table border="1">
+<table border="1" summary="Separator classes common properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -863,7 +863,7 @@ preferred size will include the Insets. </td>
   </tbody>
 </table>
 <p> JToolBar.Separator also supports the following property: </p>
-<table border="1">
+<table border="1" summary="JToolBar.Separator specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -896,7 +896,7 @@ invoked. </td>
       <code>Viewport</code>s border.
  </p>
 <h5>JScrollPane Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JScrollPane specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -920,7 +920,7 @@ invoked. The two buttons will be named:
 SplitPaneDivider.leftOneTouchButton and
 SplitPaneDivider.rightOneTouchButton. </p>
 <h5>JSplitPane Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JSplitPane specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -964,7 +964,7 @@ setOneTouchExpandable. 	</td>
 <br>
 <h4><a name="JSlider"></a>JSlider</h4>
 <h5>JSlider Specific Properties</h5>
-<table cellpadding="2" cellspacing="2" border="1"
+<table cellpadding="2" cellspacing="2" border="1" summary="JSlider specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
     <tr>
@@ -1024,7 +1024,7 @@ of the slider.<br>
 <br>
 <h4><a name="JTabbedPane"></a>JTabbedPane</h4>
 <h5>JTabbedPane Specific Properties</h5>
-<table cellpadding="2" cellspacing="2" border="1"
+<table cellpadding="2" cellspacing="2" border="1" summary="JTabbedPane specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
     <tr>
@@ -1088,7 +1088,7 @@ selected tab.<br>
 <p> JTable sets the name of the renderer to Table.cellRenderer.      
 JTable supports the following properties: </p>
 <h5>JTable Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JTable specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -1133,7 +1133,7 @@ renderer will only succeed if it is a Synth Border. 	</td>
 <p> JTree sets the name of the renderer to Tree.renderer, the name of
 the editor is Tree.cellEditor.</p>
 <h5>JTree Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JTree specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -1217,7 +1217,7 @@ and <a href="synthFileFormat.html#e.graphicsUtils">binding it</a> to the tree.</
 addition to the <a href="#buttonProperties">Button 	properties</a>,
 JToggleButton supports the following property: </p>
 <h5>JToggleButton Specific Properties</h5>
-<table border="1">
+<table border="1" summary="JToggleButton specific properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -1238,7 +1238,7 @@ JToggleButton supports the following property: </p>
 <p> Each of the Button classes (JButton, JCheckBox, JRadioButton,
 JToggleButton and SynthArrowButton) support a similar set of properties.
 These properties are: </p>
-<table border="1">
+<table border="1" summary="Button classes common properties">
   <thead><tr>
     <th>Property</th>
     <th>Expected Type</th>
@@ -1283,7 +1283,7 @@ JToggleButton.<br>
 </p>
 <h4><a name="textProperties"></a>Text Properties<br>
 </h4>
-<table cellpadding="2" cellspacing="2" border="1"
+<table cellpadding="2" cellspacing="2" border="1" summary="Text properties"
  style="text-align: left; width: 100%;">
   <tbody>
     <tr>
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html b/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
index ad84defba08..a428be92563 100644
--- a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
@@ -739,12 +739,12 @@ div.example {
   &lt;/state>
 &lt;/style>
       </pre>
-    </div>      
+    </div>
     <p>
       The following outlines which painter will be used for what
-      SynthPainter method: 
+      SynthPainter method:
     </p>
-    <table border=1>
+    <table border=1 summary="Painters for SynthPainter methods">
       <tr><th>State<th>Method<th>Painter
 	<tr><td>SELECTED<td>paintButtonBackground<td>stateButtonBackgroundPainter
 	<tr><td>SELECTED<td>Anything but paintButtonBackground<td>stateFallbackPainter
diff --git a/jdk/src/share/classes/javax/swing/text/GlyphView.java b/jdk/src/share/classes/javax/swing/text/GlyphView.java
index 2ab6cbc3618..e848f2af63c 100644
--- a/jdk/src/share/classes/javax/swing/text/GlyphView.java
+++ b/jdk/src/share/classes/javax/swing/text/GlyphView.java
@@ -56,7 +56,6 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR;
  * expanded if this view is embedded in a container that does
  * tab expansion.  ParagraphView is an example of a container
  * that does tab expansion.
- * <p>
  *
  * @since 1.3
  *
diff --git a/jdk/src/share/classes/javax/swing/text/StyleConstants.java b/jdk/src/share/classes/javax/swing/text/StyleConstants.java
index 01f94088ef2..583b4dffd72 100644
--- a/jdk/src/share/classes/javax/swing/text/StyleConstants.java
+++ b/jdk/src/share/classes/javax/swing/text/StyleConstants.java
@@ -42,7 +42,6 @@ import javax.swing.Icon;
  * <p style="text-align:center"><img src="doc-files/paragraph.gif"
  * alt="Diagram shows SpaceAbove, FirstLineIndent, LeftIndent, RightIndent,
  *      and SpaceBelow a paragraph."></p>
- * <p>
  *
  * @author  Timothy Prinzing
  */
diff --git a/jdk/src/share/classes/javax/swing/text/View.java b/jdk/src/share/classes/javax/swing/text/View.java
index 2b49055ab59..cb8306ac12e 100644
--- a/jdk/src/share/classes/javax/swing/text/View.java
+++ b/jdk/src/share/classes/javax/swing/text/View.java
@@ -183,7 +183,6 @@ A view has the following responsibilities:
     <li>{@link #removeUpdate removeUpdate}
     <li>{@link #changedUpdate changedUpdate}
     </ul>
-    <p>
 </dl>
  *
  * @author  Timothy Prinzing
diff --git a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java b/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java
index 409560ba902..de0f2b91fe5 100644
--- a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java
+++ b/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java
@@ -116,7 +116,7 @@ import javax.swing.text.*;
  * concepts we do not currently
  * support are pseudo selectors, such as <code>A:link { color: red }</code>,
  * and the <code>important</code> modifier.
- * <p>
+ *
  * @implNote This implementation is currently
  * incomplete.  It can be replaced with alternative implementations
  * that are complete.  Future versions of this class will provide
diff --git a/jdk/src/share/classes/javax/swing/undo/UndoableEdit.java b/jdk/src/share/classes/javax/swing/undo/UndoableEdit.java
index 30a4b53fce1..88fa7e92232 100644
--- a/jdk/src/share/classes/javax/swing/undo/UndoableEdit.java
+++ b/jdk/src/share/classes/javax/swing/undo/UndoableEdit.java
@@ -47,7 +47,7 @@ import javax.swing.event.*;
  *     be incorporated into a larger edit and treated as a single edit.
  * <li>If <code>addEdit</code> returns false <code>replaceEdit</code>
  *     is called on the new edit with the current edit passed in as the
- *     argument. This is the inverse of <code>addEdit</code> &#151;
+ *     argument. This is the inverse of <code>addEdit</code> &#8212;
  *     if the new edit returns true from <code>replaceEdit</code>, the new
  *     edit replaces the current edit.
  * </ol>