diff -r 9a899e2c3e64 -r 1a395165c09b test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
--- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java	Tue Nov 20 10:07:42 2018 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java	Tue Nov 20 10:50:54 2018 +0530
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765 8196202
- *      8202624 8210047
+ *      8202624 8210047 8184205
  * @summary Test the version of HTML generated by the javadoc tool.
  * @author bpatel
  * @library ../lib
@@ -127,7 +127,8 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"overviewSummary\">\n"
+                "<div class=\"overviewSummary\">\n"
+                + "<table>\n"
                 + "<caption>",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -163,7 +164,7 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"typeSummary\">",
+                "<div class=\"typeSummary\">\n<table>",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<div class=\"fixedNav\">\n"
@@ -182,7 +183,7 @@
                 "<div class=\"contentContainer\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\">\n"
-                + "<table class=\"typeSummary\">\n"
+                + "<div class=\"typeSummary\">\n<table>\n"
                 + "<caption><span>Class Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>");
 
         // Test for package-tree page
@@ -218,7 +219,7 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"useSummary\">",
+                "<div class=\"useSummary\">\n<table>",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<div class=\"fixedNav\">\n"
@@ -236,7 +237,7 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"constantsSummary\">",
+                "<div class=\"constantsSummary\">\n<table>",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<div class=\"fixedNav\">\n"
@@ -258,7 +259,7 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"deprecatedSummary\">",
+                "<div class=\"deprecatedSummary\">\n<table>",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<div class=\"fixedNav\">\n"
@@ -379,21 +380,21 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Nested Class Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">\n<table>",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"field.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Field Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">\n<table>",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"constructor.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Constructor Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">\n<table>",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"method.summary\">\n"
@@ -441,14 +442,16 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Enum Constant Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">\n",
+                "<table aria-labelledby=\"t0\">\n",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"method.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">\n",
+                "<table aria-labelledby=\"t0\">",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"enum.constant.detail\">\n"
@@ -484,7 +487,8 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">\n",
+                "<table aria-labelledby=\"t0\">\n",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"method.detail\">\n"
@@ -572,14 +576,14 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Required Element Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">\n<table>",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"annotation.type.optional.element.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Optional Element Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">\n<table>",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"annotation.type.element.detail\">\n"
@@ -603,12 +607,12 @@
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
-                "<table class=\"useSummary\">",
+                "<div class=\"useSummary\">\n<table>",
                 "<section role=\"region\"><a id=\"pkg\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h3>\n"
-                + "<table class=\"useSummary\">",
+                + "<div class=\"useSummary\">\n<table>",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
@@ -657,7 +661,7 @@
                 "<a name=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"overviewSummary\" summary=\"Package Summary table, listing packages, and an explanation\">\n"
+                "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
                 + "<caption>",
                 "</noscript>\n"
                 + "<div class=\"fixedNav\">\n"
@@ -679,12 +683,12 @@
                 + "</a>",
                 "<section role=\"region\">\n"
                 + "<h2 title=\"Package pkg Description\">Package pkg Description</h2>\n",
