diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
index 4815c2d127a..95c118f9260 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
@@ -160,13 +160,13 @@ doclet.Properties_Inherited_From_Class=Properties inherited from class
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}
diff --git a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
index f2f5271724e..5e696590e14 100644
--- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
+++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
@@ -79,7 +79,7 @@ public class TestAnnotationTypes extends JavadocTester {
"
",
"- ",
"",
- "
Element Detail
",
+ "Element Details
",
"",
"",
"",
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
index a1bb1346b1e..7aa832ae4d7 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
@@ -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 @@ public class TestHtmlVersion extends JavadocTester {
+ "\n"
+ "Method Summary
",
"\n"
- + "Field Detail
\n"
+ + "Field Details
\n"
+ "\n"
+ "\n"
+ "",
"\n"
- + "Constructor Detail
\n"
+ + "Constructor Details
\n"
+ "\n"
+ "\n"
+ "",
"\n"
- + "Method Detail
\n"
+ + "Method Details
\n"
+ "\n"
+ "\n"
+ "",
@@ -368,12 +368,12 @@ public class TestHtmlVersion extends JavadocTester {
+ "\n",
"
",
"\n"
- + "Enum Constant Detail
\n"
+ + "Enum Constant Details
\n"
+ "\n"
+ "\n"
+ "\n",
"\n"
- + "Method Detail
\n"
+ + "Method Details
\n"
+ "\n"
+ "\n"
+ "\n",
@@ -401,7 +401,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "\n",
"
\n",
"\n"
- + "Method Detail
\n"
+ + "Method Details
\n"
+ "\n"
+ "\n"
+ "\n",
@@ -427,7 +427,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "\n"
+ "Constructor Summary
",
"\n"
- + "Constructor Detail
\n"
+ + "Constructor Details
\n"
+ "\n"
+ "\n"
+ "\n",
@@ -453,7 +453,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "\n"
+ "Constructor Summary
",
"\n"
- + "Constructor Detail
\n"
+ + "Constructor Details
\n"
+ "\n"
+ "\n"
+ "\n",
@@ -485,7 +485,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "Optional Element Summary
\n"
+ "\n
",
"\n"
- + "Element Detail
\n"
+ + "Element Details
\n"
+ "\n"
+ "\n"
+ "\n",
@@ -742,19 +742,19 @@ public class TestHtmlVersion extends JavadocTester {
+ "- \n"
+ "\n"
+ "\n"
- + "
Field Detail
",
+ + "Field Details
",
"\n"
+ "\n"
+ "- \n"
+ "\n"
+ "\n"
- + "
Constructor Detail
",
+ + "Constructor Details
",
"\n"
+ "\n"
+ "- \n"
+ "\n"
+ "\n"
- + "
Method Detail
");
+ + "Method Details
");
// Negated test for enum page
checkOutput("pkg/AnotherClass.ModalExclusionType.html", false,
@@ -786,13 +786,13 @@ public class TestHtmlVersion extends JavadocTester {
+ " - \n"
+ "\n"
+ "\n"
- + "
Enum Constant Detail
",
+ + "Enum Constant Details
",
"\n"
+ "\n"
+ "- \n"
+ "\n"
+ "\n"
- + "
Method Detail
");
+ + "Method Details
");
// Negated test for interface page
checkOutput("pkg2/Interface.html", false,
@@ -816,7 +816,7 @@ public class TestHtmlVersion extends JavadocTester {
+ " - \n"
+ "\n"
+ "\n"
- + "
Method Detail
");
+ + "Method Details
");
// Negated test for error page
checkOutput("pkg/TestError.html", false,
@@ -838,7 +838,7 @@ public class TestHtmlVersion extends JavadocTester {
+ " - \n"
+ "\n"
+ "\n"
- + "
Constructor Detail
");
+ + "Constructor Details
");
// Negated test for exception page
checkOutput("pkg/TestException.html", false,
@@ -860,7 +860,7 @@ public class TestHtmlVersion extends JavadocTester {
+ " - \n"
+ "\n"
+ "\n"
- + "
Constructor Detail
");
+ + "Constructor Details
");
// Negated test for annotation page
checkOutput("pkg2/TestAnnotationType.html", false,
@@ -892,7 +892,7 @@ public class TestHtmlVersion extends JavadocTester {
+ " - \n"
+ "\n"
+ "\n"
- + "
Element Detail
");
+ + "Element Details
");
// Negated test for class use page
checkOutput("pkg1/class-use/RegClass.html", false,
diff --git a/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java b/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java
index 4276f526cee..e5befb297f2 100644
--- a/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java
@@ -75,7 +75,7 @@ public class TestIndexTaglet extends JavadocTester {
checkExit(Exit.OK);
checkOrder("pkg/A.html",
- "Method Detail
\n",
+ "Method Details
\n",
"");
diff --git a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
index 3e3e322e23d..889d6bc9411 100644
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
@@ -213,7 +213,7 @@ public class TestJavaFX extends JavadocTester {
"pkg2");
checkExit(Exit.OK);
checkOutput("pkg2/Test.html", true,
- "Property Detail
\n"
+ "Property Details
\n"
+ "\n"
+ "\n"
+ "\n"
diff --git a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java
index 8b94513b163..8aa37af9199 100644
--- a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java
+++ b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java
@@ -515,7 +515,7 @@ public class TestOrdering extends JavadocTester {
checkExit(Exit.OK);
checkOrder("pkg5/AnnoFieldTest.html",
- "Field Detail
",
+ "Field Details
",
"static final int one
",
"static final int two
",
"static final int three
",
@@ -527,7 +527,7 @@ public class TestOrdering extends JavadocTester {
"one",
"three",
"two",
- "Element Detail
",
+ "Element Details
",
"one
",
"two
",
"three
",
@@ -539,7 +539,7 @@ public class TestOrdering extends JavadocTester {
"one",
"three",
"two",
- "Element Detail
",
+ "Element Details
",
"one
",
"two
",
"three
",
@@ -551,7 +551,7 @@ public class TestOrdering extends JavadocTester {
"Constructor Detail",
+ "Constructor Details
",
"",
"",
"",
@@ -563,7 +563,7 @@ public class TestOrdering extends JavadocTester {
"ONE",
"THREE",
"TWO",
- "Enum Constant Detail
",
+ "Enum Constant Details
",
"ONE
",
"TWO
",
"THREE
",
@@ -575,7 +575,7 @@ public class TestOrdering extends JavadocTester {
"one",
"three",
"two",
- "Field Detail
",
+ "Field Details
",
"one
",
"two
",
"three
",
@@ -587,7 +587,7 @@ public class TestOrdering extends JavadocTester {
"one",
"three",
"two",
- "Method Detail
",
+ "Method Details
",
"one
",
"two
",
"three
",
@@ -599,7 +599,7 @@ public class TestOrdering extends JavadocTester {
"one",
"three",
"two",
- "Method Detail
",
+ "Method Details
",
"one
",
"two
",
"three
",
@@ -611,7 +611,7 @@ public class TestOrdering extends JavadocTester {
"one",
"three",
"two",
- "Property Detail
",
+ "Property Details
",
"oneProperty
",
"twoProperty
",
"threeProperty
",
diff --git a/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java b/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java
index e14c348a679..b3597bc3188 100644
--- a/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java
@@ -78,7 +78,7 @@ public class TestSystemPropertyTaglet extends JavadocTester {
checkOrder("pkg/A.html",
"Class A
",
"test with user.name
",
- "Method Detail
",
+ "Method Details
",
"test with java.version
");
checkOrder("index-all.html",