diff --git a/src/java.desktop/share/classes/java/awt/doc-files/Modality.html b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
index eeb779672dc..e20d9175fb7 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
@@ -8,7 +8,7 @@
   </style>
 </head>
 <!--
- Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2022, 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
@@ -379,12 +379,12 @@
 
     <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>Frame F is shown
+        <li>Document-modal dialog D<sub>i</sub> is shown
+        <li>F becomes blocked by D<sub>i</sub> &mdash; it's in the same document
+        <li>Document-modal dialog D<sub>ii</sub> is shown
         <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's in the
-            same document<br>
+            same document
     </ol>
     <p style="float: left; margin-left: 1em">
         <img src="modal-example1.gif" alt="Example 1">
@@ -392,12 +392,12 @@
 
     <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>Frame F is shown
+        <li>Document-modal dialog D<sub>i</sub> is shown
+        <li>F becomes blocked by D<sub>i</sub> &mdash; it's in the same document
+        <li>Document-modal dialog D<sub>ii</sub> is shown
         <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's in the
-            same document<br>
+            same document
     </ol>
     <p style="float: left; margin-left: 1em">
         <img src="modal-example2.gif" alt="Example 2">
@@ -405,17 +405,17 @@
 
     <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>Frame F is shown
+        <li>Toolkit-modal dialog D<sub>i</sub> is created, but not shown
+        <li>Document-modal dialog D<sub>ii</sub> is shown
+        <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document
+        <li>Application-modal dialog D<sub>iii</sub> is shown
         <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>
+            it's in the same application
+        <li>D<sub>i</sub> is shown
+        <li>D<sub>i</sub> becomes blocked by D<sub>ii</sub> &mdash; it's its owner
         <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>
+            D<sub>ii</sub> blocks D<sub>i</sub>
     </ol>
     <p style="float: left; margin-left: 1em">
         <img src="modal-example3.gif" alt="Example 3">
@@ -423,17 +423,17 @@
 
     <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>Frame F is shown
+        <li>Toolkit-modal dialog D<sub>i</sub> is created, but not shown
+        <li>Document-modal dialog D<sub>ii</sub> is shown
+        <li>F becomes blocked by D<sub>ii</sub> &mdash; it's in the same document
+        <li>Application-modal dialog D<sub>iii</sub> is shown
         <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>
+            same application
+        <li>D<sub>i</sub> is shown
         <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>
+            is not blocked
+        <li>D<sub>i</sub> remains unblocked
     </ol>
     <p style="float: left; margin-left: 1em">
         <img src="modal-example4.gif" alt="Example 4">
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
index acd51d28345..89dc08d8aef 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
@@ -196,61 +196,61 @@ with the keyboard. </td>
   <thead>
     <tr>
       <th scope="col">Property</th>
-      <th scope="col">Expected Type<br>
+      <th scope="col">Expected Type
       </th>
-      <th scope="col">Default Value<br>
+      <th scope="col">Default Value
       </th>
       <th scope="col">Description</th>
     </tr>
   </thead> <tbody>
     <tr>
-      <th scope="row">FileChooser.cancelIcon<br>
+      <th scope="row">FileChooser.cancelIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon displayed on cancel button
-of the file chooser.<br>
+of the file chooser.
       </td>
     </tr>
     <tr>
-      <th scope="row">FileChooser.okIcon<br>
+      <th scope="row">FileChooser.okIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon displayed on the ok button
-of the file chooser.<br>
+of the file chooser.
       </td>
     </tr>
     <tr>
-      <th scope="row">FileView.directoryIcon<br>
+      <th scope="row">FileView.directoryIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used for directories.
       </td>
     </tr>
     <tr>
-      <th scope="row">FileView.fileIcon<br>
+      <th scope="row">FileView.fileIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used for files.
       </td>
     </tr>
     <tr>
-      <th scope="row">FileView.computerIcon<br>
+      <th scope="row">FileView.computerIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used for directories that
             represent the computer.  Not all platforms will make use
@@ -258,11 +258,11 @@ of the file chooser.<br>
       </td>
     </tr>
     <tr>
-      <th scope="row">FileView.hardDriveIcon<br>
+      <th scope="row">FileView.hardDriveIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used to represent the root
             of a hard drive.  For example, on Windows this would be
@@ -270,66 +270,66 @@ of the file chooser.<br>
       </td>
     </tr>
     <tr>
-      <th scope="row">FileView.floppyDriveIcon<br>
+      <th scope="row">FileView.floppyDriveIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used to represent a floppy
           disk.
       </td>
     </tr>
     <tr>
-      <th scope="row">FileChooser.newFolderIcon<br>
+      <th scope="row">FileChooser.newFolderIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used by the button that creates a new
           folder.
       </td>
     </tr>
     <tr>
