--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html	Thu Jul 13 19:34:25 2017 +0000
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html	Thu Jul 13 17:45:10 2017 -0700
@@ -177,13 +177,13 @@
 	<caption>Features in <code>BaseRowSet</code></caption>
           <thead>
             <tr>
-              <th>Feature</th>
-              <th>Details</th>
+              <th scope="col">Feature</th>
+              <th scope="col">Details</th>
             </tr>
           </thead>
           <tbody>
             <tr>
-              <td>Properties</td>
+              <th scope="row">Properties</th>
               <td>Provides standard JavaBeans property manipulation
 mechanisms to allow applications to get and set <code>RowSet</code> command and
 property  values. Refer to the   documentation of the <code>javax.sql.RowSet</code>
@@ -191,7 +191,7 @@
 the standard  <code>RowSet</code> properties.</td>
             </tr>
             <tr>
-              <td>Event notification</td>
+              <th scope="row">Event notification</th>
               <td>Provides standard JavaBeans event notifications
 to registered event listeners. Refer to the documentation of <code>javax.sql.RowSetEvent</code>
 interface (available in the JDBC 3.0 specification) for
@@ -199,12 +199,12 @@
 by  compliant implementations.</td>
             </tr>
             <tr>
-              <td>Setters for a RowSet object's command</td>
+              <th scope="row">Setters for a RowSet object's command</th>
               <td>Provides a complete set of setter methods
                  for setting RowSet command parameters.</td>
             </tr>
             <tr>
-              <td>Streams</td>
+              <th scope="row">Streams</th>
               <td>Provides fields for storing of stream instances
   in addition to providing a set of constants for stream type designation.</td>
             </tr>

--- a/jdk/src/java.sql/share/classes/java/sql/Connection.java	Thu Jul 13 19:34:25 2017 +0000
+++ b/jdk/src/java.sql/share/classes/java/sql/Connection.java	Thu Jul 13 17:45:10 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -1523,7 +1523,7 @@
      *
      * @implSpec
      * The default implementation is a no-op.
-     * <p>
+     *
      * @apiNote
      * This method is to be used by Connection pooling managers.
      * <p>