-                "<table class=\"typeSummary\" summary=\"Interface Summary table, listing interfaces, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Enum Summary table, listing enums, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Exception Summary table, listing exceptions, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Error Summary table, listing errors, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
+                "<div class=\"typeSummary\">\n<table summary=\"Interface Summary table, listing interfaces, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Class Summary table, listing classes, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Enum Summary table, listing enums, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Exception Summary table, listing exceptions, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Error Summary table, listing errors, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
 
         // Negated test for package-tree page
         checkOutput("pkg/package-tree.html", false,
@@ -701,7 +705,8 @@
                 "<a name=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">");
+                "<div class=\"useSummary\">\n"
+                + "<table summary=\"Use table, listing packages, and an explanation\">");
 
         // Negated test for constant-values page
         checkOutput("constant-values.html", false,
@@ -718,7 +723,8 @@
                 + "//-->\n"
                 + "</script>\n"
                 + "<div class=\"header\">",
-                "<table class=\"constantsSummary\" summary=\"Constant Field Values table, listing constant fields, and values\">");
+                "<div class=\"constantsSummary\">\n"
+                + "<table summary=\"Constant Field Values table, listing constant fields, and values\">");
 
         // Negated test for deprecated-list page
         checkOutput("deprecated-list.html", false,
@@ -737,16 +743,16 @@
                 + "<div class=\"header\">\n"
                 + "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n"
                 + "<h2 title=\"Contents\">Contents</h2>",
-                "<table class=\"deprecatedSummary\" summary=\"Classes table, listing classes, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Enums table, listing enums, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Exceptions table, listing exceptions, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Errors table, listing errors, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Annotation Types table, listing annotation types, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Fields table, listing fields, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Methods table, listing methods, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Constructors table, listing constructors, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Enum Constants table, listing enum constants, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Annotation Type Elements table, listing annotation type elements, and an explanation\">");
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Classes table, listing classes, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Enums table, listing enums, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Exceptions table, listing exceptions, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Errors table, listing errors, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Annotation Types table, listing annotation types, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Fields table, listing fields, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Methods table, listing methods, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Constructors table, listing constructors, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Enum Constants table, listing enum constants, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n<table summary=\"Annotation Type Elements table, listing annotation type elements, and an explanation\">");
 
         // Negated test for serialized-form page
         checkOutput("serialized-form.html", false,
@@ -848,28 +854,32 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Nested Class Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Nested Class Summary table, listing nested classes, and an explanation\">",
+                + "<div class=\"memberSummary\">\n"
+                + "<table summary=\"Nested Class Summary table, listing nested classes, and an explanation\">",
                 "<!-- =========== FIELD SUMMARY =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"field.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Field Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Field Summary table, listing fields, and an explanation\">",
+                + "<div class=\"memberSummary\">\n"
+                + "<table summary=\"Field Summary table, listing fields, and an explanation\">",
                 "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Constructor Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Constructor Summary table, listing constructors, and an explanation\">",
+                + "<div class=\"memberSummary\">\n"
+                + "<table summary=\"Constructor Summary table, listing constructors, and an explanation\">",
                 "<!-- ========== METHOD SUMMARY =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"method.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
+                + "<div class=\"memberSummary\">\n"
+                + "<table summary=\"Method Summary table, listing methods, and an explanation\">",
                 "<!-- ============ FIELD DETAIL =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"field.detail\">\n"
@@ -904,14 +914,16 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Enum Constant Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Enum Constant Summary table, listing enum constants, and an explanation\">",
+                + "<div class=\"memberSummary\">\n"
+                + "<table summary=\"Enum Constant Summary table, listing enum constants, and an explanation\">",
                 "<!-- ========== METHOD SUMMARY =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"method.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
+                + "<div class=\"memberSummary\">\n"
+                + "<table summary=\"Method Summary table, listing methods, and an explanation\">",
                 "<!-- ============ ENUM CONSTANT DETAIL =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"enum.constant.detail\">\n"
@@ -940,7 +952,8 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
+                + "<div class=\"memberSummary\">\n"
+                + "<table summary=\"Method Summary table, listing methods, and an explanation\">",
                 "<!-- ============ METHOD DETAIL ========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"method.detail\">\n"
@@ -1007,14 +1020,16 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Required Element Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Required Element Summary table, listing required elements, and an explanation\">",
+                + "<div class=\"memberSummary\">\n"
+                + "<table summary=\"Required Element Summary table, listing required elements, and an explanation\">",
                 "<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"annotation.type.optional.element.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Optional Element Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Optional Element Summary table, listing optional elements, and an explanation\">",
+                + "<div class=\"memberSummary\">\n"
+                + "<table summary=\"Optional Element Summary table, listing optional elements, and an explanation\">",
                 "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"annotation.type.element.detail\">\n"
@@ -1037,12 +1052,13 @@
                 + "//-->\n"
                 + "</script>\n"
                 + "<div class=\"header\">",
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">",
+                "<div class=\"useSummary\">\n"
+                + "<table summary=\"Use table, listing packages, and an explanation\">",
                 "<li class=\"blockList\"><a name=\"pkg\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h3>\n"
-                + "<table class=\"useSummary\" summary=\"Use table, listing fields, and an explanation\">");
+                + "<div class=\"useSummary\">\n<table summary=\"Use table, listing fields, and an explanation\">");
 
         // Negated test for main index page
         checkOutput("index.html", false,
@@ -1082,7 +1098,8 @@
                 "<a name=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"overviewSummary\" summary=\"Package Summary table, listing packages, and an explanation\">\n"
+                "<div class=\"overviewSummary\">\n"
+                + "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
                 + "<caption>",
                 "</noscript>\n"
                 + "<div class=\"fixedNav\">\n"
@@ -1106,18 +1123,19 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<div class=\"block\">Test package.</div>",
-                "<table class=\"typeSummary\" summary=\"Interface Summary table, listing interfaces, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Enum Summary table, listing enums, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Exception Summary table, listing exceptions, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Error Summary table, listing errors, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
+                "<div class=\"typeSummary\">\n<table summary=\"Interface Summary table, listing interfaces, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Class Summary table, listing classes, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Enum Summary table, listing enums, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Exception Summary table, listing exceptions, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Error Summary table, listing errors, and an explanation\">",
+                "<div class=\"typeSummary\">\n<table summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
         // No Package description
         checkOutput("pkg1/package-summary.html", true,
                 "<div class=\"contentContainer\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\">\n"
-                + "<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">\n"
+                + "<div class=\"typeSummary\">\n"
+                + "<table summary=\"Class Summary table, listing classes, and an explanation\">\n"
                 + "<caption><span>Class Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>");
 
         // Test for package-tree page
@@ -1136,7 +1154,8 @@
                 "<a name=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">");
+                "<div class=\"useSummary\">\n"
+                + "<table summary=\"Use table, listing packages, and an explanation\">");
 
         // Test for constant-values page
         checkOutput("constant-values.html", true,
@@ -1153,7 +1172,8 @@
                 + "//-->\n"
                 + "</script>\n"
                 + "<div class=\"header\">",
-                "<table class=\"constantsSummary\" summary=\"Constant Field Values table, listing constant fields, and values\">");
+                "<div class=\"constantsSummary\">\n"
+                + "<table summary=\"Constant Field Values table, listing constant fields, and values\">");
 
         // Test for deprecated-list page
         checkOutput("deprecated-list.html", true,
@@ -1172,16 +1192,26 @@
                 + "<div class=\"header\">\n"
                 + "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n"
                 + "<h2 title=\"Contents\">Contents</h2>",
-                "<table class=\"deprecatedSummary\" summary=\"Classes table, listing classes, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Enums table, listing enums, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Exceptions table, listing exceptions, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Errors table, listing errors, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Annotation Types table, listing annotation types, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Fields table, listing fields, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Methods table, listing methods, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Constructors table, listing constructors, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Enum Constants table, listing enum constants, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Annotation Type Elements table, listing annotation type elements, and an explanation\">");
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Classes table, listing classes, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Enums table, listing enums, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Exceptions table, listing exceptions, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Errors table, listing errors, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Annotation Types table, listing annotation types, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Fields table, listing fields, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Methods table, listing methods, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Constructors table, listing constructors, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Enum Constants table, listing enum constants, and an explanation\">",
+                "<div class=\"deprecatedSummary\">\n"
+                + "<table summary=\"Annotation Type Elements table, listing annotation type elements, and an explanation\">");
 
         // Test for serialized-form page
         checkOutput("serialized-form.html", true,
@@ -1286,28 +1316,30 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Nested Class Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Nested Class Summary table, listing nested classes, and an explanation\">",
+                + "<div class=\"memberSummary\">",
+                "<table summary=\"Nested Class Summary table, listing nested classes, and an explanation\">",
                 "<!-- =========== FIELD SUMMARY =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"field.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Field Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Field Summary table, listing fields, and an explanation\">",
+                + "<div class=\"memberSummary\">\n<table summary=\"Field Summary table, listing fields, and an explanation\">",
                 "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Constructor Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Constructor Summary table, listing constructors, and an explanation\">",
+                + "<div class=\"memberSummary\">\n<table summary=\"Constructor Summary table, listing constructors, and an explanation\">",
                 "<!-- ========== METHOD SUMMARY =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"method.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
+                + "<div class=\"memberSummary\">\n",
+                "<table summary=\"Method Summary table, listing methods, and an explanation\" aria-labelledby=\"t0\">",
                 "<!-- ============ FIELD DETAIL =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"field.detail\">\n"
@@ -1342,14 +1374,16 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Enum Constant Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Enum Constant Summary table, listing enum constants, and an explanation\">",
+                + "<div class=\"memberSummary\">",
+                "<table summary=\"Enum Constant Summary table, listing enum constants, and an explanation\"",
                 "<!-- ========== METHOD SUMMARY =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"method.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
+                + "<div class=\"memberSummary\">\n",
+                "<table summary=\"Method Summary table, listing methods, and an explanation\" aria-labelledby=\"t0\">",
                 "<!-- ============ ENUM CONSTANT DETAIL =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"enum.constant.detail\">\n"
@@ -1378,7 +1412,9 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
+                + "<div class=\"memberSummary\">\n",
+                "<table summary=\"Method Summary table, listing methods, and an explanation\""
+                + " aria-labelledby=\"t0\">",
                 "<!-- ============ METHOD DETAIL ========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"method.detail\">\n"
@@ -1445,14 +1481,14 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Required Element Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Required Element Summary table, listing required elements, and an explanation\">",
+                + "<div class=\"memberSummary\">\n<table summary=\"Required Element Summary table, listing required elements, and an explanation\">",
                 "<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"annotation.type.optional.element.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Optional Element Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Optional Element Summary table, listing optional elements, and an explanation\">",
+                + "<div class=\"memberSummary\">\n<table summary=\"Optional Element Summary table, listing optional elements, and an explanation\">",
                 "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a name=\"annotation.type.element.detail\">\n"
@@ -1475,12 +1511,12 @@
                 + "//-->\n"
                 + "</script>\n"
                 + "<div class=\"header\">",
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">",
+                "<div class=\"useSummary\">\n<table summary=\"Use table, listing packages, and an explanation\">",
                 "<li class=\"blockList\"><a name=\"pkg\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h3>\n"
-                + "<table class=\"useSummary\" summary=\"Use table, listing fields, and an explanation\">");
+                + "<div class=\"useSummary\">\n<table summary=\"Use table, listing fields, and an explanation\">");
 
         // Test for main index page
         checkOutput("index.html", true,
@@ -1525,7 +1561,7 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"overviewSummary\">\n"
+                "<div class=\"overviewSummary\">\n"
                 + "<caption>",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -1557,7 +1593,7 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"typeSummary\">",
+                "<div class=\"typeSummary\">\n<table\">",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
@@ -1599,7 +1635,7 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"useSummary\">",
+                "<div class=\"useSummary\">\n<table>",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
@@ -1616,7 +1652,7 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"constantsSummary\">",
+                "<div class=\"constantsSummary\">\n<table>",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
@@ -1637,7 +1673,7 @@
                 "<a id=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<table class=\"deprecatedSummary\">",
+                "<div class=\"deprecatedSummary\">\n<table>",
                 "<header role=\"banner\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
@@ -1751,21 +1787,21 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Nested Class Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"field.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Field Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"constructor.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Constructor Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"method.summary\">\n"
@@ -1812,14 +1848,14 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Enum Constant Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"method.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"enum.constant.detail\">\n"
@@ -1854,7 +1890,7 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"method.detail\">\n"
@@ -1939,14 +1975,14 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Required Element Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"annotation.type.optional.element.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Optional Element Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
+                + "<div class=\"memberSummary\">",
                 "<section role=\"region\">\n"
                 + "<ul class=\"blockList\">\n"
                 + "<li class=\"blockList\"><a id=\"annotation.type.element.detail\">\n"
@@ -1969,13 +2005,13 @@
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
-                "<table class=\"useSummary\">",
+                "<div class=\"useSummary\">\n<table>\n",
                 "<section role=\"region\"><a id=\"pkg\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h3>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h3>\n"
                 + "\n"
-                + "<table class=\"useSummary\">",
+                + "<div class=\"useSummary\">",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");