--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties Tue May 21 10:46:08 2019 +0200
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties Tue May 21 15:02:18 2019 +0530
@@ -160,13 +160,13 @@
doclet.Properties_Inherited_From_Interface=Properties inherited from interface
doclet.Properties_Declared_In_Class=Properties declared in class
doclet.Properties_Declared_In_Interface=Properties declared in interface
-doclet.Annotation_Type_Member_Detail=Element Detail
-doclet.Enum_Constant_Detail=Enum Constant Detail
+doclet.Annotation_Type_Member_Detail=Element Details
+doclet.Enum_Constant_Detail=Enum Constant Details
doclet.Constants_Summary=Constant Field Values
-doclet.Field_Detail=Field Detail
-doclet.Property_Detail=Property Detail
-doclet.Method_Detail=Method Detail
-doclet.Constructor_Detail=Constructor Detail
+doclet.Field_Detail=Field Details
+doclet.Property_Detail=Property Details
+doclet.Method_Detail=Method Details
+doclet.Constructor_Detail=Constructor Details
doclet.Deprecated=Deprecated.
doclet.DeprecatedForRemoval=Deprecated, for removal: This API element is subject to removal in a future version.
doclet.Groupname_already_used=In -group option, groupname already used: {0}
--- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java Tue May 21 10:46:08 2019 +0200
+++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java Tue May 21 15:02:18 2019 +0530
@@ -79,7 +79,7 @@
"<ul class=\"blockList\">",
"<li class=\"blockList\">",
"<section class=\"memberDetails\">",
- "<h2>Element Detail</h2>",
+ "<h2>Element Details</h2>",
"<a id=\"annotation.type.element.detail\">",
"<!-- -->",
"</a>",
--- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java Tue May 21 10:46:08 2019 +0200
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java Tue May 21 15:02:18 2019 +0530
@@ -24,7 +24,7 @@
/*
* @test
* @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765 8196202
- * 8202624 8210047 8184205 8221871
+ * 8202624 8210047 8184205 8221871 8223733
* @summary Test the version of HTML generated by the javadoc tool.
* @author bpatel
* @library ../../lib
@@ -324,17 +324,17 @@
+ "</a>\n"
+ "<h2>Method Summary</h2>",
"<section class=\"fieldDetails\">\n"
- + "<h2>Field Detail</h2>\n"
+ + "<h2>Field Details</h2>\n"
+ "<a id=\"field.detail\">\n"
+ "<!-- -->\n"
+ "</a>",
"<section class=\"constructorDetails\">\n"
- + "<h2>Constructor Detail</h2>\n"
+ + "<h2>Constructor Details</h2>\n"
+ "<a id=\"constructor.detail\">\n"
+ "<!-- -->\n"
+ "</a>",
"<section class=\"methodDetails\">\n"
- + "<h2>Method Detail</h2>\n"
+ + "<h2>Method Details</h2>\n"
+ "<a id=\"method.detail\">\n"
+ "<!-- -->\n"
+ "</a>",
@@ -368,12 +368,12 @@
+ "<div class=\"memberSummary\">\n",
"<table aria-labelledby=\"t0\">",
"<section class=\"constantDetails\">\n"
- + "<h2>Enum Constant Detail</h2>\n"
+ + "<h2>Enum Constant Details</h2>\n"
+ "<a id=\"enum.constant.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
"<section class=\"methodDetails\">\n"
- + "<h2>Method Detail</h2>\n"
+ + "<h2>Method Details</h2>\n"
+ "<a id=\"method.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
@@ -401,7 +401,7 @@
+ "<div class=\"memberSummary\">\n",
"<table aria-labelledby=\"t0\">\n",
"<section class=\"methodDetails\">\n"
- + "<h2>Method Detail</h2>\n"
+ + "<h2>Method Details</h2>\n"
+ "<a id=\"method.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
@@ -427,7 +427,7 @@
+ "</a>\n"
+ "<h2>Constructor Summary</h2>",
"<section class=\"constructorDetails\">\n"
- + "<h2>Constructor Detail</h2>\n"
+ + "<h2>Constructor Details</h2>\n"
+ "<a id=\"constructor.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
@@ -453,7 +453,7 @@
+ "</a>\n"
+ "<h2>Constructor Summary</h2>",
"<section class=\"constructorDetails\">\n"
- + "<h2>Constructor Detail</h2>\n"
+ + "<h2>Constructor Details</h2>\n"
+ "<a id=\"constructor.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
@@ -485,7 +485,7 @@
+ "<h2>Optional Element Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>",
"<section class=\"memberDetails\">\n"
- + "<h2>Element Detail</h2>\n"
+ + "<h2>Element Details</h2>\n"
+ "<a id=\"annotation.type.element.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
@@ -742,19 +742,19 @@
+ "<li class=\"blockList\"><a name=\"field.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<h2>Field Detail</h2>",
+ + "<h2>Field Details</h2>",
"<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<h2>Constructor Detail</h2>",
+ + "<h2>Constructor Details</h2>",
"<!-- ============ METHOD DETAIL ========== -->\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"method.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<h2>Method Detail</h2>");
+ + "<h2>Method Details</h2>");
// Negated test for enum page
checkOutput("pkg/AnotherClass.ModalExclusionType.html", false,
@@ -786,13 +786,13 @@
+ "<li class=\"blockList\"><a name=\"enum.constant.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<h2>Enum Constant Detail</h2>",
+ + "<h2>Enum Constant Details</h2>",
"<!-- ============ METHOD DETAIL ========== -->\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"method.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<h2>Method Detail</h2>");
+ + "<h2>Method Details</h2>");
// Negated test for interface page
checkOutput("pkg2/Interface.html", false,
@@ -816,7 +816,7 @@
+ "<li class=\"blockList\"><a name=\"method.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<h2>Method Detail</h2>");
+ + "<h2>Method Details</h2>");
// Negated test for error page
checkOutput("pkg/TestError.html", false,
@@ -838,7 +838,7 @@
+ "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<h2>Constructor Detail</h2>");
+ + "<h2>Constructor Details</h2>");
// Negated test for exception page
checkOutput("pkg/TestException.html", false,
@@ -860,7 +860,7 @@
+ "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<h2>Constructor Detail</h2>");
+ + "<h2>Constructor Details</h2>");
// Negated test for annotation page
checkOutput("pkg2/TestAnnotationType.html", false,
@@ -892,7 +892,7 @@
+ "<li class=\"blockList\"><a name=\"annotation.type.element.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<h2>Element Detail</h2>");
+ + "<h2>Element Details</h2>");
// Negated test for class use page
checkOutput("pkg1/class-use/RegClass.html", false,
--- a/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java Tue May 21 10:46:08 2019 +0200
+++ b/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java Tue May 21 15:02:18 2019 +0530
@@ -75,7 +75,7 @@
checkExit(Exit.OK);
checkOrder("pkg/A.html",
- "<h2>Method Detail</h2>\n",
+ "<h2>Method Details</h2>\n",
"<div class=\"block\">test description with <a id=\"search_phrase_a\" "
+ "class=\"searchTagResult\">search_phrase_a</a></div>");
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Tue May 21 10:46:08 2019 +0200
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Tue May 21 15:02:18 2019 +0530
@@ -213,7 +213,7 @@
"pkg2");
checkExit(Exit.OK);
checkOutput("pkg2/Test.html", true,
- "<h2>Property Detail</h2>\n"
+ "<h2>Property Details</h2>\n"
+ "<a id=\"property.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
--- a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java Tue May 21 10:46:08 2019 +0200
+++ b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java Tue May 21 15:02:18 2019 +0530
@@ -515,7 +515,7 @@
checkExit(Exit.OK);
checkOrder("pkg5/AnnoFieldTest.html",
- "<h2>Field Detail</h2>",
+ "<h2>Field Details</h2>",
"<pre>static final int one</pre>",
"<pre>static final int two</pre>",
"<pre>static final int three</pre>",
@@ -527,7 +527,7 @@
"<a href=\"#one()\">one</a>",
"<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>",
- "<h2>Element Detail</h2>",
+ "<h2>Element Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
@@ -539,7 +539,7 @@
"<a href=\"#one()\">one</a>",
"<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>",
- "<h2>Element Detail</h2>",
+ "<h2>Element Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
@@ -551,7 +551,7 @@
"<a href=\"#%3Cinit%3E(int,int)\"",
"<a href=\"#%3Cinit%3E(int,int,int)\"",
"<a href=\"#%3Cinit%3E(int,int,int,int)\"",
- "<h2>Constructor Detail</h2>",
+ "<h2>Constructor Details</h2>",
"<a id=\"<init>(int,int,int,int)\">",
"<a id=\"<init>(int,int,int)\">",
"<a id=\"<init>(int,int)\">",
@@ -563,7 +563,7 @@
"<a href=\"#ONE\">ONE</a>",
"<a href=\"#THREE\">THREE</a>",
"<a href=\"#TWO\">TWO</a>",
- "<h2>Enum Constant Detail</h2>",
+ "<h2>Enum Constant Details</h2>",
"<h3>ONE</h3>",
"<h3>TWO</h3>",
"<h3>THREE</h3>",
@@ -575,7 +575,7 @@
"<a href=\"#one\">one</a>",
"<a href=\"#three\">three</a>",
"<a href=\"#two\">two</a>",
- "<h2>Field Detail</h2>",
+ "<h2>Field Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
@@ -587,7 +587,7 @@
"<a href=\"#one()\">one</a>",
"<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>",
- "<h2>Method Detail</h2>",
+ "<h2>Method Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
@@ -599,7 +599,7 @@
"<a href=\"#one()\">one</a>",
"<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>",
- "<h2>Method Detail</h2>",
+ "<h2>Method Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
@@ -611,7 +611,7 @@
"<a href=\"#oneProperty\">one</a>",
"<a href=\"#threeProperty\">three</a>",
"<a href=\"#twoProperty\">two</a>",
- "<h2>Property Detail</h2>",
+ "<h2>Property Details</h2>",
"<h3>oneProperty</h3>",
"<h3>twoProperty</h3>",
"<h3>threeProperty</h3>",
--- a/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java Tue May 21 10:46:08 2019 +0200
+++ b/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java Tue May 21 15:02:18 2019 +0530
@@ -78,7 +78,7 @@
checkOrder("pkg/A.html",
"<h1 title=\"Class A\" class=\"title\">Class A</h1>",
"test with <code><a id=\"user.name\" class=\"searchTagResult\">user.name</a></code>",
- "<h2>Method Detail</h2>",
+ "<h2>Method Details</h2>",
"test with <code><a id=\"java.version\" class=\"searchTagResult\">java.version</a></code>");
checkOrder("index-all.html",