-      <th scope="row">FileChooser.upFolderIcon<br>
+      <th scope="row">FileChooser.upFolderIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used by the button that navigates to the
           parent folder.
       </td>
     </tr>
     <tr>
-      <th scope="row">FileChooser.homeFolderIcon<br>
+      <th scope="row">FileChooser.homeFolderIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used by the button that navigates to the
           current user's home directory.
       </td>
     </tr>
     <tr>
-      <th scope="row">FileChooser.detailsViewIcon<br>
+      <th scope="row">FileChooser.detailsViewIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used by the button that toggles the
           detailed files list view.
       </td>
     </tr>
     <tr>
-      <th scope="row">FileChooser.listViewIcon<br>
+      <th scope="row">FileChooser.listViewIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used by the button that toggles the
           regular files list view, showing only an icon and the name of each
@@ -337,11 +337,11 @@ of the file chooser.<br>
       </td>
     </tr>
     <tr>
-      <th scope="row">FileChooser.viewMenuIcon<br>
+      <th scope="row">FileChooser.viewMenuIcon
       </th>
-      <td>Icon<br>
+      <td>Icon
       </td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon used by the button that shows popup menu
           for selection of a view mode.
@@ -354,26 +354,26 @@ of the file chooser.<br>
 <table class="striped" style="width: 100%;">
 <caption>JInternalFrame Specific Properties</caption>
   <thead><tr>
-      <th scope="col">Property<br>
+      <th scope="col">Property
       </th>
-      <th scope="col">Expected Type<br>
+      <th scope="col">Expected Type
       </th>
-      <th scope="col">DefaultValue<br>
+      <th scope="col">DefaultValue
       </th>
-      <th scope="col">Description<br>
+      <th scope="col">Description
       </th>
     </tr>
   </thead> <tbody>
     <tr>
-      <th scope="row">InternalFrame.icon<br>
+      <th scope="row">InternalFrame.icon
       </th>
       <td>Icon</td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon drawn representing the
-system<br>
-icon of the internal frame.&nbsp; If pressed<br>
-the system menu will be shown.<br>
+system
+icon of the internal frame.&nbsp; If pressed
+the system menu will be shown.
       </td>
     </tr>
   </tbody>
@@ -381,63 +381,63 @@ the system menu will be shown.<br>
 <br>
 <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>
+internal frame similar to that found in a frame.
 </p>
 <table class="striped" style="width: 100%;">
 <caption>JInternalFrameTitlePane Specific Properties</caption>
   <thead><tr>
-      <th scope="col">Property<br>
+      <th scope="col">Property
       </th>
-      <th scope="col">Expected Type<br>
+      <th scope="col">Expected Type
       </th>
-      <th scope="col">Default Value<br>
+      <th scope="col">Default Value
       </th>
-      <th scope="col">Description<br>
+      <th scope="col">Description
       </th>
     </tr>
   </thead> <tbody>
     <tr>
-      <th scope="row">InternalFrameTitlePane.maximizeIcon<br>
+      <th scope="row">InternalFrameTitlePane.maximizeIcon
       </th>
       <td>Icon</td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon drawn to indicate the
-ability to maximize the internal frame.<br>
+ability to maximize the internal frame.
       </td>
     </tr>
     <tr>
-      <th scope="row">InternalFrameTitlePane.minimizeIcon<br>
+      <th scope="row">InternalFrameTitlePane.minimizeIcon
       </th>
       <td>Icon</td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon drawn to indicate the
-ability to restore the internal frame back to its previous state.<br>
+ability to restore the internal frame back to its previous state.
       </td>
     </tr>
     <tr>
-      <th scope="row">InternalFrameTitlePane.iconifyIcon<br>
+      <th scope="row">InternalFrameTitlePane.iconifyIcon
       </th>
       <td>Icon</td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon drawn to indicate the
-ability to minimize the internal frame.<br>
+ability to minimize the internal frame.
       </td>
     </tr>
     <tr>
-      <th scope="row">InternalFrameTitlePane.closeIcon<br>
+      <th scope="row">InternalFrameTitlePane.closeIcon
       </th>
       <td>Icon</td>
-      <td>null<br>
+      <td>null
       </td>
       <td>Icon drawn to indicate the
 abililty to close the internal frame.
       </td>
     </tr>
     <tr>
-      <th scope="row">InternalFrameTitlePane.titleSpacing<br>
+      <th scope="row">InternalFrameTitlePane.titleSpacing
       </th>
       <td>Integer</td>
       <td>2</td>
@@ -446,7 +446,7 @@ abililty to close the internal frame.
       </td>
     </tr>
     <tr>
