--- a/jdk/src/java.management/share/classes/java/lang/management/ManagementPermission.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/java.management/share/classes/java/lang/management/ManagementPermission.java	Fri May 12 09:42:23 2017 -0700
@@ -34,7 +34,7 @@
  * provides a summary description of what the permission allows,
  * and discusses the risks of granting code the permission.
  *
- * <table border="1" cellpadding=5>
+ * <table class="striped">
  * <caption style="display:none">Table shows permission target name, what the permission allows, and associated risks</caption>
  * <tr>
  * <th>Permission Target Name</th>

--- a/jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java	Fri May 12 09:42:23 2017 -0700
@@ -695,7 +695,7 @@
      * The given {@code CompositeData} must contain the following attributes
      * unless otherwise specified below:
      * <blockquote>
-     * <table border="1">
+     * <table class="plain">
      * <caption style="display:none">The attributes and their types the given CompositeData contains</caption>
      * <tr>
      *   <th style="text-align:left">Attribute Name</th>
@@ -766,7 +766,7 @@
      *       Each element is a {@code CompositeData} representing
      *       StackTraceElement containing the following attributes:
      *       <blockquote>
-     *       <table cellspacing=1 cellpadding=0>
+     *       <table class="borderless">
      *       <caption style="display:none">The attributes and their types the given CompositeData contains</caption>
      *       <tr>
      *         <th style="text-align:left">Attribute Name</th>

--- a/jdk/src/java.management/share/classes/javax/management/Descriptor.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/java.management/share/classes/javax/management/Descriptor.java	Fri May 12 09:42:23 2017 -0700
@@ -96,7 +96,7 @@
  * of the mapped Java type, called <em>opendata</em>(J) in the <a
  * href="MXBean.html#mapping-rules">MXBean type mapping rules</a>.</p>
  *
- * <table border="1" cellpadding="5">
+ * <table class="striped">
  * <caption style="display:none">Descriptor Fields</caption>
  *
  * <tr><th>Name</th><th>Type</th><th>Used in</th><th>Meaning</th></tr>
@@ -331,7 +331,7 @@
  * interest outside Model MBeans, for example.  But only Model MBeans have
  * a predefined behavior for these fields.</p>
  *
- * <table border="1" cellpadding="5">
+ * <table class="striped">
  * <caption style="display:none">ModelMBean Fields</caption>
  *
  * <tr><th>Name</th><th>Type</th><th>Used in</th><th>Meaning</th></tr>

--- a/jdk/src/java.management/share/classes/javax/management/MXBean.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/java.management/share/classes/javax/management/MXBean.java	Fri May 12 09:42:23 2017 -0700
@@ -93,7 +93,7 @@
       Standard MBean concept.  Here is how a managed object might be
       represented as a Standard MBean, and as an MXBean:</p>
 
-    <table border="1" cellpadding="5">
+    <table class="plain">
     <caption style="display:none">Standard Bean vs. MXBean</caption>
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
@@ -134,7 +134,7 @@
 
     <p>So, we might define <code>MemoryUsage</code> like this:</p>
 
-    <table border="1" cellpadding="5">
+    <table class="plain">
     <caption style="display:none">Standard Bean vs. MXBean</caption>
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
@@ -197,7 +197,7 @@
     <p>This becomes clearer if we compare what the clients of the two
       models might look like:</p>
 
-    <table border="1" cellpadding="5">
+    <table class="plain">
     <caption style="display:none">Standard Bean vs. MXBean</caption>
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
@@ -235,7 +235,7 @@
       managed objects when you know the model beforehand, regardless
       of whether you are using Standard MBeans or MXBeans:</p>
 
-    <table border="1" cellpadding="5">
+    <table class="plain">
     <caption style="display:none">Standard Bean vs. MXBean</caption>
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
@@ -269,7 +269,7 @@
     <p>Implementing the MemoryPool object works similarly for both
       Standard MBeans and MXBeans.</p>
 
-    <table border="1" cellpadding="5">
+    <table class="plain">
     <caption style="display:none">Standard Bean vs. MXBean</caption>
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
@@ -297,7 +297,7 @@
     <p>Registering the MBean in the MBean Server works in the same way
       in both cases:</p>
 
-    <table border="1" cellpadding="5">
+    <table class="plain">
     <caption style="display:none">Standard Bean vs. MXBean</caption>
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
@@ -484,7 +484,7 @@
 
     <p>The following table summarizes the type mapping rules.</p>
 
-    <table border="1" cellpadding="5">
+    <table class="striped">
     <caption style="display:none">Type Mapping Rules</caption>
       <tr>
         <th>Java type <em>J</em></th>

--- a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java	Fri May 12 09:42:23 2017 -0700
@@ -57,7 +57,7 @@
  * Note that when the Type in this table is Number, a String that is the decimal
  * representation of a Long can also be used.</P>
  *
- * <table border="1" cellpadding="5">
+ * <table class="striped">
  * <caption style="display:none">ModelMBeanAttributeInfo Fields</caption>
  * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
  * <tr><td>name</td><td>String</td>

--- a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java	Fri May 12 09:42:23 2017 -0700
@@ -58,7 +58,7 @@
  * Note that when the Type in this table is Number, a String that is the decimal
  * representation of a Long can also be used.</P>
  *
