8225372: accessibility errors in tables in java.desktop files
authorserb
Mon, 09 Sep 2019 12:23:22 -0700
changeset 58325 d32a3b1ca84a
parent 58324 0aba35254e00
child 58326 34b6db069d68
8225372: accessibility errors in tables in java.desktop files Reviewed-by: aivanov
src/java.desktop/share/classes/java/awt/BorderLayout.java
src/java.desktop/share/classes/java/awt/Button.java
src/java.desktop/share/classes/java/awt/Checkbox.java
src/java.desktop/share/classes/java/awt/CheckboxGroup.java
src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
src/java.desktop/share/classes/java/awt/Choice.java
src/java.desktop/share/classes/java/awt/FlowLayout.java
src/java.desktop/share/classes/java/awt/Frame.java
src/java.desktop/share/classes/java/awt/GridBagLayout.java
src/java.desktop/share/classes/java/awt/GridLayout.java
src/java.desktop/share/classes/java/awt/Label.java
src/java.desktop/share/classes/java/awt/List.java
src/java.desktop/share/classes/java/awt/MenuBar.java
src/java.desktop/share/classes/java/awt/MenuItem.java
src/java.desktop/share/classes/java/awt/Scrollbar.java
src/java.desktop/share/classes/java/awt/TextArea.java
src/java.desktop/share/classes/java/awt/TextField.java
src/java.desktop/share/classes/java/awt/Window.java
src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
src/java.desktop/share/classes/java/awt/doc-files/Modality.html
src/java.desktop/share/classes/java/awt/font/NumericShaper.java
src/java.desktop/share/classes/java/awt/geom/Path2D.java
src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java
src/java.desktop/share/classes/javax/swing/BoxLayout.java
src/java.desktop/share/classes/javax/swing/JLayeredPane.java
src/java.desktop/share/classes/javax/swing/JRootPane.java
src/java.desktop/share/classes/javax/swing/JScrollPane.java
src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
--- a/src/java.desktop/share/classes/java/awt/BorderLayout.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/BorderLayout.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,11 +92,10 @@
  * Here is an example of five buttons in an applet laid out using
  * the {@code BorderLayout} layout manager:
  * <p>
- * <img src="doc-files/BorderLayout-1.gif"
- * alt="Diagram of an applet demonstrating BorderLayout.
- *      Each section of the BorderLayout contains a Button corresponding to its position in the layout, one of:
- *      North, West, Center, East, or South."
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/BorderLayout-1.gif" alt="Diagram of an applet
+ * demonstrating BorderLayout. Each section of the BorderLayout contains a
+ * Button corresponding to its position in the layout, one of: North, West,
+ * Center, East, or South." style="margin: 7px 10px;">
  * <p>
  * The code for this applet is as follows:
  *
--- a/src/java.desktop/share/classes/java/awt/Button.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/Button.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,8 @@
  * depicts three views of a "{@code Quit}" button as it appears
  * under the Solaris operating system:
  * <p>
- * <img src="doc-files/Button-1.gif" alt="The following context describes the graphic"
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/Button-1.gif" alt="The following context describes the
+ * graphic" style="margin: 7px 10px;">
  * <p>
  * The first view shows the button as it appears normally.
  * The second view shows the button
--- a/src/java.desktop/share/classes/java/awt/Checkbox.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/Checkbox.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,8 +52,8 @@
  * This image depicts the check boxes and grid layout
  * created by this code example:
  * <p>
- * <img src="doc-files/Checkbox-1.gif" alt="The following context describes the graphic."
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/Checkbox-1.gif" alt="The following context describes the
+ * graphic." style="margin: 7px 10px;">
  * <p>
  * The button labeled {@code one} is in the "on" state, and the
  * other two are in the "off" state. In this example, which uses the
--- a/src/java.desktop/share/classes/java/awt/CheckboxGroup.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/CheckboxGroup.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,9 @@
  * <p>
  * This image depicts the check box group created by this example:
  * <p>
- * <img src="doc-files/CheckboxGroup-1.gif"
- * alt="Shows three checkboxes, arranged vertically, labeled one, two, and three. Checkbox one is in the on state."
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/CheckboxGroup-1.gif" alt="Shows three checkboxes,
+ * arranged vertically, labeled one, two, and three. Checkbox one is in the on
+ * state." style="margin: 7px 10px;">
  *
  * @author      Sami Shaio
  * @see         java.awt.Checkbox
--- a/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
  * <img src="doc-files/MenuBar-1.gif"
  * alt="Menu labeled Examples, containing items Basic, Simple, Check, and More
  * Examples. The Check item is a CheckBoxMenuItem instance, in the off state."
- * style="float:center; margin: 7px 10px;">
+ * style="margin: 7px 10px;">
  * <p>
  * The item labeled {@code Check} shows a check box menu item
  * in its "off" state.
--- a/src/java.desktop/share/classes/java/awt/Choice.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/Choice.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,8 +51,8 @@
  * After this choice menu has been added to a panel,
  * it appears as follows in its normal state:
  * <p>
- * <img src="doc-files/Choice-1.gif" alt="The following text describes the graphic"
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/Choice-1.gif" alt="The following text describes the
+ * graphic" style="margin: 7px 10px;">
  * <p>
  * In the picture, {@code "Green"} is the current choice.
  * Pushing the mouse button down on the object causes a menu to
--- a/src/java.desktop/share/classes/java/awt/FlowLayout.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/FlowLayout.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@
  * <p>
  * <img src="doc-files/FlowLayout-1.gif"
  * ALT="Graphic of Layout for Three Buttons"
- * style="float:center; margin: 7px 10px;">
+ * style="margin: 7px 10px;">
  * <p>
  * Here is the code for this applet:
  *
--- a/src/java.desktop/share/classes/java/awt/Frame.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/Frame.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,10 +83,10 @@
  * of the primary screen in the virtual device, negative coordinates
  * are possible, as shown in the following figure.
  * <p>
- * <img src="doc-files/MultiScreen.gif"
- * alt="Diagram of virtual device encompassing three physical screens and one primary physical screen. The primary physical screen
- * shows (0,0) coords while a different physical screen shows (-80,-100) coords."
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/MultiScreen.gif" alt="Diagram of virtual device
+ * encompassing three physical screens and one primary physical screen. The
+ * primary physical screen shows (0,0) coords while a different physical screen
+ * shows (-80,-100) coords." style="margin: 7px 10px;">
  * <p>
  * In such an environment, when calling {@code setLocation},
  * you must pass a virtual coordinate to this method.  Similarly,
