changeset 50358:1ba28f0dbc33

8199150: Accessibility issues in java.desktop 8150156: Update bugs.sun.com references to bugs.java.com Reviewed-by: prr
author serb
date Thu, 31 May 2018 09:52:32 -0700
parents 2e0c4b2d567b
children dd9ec7e7e35a
files src/java.desktop/share/classes/com/sun/beans/TypeResolver.java src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html src/java.desktop/share/classes/java/awt/doc-files/Modality.html src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html src/java.desktop/share/classes/javax/swing/JTree.java src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html 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/JTextComponent.java src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
diffstat 20 files changed, 199 insertions(+), 191 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java	Thu May 31 09:52:32 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -324,7 +324,7 @@
     /**
      * Replaces a {@link GenericArrayType GenericArrayType}
      * with plain array class where it is possible.
-     * Bug <a href="http://bugs.sun.com/view_bug.do?bug_id=5041784">5041784</a>
+     * Bug <a href="https://bugs.java.com/view_bug.do?bug_id=5041784">5041784</a>
      * is that arrays of non-generic type sometimes show up
      * as {@link GenericArrayType GenericArrayType} when using reflection.
      * For example, a {@code String[]} might show up
--- a/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>AWT Threading Issues</title>
 </head>
 <!--
- Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2002, 2018, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>AWT Threading Issues</h1>
 
 <a id="ListenersThreads"></a>
@@ -121,7 +121,7 @@
 Prior to 1.4, the helper threads were never terminated.
 <p>
 Starting with 1.4, the behavior has changed as a result of the fix for
-<a href="http://bugs.sun.com/view_bug.do?bug_id=4030718">
+<a href="https://bugs.java.com/view_bug.do?bug_id=4030718">
 4030718</a>. With the current implementation, AWT terminates all its
 helper threads allowing the application to exit cleanly when the
 following three conditions are true:
@@ -154,11 +154,11 @@
 <ul>
   <li> Other packages can create displayable components for internal
        needs and never make them undisplayable. See
-<a href="http://bugs.sun.com/view_bug.do?bug_id=4515058">
+<a href="https://bugs.java.com/view_bug.do?bug_id=4515058">
 4515058</a>,
-<a href="http://bugs.sun.com/view_bug.do?bug_id=4671025">
+<a href="https://bugs.java.com/view_bug.do?bug_id=4671025">
 4671025</a>, and
-<a href="http://bugs.sun.com/view_bug.do?bug_id=4465537">
+<a href="https://bugs.java.com/view_bug.do?bug_id=4465537">
 4465537</a>.
   <li> Both Microsoft Windows and X11 allow an application to send native
        events to windows that belong to another application. With this
@@ -192,5 +192,6 @@
 <cite>The Java&trade; Virtual Machine Specification</cite>
  guarantees
 that the JVM doesn't exit until this thread terminates.
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>AWT Desktop Properties</title>
 </head>
 <!--
- Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2018, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>AWT Desktop Properties</h1>
 
 The following refers to standard AWT desktop properties that
@@ -274,5 +274,6 @@
 This property should be used when there is no need in listening mouse events fired as a result of
 activity with extra mouse button.
 By default this property is set to {@code true}.
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>The AWT Focus Subsystem</title>
 </head>
 <!--
- Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 2018, 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
@@ -30,6 +30,7 @@
 -->
 
     <body>
+    <main role="main">
       <h1>The AWT Focus Subsystem</h1>
 
     <p>
@@ -101,7 +102,7 @@
      </ul>
 
       <a id="Overview"></a>
-      <h3>Overview of KeyboardFocusManager</h3>
+      <h2>Overview of KeyboardFocusManager</h2>
     <p>
       The focus model is centralized around a single class,
       KeyboardFocusManager, that provides a set of APIs for client code to
@@ -213,7 +214,7 @@
 
 
 <a id="BrowserContexts"></a>
-<h3>KeyboardFocusManager and Browser Contexts</h3>
+<h2>KeyboardFocusManager and Browser Contexts</h2>
 <p>
 Some browsers partition applets in different code bases into separate
 contexts, and establish walls between these contexts. Each thread and
@@ -229,7 +230,7 @@
 
 
 <a id="KeyEventDispatcher"></a>
-<h3>KeyEventDispatcher and KeyEventPostProcessor</h3>
+<h2>KeyEventDispatcher and KeyEventPostProcessor</h2>
 <p>
 While the user's KeyEvents should generally be delivered to the focus
 owner, there are rare cases where this is not desirable. An input
@@ -272,7 +273,7 @@
 that capacity.
 
 <a id="FocusEventAndWindowEvent"></a>
-<h3>FocusEvent and WindowEvent</h3>
+<h2>FocusEvent and WindowEvent</h2>
 <p>
 The AWT defines the following six event types central to the focus
 model in two different <code>java.awt.event</code> classes:
@@ -296,7 +297,7 @@
   </ol>
 
 <a id="EventDelivery"></a>
-<h3>Event Delivery</h3>
+<h2>Event Delivery</h2>
 <p>
 If the focus is not in java application and the user clicks on a focusable
 child Component<b>a</b> of an inactive Frame <b>b</b>, the following events
@@ -347,7 +348,7 @@
 
 
 <a id="OppositeComponents"></a>
-<h3>Opposite Components and Windows</h3>
+<h2>Opposite Components and Windows</h2>
 <p>
 Each event includes information about the "opposite" Component or
 Window involved in the focus or activation change. For example, for a
@@ -371,7 +372,7 @@
 top-level Window.
 
 <a id="TemporaryFocusEvents"></a>
-<h3>Temporary FocusEvents</h3>
+<h2>Temporary FocusEvents</h2>
 <p>
 <code>FOCUS_GAINED</code> and <code>FOCUS_LOST</code> events are
 marked as either temporary or permanent.
@@ -416,7 +417,7 @@
 instead as a hook for lightweight Component libraries, such as Swing.
 
 <a id="FocusTraversal"></a>
-<h3>Focus Traversal</h3>
+<h2>Focus Traversal</h2>
 <p>
 Each Component defines its own Set of focus traversal keys for a given
 focus traversal operation. Components support separate Sets of keys
@@ -491,7 +492,7 @@
 
 
 <a id="FocusTraversalPolicy"></a>
-<h3>FocusTraversalPolicy</h3>
+<h2>FocusTraversalPolicy</h2>
 <p>
 
 A <code>FocusTraversalPolicy</code> defines the order in which Components within
@@ -653,7 +654,7 @@
 <code>DefaultFocusTraversalPolicy</code> by default.
 
 <a id="FocusTraversalPolicyProviders"></a>
-<h3>Focus Traversal Policy Providers</h3>
+<h2>Focus Traversal Policy Providers</h2>
 <p>
   A Container that isn't a focus cycle root has an option to provide a
   FocusTraversalPolicy of its own. To do so, one needs to set Container's focus
@@ -740,7 +741,7 @@
   </ul>
 
 <a id="ProgrammaticTraversal"></a>
-<h3>Programmatic Traversal</h3>
+<h2>Programmatic Traversal</h2>
 <p>
 In addition to user-initiated focus traversal, client code can
 initiate a focus traversal operation programmatically. To client code,
@@ -811,7 +812,7 @@
 
 
 <a id="Focusability"></a>
-<h3>Focusability</h3>
+<h2>Focusability</h2>
 <p>
 A focusable Component can become the focus owner ("focusability") and
 participates in keyboard focus traversal ("focus traversability") with
@@ -825,7 +826,7 @@
 
 
 <a id="FocusableWindows"></a>
-<h3>Focusable Windows</h3>
+<h2>Focusable Windows</h2>
 <p>
 To support palette windows and input methods, client code can prevent
 a Window from becoming the focused Window. By transitivity, this
@@ -877,7 +878,7 @@
 focus owner will be cleared and the focused Window will remain unchanged.
 
 <a id="RequestingFocus"></a>
-<h3>Requesting Focus</h3>
+<h2>Requesting Focus</h2>
 
 <p>
 A Component can request that it become the focus owner by calling
@@ -949,7 +950,7 @@
 See <a href="#TemporaryFocusEvents">Temporary FocusEvents</a>
 
 <a id="FocusAndPropertyChangeListener"></a>
-<h3>Focus and PropertyChangeListener</h3>
+<h2>Focus and PropertyChangeListener</h2>
 <p>
 Client code can listen to changes in context-wide focus state, or to
 changes in focus-related state in Components, via
@@ -1020,7 +1021,7 @@
 A Window is always a focus cycle root; this property cannot change.
 <p>
 <a id="FocusAndVetoableChangeListener"></a>
-<h3>Focus and VetoableChangeListener</h3>
+<h2>Focus and VetoableChangeListener</h2>
 <p>
 The <code>KeyboardFocusManager</code> also supports
 <code>VetoableChangeListener</code>s for the following properties:
@@ -1089,7 +1090,7 @@
 
 
 <a id="ZOrder"></a>
-<h3>Z-Order</h3>
+<h2>Z-Order</h2>
 <p>
 On some native windowing systems, the Z-order of a Window can affect
 its focused or active (if applicable) state. On Microsoft Windows, the
@@ -1169,7 +1170,7 @@
   </ul>
 
 <a id="ReplacingDefaultKeyboardFocusManager"></a>
-<h3>Replacing DefaultKeyboardFocusManager</h3>
+<h2>Replacing DefaultKeyboardFocusManager</h2>
 <p>
 <code>KeyboardFocusManager</code>s are pluggable at the browser context
 level. Client code can subclass <code>KeyboardFocusManager</code> or
@@ -1325,7 +1326,7 @@
     </ul>
 
 <a id="Incompatibilities"></a>
-<h3>Incompatibilities with Previous Releases</h3>
+<h2>Incompatibilities with Previous Releases</h2>
   <p><b>Cross-platform changes:</b>
     <ol>
       <li>The default focus traversability for all Components is now
@@ -1361,6 +1362,6 @@
           change requests in all cases. Previously, requests were granted
           for heavyweights, but denied for lightweights.
     </ol>
-
+  </main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/java/awt/doc-files/Modality.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>The AWT Modality</title>
 </head>
 <!--
- Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2018, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
     <h1>The AWT Modality</h1>
 
     <p>
@@ -50,7 +50,7 @@
     </ul>
 
     <a id="Definitions"></a>
-    <h3>Definitions</h3>
+    <h2>Definitions</h2>
 
     <p>
       <u>Document</u> - a window without an owner that, together with
@@ -92,7 +92,7 @@
       <hr></blockquote>
 
     <a id="ModalityTypes"></a>
-    <h3>Modality types</h3>
+    <h2>Modality types</h2>
 
     <p>
       There are four supported modality types :
@@ -156,7 +156,7 @@
       <hr></blockquote>
 
     <a id="ShowHideBlocking"></a>
-    <h3>Show/hide blocking</h3>
+    <h2>Show/hide blocking</h2>
 
     <p>
       <u>Showing the window or modeless dialog: "F"</u><br>
@@ -261,7 +261,7 @@
       are performed for each of them in the order they were initially shown.
 
     <a id="ModalExclusion"></a>
-    </p><h3>Modal exclusion</h3>
+    </p><h2>Modal exclusion</h2>
 
     <p>
       There are two modal exclusion types introduced as of JDK 6
@@ -287,7 +287,7 @@
     </blockquote>
 
     <a id="Related"></a>
-    <h3>Related AWT features</h3>
+    <h2>Related AWT features</h2>
 
     <p>
       <u>Always-On-Top</u><br>
@@ -331,7 +331,7 @@
       unchanged.
 
     <a id="Security"></a>
-    <h3>Security</h3>
+    <h2>Security</h2>
 
     <p>
       A special <code>AWTPermission</code>, <code>"toolkitModality"</code>,
@@ -344,7 +344,7 @@
       blocked by a browser's or JWS's modal dialog.
 
     <a id="PlatformSupport"></a>
-    </p><h3>Platform support</h3>
+    </p><h2>Platform support</h2>
 
     <p>
       Two <code>java.awt.Toolkit</code> methods allow you to check whether
@@ -363,7 +363,7 @@
       </li></ul>
 
     <a id="Compatibility"></a>
-    <h3>Compatibility</h3>
+    <h2>Compatibility</h2>
 
     <p>
       The default modality type is application-modal. It is used by the API
@@ -374,7 +374,7 @@
       applets and applications launched from Java Web Start.
 
     <a id="Examples"></a>
-    </p><h3>Examples</h3>
+    </p><h2>Examples</h2>
 
     <table border="0">
       <tbody><tr>
@@ -458,5 +458,5 @@
         </td>
       </tr>
     </tbody></table>
-
+</main>
 </body></html>
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>BMP Metadata Format Specification</title>
 </head>
 <!--
-Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 2018, 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
@@ -30,6 +30,7 @@
 -->
 
 <body>
+<main role="main">
 <h1>BMP Metadata Format Specification</h1>
 
 The XML schema for the native image metadata format is as follows:
@@ -160,5 +161,5 @@
 </pre>
 
 @since 1.5
-
+</main>
 </body>
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html	Thu May 31 09:52:32 2018 -0700
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>GIF Metadata Format Specification</h1>
 <a id="gif_stream_metadata_format"></a>
 <h2>GIF Stream Metadata Format Specification</h2>
@@ -434,6 +434,6 @@
 "TRUE")</td>
 </tr>
 </table>
-
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>JPEG Metadata Format Specification and Usage Notes</title>
 </head>
 <!--
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2018, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>JPEG Metadata Format Specification and Usage Notes</h1>
 
 <p>
@@ -1159,6 +1159,6 @@
   &lt;!-- All elements are as defined above for image metadata --&gt;
 ]&gt;
 </pre>
-
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/png_metadata.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>PNG Metadata Format Specification</title>
 </head>
 <!--
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2018, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>PNG Metadata Format Specification</h1>
 
 <p>
@@ -561,6 +561,6 @@
           &lt;!-- Data type: String --&gt;
 ]&gt;
 </pre>
-
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>Standard Metadata Format Specification</title>
 </head>
 <!--
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2018, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>Standard (Plug-in Neutral) Metadata Format Specification</h1>
 
 <p> The plug-in neutral "javax_imageio_1.0" format consists
@@ -394,6 +394,6 @@
             &lt;!-- Data type: Integer --&gt;
 ]&gt;
 </pre>
-
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
     <title>TIFF Metadata Format Specification and Usage Notes</title>
 </head>
 <!--
-Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2015, 2018, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>TIFF Metadata Format Specification and Usage Notes</h1>
 
 <a href="#Reading">Reading Images</a>
@@ -69,24 +69,24 @@
 <a href="#StreamMetadata">Native Stream Metadata Format</a><br/>
 <a href="#ImageMetadata">Native Image Metadata Format</a>
 
-<h3><a id="Reading">Reading Images</a></h3>
+<h2><a id="Reading">Reading Images</a></h2>
 
 TIFF images are read by an <a href="../../ImageReader.html">ImageReader</a>
 which may be controlled by its public interface as well as via a supplied
 <a href="../../plugins/tiff/TIFFImageReadParam.html">TIFFImageReadParam</a>.
 
-<!-- <h4>Supported Image Types</h4> -->
+<!-- <h3>Supported Image Types</h3> -->
 
 <!-- Table? -->
 
-<h4><a id="ColorConversionRead">Color Conversion</a></h4>
+<h3><a id="ColorConversionRead">Color Conversion</a></h3>
 
 <p>If the source image data
 have photometric type CIE L*a*b* or YCbCr, and the destination color space
 type is RGB, then the source image data will be automatically converted to
 RGB using an internal color converter.</p>
 
-<h4><a id="ColorSpacesRead">Color Spaces</a></h4>
+<h3><a id="ColorSpacesRead">Color Spaces</a></h3>
 
 The raw color space assigned by default, i.e., in the absence of a
 user-supplied <a href="../../ImageTypeSpecifier.html">ImageTypeSpecifier</a>,
@@ -154,7 +154,7 @@
 supplied to the reader and should be derived from a color space which is correct
 for the data in question.</p>
 
-<h4><a id="ICCProfilesRead">ICC Profiles</a></h4>
+<h3><a id="ICCProfilesRead">ICC Profiles</a></h3>
 
 If an ICC profile is contained in the image metadata
 (<a href="../../plugins/tiff/BaselineTIFFTagSet.html">
@@ -196,7 +196,7 @@
 more than one type, the first one will be based on the ICC profile and the
 second on the inferred color space.</p>
 
-<h4><a id="MetadataIssuesRead">Metadata Issues</a></h4>
+<h3><a id="MetadataIssuesRead">Metadata Issues</a></h3>
 
 By default all recognized fields in the TIFF image file directory (IFD) are
 loaded into the native image metadata object. Which fields are loaded may be
@@ -226,8 +226,8 @@
 object returned by the TIFF reader using the
 <code>TIFFDirectory.createFromMetadata</code> method.</p>
 
-<h5><a id="MapNativeStandard"></a>
-Mapping of TIFF Native Image Metadata to the Standard Metadata Format</h5>
+<h4><a id="MapNativeStandard"></a>
+Mapping of TIFF Native Image Metadata to the Standard Metadata Format</h4>
 
 The derivation of standard metadata format
 <a href="standard_metadata.html">javax_imageio_1.0</a>
@@ -349,12 +349,12 @@
 </tr>
 </table>
 
-<h4><a id="ExifRead">Reading Exif Images</a></h4>
+<h3><a id="ExifRead">Reading Exif Images</a></h3>
 
 The TIFF reader may be used to read an uncompressed Exif image or the
 contents of the <code>APP1</code> marker segment of a compressed Exif image.
 
-<h5><a id="ExifReadTIFF">Reading Uncompressed Exif Images</a></h5>
+<h4><a id="ExifReadTIFF">Reading Uncompressed Exif Images</a></h4>
 
 An uncompressed Exif image is a one- or two-page uncompressed TIFF image
 with a specific ordering of its IFD and image data content. Each pixel
@@ -386,7 +386,7 @@
 stream and not as a thumbnail, i.e.,
 <code>tiffReader.hasThumbnails(0)</code> will return <code>false</code>.
 
-<h5><a id="ExifReadJPEG">Reading Compressed Exif Images</a></h5>
+<h4><a id="ExifReadJPEG">Reading Compressed Exif Images</a></h4>
 
 A compressed Exif image is a 3-band ISO/IEC 10918-1 baseline DCT JPEG stream
 with an inserted <code>APP1</code> marker segment. The parameters of the marker
@@ -453,7 +453,7 @@
 an exception as the primary image in the embedded TIFF stream is always
 empty; the primary image should be obtained using the JPEG reader itself.
 
-<h3><a id="Writing">Writing Images</a></h3>
+<h2><a id="Writing">Writing Images</a></h2>
 
 TIFF images are written by a <a href="../../ImageWriter.html">ImageWriter</a> which may be
 controlled by its public interface as well as via a supplied
@@ -477,11 +477,11 @@
 rows per strip is rounded to a multiple of 8 times the maximum MCU over
 both dimensions.</p>
 
- <!-- <h4>Supported Image Types</h4> -->
+ <!-- <h3>Supported Image Types</h3> -->
 
 <!-- Table? -->
 
-<h4><a id="Compression">Compression</a></h4>
+<h3><a id="Compression">Compression</a></h3>
 
 The compression type may be set via the <code>setCompressionType()</code> method of
 the <code>ImageWriteParam</code> after setting the compression mode to
@@ -576,14 +576,14 @@
 quality value is passed directly to the JPEG writer plug-in which
 interprets it in the usual way.</p>
 
-<h4><a id="ColorConversionWrite">Color Conversion</a></h4>
+<h3><a id="ColorConversionWrite">Color Conversion</a></h3>
 
 <p>If the source image data
 color space type is RGB, and the destination photometric type is CIE L*a*b* or
 YCbCr, then the source image data will be automatically converted from
 RGB using an internal color converter.</p>
 
-<h4><a id="ICCProfilesWrite">ICC Profiles</a></h4>
+<h3><a id="ICCProfilesWrite">ICC Profiles</a></h3>
 
 An <code>ICC Profile</code> field will be written if either:
 <ul>
@@ -600,7 +600,7 @@
 </li>
 </ul>
 
-<h4><a id="MetadataIssuesWrite">Metadata Issues</a></h4>
+<h3><a id="MetadataIssuesWrite">Metadata Issues</a></h3>
 
 Some behavior of the writer is affected by or may affect the contents of
 the image metadata which may be supplied by the user.
@@ -713,8 +713,8 @@
 <code>IIOMetadata</code> object so obtained may then be passed to the TIFF
 writer.</p>
 
-<h5><a id="MapStandardNative"></a>
-Mapping of the Standard Metadata Format to TIFF Native Image Metadata</h5>
+<h4><a id="MapStandardNative"></a>
+Mapping of the Standard Metadata Format to TIFF Native Image Metadata</h4>
 
 The derivation of <a href="#ImageMetadata">TIFF native image metadata</a>
 elements from the standard metadata format
@@ -829,12 +829,12 @@
 </tr>
 </table>
 
-<h4><a id="ExifWrite">Writing Exif Images</a></h4>
+<h3><a id="ExifWrite">Writing Exif Images</a></h3>
 
 The TIFF writer may be used to write an uncompressed Exif image or the
 contents of the <code>APP1</code> marker segment of a compressed Exif image.
 
-<h5><a id="ExifWriteTIFF">Writing Uncompressed Exif Images</a></h5>
+<h4><a id="ExifWriteTIFF">Writing Uncompressed Exif Images</a></h4>
 
 When writing a sequence of images each image is normally recorded as
 {IFD,&nbsp;IFD Value,&nbsp;Image Data}. The Exif specification requires
@@ -901,7 +901,7 @@
     }
 </code></pre>
 
-<h5><a id="ExifWriteJPEG">Writing Compressed Exif Images</a></h5>
+<h4><a id="ExifWriteJPEG">Writing Compressed Exif Images</a></h4>
 
 The structure of the embedded TIFF stream in the <code>APP1</code> segment of a
 compressed Exif image is identical to the <a href="#ExifStructure">
@@ -1008,7 +1008,7 @@
 and written to the JPEG stream when the primary image is written using
 the JPEG writer.
 
-<h3><a id="StreamMetadata">Stream Metadata</a></h3>
+<h2><a id="StreamMetadata">Stream Metadata</a></h2>
 
 The DTD for the TIFF native stream metadata format is as follows:
 
@@ -1025,7 +1025,7 @@
 ]&gt;
 </pre>
 
-<h3><a id="ImageMetadata">Image Metadata</a></h3>
+<h2><a id="ImageMetadata">Image Metadata</a></h2>
 
 The DTD for the TIFF native image metadata format is as follows:
 
@@ -1174,6 +1174,6 @@
 </pre>
 
 @since 9
-
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>WBMP Metadata Format Specification</title>
 </head>
 <!--
-Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 2018, 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
@@ -30,6 +30,7 @@
 -->
 
 <body>
+<main role="main">
 <h1>WBMP Metadata Format Specification</h1>
 
 The XML schema for the native image metadata format is as follows:
@@ -62,5 +63,5 @@
 </pre>
 
 @since 1.5
-
+</main>
 </body>
--- a/src/java.desktop/share/classes/javax/swing/JTree.java	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JTree.java	Thu May 31 09:52:32 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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,7 +46,6 @@
 import static sun.swing.SwingUtilities2.Section.*;
 
 /**
- * <a id="jtree_description"></a>
  * A control that displays a set of hierarchical data as an outline.
  * You can find task-oriented documentation and examples of using trees in
  * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/tree.html">How to Use Trees</a>,
@@ -3778,7 +3777,7 @@
       * <code>TreeModel</code> changes.
       * <p>
       * For more information on what expanded state means, see the
-      * <a href=#jtree_description>JTree description</a> above.
+      * {@link JTree JTree description} above.
       *
       * @return the instance of {@code TreeModelHandler}
       */
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Thu May 31 09:52:32 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -882,7 +882,7 @@
      * To prevent this from happening twice, this method is
      * reimplemented to simply paint.
      * <p>
