2 files changed, 28 insertions, 30 deletions
diff --git a/libjava/javax/swing/plaf/BorderUIResource.java b/libjava/javax/swing/plaf/BorderUIResource.java
index a3f0db0..c0bb240 100644
--- a/libjava/javax/swing/plaf/BorderUIResource.java
+++ b/libjava/javax/swing/plaf/BorderUIResource.java
@@ -279,7 +279,7 @@ public class BorderUIResource
      *
      * <p><img src="../border/doc-files/BevelBorder-1.png"
      * width="500" height="150"
-     * alt="[An illustration showing raised and lowered BevelBorders]" />
+     * alt="[An illustration showing raised and lowered BevelBorders]" /></p>
      *
      * @param bevelType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.BevelBorder#RAISED}
@@ -300,7 +300,7 @@ public class BorderUIResource
      *
      * <p><img src="../border/doc-files/BevelBorder-2.png" width="500"
      * height="150" alt="[An illustration showing BevelBorders that were
-     * constructed with this method]" />
+     * constructed with this method]" /></p>
      *
      * @param bevelType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.BevelBorder#RAISED}
@@ -340,7 +340,7 @@ public class BorderUIResource
      *
      * <p><img src="../border/doc-files/BevelBorder-3.png" width="500"
      * height="150" alt="[An illustration showing BevelBorders that
-     * were constructed with this method]" />
+     * were constructed with this method]" /></p>
      *
      * @param bevelType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.BevelBorder#RAISED}
@@ -432,7 +432,7 @@ public class BorderUIResource
    *
    * <p><img src="../border/doc-files/EmptyBorder-1.png"
    * width="290" height="200"
-   * alt="[An illustration of EmptyBorder]" />
+   * alt="[An illustration of EmptyBorder]" /></p>
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -487,7 +487,7 @@ public class BorderUIResource
    *
    * <p><img src="../border/doc-files/EtchedBorder-1.png" width="500"
    * height="200" alt="[An illustration of the two EtchedBorder
-   * variants]" />
+   * variants]" /></p>
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -514,7 +514,7 @@ public class BorderUIResource
      *
      * <p><img src="../border/doc-files/EtchedBorder-1.png"
      * width="500" height="200" alt="[An illustration of the two
-     * EtchedBorder variants]" />
+     * EtchedBorder variants]" /></p>
      *
      * @param etchType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.EtchedBorder#RAISED}
@@ -555,7 +555,7 @@ public class BorderUIResource
      *
      * <p><img src="../border/doc-files/EtchedBorder-2.png" width="500"
      * height="200" alt="[An illustration that shows which pixels get
-     * painted in what color]" />
+     * painted in what color]" /></p>
      *
      * @param etchType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.EtchedBorder#RAISED}
@@ -588,7 +588,7 @@ public class BorderUIResource
    * such as the borders provided by this class.
    *
    * <p><img src="../border/doc-files/LineBorder-1.png" width="500"
-   * height="200" alt="[An illustration of two LineBorders] />
+   * height="200" alt="[An illustration of two LineBorders]" /></p>
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -643,7 +643,7 @@ public class BorderUIResource
    * such as the borders provided by this class.
    *
    * <p><img src="../border/doc-files/MatteBorder-1.png" width="500"
-   * height="150" alt="[An illustration of two MatteBorders] />
+   * height="150" alt="[An illustration of two MatteBorders]" /></p>
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -658,7 +658,7 @@ public class BorderUIResource
      *
      * <p><img src="../border/doc-files/MatteBorder-2.png" width="500"
      * height="150" alt="[A picture of a MatteBorder made by this
-     * constructor]" />
+     * constructor]" /></p>
      *
      * @param top the width of the border at its top edge.
      * @param left the width of the border at its left edge.
@@ -680,7 +680,7 @@ public class BorderUIResource
      *
      * <p><img src="../border/doc-files/MatteBorder-4.png" width="500"
      * height="150" alt="[A picture of a MatteBorder made by this