--- a/src/java.desktop/share/classes/java/awt/GridBagLayout.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayout.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,64 +116,49 @@
  * <dt>{@link GridBagConstraints#anchor}
  * <dd>Specifies where the component should be positioned in its display area.
  * There are three kinds of possible values: absolute, orientation-relative,
- * and baseline-relative
+ * and baseline-relative.
  * Orientation relative values are interpreted relative to the container's
  * {@code ComponentOrientation} property while absolute values
  * are not.  Baseline relative values are calculated relative to the
  * baseline.  Valid values are:
  *
- * <table class="striped" style="margin: 0px auto">
- * <caption>Absolute, relative and baseline values as described above</caption>
- * <thead>
- * <tr>
- * <th><p style="text-align:center">Absolute Values</th>
- * <th><p style="text-align:center">Orientation Relative Values</th>
- * <th><p style="text-align:center">Baseline Relative Values</th>
- * </tr>
- * </thead>
- * <tbody>
- * <tr>
- * <td>
- * <ul style="list-style-type:none">
- * <li>{@code GridBagConstraints.NORTH}</li>
- * <li>{@code GridBagConstraints.SOUTH}</li>
- * <li>{@code GridBagConstraints.WEST}</li>
- * <li>{@code GridBagConstraints.EAST}</li>
- * <li>{@code GridBagConstraints.NORTHWEST}</li>
- * <li>{@code GridBagConstraints.NORTHEAST}</li>
- * <li>{@code GridBagConstraints.SOUTHWEST}</li>
- * <li>{@code GridBagConstraints.SOUTHEAST}</li>
- * <li>{@code GridBagConstraints.CENTER} (the default)</li>
+ * <ul>
+ *   <li>Absolute Values:
+ *     <ul>
+ *       <li>{@code GridBagConstraints.NORTH}
+ *       <li>{@code GridBagConstraints.SOUTH}
+ *       <li>{@code GridBagConstraints.WEST}
+ *       <li>{@code GridBagConstraints.EAST}
+ *       <li>{@code GridBagConstraints.NORTHWEST}
+ *       <li>{@code GridBagConstraints.NORTHEAST}
+ *       <li>{@code GridBagConstraints.SOUTHWEST}
+ *       <li>{@code GridBagConstraints.SOUTHEAST}
+ *       <li>{@code GridBagConstraints.CENTER} (the default)
+ *     </ul>
+ *   <li>Orientation Relative Values:
+ *     <ul >
+ *       <li>{@code GridBagConstraints.PAGE_START}
+ *       <li>{@code GridBagConstraints.PAGE_END}
+ *       <li>{@code GridBagConstraints.LINE_START}
+ *       <li>{@code GridBagConstraints.LINE_END}
+ *       <li>{@code GridBagConstraints.FIRST_LINE_START}
+ *       <li>{@code GridBagConstraints.FIRST_LINE_END}
+ *       <li>{@code GridBagConstraints.LAST_LINE_START}
+ *       <li>{@code GridBagConstraints.LAST_LINE_END}
+ *     </ul>
+ *   <li>Baseline Relative Values:
+ *     <ul>
+ *       <li>{@code GridBagConstraints.BASELINE}
+ *       <li>{@code GridBagConstraints.BASELINE_LEADING}
+ *       <li>{@code GridBagConstraints.BASELINE_TRAILING}
+ *       <li>{@code GridBagConstraints.ABOVE_BASELINE}
+ *       <li>{@code GridBagConstraints.ABOVE_BASELINE_LEADING}
+ *       <li>{@code GridBagConstraints.ABOVE_BASELINE_TRAILING}
+ *       <li>{@code GridBagConstraints.BELOW_BASELINE}
+ *       <li>{@code GridBagConstraints.BELOW_BASELINE_LEADING}
+ *       <li>{@code GridBagConstraints.BELOW_BASELINE_TRAILING}
+ *     </ul>
  * </ul>
- * </td>
- * <td>
- * <ul style="list-style-type:none">
- * <li>{@code GridBagConstraints.PAGE_START}</li>
- * <li>{@code GridBagConstraints.PAGE_END}</li>
- * <li>{@code GridBagConstraints.LINE_START}</li>
- * <li>{@code GridBagConstraints.LINE_END}</li>
- * <li>{@code GridBagConstraints.FIRST_LINE_START}</li>
- * <li>{@code GridBagConstraints.FIRST_LINE_END}</li>
- * <li>{@code GridBagConstraints.LAST_LINE_START}</li>
- * <li>{@code GridBagConstraints.LAST_LINE_END}</li>
- * </ul>
- * </td>
- * <td>
- * <ul style="list-style-type:none">
- * <li>{@code GridBagConstraints.BASELINE}</li>
- * <li>{@code GridBagConstraints.BASELINE_LEADING}</li>
- * <li>{@code GridBagConstraints.BASELINE_TRAILING}</li>
- * <li>{@code GridBagConstraints.ABOVE_BASELINE}</li>
- * <li>{@code GridBagConstraints.ABOVE_BASELINE_LEADING}</li>
- * <li>{@code GridBagConstraints.ABOVE_BASELINE_TRAILING}</li>
- * <li>{@code GridBagConstraints.BELOW_BASELINE}</li>
- * <li>{@code GridBagConstraints.BELOW_BASELINE_LEADING}</li>
- * <li>{@code GridBagConstraints.BELOW_BASELINE_TRAILING}</li>
- * </ul>
- * </td>
- * </tr>
- * </tbody>
- * </table>
  * <dt>{@link GridBagConstraints#weightx},
  * {@link GridBagConstraints#weighty}
  * <dd>Used to determine how to distribute space, which is
@@ -201,14 +186,10 @@
  * <p>
  * The following figure shows a baseline layout and includes a
  * component that spans rows:
- * <table class="borderless" style="margin: 0px auto">
- * <caption>Baseline Layout</caption>
- * <tr style="text-align:center">
- * <td>
- * <img src="doc-files/GridBagLayout-baseline.png"
- *  alt="The following text describes this graphic (Figure 1)." style="float:center">
- * </td>
- * </table>
+ * <p style="text-align: center">
+ *   <img src="doc-files/GridBagLayout-baseline.png"
+ *   alt="The following text describes this graphic (Figure 1).">
+ * </p>
  * This layout consists of three components:
  * <ul><li>A panel that starts in row 0 and ends in row 1.  The panel
  *   has a baseline-resize behavior of {@code CONSTANT_DESCENT} and has
@@ -257,20 +238,21 @@
  * left-to-right container and Figure 3 shows the layout for a horizontal,
  * right-to-left container.
  *
- * <table class="borderless" style="margin: 0px auto">
- * <caption style="width:600;display:none">Figures</caption>
- * <tr style="text-align:center">
- * <td>
- * <img src="doc-files/GridBagLayout-1.gif" alt="The preceding text describes this graphic (Figure 1)." style="float:center; margin: 7px 10px;">
- * </td>
- * <td>
- * <img src="doc-files/GridBagLayout-2.gif" alt="The preceding text describes this graphic (Figure 2)." style="float:center; margin: 7px 10px;">
- * </td>
- * <tr style="text-align:center">
- * <td>Figure 2: Horizontal, Left-to-Right</td>
- * <td>Figure 3: Horizontal, Right-to-Left</td>
- * </tr>
- * </table>
+ * <div style="margin:0 auto;width:680px;text-align:center;font-weight:bold">
+ *   <div style="float:left">
+ *     <p><img src="doc-files/GridBagLayout-1.gif"
+ *        alt="The preceding text describes this graphic (Figure 2)."
+ *        style="margin: 7px 10px;">
+ *     <p>Figure 2: Horizontal, Left-to-Right
+ *   </div>
+ *   <div style="float:right">
+ *     <p><img src="doc-files/GridBagLayout-2.gif"
+ *        alt="The preceding text describes this graphic (Figure 3)."
+ *        style="margin: 7px 10px;">
+ *     <p>Figure 3: Horizontal, Right-to-Left
+ *   </div>
+ *   <br style="clear:both;">
+ * </div>
  * <p>
  * Each of the ten components has the {@code fill} field
  * of its associated {@code GridBagConstraints} object
--- a/src/java.desktop/share/classes/java/awt/GridLayout.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/GridLayout.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,26 +55,21 @@
  * If the container's {@code ComponentOrientation} property is horizontal
  * and right-to-left, the example produces the output shown in Figure 2.
  *
- * <table style="float:center;width:600">
- * <caption style="display:none">Figures</caption>
- * <tr style="text-align:center">
- * <td><img SRC="doc-files/GridLayout-1.gif"
- *      alt="Shows 6 buttons in rows of 2. Row 1 shows buttons 1 then 2.
- * Row 2 shows buttons 3 then 4. Row 3 shows buttons 5 then 6.">
- * </td>
- *
- * <td style="text-align:center"><img SRC="doc-files/GridLayout-2.gif"
- *              alt="Shows 6 buttons in rows of 2. Row 1 shows buttons 2 then 1.
- * Row 2 shows buttons 4 then 3. Row 3 shows buttons 6 then 5.">
- * </td>
- * </tr>
- *
- * <tr style="text-align:center">
- * <td>Figure 1: Horizontal, Left-to-Right</td>
- *
- * <td>Figure 2: Horizontal, Right-to-Left</td>
- * </tr>
- * </table>
+ * <div style="margin:0 auto;width:600px;text-align:center;font-weight:bold">
+ *   <div style="float:left">
+ *     <p><img SRC="doc-files/GridLayout-1.gif"
+ *        alt="Shows 6 buttons in rows of 2. Row 1 shows buttons 1 then 2.
+ *        Row 2 shows buttons 3 then 4. Row 3 shows buttons 5 then 6.">
+ *     <p>Figure 1: Horizontal, Left-to-Right
+ *   </div>
+ *   <div style="float:right">
+ *     <p><img SRC="doc-files/GridLayout-2.gif"
+ *        alt="Shows 6 buttons in rows of 2. Row 1 shows buttons 2 then 1.
+ *        Row 2 shows buttons 4 then 3. Row 3 shows buttons 6 then 5.">
+ *     <p>Figure 2: Horizontal, Right-to-Left
+ *   </div>
+ *   <br style="clear:both;">
+ * </div>
  * <p>
  * When both the number of rows and the number of columns have
  * been set to non-zero values, either by a constructor or
--- a/src/java.desktop/share/classes/java/awt/Label.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/Label.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@
  * <p>
  * produces the following labels:
  * <p>
- * <img src="doc-files/Label-1.gif" alt="Two labels: 'Hi There!' and 'Another label'"
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/Label-1.gif" alt="Two labels: 'Hi There!' and
+ * 'Another label'" style="margin: 7px 10px;">
  *
  * @author      Sami Shaio
  * @since       1.0
--- a/src/java.desktop/share/classes/java/awt/List.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/List.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,8 @@
  * scrolling list:
  * <p>
  * <img src="doc-files/List-1.gif"
- * alt="Shows a list containing: Venus, Earth, JavaSoft, and Mars. Javasoft is selected." style="float:center; margin: 7px 10px;">
+ * alt="Shows a list containing: Venus, Earth, JavaSoft, and Mars. Javasoft is
+ * selected." style="margin: 7px 10px;">
  * <p>
  * If the List allows multiple selections, then clicking on
  * an item that is already selected deselects it. In the preceding
--- a/src/java.desktop/share/classes/java/awt/MenuBar.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/MenuBar.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,9 +50,9 @@
  * This is what a menu bar might look like:
  * <p>
  * <img src="doc-files/MenuBar-1.gif"
- * alt="Diagram of MenuBar containing 2 menus: Examples and Options.
- * Examples menu is expanded showing items: Basic, Simple, Check, and More Examples."
- * style="float:center; margin: 7px 10px;">
+ * alt="Diagram of MenuBar containing 2 menus: Examples and Options. Examples
+ * menu is expanded showing items: Basic, Simple, Check, and More Examples."
+ * style="margin: 7px 10px;">
  * <p>
  * A menu bar handles keyboard shortcuts for menu items, passing them
  * along to its child menus.
--- a/src/java.desktop/share/classes/java/awt/MenuItem.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/MenuItem.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,8 +51,8 @@
  * a simple labeled menu item.
  * <p>
  * This picture of a menu bar shows five menu items:
- * <IMG SRC="doc-files/MenuBar-1.gif" alt="The following text describes this graphic."
- * style="float:center; margin: 7px 10px;">
+ * <IMG SRC="doc-files/MenuBar-1.gif" alt="The following text describes this
+ * graphic." style="margin: 7px 10px;">
  * <br style="clear:left;">
  * The first two items are simple menu items, labeled
  * {@code "Basic"} and {@code "Simple"}.
--- a/src/java.desktop/share/classes/java/awt/Scrollbar.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/Scrollbar.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,8 @@
  * scroll bars could be used as slider controls to pick
  * the red, green, and blue components of a color:
  * <p>
- * <img src="doc-files/Scrollbar-1.gif" alt="Image shows 3 vertical sliders, side-by-side."
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/Scrollbar-1.gif" alt="Image shows 3 vertical sliders,
+ * side-by-side." style="margin: 7px 10px;">
  * <p>
  * Each scroll bar in this example could be created with
  * code similar to the following:
@@ -59,8 +59,8 @@
  * Here is an example of a scroll bar that represents a range:
  * <p>
  * <img src="doc-files/Scrollbar-2.gif"
- * alt="Image shows horizontal slider with starting range of 0 and ending range of 300. The slider thumb is labeled 60."
- * style="float:center; margin: 7px 10px;">
+ * alt="Image shows horizontal slider with starting range of 0 and ending range
+ * of 300. The slider thumb is labeled 60." style="margin: 7px 10px;">
  * <p>
  * The value range represented by the bubble in this example
  * is the <em>visible amount</em>. The horizontal scroll bar
--- a/src/java.desktop/share/classes/java/awt/TextArea.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/TextArea.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,8 @@
  * <p>
  * The following image shows the appearance of a text area:
  * <p>
- * <img src="doc-files/TextArea-1.gif" alt="A TextArea showing the word 'Hello!'"
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/TextArea-1.gif" alt="A TextArea showing the word
+ * 'Hello!'" style="margin: 7px 10px;">
  * <p>
  * This text area could be created by the following line of code:
  *
--- a/src/java.desktop/share/classes/java/awt/TextField.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/TextField.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,8 @@
  * text fields of varying widths. Two of these text fields
  * display the predefined text {@code "Hello"}.
  * <p>
- * <img src="doc-files/TextField-1.gif" alt="The preceding text describes this image."
- * style="float:center; margin: 7px 10px;">
+ * <img src="doc-files/TextField-1.gif" alt="The preceding text describes this
+ * image." style="margin: 7px 10px;">
  * <p>
  * Here is the code that produces these four text fields:
  *
--- a/src/java.desktop/share/classes/java/awt/Window.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/Window.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,8 +96,9 @@
  * possible, as shown in the following figure.
  * <p>
  * <img src="doc-files/MultiScreen.gif"
- * alt="Diagram shows virtual device containing 4 physical screens. Primary physical screen shows coords (0,0), other screen shows (-80,-100)."
- * style="float:center; margin: 7px 10px;">
+ * alt="Diagram shows virtual device containing 4 physical screens. Primary
+ * physical screen shows coords (0,0), other screen shows (-80,-100)."
+ * style="margin: 7px 10px;">
  * <p>
  * In such an environment, when calling {@code setLocation},
  * you must pass a virtual coordinate to this method.  Similarly,
--- a/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html	Mon Sep 09 12:23:22 2019 -0700
@@ -5,7 +5,7 @@
   <title>AWT Desktop Properties</title>
 </head>
 <!--
- Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -57,22 +57,26 @@
 The following table summarizes the desktop properties documented
 here, and their value types.
 <br><br>
-<table>
-<tr bgcolor="#ccccff">
-<th>Property Name</th>
-<th>Value Type</th>
-<th>Summary Description</th>
+<table border=1>
+<thead>
+<tr>
+<th scope="col">Property Name</th>
+<th scope="col">Value Type</th>
+<th scope="col">Summary Description</th>
 </tr>
+</thead>
+<tbody>
 <tr>
-<td><A href="#awt.font.desktophints">awt.font.desktophints</A></td>
+<th scope="row"><A href="#awt.font.desktophints">awt.font.desktophints</A></th>
 <td>{@link java.util.Map java.util.Map}</td>
 <td>Font smoothing (text antialiasing) settings.</td>
 </tr>
 <tr>
-<td><A href="#sun.awt.enableExtraMouseButtons">sun.awt.enableExtraMouseButtons</A></td>
+<th scope="row"><A href="#sun.awt.enableExtraMouseButtons">sun.awt.enableExtraMouseButtons</A></th>
 <td>{@link java.lang.Boolean java.lang.Boolean}</td>
 <td>Controls if mouse events from extra buttons are to be generated or not</td>
 </tr>
+</tbody>
 </table>
 
 <h2>Desktop Font Rendering Hints</h2>
--- a/src/java.desktop/share/classes/java/awt/doc-files/Modality.html	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html	Mon Sep 09 12:23:22 2019 -0700
@@ -9,7 +9,7 @@
   </style>
 </head>
 <!--
- Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -57,14 +57,14 @@
     <h2>Definitions</h2>
 
     <p>
-      <u>Document</u> - a window without an owner that, together with
+      Document - a window without an owner that, together with
       all its child hierarchy, may be operated on as a single self-contained
       document.
       Every window belongs to some document &mdash; its root can be found as
       the closest ancestor window without an owner.
     </p><p>
       <a id="ModalBlocked"></a>
-      <u>Modal blocked window</u> - a window, that:
+      Modal blocked window - a window, that:
       </p><ul>
         <li>doesn't receive any user input events
         </li><li>doesn't receive input focus
@@ -78,15 +78,15 @@
         <hr>
       </blockquote>
     <p>
-      <u>Modal dialog</u> - a dialog that blocks some windows while it is
+      Modal dialog - a dialog that blocks some windows while it is
       visible. The blocked windows are determined according to the dialog's
       scope of blocking.
     </p><p>
-      <u>Modal excluded window</u> - a window that stays unblocked
+      Modal excluded window - a window that stays unblocked
       while the modal dialog is visible. If a window is modal excluded
       then all its owned windows and child components are also excluded.
     </p><p>
-      <u>Scope of blocking (SB)</u> - the set of windows (instances of
+      Scope of blocking (SB) - the set of windows (instances of
       <code>java.awt.Window</code> and all derived classes) that are blocked by
       the modal dialog while it is visible.
      <blockquote><hr>
@@ -109,20 +109,20 @@
       A dialog is, by default, modeless.  A modal dialog is, by default,
       application-modal.
     <ol>
-      <li><u>Modeless dialogs</u><br>
+      <li>Modeless dialogs<br>
         A modeless dialog doesn't block any windows while visible.
-      </li><li><u>Document-modal dialogs</u><br>
+      </li><li>Document-modal dialogs<br>
         A document-modal dialog blocks all windows from the same
         document except those from its child hierarchy. The document root
         is determined as the closest ancestor window without an
         owner.
-      </li><li><u>Application-modal dialogs</u><br>
+      </li><li>Application-modal dialogs<br>
         An application-modal dialog blocks all windows from the same
         application except for those from its child hierarchy.
         If there are several applets launched in a browser, they can be
         treated either as separate applications or a single application.
 	This behavior is implementation-dependent.
-      </li><li><u>Toolkit-modal dialogs</u><br>
+      </li><li>Toolkit-modal dialogs<br>
         A toolkit-modal dialog blocks all windows that run in the same
         toolkit except those from its child hierarchy. If there
         are several applets launched all of them run with the same toolkit,
@@ -163,13 +163,13 @@
     <h2>Show/hide blocking</h2>
 
     <p>
-      <u>Showing the window or modeless dialog: "F"</u><br>
+      Showing the window or modeless dialog: "F"<br>
       All the visible modal dialogs are looked through &mdash; if F is from the SB
       of one of them, it becomes blocked by it. If there are several such
       dialogs, the first shown is used. If no such dialogs exist, F remains
       unblocked.
     </p><p>
-      <u>Showing the modal dialog: "M"</u><br>
+      Showing the modal dialog: "M"<br>
       When modal dialog M is shown, all the visible windows fall into one of
       three distinct groups:
       <ul>
@@ -188,57 +188,57 @@
       second one become blocked by M, and all the windows from the third group
       remain untouched.
     </p><p>
-      <u>In typical cases</u>, when no child dialogs are shown before their owners,
+      In typical cases, when no child dialogs are shown before their owners,
       this rule can be simplified. (The following, simplified case, may
       leave out some details).
       </p><p>
-      <u>Showing the document-modal dialog: "M"</u><br>
+      Showing the document-modal dialog: "M"<br>
       All the visible application- and toolkit-modal dialogs are looked
       through &mdash; if M is from the SB of one of them,
       it becomes blocked by it. If there are several such dialogs,
       the first shown is used. If no such dialogs exist, M remains unblocked.
       </p><p>
-      <u>Showing the application-modal dialog: "M"</u><br>
+      Showing the application-modal dialog: "M"<br>
       All the visible toolkit-modal dialogs are looked through &mdash;
       if M is from the SB of one of them, it becomes blocked by it.
       If there are several such dialogs, the first shown is used.
       If no such dialogs exist, M remains unblocked.
       </p><p>
-      <u>Showing the toolkit-modal dialog: "M"</u><br>
+      Showing the toolkit-modal dialog: "M"<br>
       M remains unblocked.
 
           <table border="1">
-	  <caption>The Standard Blocking Matrix</caption>
+	        <caption>The Standard Blocking Matrix</caption>
             <tbody><tr>
-              <td>current/shown</td>
-              <td>frame &amp; modeless</td>
-              <td>document</td>
-              <td>application</td>
-              <td>toolkit</td>
+              <th scope="col">current/shown</th>
+              <th scope="col">frame &amp; modeless</th>
+              <th scope="col">document</th>
+              <th scope="col">application</th>
+              <th scope="col">toolkit</th>
             </tr>
             <tr>
-              <td>-</td>
+              <th scope="row">-</th>
               <td>-</td>
               <td>-</td>
               <td>-</td>
               <td>-</td>
             </tr>
             <tr>
-              <td>document</td>
+              <th scope="row">document</th>
               <td>blocked</td>
               <td>-</td>
               <td>-</td>
               <td>-</td>
             </tr>
             <tr>
-              <td>application</td>
+              <th scope="row">application</th>
               <td>blocked</td>
               <td>blocked</td>
               <td>-</td>
               <td>-</td>
             </tr>
             <tr>
-              <td>toolkit</td>
+              <th scope="row">toolkit</th>
               <td>blocked</td>
               <td>blocked</td>
               <td>blocked</td>
@@ -250,11 +250,11 @@
       After the modal dialog is shown, all the windows from its SB are blocked,
       except those that block this modal dialog.
     </p><p>
-      <u>Hiding the window or modeless dialog: "F"</u><br>
+      Hiding the window or modeless dialog: "F"<br>
       If F was blocked by any modal dialog M, it becomes unblocked and is
       removed from M's blocked windows list.
     </p><p>
-      <u>Hiding the modal dialog: "M"</u><br>
+      Hiding the modal dialog: "M"<br>
       If M was blocked by any other modal dialog, for example, "N",
       it becomes unblocked and
       is removed from N's blocked windows list. Then, all the windows and dialogs
@@ -273,11 +273,11 @@
       </li></ul>
       By default, a window's modal exclusion property is turned off.
       <ol>
-        <li><u>Application-modal exclusion</u><br>
+        <li>Application-modal exclusion<br>
           If a window is application-modal excluded, it is not blocked by any
           application-modal dialogs. Also, it is not blocked by document-modal
           dialogs from outside of its child hierarchy.
-        </li><li><u>Toolkit-modal exclusion</u><br>
+        </li><li>Toolkit-modal exclusion<br>
           If a window is toolkit-modal excluded, it is not blocked
           by any application- or toolkit-modal dialogs. Also, it is not
           blocked by document-modal dialogs from outside of their child hierarchy.
@@ -285,19 +285,19 @@
     <blockquote>
       <hr>
         <b>Implementation note</b>: Changing the modal exclusion type for a visible window
-        may have no effect until it is hidden and then shown again.
+        may have no effect until it is hidden and then shown again.<hr>
     </blockquote>
 
     <a id="Related"></a>
     <h2>Related AWT features</h2>
 
     <p>
-      <u>Always-On-Top</u><br>
+      Always-On-Top<br>
       When a modal dialog that is not always-on-top blocks an always-on-top window,
       their relative Z-order is unspecified and platform-dependent.
     </p>
     <p>
-      <u>The <code>toFront()</code> and <code>toBack()</code> methods</u><br>
+      The <code>toFront()</code> and <code>toBack()</code> methods<br>
       A modal dialog should always be above all its blocked windows. Thus, if a blocked
       window is brought to the front, its blocking dialog, if any, is also brought to the
       front and remains above the blocked window. Likewise, if a modal dialog is sent to
@@ -305,7 +305,7 @@
       blocking dialog.
     </p>
     <p>
-      <u>Minimizing, maximizing and closing blocked windows</u><br>
+      Minimizing, maximizing and closing blocked windows<br>
       When a modal dialog blocks a window, the user may not be able to maximize or
       minimize the blocked window&mdash; however, the actual behavior is unspecified
       and platform-dependent. In any case, the user can't close the blocked window
@@ -314,13 +314,13 @@
       window.
     </p>
     <p>
-      <u>Blocked windows activations</u><br>
+      Blocked windows activations<br>
       When the user selects a blocked window, it may be brought to the front, along
       with the blocking modal dialog which would then become the active window&mdash;
       however, the actual behavior is unspecified and platform-dependent.
     </p>
     <p>
-      <u>Hiding a modal dialog</u><br>
+      Hiding a modal dialog<br>
       When the modal dialog that currently has focus is hidden, it is unspecified
       and platform-dependent, which other window will become the active window.
       Any of the following may become the active window:
@@ -378,87 +378,67 @@
     <a id="Examples"></a>
     </p><h2>Examples</h2>
 
-    <table border="0">
-      <tbody><tr>
-        <td style="text-align:left" >
-	<ol>
-          <li>Frame "F" is shown<br>
-          <li>Document-modal dialog "D<sub>i</sub>" is shown<br>
-          <li>F becomes blocked by D<sub>i</sub> &mdash; it's in the same document<br>
-          <li>Document-modal dialog "D<sub>ii</sub>" is shown<br>
-          <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's in the
-              same document<br>
-	  </ol>
-          <br>
-        </td>
-        <td>
-          <img src="modal-example1.gif" alt="Example 1">
-          <br>
-        </td>
-      </tr>
-      <tr>
-        <td style="text-align:left">
-	<ol>
-         <li>Frame "F" is shown<br>
-         <li>Document-modal dialog "D<sub>i</sub>" is shown<br>
-         <li>F becomes blocked by D<sub>i</sub> &mdash; it's in the same document<br>
-         <li>Document-modal dialog "D<sub>ii</sub>" is shown<br>
-         <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash;
-             it's in the same document<br>
-         <li>D<sub>i</sub> is hidden<br>
-         <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document<br>
-         </ol>
-	 <br>
-        </td>
-        <td>
-          <img src="modal-example2.gif" alt="Example 2">
-          <br>
-        </td>
-      </tr>
-      <tr>
-        <td style="text-align:left">
-	<ol>
-          <li>Frame "F" is shown<br>
-          <li>Toolkit-modal dialog "D<sub>i</sub>" is created, but not shown<br>
-          <li>Document-modal dialog "D<sub>ii</sub>" is shown<br>
-          <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document<br>
-          <li>Application-modal dialog "D<sub>iii</sub>" is shown<br>
-          <li>D<sub>ii</sub> becomes blocked by D<sub>iii</sub> &mdash;
-              it's in the same application<br>
-          <li>D<sub>i</sub> is shown<br>
-          <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's its owner<br>
-          <li>D<sub>iii</sub> remains unblocked &mdash; it blocks D<sub>ii</sub> and
-              D<sub>ii</sub> blocks D<sub>i</sub><br>
-	  </ol>
-          <br>
-        </td>
-        <td>
-          <img src="modal-example3.gif" alt="Example 3">
-          <br>
-        </td>
-      </tr>
-      <tr>
-        <td style="text-align:left">
-    <ol>
-          <li>Frame "F" is shown<br>
-          <li>Toolkit-modal dialog "D<sub>i</sub>" is created, but not shown<br>
-          <li>Document-modal dialog "D<sub>ii</sub>" is shown<br>
-          <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document<br>
-          <li>Application-modal dialog "D<sub>iii</sub>" is shown<br>
-          <li>D<sub>ii</sub> becomes blocked by D<sub>iii</sub> &mdash; it's in the
-              same application<br>
-          <li>D<sub>i</sub> is shown<br>
-          <li>D<sub>iii</sub> becomes blocked by D<sub>i</sub> &mdash; D<sub>i</sub>
-              is not blocked<br>
-          <li>D<sub>i</sub> remains unblocked<br>
-	  </ol>
-          <br>
-        </td>
-        <td>
-          <img src="modal-example4.gif" alt="Example 4">
-          <br>
-        </td>
-      </tr>
-    </tbody></table>
+    <h3>Example 1</h3>
+    <ol style="float: left">
+        <li>Frame F is shown<br>
+        <li>Document-modal dialog D<sub>i</sub> is shown<br>
+        <li>F becomes blocked by D<sub>i</sub> &mdash; it's in the same document<br>
+        <li>Document-modal dialog D<sub>ii</sub> is shown<br>
+        <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's in the
+            same document<br>
+    </ol>
+    <p style="float: left; margin-left: 1em">
+        <img src="modal-example1.gif" alt="Example 1">
+    </p>
+
+    <h3 style="clear: left">Example 2</h3>
+    <ol style="float: left">
+        <li>Frame F is shown<br>
+        <li>Document-modal dialog D<sub>i</sub> is shown<br>
+        <li>F becomes blocked by D<sub>i</sub> &mdash; it's in the same document<br>
+        <li>Document-modal dialog D<sub>ii</sub> is shown<br>
+        <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's in the
+            same document<br>
+    </ol>
+    <p style="float: left; margin-left: 1em">
+        <img src="modal-example2.gif" alt="Example 2">
+    </p>
+
+    <h3 style="clear: left">Example 3</h3>
+    <ol style="float: left">
+        <li>Frame F is shown<br>
+        <li>Toolkit-modal dialog D<sub>i</sub> is created, but not shown<br>
+        <li>Document-modal dialog D<sub>ii</sub> is shown<br>
+        <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document<br>
+        <li>Application-modal dialog D<sub>iii</sub> is shown<br>
+        <li>D<sub>ii</sub> becomes blocked by D<sub>iii</sub> &mdash;
+            it's in the same application<br>
+        <li>D<sub>i</sub> is shown<br>
+        <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's its owner<br>
+        <li>D<sub>iii</sub> remains unblocked &mdash; it blocks D<sub>ii</sub> and
+            D<sub>ii</sub> blocks D<sub>i</sub><br>
+    </ol>
+    <p style="float: left; margin-left: 1em">
+        <img src="modal-example3.gif" alt="Example 3">
+    </p>
+
+    <h3 style="clear: left">Example 4</h3>
+    <ol style="float: left">
+        <li>Frame F is shown<br>
+        <li>Toolkit-modal dialog D<sub>i</sub> is created, but not shown<br>
+        <li>Document-modal dialog D<sub>ii</sub> is shown<br>
+        <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document<br>
+        <li>Application-modal dialog D<sub>iii</sub> is shown<br>
+        <li>D<sub>ii</sub> becomes blocked by D<sub>iii</sub> &mdash; it's in the
+            same application<br>
+        <li>D<sub>i</sub> is shown<br>
+        <li>D<sub>iii</sub> becomes blocked by D<sub>i</sub> &mdash; D<sub>i</sub>
+            is not blocked<br>
+        <li>D<sub>i</sub> remains unblocked<br>
+    </ol>
+    <p style="float: left; margin-left: 1em">
+        <img src="modal-example4.gif" alt="Example 4">
+    </p>
+    <br style="clear:both;">
 </main>
 </body></html>
--- a/src/java.desktop/share/classes/java/awt/font/NumericShaper.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/font/NumericShaper.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,17 +116,19 @@
  * </thead>
  * <tbody>
  *   <tr>
- *     <th scope="row" rowspan="2">Arabic
+ *     <th scope="rowgroup" rowspan="2">Arabic
  *     <td>{@link NumericShaper#ARABIC NumericShaper.ARABIC}
  *     <br>
  *     {@link NumericShaper#EASTERN_ARABIC NumericShaper.EASTERN_ARABIC}
  *     <td>{@link NumericShaper#EASTERN_ARABIC NumericShaper.EASTERN_ARABIC}
  *   </tr>
  *   <tr>
- *     <th scope="row">{@link NumericShaper.Range#ARABIC}
+ *     <td>{@link NumericShaper.Range#ARABIC}
  *     <br>
  *     {@link NumericShaper.Range#EASTERN_ARABIC}
  *     <td>{@link NumericShaper.Range#EASTERN_ARABIC}
+ * </tbody>
+ * <tbody>
  *   <tr>
  *     <th scope="row">Tai Tham
  *     <td>{@link NumericShaper.Range#TAI_THAM_HORA}
--- a/src/java.desktop/share/classes/java/awt/geom/Path2D.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/java/awt/geom/Path2D.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -892,83 +892,83 @@
          * <caption>Constants</caption>
          * <thead>
          * <tr>
-         * <th>Constant Name</th>
-         * <th>Byte Value</th>
-         * <th>Followed by</th>
-         * <th>Description</th>
+         * <th scope="col">Constant Name</th>
+         * <th scope="col">Byte Value</th>
+         * <th scope="col">Followed by</th>
+         * <th scope="col">Description</th>
          * </tr>
          * </thead>
          * <tbody>
          * <tr>
-         * <td>{@code SERIAL_STORAGE_FLT_ARRAY}</td>
+         * <th scope="row">{@code SERIAL_STORAGE_FLT_ARRAY}</th>
          * <td>0x30</td>
          * <td></td>
          * <td>A hint that the original {@code Path2D} object stored
          * the coordinates in a Java array of floats.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_STORAGE_DBL_ARRAY}</td>
+         * <th scope="row">{@code SERIAL_STORAGE_DBL_ARRAY}</th>
          * <td>0x31</td>
          * <td></td>
          * <td>A hint that the original {@code Path2D} object stored
          * the coordinates in a Java array of doubles.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_FLT_MOVETO}</td>
+         * <th scope="row">{@code SERIAL_SEG_FLT_MOVETO}</th>
          * <td>0x40</td>
          * <td>2 floats</td>
          * <td>A {@link #moveTo moveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_FLT_LINETO}</td>
+         * <th scope="row">{@code SERIAL_SEG_FLT_LINETO}</th>
          * <td>0x41</td>
          * <td>2 floats</td>
          * <td>A {@link #lineTo lineTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_FLT_QUADTO}</td>
+         * <th scope="row">{@code SERIAL_SEG_FLT_QUADTO}</th>
          * <td>0x42</td>
          * <td>4 floats</td>
          * <td>A {@link #quadTo quadTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_FLT_CUBICTO}</td>
+         * <th scope="row">{@code SERIAL_SEG_FLT_CUBICTO}</th>
          * <td>0x43</td>
          * <td>6 floats</td>
          * <td>A {@link #curveTo curveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_DBL_MOVETO}</td>
+         * <th scope="row">{@code SERIAL_SEG_DBL_MOVETO}</th>
          * <td>0x50</td>
          * <td>2 doubles</td>
          * <td>A {@link #moveTo moveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_DBL_LINETO}</td>
+         * <th scope="row">{@code SERIAL_SEG_DBL_LINETO}</th>
          * <td>0x51</td>
          * <td>2 doubles</td>
          * <td>A {@link #lineTo lineTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_DBL_QUADTO}</td>
+         * <th scope="row">{@code SERIAL_SEG_DBL_QUADTO}</th>
          * <td>0x52</td>
          * <td>4 doubles</td>
          * <td>A {@link #curveTo curveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_DBL_CUBICTO}</td>
+         * <th scope="row">{@code SERIAL_SEG_DBL_CUBICTO}</th>
          * <td>0x53</td>
          * <td>6 doubles</td>
          * <td>A {@link #curveTo curveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_CLOSE}</td>
+         * <th scope="row">{@code SERIAL_SEG_CLOSE}</th>
          * <td>0x60</td>
          * <td></td>
          * <td>A {@link #closePath closePath} path segment.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_PATH_END}</td>
+         * <th scope="row">{@code SERIAL_PATH_END}</th>
          * <td>0x61</td>
          * <td></td>
          * <td>There are no more path segments following.</td>
@@ -1666,83 +1666,83 @@
          * <caption>Constants</caption>
          * <thead>
          * <tr>
-         * <th>Constant Name</th>
-         * <th>Byte Value</th>
-         * <th>Followed by</th>
-         * <th>Description</th>
+         * <th scope="col">Constant Name</th>
+         * <th scope="col">Byte Value</th>
+         * <th scope="col">Followed by</th>
+         * <th scope="col">Description</th>
          * </tr>
          * </thead>
          * <tbody>
          * <tr>
-         * <td>{@code SERIAL_STORAGE_FLT_ARRAY}</td>
+         * <th scope="row">{@code SERIAL_STORAGE_FLT_ARRAY}</th>
          * <td>0x30</td>
          * <td></td>
          * <td>A hint that the original {@code Path2D} object stored
          * the coordinates in a Java array of floats.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_STORAGE_DBL_ARRAY}</td>
+         * <th scope="row">{@code SERIAL_STORAGE_DBL_ARRAY}</th>
          * <td>0x31</td>
          * <td></td>
          * <td>A hint that the original {@code Path2D} object stored
          * the coordinates in a Java array of doubles.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_FLT_MOVETO}</td>
+         * <th scope="row">{@code SERIAL_SEG_FLT_MOVETO}</th>
          * <td>0x40</td>
          * <td>2 floats</td>
          * <td>A {@link #moveTo moveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_FLT_LINETO}</td>
+         * <th scope="row">{@code SERIAL_SEG_FLT_LINETO}</th>
          * <td>0x41</td>
          * <td>2 floats</td>
          * <td>A {@link #lineTo lineTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_FLT_QUADTO}</td>
+         * <th scope="row">{@code SERIAL_SEG_FLT_QUADTO}</th>
          * <td>0x42</td>
          * <td>4 floats</td>
          * <td>A {@link #quadTo quadTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_FLT_CUBICTO}</td>
+         * <th scope="row">{@code SERIAL_SEG_FLT_CUBICTO}</th>
          * <td>0x43</td>
          * <td>6 floats</td>
          * <td>A {@link #curveTo curveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_DBL_MOVETO}</td>
+         * <th scope="row">{@code SERIAL_SEG_DBL_MOVETO}</th>
          * <td>0x50</td>
          * <td>2 doubles</td>
          * <td>A {@link #moveTo moveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_DBL_LINETO}</td>
+         * <th scope="row">{@code SERIAL_SEG_DBL_LINETO}</th>
          * <td>0x51</td>
          * <td>2 doubles</td>
          * <td>A {@link #lineTo lineTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_DBL_QUADTO}</td>
+         * <th scope="row">{@code SERIAL_SEG_DBL_QUADTO}</th>
          * <td>0x52</td>
          * <td>4 doubles</td>
          * <td>A {@link #curveTo curveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_DBL_CUBICTO}</td>
+         * <th scope="row">{@code SERIAL_SEG_DBL_CUBICTO}</th>
          * <td>0x53</td>
          * <td>6 doubles</td>
          * <td>A {@link #curveTo curveTo} path segment follows.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_SEG_CLOSE}</td>
+         * <th scope="row">{@code SERIAL_SEG_CLOSE}</th>
          * <td>0x60</td>
          * <td></td>
          * <td>A {@link #closePath closePath} path segment.</td>
          * </tr>
          * <tr>
-         * <td>{@code SERIAL_PATH_END}</td>
+         * <th scope="row">{@code SERIAL_PATH_END}</th>
          * <td>0x61</td>
          * <td></td>
          * <td>There are no more path segments following.</td>
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html	Mon Sep 09 12:23:22 2019 -0700
@@ -5,7 +5,7 @@
   <title>GIF Metadata Format Specification</title>
 </head>
 <!--
-Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
@@ -347,92 +347,120 @@
 <a id="mapping"></a>
 <table border=1>
 <caption><b>Mapping of Standard to GIF Native Stream Metadata</b></caption>
+<thead>
 <tr>
-<th>Standard Metadata Component</th>
-<th>GIF Native Stream Metadata Component</th>
+<th scope="col">Index</th>
+<th scope="col">Standard Metadata Component</th>
+<th scope="col">GIF Native Stream Metadata Component</th>
 </tr>
+</thead>
+<tbody>
 <tr>
+<th scope="row">1</th>
 <td>/Chroma/Palette/PaletteEntry@index</td>
 <td>/GlobalColorTable/ColorTableEntry@index</td>
 </tr>
 <tr>
+<th scope="row">2</th>
 <td>/Chroma/Palette/PaletteEntry@red</td>
 <td>/GlobalColorTable/ColorTableEntry@red</td>
 </tr>
 <tr>
+<th scope="row">3</th>
 <td>/Chroma/Palette/PaletteEntry@green</td>
 <td>/GlobalColorTable/ColorTableEntry@green</td>
 </tr>
 <tr>
+<th scope="row">4</th>
 <td>/Chroma/Palette/PaletteEntry@blue</td>
 <td>/GlobalColorTable/ColorTableEntry@blue</td>
 </tr>
 <tr>
+<th scope="row">5</th>
 <td>/Chroma/BackgroundIndex@value</td>
 <td>/GlobalColorTable@backgroundColorIndex</td>
 </tr>
 <tr>
+<th scope="row">6</th>
 <td>/Data/BitsPerSample@value</td>
 <td>/LogicalScreenDescriptor@colorResolution</td>
 </tr>
 <tr>
+<th scope="row">7</th>
 <td>/Dimension/PixelAspectRatio@value</td>
 <td>/LogicalScreenDescriptor@pixelAspectRatio</td>
 </tr>
 <tr>
+<th scope="row">8</th>
 <td>/Dimension/HorizontalScreenSize@value</td>
 <td>/LogicalScreenDescriptor@logicalScreenWidth</td>
 </tr>
 <tr>
+<th scope="row">9</th>
 <td>/Dimension/VerticalScreenSize@value</td>
 <td>/LogicalScreenDescriptor@logicalScreenHeight</td>
 </tr>
 <tr>
+<th scope="row">10</th>
 <td>/Document/FormatVersion@value</td>
 <td>/Version@value</td>
 </tr>
+</tbody>
 </table>
 
 <table border=1>
 <caption><b>Mapping of Standard to GIF Native Image Metadata</b></caption>
+<thead>
 <tr>
-<th>Standard Metadata Component</th>
-<th>GIF Native Image Metadata Component</th>
+<th scope="col">Index</th>
+<th scope="col">Standard Metadata Component</th>
+<th scope="col">GIF Native Image Metadata Component</th>
 </tr>
+</thead>
+<tbody>
 <tr>
+<th scope="row">1</th>
 <td>/Chroma/Palette/PaletteEntry@index</td>
 <td>/LocalColorTable/ColorTableEntry@index</td>
 </tr>
 <tr>
+<th scope="row">2</th>
 <td>/Chroma/Palette/PaletteEntry@red</td>
 <td>/LocalColorTable/ColorTableEntry@red</td>
 </tr>
 <tr>
+<th scope="row">3</th>
 <td>/Chroma/Palette/PaletteEntry@green</td>
 <td>/LocalColorTable/ColorTableEntry@green</td>
 </tr>
 <tr>
+<th scope="row">4</th>
 <td>/Chroma/Palette/PaletteEntry@blue</td>
 <td>/LocalColorTable/ColorTableEntry@blue</td>
 </tr>
 <tr>
+<th scope="row">5</th>
 <td>/Dimension/HorizontalPixelOffset@value</td>
 <td>/ImageDescriptor@imageLeftPosition</td>
 </tr>
 <tr>
+<th scope="row">6</th>
 <td>/Dimension/VerticalPixelOffset@value</td>
 <td>/ImageDescriptor@imageTopPosition</td>
 </tr>
 <tr>
+<th scope="row">7</th>
 <td>/Text/TextEntry@value</td>
 <td>/CommentExtensions/CommentExtension@value</td>
 </tr>
 <tr>
+<th scope="row">8</th>
 <td>/Transparency/TransparentIndex@value</td>
 <td>/GraphicControlExtension@transparentColorIndex
 (/GraphicControlExtension@transparentColorFlag is also set to
 "TRUE")</td>
 </tr>
+</tbody>
 </table>
 </main>
 </body>
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html	Mon Sep 09 12:23:22 2019 -0700
@@ -5,7 +5,7 @@
     <title>TIFF Metadata Format Specification and Usage Notes</title>
 </head>
 <!--
-Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
@@ -235,11 +235,16 @@
 in the following table.
 
 <table border="1">
+<thead>
 <tr>
-<th>Standard Metadata Element</th>
-<th>Derivation from TIFF Fields</th>
+<th scope="col">Index</th>
+<th scope="col">Standard Metadata Element</th>
+<th scope="col">Derivation from TIFF Fields</th>
 </tr>
+</thead>
+<tbody>
 <tr>
+<th scope="row">1</th>
 <td>/Chroma/ColorSpaceType@name</td>
 <td>PhotometricInterpretation: WhiteIsZero, BlackIsZero, TransparencyMask =
 "GRAY"; RGB, PaletteColor =&gt; "RGB"; CMYK =&gt; "CMYK";
@@ -247,18 +252,22 @@
 CIELab, ICCLab =&gt; "Lab".</td>
 </tr>
 <tr>
+<th scope="row">2</th>
 <td>/Chroma/NumChannels@value</td>
 <td>SamplesPerPixel</td>
 </tr>
 <tr>
+<th scope="row">3</th>
 <td>/Chroma/BlackIsZero@value</td>
 <td>"TRUE" &lt;=&gt; PhotometricInterpretation =&gt; WhiteIsZero</td>
 </tr>
 <tr>
+<th scope="row">4</th>
 <td>/Chroma/Palette</td>
 <td>ColorMap</td>
 </tr>
 <tr>
+<th scope="row">5</th>
 <td>/Compression/CompressionTypeName@value</td>
 <td>Compression: Uncompressed =&gt; "none"; CCITT 1D =&gt; "CCITT
 RLE";
@@ -269,14 +278,17 @@
 Deflate =&gt; "Deflate"; Exif JPEG =&gt; "JPEG".</td>
 </tr>
 <tr>
+<th scope="row">6</th>
 <td>/Compression/Lossless@value</td>
 <td>Compression: JPEG or New JPEG =&gt; "FALSE"; otherwise "TRUE".</td>
 </tr>
 <tr>
+<th scope="row">7</th>
 <td>/Data/PlanarConfiguration@value</td>
 <td>Chunky =&gt; "PixelInterleaved"; Planar =&gt; "PlaneInterleaved".</td>
 </tr>
 <tr>
+<th scope="row">8</th>
 <td>/Data/SampleFormat@value</td>
 <td>PhotometricInterpretation PaletteColor =&gt; "Index";
 SampleFormat unsigned integer data =&gt; "UnsignedIntegral";
@@ -286,53 +298,65 @@
 </td>
 </tr>
 <tr>
+<th scope="row">9</th>
 <td>/Data/BitsPerSample@value</td>
 <td>BitsPerSample as a space-separated list.</td>
 </tr>
 <tr>
+<th scope="row">10</th>
 <td>/Data/SampleMSB@value</td>
 <td>FillOrder: left-to-right =&gt; space-separated list of BitsPerSample-1;
 right-to-left =&gt; space-separated list of 0s.</td>
 </tr>
 <tr>
+<th scope="row">11</th>
 <td>/Dimension/PixelAspectRatio@value</td>
 <td>(1/XResolution)/(1/YResolution)</td>
 </tr>
 <tr>
+<th scope="row">12</th>
 <td>/Dimension/ImageOrientation@value</td>
 <td>Orientation</td>
 </tr>
 <tr>
+<th scope="row">13</th>
 <td>/Dimension/HorizontalPixelSize@value</td>
 <td>1/XResolution in millimeters if ResolutionUnit is not None.</td>
 </tr>
 <tr>
+<th scope="row">14</th>
 <td>/Dimension/VerticalPixelSize@value</td>
 <td>1/YResolution in millimeters if ResolutionUnit is not None.</td>
 </tr>
 <tr>
+<th scope="row">15</th>
 <td>/Dimension/HorizontalPosition@value</td>
 <td>XPosition in millimeters if ResolutionUnit is not None.</td>
 </tr>
 <tr>
+<th scope="row">16</th>
 <td>/Dimension/VerticalPosition@value</td>
 <td>YPosition in millimeters if ResolutionUnit is not None.</td>
 </tr>
 <tr>
+<th scope="row">17</th>
 <td>/Document/FormatVersion@value</td>
 <td>6.0</td>
 </tr>
 <tr>
+<th scope="row">18</th>
 <td>/Document/SubimageInterpretation@value</td>
 <td>NewSubFileType: transparency =&gt; "TransparencyMask";
 reduced-resolution =&gt; "ReducedResolution";
 single page =&gt; "SinglePage".</td>
 </tr>
 <tr>
+<th scope="row">19</th>
 <td>/Document/ImageCreationTime@value</td>
 <td>DateTime</td>
 </tr>
 <tr>
+<th scope="row">20</th>
 <td>/Text/TextEntry</td>
 <td>DocumentName, ImageDescription, Make, Model, PageName, Software,
 Artist, HostComputer, InkNames, Copyright:
@@ -343,10 +367,12 @@
 used to create the image.</td>
 </tr>
 <tr>
+<th scope="row">21</th>
 <td>/Transparency/Alpha@value</td>
 <td>ExtraSamples: associated alpha =&gt; "premultiplied";
 unassociated alpha =&gt; "nonpremultiplied".</td>
 </tr>
+</tbody>
 </table>
 
 <h3><a id="ExifRead">Reading Exif Images</a></h3>
@@ -490,40 +516,55 @@
 
 <table border=1>
 <caption><b>Supported Compression Types</b></caption>
-<tr><th>Compression Type</th> <th>Description</th> <th>Reference</th></tr>
+<thead>
 <tr>
+  <th scope="col">Index</th>
+  <th scope="col">Compression Type</th>
+  <th scope="col">Description</th>
+  <th scope="col">Reference</th></tr>
+<tr>
+</thead>
+<tbody>
+<th scope="row">1</th>
 <td>CCITT RLE</td>
 <td>Modified Huffman compression</td>
 <td>TIFF 6.0 Specification, Section 10</td>
 </tr>
 <tr>
+<th scope="row">2</th>
 <td>CCITT T.4</td>
 <td>CCITT T.4 bilevel encoding/Group 3 facsimile compression</td>
 <td>TIFF 6.0 Specification, Section 11</td>
 </tr>
 <tr>
+<th scope="row">3</th>
 <td>CCITT T.6</td>
 <td>CCITT T.6 bilevel encoding/Group 4 facsimile compression</td>
 <td>TIFF 6.0 Specification, Section 11</td></tr>
 <tr>
+<th scope="row">4</th>
 <td>LZW</td>
 <td>LZW compression</td>
 <td>TIFF 6.0 Specification, Section 13</td></tr>
 <tr>
+<th scope="row">5</th>
 <td>JPEG</td>
 <td>"New" JPEG-in-TIFF compression</td>
 <td>TIFF Technical Note #2</td></tr>
 <tr>
+<th scope="row">6</th>
 <td>ZLib</td>
 <td>"Deflate/Inflate" compression (see note following this table)</td>
 <td>Adobe Photoshop&#174; TIFF Technical Notes</td>
 </tr>
 <tr>
+<th scope="row">7</th>
 <td>PackBits</td>
 <td>Byte-oriented, run length compression</td>
 <td>TIFF 6.0 Specification, Section 9</td>
 </tr>
 <tr>
+<th scope="row">8</th>
 <td>Deflate</td>
 <td>"Zip-in-TIFF" compression (see note following this table)</td>
 <td><a href="https://tools.ietf.org/html/rfc1950">
@@ -532,10 +573,12 @@
 DEFLATE Compressed Data Format Specification</a></td>
 </tr>
 <tr>
+<th scope="row">9</th>
 <td>Exif JPEG</td>
 <td>Exif-specific JPEG compression (see note following this table)</td>
 <td><a href="http://www.exif.org/Exif2-2.PDF">Exif 2.2 Specification</a>
 (PDF), section 4.5.5, "Basic Structure of Thumbnail Data"</td>
+</tbody>
 </table>
 
 <p>
@@ -721,11 +764,16 @@
 given in the following table.
 
 <table border="1">
+<thead>
 <tr>
-<th>TIFF Field</th>
-<th>Derivation from Standard Metadata Elements</th>
+<th scope="col">Index</th>
+<th scope="col">TIFF Field</th>
+<th scope="col">Derivation from Standard Metadata Elements</th>
 </tr>
+</thead>
+<tbody>
 <tr>
+<th scope="row">1</th>
 <td>
 PhotometricInterpretation
 </td>
@@ -736,14 +784,17 @@
 "CMYK" =&gt; CMYK; "Lab" =&gt; CIELab.</td>
 </tr>
 <tr>
+<th scope="row">2</th>
 <td>SamplesPerPixel</td>
 <td>/Chroma/NumChannels@value</td>
 </tr>
 <tr>
+<th scope="row">3</th>
 <td>ColorMap</td>
 <td>/Chroma/Palette</td>
 </tr>
 <tr>
+<th scope="row">4</th>
 <td>Compression</td>
 <td>/Compression/CompressionTypeName@value: "none" =&gt; Uncompressed;
 "CCITT RLE" =&gt; CCITT 1D; "CCITT T.4" =&gt; Group 3 Fax; "CCITT T.6" =&gt; Group 4
@@ -751,11 +802,13 @@
 "PackBits" =&gt; PackBits; "Deflate" =&gt; Deflate.</td>
 </tr>
 <tr>
+<th scope="row">5</th>
 <td>PlanarConfiguration</td>
 <td>/Data/PlanarConfiguration@value: "PixelInterleaved" =&gt; Chunky;
 "PlaneInterleaved" =&gt; Planar.</td>
 </tr>
 <tr>
+<th scope="row">6</th>
 <td>SampleFormat</td>
 <td>/Data/SampleFormat@value: "SignedIntegral" =&gt; two's complement signed
 integer data; "UnsignedIntegral" =&gt; unsigned integer data; "Real" =&gt;
@@ -763,54 +816,65 @@
 </td>
 </tr>
 <tr>
+<th scope="row">7</th>
 <td>BitsPerSample</td>
 <td>/Data/BitsPerSample@value: space-separated list parsed to char array.</td>
 </tr>
 <tr>
+<th scope="row">8</th>
 <td>FillOrder</td>
 <td>/Data/SampleMSB@value: if all values in space-separated list are 0s =&gt;
 right-to-left; otherwise =&gt; left-to-right.
 </td>
 </tr>
 <tr>
+<th scope="row">9</th>
 <td>XResolution</td>
 <td>(10 / /Dimension/HorizontalPixelSize@value) or
 (10 / (/Dimension/VerticalPixelSize@value *
 /Dimension/PixelAspectRatio@value))</td>
 </tr>
 <tr>
+<th scope="row">10</th>
 <td>YResolution</td>
 <td>(10 / /Dimension/VerticalPixelSize@value) or
 (10 / (/Dimension/HorizontalPixelSize@value /
 /Dimension/PixelAspectRatio@value))</td>
 </tr>
 <tr>
+<th scope="row">11</th>
 <td>ResolutionUnit</td>
 <td>Centimeter if XResolution or YResolution set; otherwise None.</td>
 </tr>
 <tr>
+<th scope="row">12</th>
 <td>Orientation</td>
 <td>/Dimension/ImageOrientation@value</td>
 </tr>
 <tr>
+<th scope="row">13</th>
 <td>XPosition</td>
 <td>/Dimension/HorizontalPosition@value / 10</td>
 </tr>
 <tr>
+<th scope="row">14</th>
 <td>YPosition</td>
 <td>/Dimension/VerticalPosition@value / 10</td>
 </tr>
 <tr>
+<th scope="row">15</th>
 <td>NewSubFileType</td>
 <td>/Document/SubimageInterpretation@value: "TransparencyMask" =&gt;
 transparency mask; "ReducedResolution" =&gt; reduced-resolution;
 "SinglePage" =&gt; single page.</td>
 </tr>
 <tr>
+<th scope="row">16</th>
 <td>DateTime</td>
 <td>/Document/ImageCreationTime@value</td>
 </tr>
 <tr>
+<th scope="row">17</th>
 <td>DocumentName, ImageDescription, Make, Model, PageName, Software,
 Artist, HostComputer, InkNames, Copyright</td>
 <td>/Text/TextEntry: if /Text/TextEntry@keyword is the name of any of the
@@ -818,14 +882,12 @@
 /Text/TextEntry@value and count 1.</td>
 </tr>
 <tr>
+<th scope="row">18</th>
 <td>ExtraSamples</td>
 <td>/Transparency/Alpha@value: "premultiplied" =&gt; associated alpha, count 1;
 "nonpremultiplied" =&gt; unassociated alpha, count 1.</td>
 </tr>
-<tr>
-<td></td>
-<td></td>
-</tr>
+</tbody>
 </table>
 
 <h3><a id="ExifWrite">Writing Exif Images</a></h3>
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,50 +40,31 @@
  * determines what constitutes a "copy" for purposes of finishing.
  * <p>
  * Standard Finishings values are:
- * <table class="borderless" style="width:100%;margin: 0px auto">
- * <caption>Standard Finishings values</caption>
- *   <tr>
- *     <td style="width:10%">&nbsp;
- *     <td style="width:27%">{@link #NONE NONE}
- *     <td style="width:27%">{@link #STAPLE STAPLE}
- *     <td style="width:36%">{@link #EDGE_STITCH EDGE_STITCH}
- *   <tr>
- *     <td>&nbsp;
- *     <td>{@link #BIND BIND}
- *     <td>{@link #SADDLE_STITCH SADDLE_STITCH}
- *     <td>{@link #COVER COVER}
- *     <td>&nbsp;
- * </table>
+ * <ul>
+ *   <li>{@link #NONE NONE}
+ *   <li>{@link #STAPLE STAPLE}
+ *   <li>{@link #EDGE_STITCH EDGE_STITCH}
+ *   <li>{@link #BIND BIND}
+ *   <li>{@link #SADDLE_STITCH SADDLE_STITCH}
+ *   <li>{@link #COVER COVER}
+ * </ul>
  * <p>
  * The following {@code Finishings} values are more specific; they indicate a
  * corner or an edge as if the document were a portrait document:
- * <table class="borderless" style="width:100%;margin: 0px auto">
- * <caption>Specific Finishings values</caption>
- *   <tr>
- *     <td style="width:10%">&nbsp;
- *     <td style="width:27%">{@link #STAPLE_TOP_LEFT STAPLE_TOP_LEFT}
- *     <td style="width:27%">{@link #EDGE_STITCH_LEFT EDGE_STITCH_LEFT}
- *     <td style="width:27%">{@link #STAPLE_DUAL_LEFT STAPLE_DUAL_LEFT}
- *     <td style="width:9%">&nbsp;
- *   <tr>
- *     <td style="width:10%">&nbsp;
- *     <td style="width:27%">{@link #STAPLE_BOTTOM_LEFT STAPLE_BOTTOM_LEFT}
- *     <td style="width:27%">{@link #EDGE_STITCH_TOP EDGE_STITCH_TOP}
- *     <td style="width:27%">{@link #STAPLE_DUAL_TOP STAPLE_DUAL_TOP}
- *     <td style="width:9%">&nbsp;
- *   <tr>
- *     <td style="width:10%">&nbsp;
- *     <td style="width:27%">{@link #STAPLE_TOP_RIGHT STAPLE_TOP_RIGHT}
- *     <td style="width:27%">{@link #EDGE_STITCH_RIGHT EDGE_STITCH_RIGHT}
- *     <td style="width:27%">{@link #STAPLE_DUAL_RIGHT STAPLE_DUAL_RIGHT}
- *     <td style="width:9%">&nbsp;
- *   <tr>
- *     <td style="width:10%">&nbsp;
- *     <td style="width:27%">{@link #STAPLE_BOTTOM_RIGHT STAPLE_BOTTOM_RIGHT}
- *     <td style="width:27%">{@link #EDGE_STITCH_BOTTOM EDGE_STITCH_BOTTOM}
- *     <td style="width:27%">{@link #STAPLE_DUAL_BOTTOM STAPLE_DUAL_BOTTOM}
- *     <td style="width:9%">&nbsp;
- * </table>
+ * <ul>
+ *   <li>{@link #STAPLE_TOP_LEFT STAPLE_TOP_LEFT}
+ *   <li>{@link #EDGE_STITCH_LEFT EDGE_STITCH_LEFT}
+ *   <li>{@link #STAPLE_DUAL_LEFT STAPLE_DUAL_LEFT}
+ *   <li>{@link #STAPLE_BOTTOM_LEFT STAPLE_BOTTOM_LEFT}
+ *   <li>{@link #EDGE_STITCH_TOP EDGE_STITCH_TOP}
+ *   <li>{@link #STAPLE_DUAL_TOP STAPLE_DUAL_TOP}
+ *   <li>{@link #STAPLE_TOP_RIGHT STAPLE_TOP_RIGHT}
+ *   <li>{@link #EDGE_STITCH_RIGHT EDGE_STITCH_RIGHT}
+ *   <li>{@link #STAPLE_DUAL_RIGHT STAPLE_DUAL_RIGHT}
+ *   <li>{@link #STAPLE_BOTTOM_RIGHT STAPLE_BOTTOM_RIGHT}
+ *   <li>{@link #EDGE_STITCH_BOTTOM EDGE_STITCH_BOTTOM}
+ *   <li>{@link #STAPLE_DUAL_BOTTOM STAPLE_DUAL_BOTTOM}
+ * </ul>
  * <p>
  * The STAPLE_<i>XXX</i> values are specified with respect to the document as if
  * the document were a portrait document. If the document is actually a
--- a/src/java.desktop/share/classes/javax/swing/BoxLayout.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/swing/BoxLayout.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,16 +36,12 @@
  * vertically or horizontally. The components will not wrap so, for
  * example, a vertical arrangement of components will stay vertically
  * arranged when the frame is resized.
- * <table class="borderless" style="float:right">
- * <caption>Example:</caption>
- *    <TR>
- *      <TD style="text-align:center">
- *         <P STYLE="TEXT-ALIGN:CENTER"><IMG SRC="doc-files/BoxLayout-1.gif"
- *          alt="The following text describes this graphic."
- *          WIDTH="191" HEIGHT="201" STYLE="FLOAT:BOTTOM; BORDER:0">
- *      </TD>
- *    </TR>
- * </TABLE>
+ * <div style="float:right;text-align:center">
+ *   <p><b>Example:</b>
+ *   <p><img src="doc-files/BoxLayout-1.gif"
+ *      alt="The following text describes this graphic."
+ *      width="191" height="201">
+ * </div>
  * <p>
  * Nesting multiple panels with different combinations of horizontal and
  * vertical gives an effect similar to GridBagLayout, without the
--- a/src/java.desktop/share/classes/javax/swing/JLayeredPane.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,16 +47,12 @@
  * <a href="https://docs.oracle.com/javase/tutorial/uiswing/components/layeredpane.html">How to Use a Layered Pane</a>,
  * a section in <em>The Java Tutorial</em>.
  *
- * <table class="borderless" style="float:right">
- * <caption>Example</caption>
- * <TR>
- *   <TD style="text-align:center">
- *     <P STYLE="TEXT-ALIGN:CENTER"><IMG SRC="doc-files/JLayeredPane-1.gif"
- *     alt="The following text describes this image."
- *     WIDTH="269" HEIGHT="264" STYLE="FLOAT:BOTTOM; BORDER=0">
- *   </TD>
- * </TR>
- * </TABLE>
+ * <div style="float:right;text-align:center">
+ *   <p><b>Example:</b>
+ *   <p><img src="doc-files/JLayeredPane-1.gif"
+ *       alt="The following text describes this image."
+ *       width="269" height="264">
+ * </div>
  * For convenience, <code>JLayeredPane</code> divides the depth-range
  * into several different layers. Putting a component into one of those
  * layers makes it easy to ensure that components overlap properly,
--- a/src/java.desktop/share/classes/javax/swing/JRootPane.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JRootPane.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,15 +71,11 @@
  * a given component.
  * </blockquote>
  *
- * <table class="borderless" style="float:right">
- * <caption>Example</caption>
- * <tr>
- * <td style="text-align:center">
- * <img src="doc-files/JRootPane-2.gif"
- * alt="The following text describes this graphic." HEIGHT=386 WIDTH=349>
- * </td>
- * </tr>
- * </table>
+ * <div style="float:right;text-align:center;font-weight:bold">
+ *   <p>Example:
+ *   <p><img src="doc-files/JRootPane-2.gif"
+ *      alt="the following text describes this graphic." height=386 width=349>
+ * </div>
  * The diagram at right shows the structure of a <code>JRootPane</code>.
  * A <code>JRootpane</code> is made up of a <code>glassPane</code>,
  * an optional <code>menuBar</code>, and a <code>contentPane</code>.
--- a/src/java.desktop/share/classes/javax/swing/JScrollPane.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JScrollPane.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,16 +55,12 @@
  * a section in <em>The Java Tutorial</em>.  Note that
  * <code>JScrollPane</code> does not support heavyweight components.
  *
- * <table class="borderless" style="float:right">
- * <caption>Example</caption>
- *    <TR>
- *    <TD style="text-align:center">
- *      <P STYLE="TEXT-ALIGN:CENTER"><IMG SRC="doc-files/JScrollPane-1.gif"
- *      alt="The following text describes this image."
- *      WIDTH="256" HEIGHT="248" STYLE="FLOAT:BOTTOM; BORDER:0px">
- *    </TD>
- *    </TR>
- * </TABLE>
+ * <div style="float:right;text-align:center">
+ *   <p><b>Example:</b>
+ *   <p><img src="doc-files/JScrollPane-1.gif"
+ *       alt="The following text describes this image."
+ *       width="256" height="248">
+ * </div>
  * The <code>JViewport</code> provides a window,
  * or &quot;viewport&quot; onto a data
  * source -- for example, a text file. That data source is the
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html	Mon Sep 09 12:23:22 2019 -0700
@@ -3,9 +3,10 @@
 <head>
   <meta charset="utf-8"/>
   <title>Component Specific Properties</title>
+  <style type="text/css">tbody th {font-weight:normal;text-align:left}</style>
 </head>
 <!--
-Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
@@ -56,14 +57,14 @@
 <table border="1">
 <caption>ArrowButton Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
     <tr>
-      <td>ArrowButton.size</td>
+      <th scope="row">ArrowButton.size</th>
       <td>Integer</td>
       <td>16 	 </td>
       <td>Preferred size of the arrow button. </td>
@@ -78,14 +79,14 @@
 <table border="1">
 <caption>JButton Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>Button.defaultButtonFollowsFocus</td>
+      <th scope="row">Button.defaultButtonFollowsFocus</th>
       <td>Boolean</td>
       <td>true 	 </td>
       <td>Whether or not the 	    default JButton should change to the
@@ -101,14 +102,14 @@
 <table border="1">
 <caption>JCheckBox Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>CheckBox.icon</td>
+      <th scope="row">CheckBox.icon</th>
       <td>Icon</td>
       <td>null 	 </td>
       <td>Icon used to render the check. </td>
@@ -122,44 +123,44 @@
 <table border="1">
 <caption>JComboBox child components</caption>
   <thead><tr>
-    <th>Name</th>
-    <th>Type</th>
-    <th>Description </th>
+    <th scope="col">Name</th>
+    <th scope="col">Type</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>ComboBox.arrowButton</td>
+      <th scope="row">ComboBox.arrowButton</th>
       <td>SynthArrowButton 	 </td>
       <td>Renders the drop down indicator. 	</td>
     </tr>
     <tr>
-      <td>ComboBox.list</td>
+      <th scope="row">ComboBox.list</th>
       <td>JList 	 </td>
       <td>JList used to render the values. 	</td>
     </tr>
     <tr>
-      <td>ComboBox.listRenderer</td>
+      <th scope="row">ComboBox.listRenderer</th>
       <td>Component 	 </td>
       <td>The renderer used for the JComboBox's JList. 	</td>
     </tr>
     <tr>
-      <td>ComboBox.popup</td>
+      <th scope="row">ComboBox.popup</th>
       <td>JPopupMenu 	 </td>
       <td>JPopupMenu used to show the ComboBox.list of the JComboBox. 	</td>
     </tr>
     <tr>
-      <td>ComboBox.renderer</td>
+      <th scope="row">ComboBox.renderer</th>
       <td>Component 	 </td>
       <td>The renderer used for the JComboBox. This is ONLY set if
 the renderer is a UIResource. 	</td>
     </tr>
     <tr>
-      <td>ComboBox.scrollPane</td>
+      <th scope="row">ComboBox.scrollPane</th>
       <td>JScrollPane 	 </td>
       <td>JScrollPane containing the JList. 	</td>
     </tr>
     <tr>
-      <td>ComboBox.textField</td>
+      <th scope="row">ComboBox.textField</th>
       <td>JTextField 	 </td>
       <td>The editor. </td>
     </tr>
@@ -170,14 +171,14 @@
 <table border="1">
 <caption>JComboBox Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
     <tr>
-      <td>ComboBox.showPopupOnNavigation</td>
+      <th scope="row">ComboBox.showPopupOnNavigation</th>
       <td>Boolean</td>
       <td>false 	 </td>
       <td>Whether or not the JPopupMenu should appear when 	 navigating
@@ -189,18 +190,19 @@
 <h2>JFileChooser</h2>
 <table cellpadding="2" cellspacing="2" border="1" style="width: 100%; text-align: left;">
 <caption>JFileChooser Specific Properties</caption>
-  <tbody>
+  <thead>
     <tr>
-      <th style="vertical-align: top; text-align: center;">Property</th>
-      <th style="vertical-align: top; text-align: center;">Expected Type<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Property</th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Expected Type<br>
+      </th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Default Value<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Default Value<br>
-      </th>
-      <th style="vertical-align: top; text-align: center;">Description</th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Description</th>
     </tr>
+  </thead> <tbody>
     <tr>
-      <td style="vertical-align: top;">FileChooser.cancelIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileChooser.cancelIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -210,8 +212,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileChooser.okIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileChooser.okIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -221,8 +223,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileView.directoryIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileView.directoryIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -231,8 +233,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileView.fileIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileView.fileIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -241,8 +243,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileView.computerIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileView.computerIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -253,8 +255,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileView.hardDriveIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileView.hardDriveIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -265,8 +267,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileView.floppyDriveIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileView.floppyDriveIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -276,8 +278,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileChooser.newFolderIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileChooser.newFolderIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -287,8 +289,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileChooser.upFolderIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileChooser.upFolderIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -298,8 +300,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileChooser.homeFolderIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileChooser.homeFolderIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -309,8 +311,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileChooser.detailsViewIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileChooser.detailsViewIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -320,8 +322,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileChooser.listViewIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileChooser.listViewIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -332,8 +334,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">FileChooser.viewMenuIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">FileChooser.viewMenuIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon<br>
       </td>
       <td style="vertical-align: top;">null<br>
@@ -348,20 +350,20 @@
 <h2><a id="JInternalFrame"></a>JInternalFrame</h2>
 <table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
 <caption>JInternalFrame Specific Properties</caption>
-  <tbody>
-    <tr>
-      <th style="vertical-align: top; text-align: center;">Property<br>
+  <thead><tr>
+      <th scope="col" style="vertical-align: top; text-align: center;">Property<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Expected Type<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Expected Type<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">DefaultValue<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">DefaultValue<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Description<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Description<br>
       </th>
     </tr>
+  </thead> <tbody>
     <tr>
-      <td style="vertical-align: top;">InternalFrame.icon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">InternalFrame.icon<br>
+      </th>
       <td style="vertical-align: top;">Icon</td>
       <td style="vertical-align: top;">null<br>
       </td>
@@ -380,20 +382,20 @@
 </p>
 <table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
 <caption>JInternalFrameTitlePane Specific Properties</caption>
-  <tbody>
-    <tr>
-      <th style="vertical-align: top; text-align: center;">Property<br>
+  <thead><tr>
+      <th scope="col" style="vertical-align: top; text-align: center;">Property<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Expected Type<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Expected Type<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Default Value<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Default Value<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Description<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Description<br>
       </th>
     </tr>
+  </thead> <tbody>
     <tr>
-      <td style="vertical-align: top;">InternalFrameTitlePane.maximizeIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">InternalFrameTitlePane.maximizeIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon</td>
       <td style="vertical-align: top;">null<br>
       </td>
@@ -402,8 +404,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">InternalFrameTitlePane.minimizeIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">InternalFrameTitlePane.minimizeIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon</td>
       <td style="vertical-align: top;">null<br>
       </td>
@@ -412,8 +414,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">InternalFrameTitlePane.iconifyIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">InternalFrameTitlePane.iconifyIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon</td>
       <td style="vertical-align: top;">null<br>
       </td>
@@ -422,8 +424,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">InternalFrameTitlePane.closeIcon<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">InternalFrameTitlePane.closeIcon<br>
+      </th>
       <td style="vertical-align: top;">Icon</td>
       <td style="vertical-align: top;">null<br>
       </td>
@@ -432,8 +434,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">InternalFrameTitlePane.titleSpacing<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">InternalFrameTitlePane.titleSpacing<br>
+      </th>
       <td style="vertical-align: top;">Integer</td>
       <td style="vertical-align: top;">2</td>
       <td style="vertical-align: top;">Space between the
@@ -441,8 +443,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">InternalFrameTitlePane.buttonSpacing<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">InternalFrameTitlePane.buttonSpacing<br>
+      </th>
       <td style="vertical-align: top;">Integer</td>
       <td style="vertical-align: top;">2</td>
       <td style="vertical-align: top;">Space between the buttons on
@@ -450,8 +452,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">InternalFrameTitlePane.maxFrameIconSize<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">InternalFrameTitlePane.maxFrameIconSize<br>
+      </th>
       <td style="vertical-align: top;">Dimension</td>
       <td style="vertical-align: top;">16x16</td>
       <td style="vertical-align: top;">Maximum size of the frame
@@ -460,8 +462,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">InternalFrameTitlePane.titleAlignment<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">InternalFrameTitlePane.titleAlignment<br>
+      </th>
       <td style="vertical-align: top;">leading|trailing|center</td>
       <td style="vertical-align: top;">leading</td>
       <td style="vertical-align: top;">Alignment for the title.
@@ -479,14 +481,14 @@
 <table border="1">
 <caption>JList Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
     <tr>
-      <td>List.rendererUseListColors</td>
+      <th scope="row">List.rendererUseListColors</th>
       <td>Boolean</td>
       <td>true 	 </td>
       <td>If true the renderers state is not updated, and the 	    text
@@ -495,7 +497,7 @@
 updated and the colors will instead come from the 	    Style. 	</td>
     </tr>
     <tr>
-      <td>List.rendererUseUIBorder</td>
+      <th scope="row">List.rendererUseUIBorder</th>
       <td>Boolean</td>
       <td>true 	 </td>
       <td>If true setBorder on the renderer will succeed 	 regardless
@@ -503,7 +505,7 @@
 only succeed if it is a Synth Border. 	</td>
     </tr>
     <tr>
-      <td>List.cellHeight</td>
+      <th scope="row">List.cellHeight</th>
       <td>Integer</td>
       <td>-1 	 </td>
       <td>Cell height of the JList. Is this is -1, 	 <code>setFixedCellHeight</code>
@@ -523,14 +525,14 @@
 <table border="1">
 <caption>Menu classes common properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>prefix.acceleratorDelimiter</td>
+      <th scope="row">prefix.acceleratorDelimiter</th>
       <td>String</td>
       <td>+ 	 </td>
       <td>String separator between the description of the 	 modifiers
@@ -538,7 +540,7 @@
 	</td>
     </tr>
     <tr>
-      <td>prefix.arrowIcon</td>
+      <th scope="row">prefix.arrowIcon</th>
       <td>Icon</td>
       <td>null 	 </td>
       <td>Icon drawn to the right of the text (or left when the
@@ -546,7 +548,7 @@
 typically only defined for JMenu. 	</td>
     </tr>
     <tr>
-      <td>prefix.checkIcon</td>
+      <th scope="row">prefix.checkIcon</th>
       <td>Icon</td>
       <td>null 	 </td>
       <td>Icon drawn to the left of the text (or right when the
@@ -555,7 +557,7 @@
 to provide the check or radio button. 	</td>
     </tr>
     <tr>
-      <td>prefix.margin</td>
+      <th scope="row">prefix.margin</th>
       <td>Insets</td>
       <td>Empty Insets (0, 0, 0, 0) 	 </td>
       <td>Margin for the JMenuItem. Refer to the javadoc of
@@ -563,7 +565,7 @@
 of how the margin is used. 	</td>
     </tr>
     <tr>
-      <td>prefix.textIconGap</td>
+      <th scope="row">prefix.textIconGap</th>
       <td>Integer</td>
       <td>4 	 </td>
       <td>Padding between the icon and text. Refer to the javadoc for
@@ -578,20 +580,20 @@
 <table border="1">
 <caption>JMenu specific properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>Menu.delay</td>
+      <th scope="row">Menu.delay</th>
       <td>Integer</td>
       <td>200 	 </td>
       <td>Sets the delay before the menu appears. 	</td>
     </tr>
     <tr>
-      <td>Menu.shortcutKeys</td>
+      <th scope="row">Menu.shortcutKeys</th>
       <td>int[]</td>
       <td>KeyEvent.ALT_MASK 	 </td>
       <td>Array of the KeyEvent modifiers to use for shortcut keys. </td>
@@ -607,26 +609,26 @@
 <table border="1">
 <caption>JOptionPane Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>OptionPane.buttonAreaBorder</td>
+      <th scope="row">OptionPane.buttonAreaBorder</th>
       <td>Border 	 </td>
       <td>null 	 </td>
       <td>Border around the button area. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.buttonClickThreshhold</td>
+      <th scope="row">OptionPane.buttonClickThreshhold</th>
       <td>Integer 	 </td>
       <td>0 	 </td>
       <td>Passed to the created buttons setMultiClickThreshhold. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.buttonOrientation</td>
+      <th scope="row">OptionPane.buttonOrientation</th>
       <td>Integer 	 </td>
       <td>SwingConstants.CENTER 	 </td>
       <td>How the buttons should be layed out, one of
@@ -634,80 +636,80 @@
 (this will be flipped when in a 	    right to left locale). 	</td>
     </tr>
     <tr>
-      <td>OptionPane.buttonPadding</td>
+      <th scope="row">OptionPane.buttonPadding</th>
       <td>Integer 	 </td>
       <td>6 	 </td>
       <td>Amount of space between buttons. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.cancelIcon</td>
+      <th scope="row">OptionPane.cancelIcon</th>
       <td>Icon 	 </td>
       <td>null 	 </td>
       <td>Icon for the cancel button. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.errorIcon</td>
+      <th scope="row">OptionPane.errorIcon</th>
       <td>Icon 	 </td>
       <td>null 	 </td>
       <td>Icon used for ERROR_MESSAGE. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.informationIcon</td>
+      <th scope="row">OptionPane.informationIcon</th>
       <td>Icon 	 </td>
       <td>null 	 </td>
       <td>Icon used for INFORMATION_MESSAGE. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.isYesLast</td>
+      <th scope="row">OptionPane.isYesLast</th>
       <td>Boolean 	 </td>
       <td>false 	 </td>
       <td>If true the 'yes' button leads other buttons, 	    otherwise
 it follows the other buttons. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.questionIcon</td>
+      <th scope="row">OptionPane.questionIcon</th>
       <td>Icon 	 </td>
       <td>null 	 </td>
       <td>Icon used for error QUESTION_MESSAGE. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.minimumSize</td>
+      <th scope="row">OptionPane.minimumSize</th>
       <td>Dimension 	 </td>
       <td>262x90</td>
       <td>Minimum size for the JOptionPane. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.noIcon</td>
+      <th scope="row">OptionPane.noIcon</th>
       <td>Icon 	 </td>
       <td>null 	 </td>
       <td>Icon for the no button. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.okIcon</td>
+      <th scope="row">OptionPane.okIcon</th>
       <td>Icon 	 </td>
       <td>null 	 </td>
       <td>Icon for the ok button. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.sameSizeButtons</td>
+      <th scope="row">OptionPane.sameSizeButtons</th>
       <td>Boolean 	 </td>
       <td>true 	 </td>
       <td>Whether or not all the buttons should be the same size. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.separatorPadding</td>
+      <th scope="row">OptionPane.separatorPadding</th>
       <td>Integer 	 </td>
       <td>6</td>
       <td>Amount of padding between the message area and 	 separator. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.yesIcon</td>
+      <th scope="row">OptionPane.yesIcon</th>
       <td>Icon 	 </td>
       <td>null 	 </td>
       <td>Icon for the yes button. 	</td>
     </tr>
     <tr>
-      <td>OptionPane.warningIcon</td>
+      <th scope="row">OptionPane.warningIcon</th>
       <td>Icon 	 </td>
       <td>null 	 </td>
       <td>Icon used for error WARNING_MESSAGE 	</td>
@@ -719,18 +721,18 @@
 </h2>
 <table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
 <caption>JProgressBar Specific Properties</caption>
-  <tbody>
-    <tr>
-      <th style="vertical-align: top; text-align: center;">Property</th>
-      <th style="vertical-align: top; text-align: center;">Expected Type<br>
+  <thead><tr>
+      <th scope="col" style="vertical-align: top; text-align: center;">Property</th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Expected Type<br>
+      </th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Default Value<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Default Value<br>
-      </th>
-      <th style="vertical-align: top; text-align: center;">Description</th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Description</th>
     </tr>
+  </thead> <tbody>
     <tr>
-      <td style="vertical-align: top;">ProgressBar.repaintInterval<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">ProgressBar.repaintInterval<br>
+      </th>
       <td style="vertical-align: top;">Integer<br>
       </td>
       <td style="vertical-align: top;">50<br>
@@ -740,8 +742,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">ProgressBar.cycleTime<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">ProgressBar.cycleTime<br>
+      </th>
       <td style="vertical-align: top;">Integer<br>
       </td>
       <td style="vertical-align: top;">3000<br>
@@ -760,14 +762,14 @@
 <table border="1">
 <caption>JRadioButton Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>RadioButton.icon</td>
+      <th scope="row">RadioButton.icon</th>
       <td>Icon</td>
       <td>null 	 </td>
       <td>Icon used to render the radio indicator. </td>
@@ -781,13 +783,13 @@
 <table border="1">
 <caption>JScrollBar child components</caption>
   <thead><tr>
-    <th>Name</th>
-    <th>Type</th>
-    <th>Description </th>
+    <th scope="col">Name</th>
+    <th scope="col">Type</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>ScrollBar.button</td>
+      <th scope="row">ScrollBar.button</th>
       <td>SynthArrowButton 	 </td>
       <td>Identifies the increment/decrement buttons. </td>
     </tr>
@@ -798,27 +800,27 @@
 <table border="1">
 <caption>JScrollBar Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>ScrollBar.allowsAbsolutePositioning</td>
+      <th scope="row">ScrollBar.allowsAbsolutePositioning</th>
       <td>Boolean 	 </td>
       <td>false</td>
       <td>If true, middle mouse click in the track will 	    set the
 position of the track to where the mouse is. 	</td>
     </tr>
     <tr>
-      <td>ScrollBar.maximumThumbSize</td>
+      <th scope="row">ScrollBar.maximumThumbSize</th>
       <td>Dimension</td>
       <td>4096x4096 	 </td>
       <td>Maximum thumb size. 	</td>
     </tr>
     <tr>
-      <td>ScrollBar.minimumThumbSize</td>
+      <th scope="row">ScrollBar.minimumThumbSize</th>
       <td>Dimension</td>
       <td>Derived from ScrollBar.thumbHeight</td>
       <td>The minimum thumb size.  If this is not specified the
@@ -830,14 +832,14 @@
 	    size width is ScrollBar.thumbHeight with a height of 7.</td>
     </tr>
     <tr>
-      <td>ScrollBar.squareButtons</td>
+      <th scope="row">ScrollBar.squareButtons</th>
       <td>Boolean 	 </td>
       <td>false</td>
       <td>If true, the width and height of the scrollbar 	    buttons
 will be made equal. 	</td>
     </tr>
     <tr>
-      <td>ScrollBar.thumbHeight</td>
+      <th scope="row">ScrollBar.thumbHeight</th>
       <td>Integer</td>
       <td>14 	 </td>
       <td>The preferred height, when the orientation of the
@@ -853,14 +855,14 @@
 <table border="1">
 <caption>Separator classes common properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>Separator.thickness</td>
+      <th scope="row">Separator.thickness</th>
       <td>Integer</td>
       <td>2 	 </td>
       <td>Preferred width, for vertically aligned separators, or
@@ -873,14 +875,14 @@
 <table border="1">
 <caption>JToolBar.Separator specific properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>ToolBar.separatorSize</td>
+      <th scope="row">ToolBar.separatorSize</th>
       <td>Dimension</td>
       <td>null 	 </td>
     <td>The value of this is passed to the
@@ -907,14 +909,14 @@
 <table border="1">
 <caption>JScrollPane Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
     <tr>
-      <td>ScrollPane.viewportBorderInsets</td>
+      <th scope="row">ScrollPane.viewportBorderInsets</th>
       <td>Insets</td>
       <td>null 	 </td>
       <td>Insets for the viewport Border. 	</td>
@@ -931,39 +933,39 @@
 <table border="1">
 <caption>JSplitPane Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
     <tr>
-      <td>SplitPane.centerOneTouchButtons</td>
+      <th scope="row">SplitPane.centerOneTouchButtons</th>
       <td>Boolean</td>
       <td>true 	 </td>
       <td>If true, the one touch buttons are centered on the divider. 	</td>
     </tr>
     <tr>
-      <td>SplitPane.oneTouchButtonOffset</td>
+      <th scope="row">SplitPane.oneTouchButtonOffset</th>
       <td>Integer</td>
       <td>2 	 </td>
       <td>Distance between the one touch buttons. 	</td>
     </tr>
     <tr>
-      <td>SplitPane.oneTouchButtonSize</td>
+      <th scope="row">SplitPane.oneTouchButtonSize</th>
       <td>Integer</td>
       <td>6 	 </td>
       <td>Size to make the one touch buttons. 	</td>
     </tr>
     <tr>
-      <td>SplitPane.oneTouchExpandable</td>
+      <th scope="row">SplitPane.oneTouchExpandable</th>
       <td>Boolean</td>
       <td>null 	 </td>
       <td>If non null, the value of this is passed to
 setOneTouchExpandable. 	</td>
     </tr>
     <tr>
-      <td>SplitPane.size</td>
+      <th scope="row">SplitPane.size</th>
       <td>Integer</td>
       <td>6 	 </td>
       <td>Size of the divider </td>
@@ -974,20 +976,20 @@
 <h2><a id="JSlider"></a>JSlider</h2>
 <table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
 <caption>JSlider Specific Properties</caption>
-  <tbody>
-    <tr>
-      <th style="vertical-align: top; text-align: center;">Property<br>
+  <thead><tr>
+      <th scope="col" style="vertical-align: top; text-align: center;">Property<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Expected Type<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Expected Type<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Default Value<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Default Value<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Description<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Description<br>
       </th>
     </tr>
+  </thead> <tbody>
     <tr>
-      <td style="vertical-align: top;">Slider.thumbWidth<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">Slider.thumbWidth<br>
+      </th>
       <td style="vertical-align: top;">Integer<br>
       </td>
       <td style="vertical-align: top;">30<br>
@@ -996,8 +998,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">Slider.thumbHeight<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">Slider.thumbHeight<br>
+      </th>
       <td style="vertical-align: top;">Integer<br>
       </td>
       <td style="vertical-align: top;">14<br>
@@ -1006,8 +1008,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">Slider.trackBorder<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">Slider.trackBorder<br>
+      </th>
       <td style="vertical-align: top;">Integer<br>
       </td>
       <td style="vertical-align: top;">1<br>
@@ -1016,8 +1018,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">Slider.paintValue<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">Slider.paintValue<br>
+      </th>
       <td style="vertical-align: top;">Boolean<br>
       </td>
       <td style="vertical-align: top;">true<br>
@@ -1033,18 +1035,18 @@
 <h2><a id="JTabbedPane"></a>JTabbedPane</h2>
 <table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
 <caption>JTabbedPane Specific Properties</caption>
-  <tbody>
-    <tr>
-      <th style="vertical-align: top; text-align: center;">Property</th>
-      <th style="vertical-align: top; text-align: center;">Expected Type<br>
+  <thead><tr>
+      <th scope="col" style="vertical-align: top; text-align: center;">Property</th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Expected Type<br>
+      </th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Default Value<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Default Value<br>
-      </th>
-      <th style="vertical-align: top; text-align: center;">Description</th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Description</th>
     </tr>
+  </thead> <tbody>
     <tr>
-      <td style="vertical-align: top;">TabbedPane.tabRunOverlay<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">TabbedPane.tabRunOverlay<br>
+      </th>
       <td style="vertical-align: top;">Integer<br>
       </td>
       <td style="vertical-align: top;">0<br>
@@ -1054,8 +1056,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">TabbedPane.textIconGap<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">TabbedPane.textIconGap<br>
+      </th>
       <td style="vertical-align: top;">Integer<br>
       </td>
       <td style="vertical-align: top;">0<br>
@@ -1066,8 +1068,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">TabbedPane.selectedTabPadInsets<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">TabbedPane.selectedTabPadInsets<br>
+      </th>
       <td style="vertical-align: top;">Insets<br>
       </td>
       <td style="vertical-align: top;">Empty Insets (0, 0, 0, 0)<br>
@@ -1077,8 +1079,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">TabbedPane.selectionFollowsFocus<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">TabbedPane.selectionFollowsFocus<br>
+      </th>
       <td style="vertical-align: top;">Boolean<br>
       </td>
       <td style="vertical-align: top;">true<br>
@@ -1097,21 +1099,21 @@
 <table border="1">
 <caption>JTable Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
     <tr>
-      <td>Table.gridColor</td>
+      <th scope="row">Table.gridColor</th>
       <td>Color</td>
       <td>null 	 </td>
       <td>Color used for the grid. If null the foreground from 	    the
 style is used. 	</td>
     </tr>
     <tr>
-      <td>Table.rendererUseTableColors</td>
+      <th scope="row">Table.rendererUseTableColors</th>
       <td>Boolean</td>
       <td>true 	 </td>
       <td>If true the renderers state is not updated, and the 	    text
@@ -1120,7 +1122,7 @@
 updated and the colors will instead come from the 	    Style. 	</td>
     </tr>
     <tr>
-      <td>Table.rendererUseUIBorder</td>
+      <th scope="row">Table.rendererUseUIBorder</th>
       <td>Boolean</td>
       <td>true 	 </td>
       <td>If true setBorder on the renderer will succeed
@@ -1128,7 +1130,7 @@
 renderer will only succeed if it is a Synth Border. 	</td>
     </tr>
     <tr>
-      <td>Table.rowHeight</td>
+      <th scope="row">Table.rowHeight</th>
       <td>Integer</td>
       <td>-1 	 </td>
       <td>If not -1 setRowHeight is invoked on the JTable. </td>
@@ -1142,59 +1144,59 @@
 <table border="1">
 <caption>JTree Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
     <tr>
-      <td>Tree.collapsedIcon</td>
+      <th scope="row">Tree.collapsedIcon</th>
       <td>Icon</td>
       <td>null 	 </td>
       <td>Icon to use when a node is collapsed. 	</td>
     </tr>
     <tr>
-      <td>Tree.drawHorizontalLines</td>
+      <th scope="row">Tree.drawHorizontalLines</th>
       <td>Boolean</td>
       <td>true 	 </td>
       <td>If true nodes have a horizontal connecting them to the
 leading edge of their parent. 	</td>
     </tr>
     <tr>
-      <td>Tree.drawVerticalLines</td>
+      <th scope="row">Tree.drawVerticalLines</th>
       <td>Boolean</td>
       <td>true 	 </td>
       <td>If true a vertical line is drawn down from expanded nodes. 	</td>
     </tr>
     <tr>
-      <td>Tree.expandedIcon</td>
+      <th scope="row">Tree.expandedIcon</th>
       <td>Icon</td>
       <td>null 	 </td>
       <td>Icon to use when a node has been expanded. 	</td>
     </tr>
     <tr>
-      <td>Tree.leftChildIndent</td>
+      <th scope="row">Tree.leftChildIndent</th>
       <td>Integer</td>
       <td>0 	 </td>
       <td>This plus Tree.rightChildIndent account for the 	    total
 space, along the y axis, to offset nodes from their 	    parent. 	</td>
     </tr>
     <tr>
-      <td>Tree.rightChildIndent</td>
+      <th scope="row">Tree.rightChildIndent</th>
       <td>Integer</td>
       <td>0 	 </td>
       <td>This plus Tree.leftChildIndent account for the 	    total
 space, along the y axis, to offset nodes from their 	    parent. 	</td>
     </tr>
     <tr>
-      <td>Tree.rowHeight</td>
+      <th scope="row">Tree.rowHeight</th>
       <td>Integer</td>
       <td>-1 	 </td>
       <td>Row height for the Tree.</td>
     </tr>
     <tr>
-      <td>Tree.scrollsHorizontallyAndVertically</td>
+      <th scope="row">Tree.scrollsHorizontallyAndVertically</th>
       <td>Boolean</td>
       <td>false 	 </td>
       <td>If false and scrolling needs to happen to accommodate 	 cells
@@ -1202,14 +1204,14 @@
 may happen along both the horizontal and 	    vertical axis. 	</td>
     </tr>
     <tr>
-      <td>Tree.scrollsOnExpand</td>
+      <th scope="row">Tree.scrollsOnExpand</th>
       <td>Boolean</td>
       <td>true 	 </td>
       <td>Whether or not the JTree should scroll when a node is
 expanded. </td>
     </tr>
     <tr>
-      <td>Tree.linesStyle</td>
+      <th scope="row">Tree.linesStyle</th>
       <td>String</td>
       <td>      </td>
       <td>The styles of the lines in the tree. Synth supports solid lines
@@ -1226,14 +1228,14 @@
 <table border="1">
 <caption>JToggleButton Specific Properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>ToggleButton.icon</td>
+      <th scope="row">ToggleButton.icon</th>
       <td>Icon</td>
       <td>null 	 </td>
       <td>Icon used to render the radio indicator. </td>
@@ -1248,14 +1250,14 @@
 <table border="1">
 <caption>Button classes common properties</caption>
   <thead><tr>
-    <th>Property</th>
-    <th>Expected Type</th>
-    <th>Default Value</th>
-    <th>Description </th>
+    <th scope="col">Property</th>
+    <th scope="col">Expected Type</th>
+    <th scope="col">Default Value</th>
+    <th scope="col">Description </th>
   </tr>
   </thead> <tbody>
 	<tr>
-      <td>prefix.contentAreaFilled</td>
+      <th scope="row">prefix.contentAreaFilled</th>
       <td>Integer</td>
       <td>true 	 </td>
     <td>Refer to the javadoc of
@@ -1265,7 +1267,7 @@
     </td>
   </tr>
     <tr>
-      <td>prefix.iconTextGap</td>
+      <th scope="row">prefix.iconTextGap</th>
       <td>Integer</td>
       <td>If unspecified, JButton.setIconTextGap is not invoked.</td>
       <td>Padding between the icon and text. Refer to the javadoc of
@@ -1274,7 +1276,7 @@
       </td>
     </tr>
     <tr>
-      <td>prefix.margin</td>
+      <th scope="row">prefix.margin</th>
       <td>Insets</td>
       <td>Empty Insets (0, 0, 0, 0) 	 </td>
       <td>Margin for the JButton. Refer to the javadoc of
@@ -1283,7 +1285,7 @@
       </td>
     </tr>
     <tr>
-      <td>prefix.textShiftOffset</td>
+      <th scope="row">prefix.textShiftOffset</th>
       <td>Integer</td>
       <td>0 	 </td>
       <td>Amount to shift the text and icon, along the x and y 	 axis,
@@ -1298,19 +1300,19 @@
 <h2><a id="textProperties"></a>Text Properties<br>
 </h2>
 <table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <th style="vertical-align: top; text-align: center;">Property</th>
-      <th style="vertical-align: top; text-align: center;">Expected Type<br>
+  <thead><tr>
+      <th scope="col" style="vertical-align: top; text-align: center;">Property</th>
+      <th scope="col" style="vertical-align: top; text-align: center;">Expected Type<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Default Value<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Default Value<br>
       </th>
-      <th style="vertical-align: top; text-align: center;">Description<br>
+      <th scope="col" style="vertical-align: top; text-align: center;">Description<br>
       </th>
     </tr>
+  </thead> <tbody>
     <tr>
-      <td style="vertical-align: top;">prefix.caretForeground<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">prefix.caretForeground<br>
+      </th>
       <td style="vertical-align: top;">Color<br>
       </td>
       <td style="vertical-align: top;">#000000</td>
@@ -1318,8 +1320,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">prefix.margin<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">prefix.margin<br>
+      </th>
       <td style="vertical-align: top;">Insets</td>
       <td style="vertical-align: top;">Empty Insets (0, 0, 0, 0),<br>
 EditorPane and TextPane (3, 3, 3, 3)<br>
@@ -1328,8 +1330,8 @@
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">prefix.caretBlinkRate<br>
-      </td>
+      <th scope="row" style="vertical-align: top;">prefix.caretBlinkRate<br>
+      </th>
       <td style="vertical-align: top;">Integer<br>
       </td>
       <td style="vertical-align: top;">500<br>
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html	Mon Sep 09 12:23:22 2019 -0700
@@ -4,7 +4,7 @@
   <meta charset="utf-8"/>
   <title>Synth File Format</title>
 <!--
- Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -777,12 +777,32 @@
       SynthPainter method:
     </p>
     <table border=1>
-     <caption> Painters for SynthPainter methods </caption>
-      <tr><th>State<th>Method<th>Painter
-	<tr><td>SELECTED<td>paintButtonBackground<td>stateButtonBackgroundPainter
-	<tr><td>SELECTED<td>Anything but paintButtonBackground<td>stateFallbackPainter
-	<tr><td>Anything but SELECTED<td>paintButtonBackground<td>styleButtonBackgroundPainter
-	<tr><td>Anything but SELECTED<td>Anything but paintButtonBackground<td>fallbackPainter
+     <caption>Painters for SynthPainter methods</caption>
+      <thead>
+      <tr>
+        <th scope="col">Index
+        <th scope="col">State
+        <th scope="col">Method
+        <th scope="col">Painter
+      </thead>
+      <tbody>
+	    <tr>
+        <th scope="row">1
+        <td>SELECTED
+        <td>paintButtonBackground<td>stateButtonBackgroundPainter
+	    <tr>
+        <th scope="row">2
+        <td>SELECTED
+        <td>Anything but paintButtonBackground<td>stateFallbackPainter
+	    <tr>
+        <th scope="row">3
+        <td>Anything but SELECTED
+        <td>paintButtonBackground<td>styleButtonBackgroundPainter
+	    <tr>
+        <th scope="row">4
+        <td>Anything but SELECTED
+        <td>Anything but paintButtonBackground<td>fallbackPainter
+      </tbody>
     </table>
 
     <p>
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java	Fri Sep 13 17:35:12 2019 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java	Mon Sep 09 12:23:22 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3577,7 +3577,7 @@
          *     <td>{@link DefaultComboBoxModel} or an {@link DefaultListModel},
          *     with an item type of Option
          *   <tr>
-         *     <td>textarea
+         *     <th scope="row">textarea
          *     <td>{@link PlainDocument}
          * </tbody>
          * </table>