-     * <em>NOTE:</em> NOTE: Superclass is also not thread-safe in its
+     * <em>NOTE:</em> Superclass is also not thread-safe in its
      * rendering of the background, although that is not an issue with the
      * default rendering.
      */
@@ -1283,8 +1283,8 @@
      * text component (i.e. the root of the hierarchy) that
      * can be traversed to determine how the model is being
      * represented spatially.
-     * <p style="color:red;">
-     * <b>NOTE:</b>The View hierarchy can
+     * <p>
+     * <strong>Warning:</strong> The View hierarchy can
      * be traversed from the root view, and other things
      * can be done as well.  Things done in this way cannot
      * be protected like simple method calls through the TextUI.
--- a/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>Using the Multiplexing Look and Feel</title>
 </head>
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2018, 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
@@ -30,7 +30,7 @@
 -->
 
 <body>
-
+<main role="main">
 <h1>Using the Multiplexing Look and Feel</h1>
 
 <blockquote>
@@ -497,6 +497,6 @@
 of auxiliary look and feels will most likely have developed and
 tested against our Multiplexing look and feel.
 </p>
-
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>Nimbus colors</title>
 </head>
 <!--
- Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2018, 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
@@ -30,6 +30,7 @@
 -->
 
 <body>
+<main role="main">
 <h1 id="primaryColors">Primary Colors</h1>
 <table summary="Nimbus primary colors">
 <tr><th>Key</th><th>Value</th><th>Preview</th></tr>