- * <table border="1" cellpadding="5">
+ * <table class="striped">
  * <caption style="display:none">ModelMBeanConstructorInfo Fields</caption>
  * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
  * <tr><td>name</td><td>String</td>

--- a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfo.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanInfo.java	Fri May 12 09:42:23 2017 -0700
@@ -165,7 +165,7 @@
      * following.  Note that when the Type in this table is Number, a String
      * that is the decimal representation of a Long can also be used.</P>
      *
-     * <table border="1" cellpadding="5">
+     * <table class="striped">
      * <caption style="display:none">ModelMBean Fields</caption>
      * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
      * <tr><td>name</td><td>String</td>

--- a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java	Fri May 12 09:42:23 2017 -0700
@@ -56,7 +56,7 @@
  * Note that when the Type in this table is Number, a String that is the decimal
  * representation of a Long can also be used.</P>
  *
- * <table border="1" cellpadding="5">
+ * <table class="striped">
  * <caption style="display:none">ModelMBeanNotificationInfo Fields</caption>
  * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
  * <tr><td>name</td><td>String</td>

--- a/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/java.management/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java	Fri May 12 09:42:23 2017 -0700
@@ -59,7 +59,7 @@
  * Note that when the Type in this table is Number, a String that is the decimal
  * representation of a Long can also be used.</P>
  *
- * <table border="1" cellpadding="5">
+ * <table class="striped">
  * <caption style="display:none">ModelMBeanOperationInfo Fields</caption>
  * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
  * <tr><td>name</td><td>String</td>

--- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java	Fri May 12 09:42:23 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -40,8 +40,8 @@
  * permission allows, and discusses the risks of granting code the
  * permission.
  *
- * <table border=1 cellpadding=5 summary="Table shows permission
- * target name, what the permission allows, and associated risks">
+ * <table class="striped"><caption style="display:none">Table shows permission
+ * target name, what the permission allows, and associated risks</caption>
  * <tr>
  * <th>Permission Target Name</th>
  * <th>What the Permission Allows</th>

--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java	Fri May 12 09:42:23 2017 -0700
@@ -40,7 +40,7 @@
  * permission allows, and discusses the risks of granting code the
  * permission.
  *
- * <table border="1" cellpadding=5>
+ * <table class="plain">
  * <caption style="display:none">Table shows permission target name, what the
  * permission allows, and associated risks</caption>
  * <tr>

--- a/jdk/src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html	Fri May 12 09:42:23 2017 -0700
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML>
 <HTML>
 <HEAD>
 <TITLE>

--- a/jdk/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java	Fri May 12 09:42:23 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -106,7 +106,7 @@
  * The additional meta-data provided for an operation associated with a
  * diagnostic command are described in the table below:
  *
- * <table border="1" cellpadding="5">
+ * <table class="striped"><caption style="display:none">description</caption>
  *   <tr>
  *     <th>Name</th><th>Type</th><th>Description</th>
  *   </tr>
@@ -167,7 +167,7 @@
  * a Descriptor instance. The fields provided in this second Descriptor
  * instance are described in the table below:
  *
- * <table border="1" cellpadding="5">
+ * <table class="striped"><caption style="display:none">description</caption>
  *   <tr>
  *     <th>Name</th><th>Type</th><th>Description</th>
  *   </tr>

--- a/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java	Fri May 12 09:42:23 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -181,10 +181,10 @@
      * The given {@code CompositeData} must contain
      * the following attributes:
      * <blockquote>
-     * <table border>
+     * <table class="striped"><caption style="display:none">description</caption>
      * <tr>
-     *   <th align=left>Attribute Name</th>
-     *   <th align=left>Type</th>
+     *   <th style="text-align:left">Attribute Name</th>
+     *   <th style="text-align:left">Type</th>
      * </tr>
      * <tr>
      *   <td>gcName</td>

--- a/jdk/src/jdk.management/share/classes/com/sun/management/GcInfo.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/GcInfo.java	Fri May 12 09:42:23 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -56,7 +56,7 @@
  * interface.  This is a historical relic, and other classes should
  * not copy this pattern.  Use {@link CompositeDataView} instead.
  *
- * <h4>MXBean Mapping</h4>
+ * <h3>MXBean Mapping</h3>
  * {@code GcInfo} is mapped to a {@link CompositeData CompositeData}
  * with attributes as specified in the {@link #from from} method.
  *
@@ -183,10 +183,10 @@
      * all the following attributes:
      *
      * <blockquote>
-     * <table border>
+     * <table class="striped"><caption style="display:none">description</caption>
      * <tr>
-     *   <th align=left>Attribute Name</th>
-     *   <th align=left>Type</th>
+     *   <th style="text-align:left">Attribute Name</th>
+     *   <th style="text-align:left">Type</th>
      * </tr>
      * <tr>
      *   <td>index</td>

--- a/jdk/src/jdk.management/share/classes/com/sun/management/VMOption.java	Fri May 12 17:38:30 2017 +0100
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/VMOption.java	Fri May 12 09:42:23 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -190,10 +190,10 @@
      * must contain the following attributes:
      *
      * <blockquote>
-     * <table border>
+     * <table class="striped"><caption style="display:none">description</caption>
      * <tr>
-     *   <th align=left>Attribute Name</th>
-     *   <th align=left>Type</th>
+     *   <th style="text-align:left">Attribute Name</th>
+     *   <th style="text-align:left">Type</th>
      * </tr>
      * <tr>
      *   <td>name</td>