-     * constructor]" />
+     * constructor]" /></p>
      *
      * @param top the width of the border at its top edge.
      * @param left the width of the border at its left edge.
@@ -704,7 +704,7 @@ public class BorderUIResource
      *
      * <p><img src="../border/doc-files/MatteBorder-6.png" width="500"
      * height="150" alt="[A picture of a MatteBorder made by this
-     * constructor]" />
+     * constructor]" /></p>
      *
      * @param tileIcon an icon for tiling the border area. 
      */
diff --git a/libjava/javax/swing/plaf/ComponentUI.java b/libjava/javax/swing/plaf/ComponentUI.java
index 5147ebb..a2ca1f0 100644
--- a/libjava/javax/swing/plaf/ComponentUI.java
+++ b/libjava/javax/swing/plaf/ComponentUI.java
@@ -52,7 +52,7 @@ import javax.swing.JComponent;
  *
  * <p><img src="doc-files/ComponentUI-1.png" width="700" height="550"
  * alt="[UML diagram illustrating the architecture for pluggable
- * look and feels]" />
+ * look and feels]" /></p>
  *
  * <p>Components such as {@link javax.swing.JSlider} do not directly
  * implement operations related to the look and feel of the user
@@ -68,14 +68,14 @@ import javax.swing.JComponent;
  * services. Soon before the end of its lifecycle, the
  * <code>ComponentUI</code> will receive an {@link #uninstallUI}
  * message, at which time the <code>ComponentUI</code> is expected to
- * undo any changes.
+ * undo any changes.</p>
  *
  * <p>Note that the <code>ui</code> of a <code>JComponent</code>
  * changes whenever the user switches between look and feels.  For
  * example, the <code>ui</code> property of a <code>JSlider</code>
  * could change from an instance of <code>MetalSliderUI</code> to an
  * instance of <code>FooSliderUI</code>. This switch can happen at any
- * time, but it will always be performed from inside the Swing thread.
+ * time, but it will always be performed from inside the Swing thread.</p>
  *
  * @author Sascha Brawer (brawer@dandelis.ch)
  */
@@ -96,26 +96,24 @@ public abstract class ComponentUI
    * The delegate object then receives an <code>installUI</code>
    * message.
    *
-   * <p>This method should perform the following tasks:
-   *
-   * <ul><li>Set visual properties such as borders, fonts, colors, or
-   * icons. However, no change should be performed for those
-   * properties whose values have been directly set by the client
-   * application. To allow the distinction, LookAndFeels are expected
-   * to use values that implement the {@link UIResource} marker
-   * interface, such as {@link BorderUIResource} or {@link
-   * ColorUIResource}.</li>
+   * <p>This method should perform the following tasks:</p>
    *
+   * <ul>
+   * <li>Set visual properties such as borders, fonts, colors, or
+   *     icons. However, no change should be performed for those
+   *     properties whose values have been directly set by the client
+   *     application. To allow the distinction, LookAndFeels are expected
+   *     to use values that implement the {@link UIResource} marker
+   *     interface, such as {@link BorderUIResource} or {@link
+   *     ColorUIResource}.</li>
    * <li>If necessary, install a {@link java.awt.LayoutManager}.</li>
-   *
    * <li>Embed custom sub-components. For instance, the UI delegate
-   * for a {@link javax.swing.JSplitPane} might install a special
-   * component for the divider.</li>
-   *
+   *     for a {@link javax.swing.JSplitPane} might install a special
+   *     component for the divider.</li>
    * <li>Register event listeners.</li>
-   *
    * <li>Set up properties related to keyborad navigation, such as
-   * mnemonics or focus traversal policies.</li></ul>
+   *     mnemonics or focus traversal policies.</li>
+   * </ul>
    *
    * @param c the component for which this delegate will provide
    *        services.