@@ -229,6 +230,6 @@
 <td width="100" bgcolor="#8e8f91">&nbsp;</td>
 </tr>
 </table>
-
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html	Thu May 31 09:52:32 2018 -0700
@@ -5,7 +5,7 @@
   <title>Component Specific Properties</title>
 </head>
 <!--
-Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 2018, 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
@@ -29,8 +29,9 @@
 questions.
 -->
 
-<body bgcolor="white">
-<h3>Component Specific Properties</h3>
+<body>
+<main role="main">
+<h1>Component Specific Properties</h1>
 <p> The look, and to some degree the feel of Synth
   can be customized by way of component specific properties.
   These properties are accessed from <a
@@ -43,7 +44,7 @@
       unspecified: typically a <code>ClassCastException</code> is
       thrown, but it is implementation specific.
     </p>
-<h4>ArrowButton</h4>
+<h2>ArrowButton</h2>
 <p> ArrowButton is a special type of JButton that renders an arrow.
 ArrowButton is typically not created directly, rather some of the
 Components will create it       to render a button with an arrow. The
@@ -52,7 +53,7 @@
 In       addition to the <a
  href="#buttonProperties">Button 	properties</a>, ArrowButton supports
 the following properties: </p>
-<h5>ArrowButton Specific Properties</h5>
+<h3>ArrowButton Specific Properties</h3>
 <table border="1" summary="ArrowButton specific properties">
   <thead><tr>
     <th>Property</th>
