diff --git a/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
index 0052708c61f..54be1bacfef 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/DesktopProperties.html
@@ -55,10 +55,9 @@ not support them. In the event that a desktop property is
 unavailable for any reason, the implementation will return
 <code>null</code>.
 <p>
-The following table summarizes the desktop properties documented
-here, and their value types.
-<br><br>
 <table border=1>
+<caption>The following table summarizes the desktop properties documented
+here, and their value types.</caption>
 <thead>
 <tr>
 <th scope="col">Property Name</th>
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
index 6a7bd7f2550..cfd7fdfa3ca 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html
@@ -230,12 +230,11 @@ object returned by the TIFF reader using the
 <h4><a id="MapNativeStandard"></a>
 Mapping of TIFF Native Image Metadata to the Standard Metadata Format</h4>
 
-The derivation of standard metadata format
+<table border="1">
+<caption>The derivation of standard metadata format
 <a href="standard_metadata.html">javax_imageio_1.0</a>
 elements from <a href="#ImageMetadata">TIFF native image metadata</a> is given
-in the following table.
-
-<table border="1">
+in the following table.</caption>
 <thead>
 <tr>
 <th scope="col">Index</th>
@@ -760,12 +759,12 @@ writer.</p>
 <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
-<a href="standard_metadata.html">javax_imageio_1.0</a> is
-given in the following table.
 
 <table border="1">
+<caption>The derivation of <a href="#ImageMetadata">TIFF native image metadata</a>
+elements from the standard metadata format
+<a href="standard_metadata.html">javax_imageio_1.0</a> is
+given in the following table.</caption>
 <thead>
 <tr>
 <th scope="col">Index</th>
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 251a7ec2c27..6346d52a430 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
@@ -1301,6 +1301,7 @@ JToggleButton.<br>
 <h2><a id="textProperties"></a>Text Properties<br>
 </h2>
 <table cellpadding="2" cellspacing="2" border="1" style="text-align: left; width: 100%;">
+<caption>Text classes common properties</caption>
   <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>