-      <th scope="row">InternalFrameTitlePane.buttonSpacing<br>
+      <th scope="row">InternalFrameTitlePane.buttonSpacing
       </th>
       <td>Integer</td>
       <td>2</td>
@@ -455,7 +455,7 @@ abililty to close the internal frame.
       </td>
     </tr>
     <tr>
-      <th scope="row">InternalFrameTitlePane.maxFrameIconSize<br>
+      <th scope="row">InternalFrameTitlePane.maxFrameIconSize
       </th>
       <td>Dimension</td>
       <td>16x16</td>
@@ -465,7 +465,7 @@ abililty to close the internal frame.
       </td>
     </tr>
     <tr>
-      <th scope="row">InternalFrameTitlePane.titleAlignment<br>
+      <th scope="row">InternalFrameTitlePane.titleAlignment
       </th>
       <td>leading|trailing|center</td>
       <td>leading</td>
@@ -720,40 +720,40 @@ it follows the other buttons. 	</td>
   </tbody>
 </table>
 <br>
-<h2><a id="JProgressBar"></a>JProgressBar<br>
+<h2><a id="JProgressBar"></a>JProgressBar
 </h2>
 <table class="striped" style="width: 100%;">
 <caption>JProgressBar Specific Properties</caption>
   <thead><tr>
       <th scope="col">Property</th>
-      <th scope="col">Expected Type<br>
+      <th scope="col">Expected Type
       </th>
-      <th scope="col">Default Value<br>
+      <th scope="col">Default Value
       </th>
       <th scope="col">Description</th>
     </tr>
   </thead> <tbody>
     <tr>
-      <th scope="row">ProgressBar.repaintInterval<br>
+      <th scope="row">ProgressBar.repaintInterval
       </th>
-      <td>Integer<br>
+      <td>Integer
       </td>
-      <td>50<br>
+      <td>50
       </td>
       <td>Number of milliseconds between
-repaints for indeterminate progress bars.<br>
+repaints for indeterminate progress bars.
       </td>
     </tr>
     <tr>
-      <th scope="row">ProgressBar.cycleTime<br>
+      <th scope="row">ProgressBar.cycleTime
       </th>
-      <td>Integer<br>
+      <td>Integer
       </td>
-      <td>3000<br>
+      <td>3000
       </td>
       <td>Number of milliseconds used to
-determine how far to move<br>
-the bouncing box per frame when the progress bar is indeterminate.<br>
+determine how far to move
+the bouncing box per frame when the progress bar is indeterminate.
       </td>
     </tr>
   </tbody>
@@ -980,56 +980,56 @@ setOneTouchExpandable. 	</td>
 <table class="striped" style="width: 100%;">
 <caption>JSlider Specific Properties</caption>
   <thead><tr>
-      <th scope="col">Property<br>
+      <th scope="col">Property
       </th>
-      <th scope="col">Expected Type<br>
+      <th scope="col">Expected Type
       </th>
-      <th scope="col">Default Value<br>
+      <th scope="col">Default Value
       </th>
-      <th scope="col">Description<br>
+      <th scope="col">Description
       </th>
     </tr>
   </thead> <tbody>
     <tr>
-      <th scope="row">Slider.thumbWidth<br>
+      <th scope="row">Slider.thumbWidth
       </th>
-      <td>Integer<br>
+      <td>Integer
       </td>
-      <td>30<br>
+      <td>30
       </td>
-      <td>Width of the slider thumb<br>
+      <td>Width of the slider thumb
       </td>
     </tr>
     <tr>
-      <th scope="row">Slider.thumbHeight<br>
+      <th scope="row">Slider.thumbHeight
       </th>
-      <td>Integer<br>
+      <td>Integer
       </td>
-      <td>14<br>
+      <td>14
       </td>
-      <td>Height of the slider thumb<br>
+      <td>Height of the slider thumb
       </td>
     </tr>
     <tr>
-      <th scope="row">Slider.trackBorder<br>
+      <th scope="row">Slider.trackBorder
       </th>
-      <td>Integer<br>
+      <td>Integer
       </td>
-      <td>1<br>
+      <td>1
       </td>
-      <td>Width of the track border<br>
+      <td>Width of the track border
       </td>
     </tr>
     <tr>
-      <th scope="row">Slider.paintValue<br>
+      <th scope="row">Slider.paintValue
       </th>
-      <td>Boolean<br>
+      <td>Boolean
       </td>
-      <td>true<br>
+      <td>true
       </td>
       <td>Whether or not to paint the
-current value<br>
-of the slider.<br>
+current value
+of the slider.
       </td>
     </tr>
   </tbody>