@@ -70,11 +71,11 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JButton">JButton</a></h4>
+<h2><a id="JButton">JButton</a></h2>
 <p> JButton paints text using the TEXT_FOREGROUND ColorType. In addition
 to the <a href="#buttonProperties">Button 	properties</a>, JButton
 supports the following property: </p>
-<h5>JButton Specific Properties</h5>
+<h3>JButton Specific Properties</h3>
 <table border="1" summary="JButton specific properties">
   <thead><tr>
     <th>Property</th>
@@ -93,11 +94,11 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JCheckBox">JCheckBox</a></h4>
+<h2><a id="JCheckBox">JCheckBox</a></h2>
 <p> JCheckBox paints text using the TEXT_FOREGROUND ColorType. In
 addition to the <a href="#buttonProperties">Button 	properties</a>,
 JCheckBox supports the following property: </p>
-<h5>JCheckBox Specific Properties</h5>
+<h3>JCheckBox Specific Properties</h3>
 <table border="1" summary="JCheckBox specific properties">
   <thead><tr>
     <th>Property</th>
@@ -115,7 +116,7 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JComboBox">JComboBox</a></h4>
+<h2><a id="JComboBox">JComboBox</a></h2>
 <p> JComboBox is a composite component that consists of the following
 child Components: </p>
 <table border="1" summary="JComboBox child components">