--- a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java	Thu Jul 13 19:34:25 2017 +0000
+++ b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java	Thu Jul 13 17:45:10 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -63,7 +63,6 @@
  * via the {@linkplain ServiceLoader#load service-provider loading} mechanism.
  *</ul>
  *
- *<P>
  * @implNote
  * {@code DriverManager} initialization is done lazily and looks up service
  * providers using the thread context class loader.  The drivers loaded and

--- a/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java	Thu Jul 13 19:34:25 2017 +0000
+++ b/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java	Thu Jul 13 17:45:10 2017 -0700
@@ -62,29 +62,29 @@
  * <caption style="display:none">permission target name, what the permission allows, and associated risks</caption>
  * <thead>
  * <tr>
- * <th>Permission Target Name</th>
- * <th>What the Permission Allows</th>
- * <th>Risks of Allowing this Permission</th>
+ * <th scope="col">Permission Target Name</th>
+ * <th scope="col">What the Permission Allows</th>
+ * <th scope="col">Risks of Allowing this Permission</th>
  * </tr>
  * </thead>
  *
  * <tbody>
  * <tr>
- *   <td>setLog</td>
+ *   <th scope="row">setLog</th>
  *   <td>Setting of the logging stream</td>
  *   <td>This is a dangerous permission to grant.
  * The contents of the log may contain usernames and passwords,
  * SQL statements, and SQL data.</td>
  * </tr>
  * <tr>
- * <td>callAbort</td>
+ * <th scope="row">callAbort</th>
  *   <td>Allows the invocation of the {@code Connection} method
  *   {@code abort}</td>
  *   <td>Permits an application to terminate a physical connection to a
  *  database.</td>
  * </tr>
  * <tr>
- * <td>setSyncFactory</td>
+ * <th scope="row">setSyncFactory</th>
  *   <td>Allows the invocation of the {@code SyncFactory} methods
  *   {@code setJNDIContext} and {@code setLogger}</td>
  *   <td>Permits an application to specify the JNDI context from which the
@@ -93,7 +93,7 @@
  * </tr>
  *
  * <tr>
- * <td>setNetworkTimeout</td>
+ * <th scope="row">setNetworkTimeout</th>
  *   <td>Allows the invocation of the {@code Connection} method
  *   {@code setNetworkTimeout}</td>
  *   <td>Permits an application to specify the maximum period a
@@ -101,7 +101,7 @@
  * objects created from the <code>Connection</code>
  * will wait for the database to reply to any one request.</td>
  * <tr>
- * <td>deregisterDriver</td>
+ * <th scope="row">deregisterDriver</th>
  *   <td>Allows the invocation of the {@code DriverManager}
  * method {@code deregisterDriver}</td>
  *   <td>Permits an application to remove a JDBC driver from the list of

--- a/jdk/src/java.sql/share/classes/java/sql/Statement.java	Thu Jul 13 19:34:25 2017 +0000
+++ b/jdk/src/java.sql/share/classes/java/sql/Statement.java	Thu Jul 13 17:45:10 2017 -0700
@@ -1379,17 +1379,17 @@
      * single quote within the string will be replaced by two single quotes.
      *
      * <blockquote>
-     * <table class="striped" >
+     * <table class="striped">
      * <caption>Examples of the conversion:</caption>
      * <thead>
-     * <tr><th>Value</th><th>Result</th></tr>
+     * <tr><th scope="col">Value</th><th scope="col">Result</th></tr>
      * </thead>
      * <tbody style="text-align:center">
-     * <tr> <td>Hello</td> <td>'Hello'</td> </tr>
-     * <tr> <td>G'Day</td> <td>'G''Day'</td> </tr>
-     * <tr> <td>'G''Day'</td>
+     * <tr> <th scope="row">Hello</th> <td>'Hello'</td> </tr>
+     * <tr> <th scope="row">G'Day</th> <td>'G''Day'</td> </tr>
+     * <tr> <th scope="row">'G''Day'</th>
      * <td>'''G''''Day'''</td> </tr>
-     * <tr> <td>I'''M</td> <td>'I''''''M'</td>
+     * <tr> <th scope="row">I'''M</th> <td>'I''''''M'</td>
      * </tr>
      *
      * </tbody>
@@ -1454,48 +1454,48 @@
      * <caption>Examples of the conversion:</caption>
      * <thead>
      * <tr>
-     * <th>identifier</th>
-     * <th>alwaysQuote</th>
-     * <th>Result</th></tr>
+     * <th scope="col">identifier</th>
+     * <th scope="col">alwaysQuote</th>
+     * <th scope="col">Result</th></tr>
      * </thead>
      * <tbody>
      * <tr>
-     * <td>Hello</td>
+     * <th scope="row">Hello</th>
      * <td>false</td>
      * <td>Hello</td>
      * </tr>
      * <tr>
-     * <td>Hello</td>
+     * <th scope="row">Hello</th>
      * <td>true</td>
      * <td>"Hello"</td>
      * </tr>
      * <tr>
-     * <td>G'Day</td>
+     * <th scope="row">G'Day</th>
      * <td>false</td>
      * <td>"G'Day"</td>
      * </tr>
      * <tr>
-     * <td>"Bruce Wayne"</td>
+     * <th scope="row">"Bruce Wayne"</th>
      * <td>false</td>
      * <td>"Bruce Wayne"</td>
      * </tr>
      * <tr>
-     * <td>"Bruce Wayne"</td>
+     * <th scope="row">"Bruce Wayne"</th>
      * <td>true</td>
      * <td>"Bruce Wayne"</td>
      * </tr>
      * <tr>
-     * <td>GoodDay$</td>
+     * <th scope="row">GoodDay$</th>
      * <td>false</td>
      * <td>"GoodDay$"</td>
      * </tr>
      * <tr>
-     * <td>Hello"World</td>
+     * <th scope="row">Hello"World</th>
      * <td>false</td>
      * <td>SQLException</td>
      * </tr>
      * <tr>
-     * <td>"Hello"World"</td>
+     * <th scope="row">"Hello"World"</th>
      * <td>false</td>
      * <td>SQLException</td>
      * </tr>
@@ -1554,33 +1554,33 @@
      * <caption>Examples of the conversion:</caption>
      * <thead>
      * <tr>
-     * <th>identifier</th>
-     * <th>Simple Identifier</th>
+     * <th scope="col">identifier</th>
+     * <th scope="col">Simple Identifier</th>
      * </thead>
      *
      * <tbody>
      * <tr>
-     * <td>Hello</td>
+     * <th scope="row">Hello</th>
      * <td>true</td>
      * </tr>
      * <tr>
-     * <td>G'Day</td>
+     * <th scope="row">G'Day</th>
      * <td>false</td>
      * </tr>
      * <tr>
-     * <td>"Bruce Wayne"</td>
+     * <th scope="row">"Bruce Wayne"</th>
      * <td>false</td>
      * </tr>
      * <tr>
-     * <td>GoodDay$</td>
+     * <th scope="row">GoodDay$</th>
      * <td>false</td>
      * </tr>
      * <tr>
-     * <td>Hello"World</td>
+     * <th scope="row">Hello"World</th>
      * <td>false</td>
      * </tr>
      * <tr>
-     * <td>"Hello"World"</td>
+     * <th scope="row">"Hello"World"</th>
      * <td>false</td>
      * </tr>
      * </tbody>
@@ -1613,17 +1613,17 @@
     * <caption>Examples of the conversion:</caption>
     * <thead>
     * <tr>
-    * <th>Value</th>
-    * <th>Result</th>
+    * <th scope="col">Value</th>
+    * <th scope="col">Result</th>
     * </tr>
     * </thead>
     * <tbody>
-    * <tr> <td>Hello</td> <td>N'Hello'</td> </tr>
-    * <tr> <td>G'Day</td> <td>N'G''Day'</td> </tr>
-    * <tr> <td>'G''Day'</td>
+    * <tr> <th scope="row">Hello</th> <td>N'Hello'</td> </tr>
+    * <tr> <th scope="row">G'Day</th> <td>N'G''Day'</td> </tr>
+    * <tr> <th scope="row">'G''Day'</th>
     * <td>N'''G''''Day'''</td> </tr>
-    * <tr> <td>I'''M</td> <td>N'I''''''M'</td>
-    * <tr> <td>N'Hello'</td> <td>N'N''Hello'''</td> </tr>
+    * <tr> <th scope="row">I'''M</th> <td>N'I''''''M'</td>
+    * <tr> <th scope="row">N'Hello'</th> <td>N'N''Hello'''</td> </tr>
     *
     * </tbody>
     * </table>

--- a/jdk/src/java.sql/share/classes/javax/sql/package.html	Thu Jul 13 19:34:25 2017 +0000
+++ b/jdk/src/java.sql/share/classes/javax/sql/package.html	Thu Jul 13 17:45:10 2017 -0700
@@ -280,7 +280,6 @@
 The <code>RowSet</code> interface may be implemented in any number of
 ways, and anyone may write an implementation. Developers are encouraged 
 to use their imaginations in coming up with new ways to use rowsets.
-<P>
 
 
 <h2>Package Specification</h2>