@@ -1040,30 +1040,30 @@ of the slider.<br>
 <caption>JTabbedPane Specific Properties</caption>
   <thead><tr>
       <th scope="col">Property</th>
-      <th scope="col">Expected Type<br>
+      <th scope="col">Expected Type
       </th>
-      <th scope="col">Default Value<br>
+      <th scope="col">Default Value
       </th>
       <th scope="col">Description</th>
     </tr>
   </thead> <tbody>
     <tr>
-      <th scope="row">TabbedPane.tabRunOverlay<br>
+      <th scope="row">TabbedPane.tabRunOverlay
       </th>
-      <td>Integer<br>
+      <td>Integer
       </td>
-      <td>0<br>
+      <td>0
       </td>
       <td>Number of pixels to overlap
-	    tabs when there is more than one row.  <br>
+	    tabs when there is more than one row.
       </td>
     </tr>
     <tr>
-      <th scope="row">TabbedPane.textIconGap<br>
+      <th scope="row">TabbedPane.textIconGap
       </th>
-      <td>Integer<br>
+      <td>Integer
       </td>
-      <td>0<br>
+      <td>0
       </td>
       <td>Padding added between the icon
 	    and text on a tab.  If there is no text or icon this value
@@ -1071,26 +1071,26 @@ of the slider.<br>
       </td>
     </tr>
     <tr>
-      <th scope="row">TabbedPane.selectedTabPadInsets<br>
+      <th scope="row">TabbedPane.selectedTabPadInsets
       </th>
-      <td>Insets<br>
+      <td>Insets
       </td>
-      <td>Empty Insets (0, 0, 0, 0)<br>
+      <td>Empty Insets (0, 0, 0, 0)
       </td>
       <td>Extra insets added to the
-selected tab.<br>
+selected tab.
       </td>
     </tr>
     <tr>
-      <th scope="row">TabbedPane.selectionFollowsFocus<br>
+      <th scope="row">TabbedPane.selectionFollowsFocus
       </th>
-      <td>Boolean<br>
+      <td>Boolean
       </td>
-      <td>true<br>
+      <td>true
       </td>
       <td>If true the selection of the
 	    tabbed pane changes as the user navigates the tabs with a
-	    mouse.<br>
+	    mouse.
       </td>
     </tr>
   </tbody>
@@ -1298,56 +1298,56 @@ the button is in a pressed state and does 	    not have a pressed icon. </td>
   </tbody>
 </table>
 <p> <code>Prefix</code> is one of: Button, CheckBox, RadioButton or
-JToggleButton.<br>
+JToggleButton.
 </p>
-<h2><a id="textProperties"></a>Text Properties<br>
+<h2><a id="textProperties"></a>Text Properties
 </h2>
 <table class="striped" style="width: 100%;">
 <caption>Text classes common properties</caption>
   <thead><tr>
       <th scope="col">Property</th>
-      <th scope="col">Expected Type<br>
+      <th scope="col">Expected Type
       </th>
-      <th scope="col">Default Value<br>
+      <th scope="col">Default Value
       </th>
-      <th scope="col">Description<br>
+      <th scope="col">Description
       </th>
     </tr>
   </thead> <tbody>
     <tr>
-      <th scope="row">prefix.caretForeground<br>
+      <th scope="row">prefix.caretForeground
       </th>
-      <td>Color<br>
+      <td>Color
       </td>
       <td>#000000</td>
-      <td>Color of the caret.<br>
+      <td>Color of the caret.
       </td>
     </tr>
     <tr>
-      <th scope="row">prefix.margin<br>
+      <th scope="row">prefix.margin
       </th>
       <td>Insets</td>
-      <td>Empty Insets (0, 0, 0, 0),<br>
-EditorPane and TextPane (3, 3, 3, 3)<br>
+      <td>Empty Insets (0, 0, 0, 0),
+EditorPane and TextPane (3, 3, 3, 3)
       </td>
-      <td>Margins of the text component.<br>
+      <td>Margins of the text component.
       </td>
     </tr>
     <tr>
-      <th scope="row">prefix.caretBlinkRate<br>
+      <th scope="row">prefix.caretBlinkRate
       </th>
-      <td>Integer<br>
+      <td>Integer
       </td>
-      <td>500<br>
+      <td>500
       </td>
       <td>Number of milliseconds defining
-the blink rate fo the caret.<br>
+the blink rate fo the caret.
       </td>
     </tr>
   </tbody>
 </table>
 <p><code>Prefix</code> is one of: EditorPane, FormattedTextField,
-PasswordField, TextArea, TextField or TextPane.<br>
+PasswordField, TextArea, TextField or TextPane.
 </p>
 </main>
 </body>