@@ -164,7 +165,7 @@
   </tbody>
 </table>
 
-<h5>JComboBox Specific Properties</h5>
+<h3>JComboBox Specific Properties</h3>
 <table border="1" summary="JComboBox specific properties">
   <thead><tr>
     <th>Property</th>
@@ -183,8 +184,8 @@
   </tbody>
 </table>
 <br>
-<h4>JFileChooser</h4>
-<h5>JFileChooser Specific Properties</h5>
+<h2>JFileChooser</h2>
+<h3>JFileChooser Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JFileChooser specific properties"
  style="width: 100%; text-align: left;">
   <tbody>
@@ -343,8 +344,8 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JInternalFrame"></a>JInternalFrame</h4>
-<h5>JInternalFrame Specific Properties</h5>
+<h2><a id="JInternalFrame"></a>JInternalFrame</h2>
+<h3>JInternalFrame Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JInternalFrame specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -373,11 +374,11 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JInternalFrameTitlePane"></a>JInternalFrameTitlePane</h4>
+<h2><a id="JInternalFrameTitlePane"></a>JInternalFrameTitlePane</h2>
 <p>JInternalFrameTitlePane is the control bar located at the top of the
 internal frame similar to that found in a frame.<br>
 </p>
-<h5>JInternalFrameTitlePane Specific Properties</h5>
+<h3>JInternalFrameTitlePane Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JInternalFrameTitlePane specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -473,10 +474,10 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JList">JList</a></h4>
+<h2><a id="JList">JList</a></h2>
 <p> JList's sets the name of the renderer to List.renderer.       JList
 supports the following properties: </p>
-<h5>JList Specific Properties</h5>
+<h3>JList Specific Properties</h3>
 <table border="1" summary="JList specific properties">
   <thead><tr>
     <th>Property</th>
@@ -512,7 +513,7 @@
   </tbody>
 </table>
 <br>
-<h4><a id="menuProperties">Menu Properties</a></h4>
+<h2><a id="menuProperties">Menu Properties</a></h2>
 <p> The Menu classes (JCheckBoxMenuItem, JMenu, JMenuItem, and
 JRadioButtonMenuItem) all support the same set of properties and behave
 similarly.       Each component consists of two Regions: the region
@@ -597,12 +598,12 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JOptionPane">JOptionPane</a></h4>
+<h2><a id="JOptionPane">JOptionPane</a></h2>
 <p> JOptionPane is a composite component and may consist of numerous child
 components, they are: OptionPane.button, OptionPane.label,
 OptionPane.comboBox, OptionPane.scrollPane, OptionPane.list,
 OptionPane.textField, OptionPane.iconLabel. </p>
-<h5>JOptionPane Specific Properties</h5>
+<h3>JOptionPane Specific Properties</h3>
 <table border="1" summary="JOptionPane specific properties">
   <thead><tr>
     <th>Property</th>
@@ -713,10 +714,10 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JProgressBar"></a>JProgressBar<br>
-</h4>
-<h5>JProgressBar Specific Properties<br>
-</h5>
+<h2><a id="JProgressBar"></a>JProgressBar<br>
+</h2>
+<h3>JProgressBar Specific Properties<br>
+</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JProgressBar specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -753,11 +754,11 @@
     </tr>
   </tbody>
 </table>
-<h4><a id="JRadioButton">JRadioButton</a></h4>
+<h2><a id="JRadioButton">JRadioButton</a></h2>
 <p> JRadioButton paints text using the TEXT_FOREGROUND ColorType. In
 addition to the <a href="#buttonProperties">Button 	properties</a>,
 JRadioButton supports the following property: </p>
-<h5>JRadioButton Specific Properties</h5>
+<h3>JRadioButton Specific Properties</h3>
 <table border="1" summary="JRadioButton specific properties">
   <thead><tr>
     <th>Property</th>
@@ -775,7 +776,7 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JScrollBar">JScrollBar</a></h4>
+<h2><a id="JScrollBar">JScrollBar</a></h2>
 <p> JScrollBar is a composite component that consists of the following
 child Components: </p>
 <table border="1" summary="JScrollBar child components">
@@ -793,7 +794,7 @@
   </tbody>
 </table>
 
-<h5>JScrollBar Specific Properties</h5>
+<h3>JScrollBar Specific Properties</h3>
 <table border="1" summary="JScrollBar specific properties">
   <thead><tr>
     <th>Property</th>
@@ -845,7 +846,7 @@
   </tbody>
 </table>
 <br>
-<h4><a id="Separator">Separators</a></h4>
+<h2><a id="Separator">Separators</a></h2>
 <p> All of the separator classes, JSeparator, JPopupMenu.Separator and
 JToolBar.Separator use the same property: </p>
 <table border="1" summary="Separator classes common properties">
@@ -887,7 +888,7 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JScrollPane">JScrollPane</a></h4>
+<h2><a id="JScrollPane">JScrollPane</a></h2>
 <p>
       JScrollPane is unique in that it provides a method for setting
       the Border around the JViewport with JViewport throwing an
@@ -900,7 +901,7 @@
       <code>paintViewportBorder</code> is called to paint the
       <code>Viewport</code>s border.
  </p>
-<h5>JScrollPane Specific Properties</h5>
+<h3>JScrollPane Specific Properties</h3>
 <table border="1" summary="JScrollPane specific properties">
   <thead><tr>
     <th>Property</th>
@@ -918,13 +919,13 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JSplitPane">JSplitPane</a></h4>
+<h2><a id="JSplitPane">JSplitPane</a></h2>
 <p> JSplitPane is a composite component that will contain a divider and
 potentially two buttons, if setOneTouchExpandable(true) has been
 invoked. The two buttons will be named:
 SplitPaneDivider.leftOneTouchButton and
 SplitPaneDivider.rightOneTouchButton. </p>
-<h5>JSplitPane Specific Properties</h5>
+<h3>JSplitPane Specific Properties</h3>
 <table border="1" summary="JSplitPane specific properties">
   <thead><tr>
     <th>Property</th>
@@ -967,8 +968,8 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JSlider"></a>JSlider</h4>
-<h5>JSlider Specific Properties</h5>
+<h2><a id="JSlider"></a>JSlider</h2>
+<h3>JSlider Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JSlider specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -1027,8 +1028,8 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JTabbedPane"></a>JTabbedPane</h4>
-<h5>JTabbedPane Specific Properties</h5>
+<h2><a id="JTabbedPane"></a>JTabbedPane</h2>
+<h3>JTabbedPane Specific Properties</h3>
 <table cellpadding="2" cellspacing="2" border="1" summary="JTabbedPane specific properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -1089,10 +1090,10 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JTable">JTable</a></h4>
+<h2><a id="JTable">JTable</a></h2>
 <p> JTable sets the name of the renderer to Table.cellRenderer.
 JTable supports the following properties: </p>
-<h5>JTable Specific Properties</h5>
+<h3>JTable Specific Properties</h3>
 <table border="1" summary="JTable specific properties">
   <thead><tr>
     <th>Property</th>
@@ -1134,10 +1135,10 @@
   </tbody>
 </table>
 <br>
-<h4><a id="JTree">JTree</a></h4>
+<h2><a id="JTree">JTree</a></h2>
 <p> JTree sets the name of the renderer to Tree.renderer, the name of
 the editor is Tree.cellEditor.</p>
-<h5>JTree Specific Properties</h5>
+<h3>JTree Specific Properties</h3>
 <table border="1" summary="JTree specific properties">
   <thead><tr>
     <th>Property</th>
@@ -1217,11 +1218,11 @@
     </tr>
   </tbody>
 </table>
-<h4><a id="JToggleButton">JToggleButton</a></h4>
+<h2><a id="JToggleButton">JToggleButton</a></h2>
 <p> JToggleButton paints text using the TEXT_FOREGROUND ColorType. In
 addition to the <a href="#buttonProperties">Button 	properties</a>,
 JToggleButton supports the following property: </p>
-<h5>JToggleButton Specific Properties</h5>
+<h3>JToggleButton Specific Properties</h3>
 <table border="1" summary="JToggleButton specific properties">
   <thead><tr>
     <th>Property</th>
@@ -1239,7 +1240,7 @@
   </tbody>
 </table>
 <br>
-<h4><a id="buttonProperties">Button Properties</a></h4>
+<h2><a id="buttonProperties">Button Properties</a></h2>
 <p> Each of the Button classes (JButton, JCheckBox, JRadioButton,
 JToggleButton and SynthArrowButton) support a similar set of properties.
 These properties are: </p>
@@ -1292,8 +1293,8 @@
 <p> <code>Prefix</code> is one of: Button, CheckBox, RadioButton or
 JToggleButton.<br>
 </p>
-<h4><a id="textProperties"></a>Text Properties<br>
-</h4>
+<h2><a id="textProperties"></a>Text Properties<br>
+</h2>
 <table cellpadding="2" cellspacing="2" border="1" summary="Text properties"
  style="text-align: left; width: 100%;">
   <tbody>
@@ -1341,5 +1342,6 @@
 <p><code>Prefix</code> is one of: EditorPane, FormattedTextField,
 PasswordField, TextArea, TextField or TextPane.<br>
 </p>
+</main>
 </body>
 </html>
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html	Thu May 31 09:52:32 2018 -0700
@@ -4,7 +4,7 @@
   <meta charset="utf-8"/>
   <title>Synth File Format</title>
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2018, 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,7 +45,8 @@
   </head>
 
   <body>
-    <h2><a id="file">File Format</a></h2>
+  <main role="main">
+    <h1><a id="file">File Format</a></h1>
     <p>
       Synth's file format (<a href="synth.dtd">dtd</a>)
       allows for specifying all the pieces
@@ -98,7 +99,7 @@
       Parsing will fail only if a necessary attribute is not
       specified, or of the wrong type.
 
-    <h3>The synth element</h3>
+    <h2>The synth element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.synth">synth</a> ((<a href="#ee.beansPersistance">%beansPersistance;</a>) | <a href="#e.style">style</a> | <a href="#e.bind">bind</a> | <a href="#e.font">font</a> | <a href="#e.color">color</a> |
@@ -118,7 +119,7 @@
     </p>
 
 
-    <h3>The style element</h3>
+    <h2>The style element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.style">style</a> (<a href="#e.property">property</a> | <a href="#e.defaultsProperty">defaultsProperty</a> | <a href="#e.state">state</a> | <a href="#e.font">font</a> | <a href="#e.graphicsUtils">graphicsUtils</a> |
@@ -172,7 +173,7 @@
       </pre>
     </div>
 
-    <h3>The state element</h3>
+    <h2>The state element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.state">state</a> (<a href="#e.color">color</a> | <a href="#e.font">font</a> | <a href="#e.painter">painter</a> | <a href="#e.imagePainter">imagePainter</a> | (<a href="#ee.beansPersistance">%beansPersistance;</a>) |
@@ -248,7 +249,7 @@
       chosen, otherwise if the state is SELECTED, but not does not
       contain PRESSED, state <code>two</code> will be used.
 
-    <h3>The font element</h3>
+    <h2>The font element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.font">font</a> EMPTY>
@@ -317,7 +318,7 @@
     </p>
 
 
-    <h3>The color element</h3>
+    <h2>The color element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.color">color</a> EMPTY>
@@ -394,7 +395,7 @@
     </pre>
 </div>
 
-    <h3>The property element</h3>
+    <h2>The property element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.property">property</a> EMPTY>
@@ -516,7 +517,7 @@
       <code>UIManager.get("Table.focusCellForeground")</code>.
     </p>
 
-    <h3>The graphicsUtils element</h3>
+    <h2>The graphicsUtils element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.graphicsUtils">graphicsUtils</a> EMPTY>
@@ -548,7 +549,7 @@
     </pre>
 </div>
 
-    <h3>The insets element</h3>
+    <h2>The insets element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.insets">insets</a> EMPTY>
@@ -592,7 +593,7 @@
     </pre>
 </div>
 
-    <h3>The bind element</h3>
+    <h2>The bind element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.bind">bind</a> EMPTY>
@@ -701,7 +702,7 @@
     </pre>
 </div>
 
-    <h3>The painter element</h3>
+    <h2>The painter element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.painter">painter</a> EMPTY>
@@ -815,7 +816,7 @@
 	  handle it.
 	</p>
 
-    <h3>The imagePainter element</h3>
+    <h2>The imagePainter element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.imagePainter">imagePainter</a> EMPTY>
@@ -911,7 +912,7 @@
       understand how identical painters are handled.
 
 
-    <h3>The imageIcon element</h3>
+    <h2>The imageIcon element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.imageIcon">imageIcon</a> EMPTY>
@@ -945,7 +946,7 @@
     </pre>
 </div>
 
-   <h3>The opaque element</h3>
+   <h2>The opaque element</h2>
 <div class="dtd-fragment">
 <pre class="dtd-fragment">
 &lt;!ELEMENT <a id="e.opaque">opaque</a> EMPTY>
@@ -976,7 +977,7 @@
     </pre>
 </div>
 
-    <h3><a id="ee.beansPersistance">The beansPersistance entity</a></h3>
+    <h2><a id="ee.beansPersistance">The beansPersistance entity</a></h2>
     <p>
       Beans persistance can be used to embed any Object. This is
       typically used for embedding your own Painters, but can be used
@@ -986,7 +987,7 @@
       for details on beans persistance.
 
 
-    <h3>Backing Style</h3>
+    <h2>Backing Style</h2>
     <p>
       In creating a Synth file it's good practice to create a backing
       style that is used by all components.  This will make sure that
@@ -1008,6 +1009,6 @@
 &lt;/synth>
       </pre>
     </div>
-
+  </main>
   </body>
 </html>
--- a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java	Thu May 31 09:52:32 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -171,7 +171,7 @@
  *     <td>input methods
  *     <td>(generated here)
  *   <tr>
- *     <th scope="row" headers="stage">2.
+ *     <th scope="row">2.
  *     <td>focus manager
  *     <td>
  *   </tr>
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java	Thu May 31 09:24:27 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java	Thu May 31 09:52:32 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -112,7 +112,7 @@
  *     &lt;title&gt;An example HTMLDocument&lt;/title&gt;
  *     &lt;style type="text/css"&gt;
  *       div { background-color: silver; }
- *       ul { color: red; }
+ *       ul { color: blue; }
  *     &lt;/style&gt;
  *   &lt;/head&gt;
  *   &lt;body&gt;
@@ -204,7 +204,7 @@
  * <!--insertAfterStart-->
  *     <td style="white-space:nowrap">
  *       <div style="background-color: silver;">
- *         <ul style="color: red;">
+ *         <ul style="color: blue;">
  *           <li>List Item</li>
  *         </ul>
  *         <p>Paragraph 1</p>
@@ -216,14 +216,14 @@
  *       <div style="background-color: silver;">
  *         <p>Paragraph 1</p>
  *         <p>Paragraph 2</p>
- *         <ul style="color: red;">
+ *         <ul style="color: blue;">
  *           <li>List Item</li>
  *         </ul>
  *       </div>
  *     </td>
  * <!--insertBeforeStart-->
  *     <td style="white-space:nowrap">
- *       <ul style="color: red;">
+ *       <ul style="color: blue;">
  *         <li>List Item</li>
  *       </ul>
  *       <div style="background-color: silver;">
@@ -237,21 +237,21 @@
  *         <p>Paragraph 1</p>
  *         <p>Paragraph 2</p>
  *       </div>
- *       <ul style="color: red;">
+ *       <ul style="color: blue;">
  *         <li>List Item</li>
  *       </ul>
  *     </td>
  * <!--setInnerHTML-->
  *     <td style="white-space:nowrap">
  *       <div style="background-color: silver;">
- *         <ul style="color: red;">
+ *         <ul style="color: blue;">
  *           <li>List Item</li>
  *         </ul>
  *       </div>
  *     </td>
  * <!--setOuterHTML-->
  *     <td style="white-space:nowrap">
- *       <ul style="color: red;">
+ *       <ul style="color: blue;">
  *         <li>List Item</li>
  *       </ul>
  *     </td>
@@ -1001,16 +1001,16 @@
      *
      * <p>Invoking <code>setInnerHTML(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <span
-     * style="color: red;">in red</span>).</p>
+     * style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *     &lt;body&gt;
      *       |
      *     <b>&lt;div&gt;</b>
      *         \
-     *         <span style="color: red;">&lt;ul&gt;</span>
+     *         <span style="color: blue;">&lt;ul&gt;</span>
      *           \
-     *           <span style="color: red;">&lt;li&gt;</span>
+     *           <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>Parameter <code>elem</code> must not be a leaf element,
@@ -1085,14 +1085,14 @@
      *
      * <p>Invoking <code>setOuterHTML(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <span
-     * style="color: red;">in red</span>).</p>
+     * style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *    &lt;body&gt;
      *      |
-     *     <span style="color: red;">&lt;ul&gt;</span>
+     *     <span style="color: blue;">&lt;ul&gt;</span>
      *       \
-     *       <span style="color: red;">&lt;li&gt;</span>
+     *       <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>If either <code>elem</code> or <code>htmlText</code>
@@ -1158,16 +1158,16 @@
      *
      * <p>Invoking <code>insertAfterStart(elem,
      * "&lt;ul&gt;&lt;li&gt;")</code> results in the following structure
-     * (new elements are <span style="color: red;">in red</span>).</p>
+     * (new elements are <span style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *          |
      *        <b>&lt;div&gt;</b>
      *       /  |  \
-     *    <span style="color: red;">&lt;ul&gt;</span> &lt;p&gt; &lt;p&gt;
+     *    <span style="color: blue;">&lt;ul&gt;</span> &lt;p&gt; &lt;p&gt;
      *     /
-     *  <span style="color: red;">&lt;li&gt;</span>
+     *  <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>Unlike the <code>insertBeforeStart</code> method, new
@@ -1231,16 +1231,16 @@
      *
      * <p>Invoking <code>insertBeforeEnd(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <span
-     * style="color: red;">in red</span>).</p>
+     * style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *          |
      *        <b>&lt;div&gt;</b>
      *       /  |  \
-     *     &lt;p&gt; &lt;p&gt; <span style="color: red;">&lt;ul&gt;</span>
+     *     &lt;p&gt; &lt;p&gt; <span style="color: blue;">&lt;ul&gt;</span>
      *               \
-     *               <span style="color: red;">&lt;li&gt;</span>
+     *               <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>Unlike the <code>insertAfterEnd</code> method, new elements
@@ -1301,14 +1301,14 @@
      *
      * <p>Invoking <code>insertBeforeStart(elem,
      * "&lt;ul&gt;&lt;li&gt;")</code> results in the following structure
-     * (new elements are <span style="color: red;">in red</span>).</p>
+     * (new elements are <span style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *         /  \
-     *      <span style="color: red;">&lt;ul&gt;</span> <b>&lt;div&gt;</b>
+     *      <span style="color: blue;">&lt;ul&gt;</span> <b>&lt;div&gt;</b>
      *       /    /  \
-     *     <span style="color: red;">&lt;li&gt;</span> &lt;p&gt;  &lt;p&gt;
+     *     <span style="color: blue;">&lt;li&gt;</span> &lt;p&gt;  &lt;p&gt;
      * </pre>
      *
      * <p>Unlike the <code>insertAfterStart</code> method, new
@@ -1362,14 +1362,14 @@
      *
      * <p>Invoking <code>insertAfterEnd(elem, "&lt;ul&gt;&lt;li&gt;")</code>
      * results in the following structure (new elements are <span
-     * style="color: red;">in red</span>).</p>
+     * style="color: blue;">in blue</span>).</p>
      *
      * <pre>
      *        &lt;body&gt;
      *         /  \
-     *      <b>&lt;div&gt;</b> <span style="color: red;">&lt;ul&gt;</span>
+     *      <b>&lt;div&gt;</b> <span style="color: blue;">&lt;ul&gt;</span>
      *       / \    \
-     *     &lt;p&gt; &lt;p&gt;  <span style="color: red;">&lt;li&gt;</span>
+     *     &lt;p&gt; &lt;p&gt;  <span style="color: blue;">&lt;li&gt;</span>
      * </pre>
      *
      * <p>Unlike the <code>insertBeforeEnd</code> method, new elements