--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java	Tue Mar 15 13:48:30 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlWriter.java	Thu Mar 17 19:04:28 2016 +0000
@@ -67,6 +67,11 @@
     protected boolean memberDetailsListPrinted;
 
     /**
+     * Header for table displaying modules and description..
+     */
+    protected final List<String> moduleTableHeader;
+
+    /**
      * Header for tables displaying packages and description..
      */
     protected final List<String> packageTableHeader;
@@ -87,6 +92,8 @@
 
     public final Content packageLabel;
 
+    public final Content moduleLabel;
+
     public final Content useLabel;
 
     public final Content prevLabel;
@@ -117,6 +124,8 @@
 
     public final Content allpackagesLabel;
 
+    public final Content allmodulesLabel;
+
     public final Content indexLabel;
 
     public final Content helpLabel;
@@ -129,8 +138,14 @@
 
     public final Content nextpackageLabel;
 
+    public final Content prevmoduleLabel;
+
+    public final Content nextmoduleLabel;
+
     public final Content packagesLabel;
 
+    public final Content modulesLabel;
+
     public final Content methodDetailsLabel;
 
     public final Content annotationTypeDetailsLabel;
@@ -171,6 +186,9 @@
         writer = DocFile.createFileForOutput(configuration, path).openWriter();
         this.configuration = configuration;
         this.memberDetailsListPrinted = false;
+        moduleTableHeader = Arrays.asList(
+            configuration.getText("doclet.Module"),
+            configuration.getText("doclet.Description"));
         packageTableHeader = new ArrayList<>();
         packageTableHeader.add(configuration.getText("doclet.Package"));
         packageTableHeader.add(configuration.getText("doclet.Description"));
@@ -182,6 +200,7 @@
         overviewLabel = getResource("doclet.Overview");
         defaultPackageLabel = new StringContent(DocletConstants.DEFAULT_PACKAGE_NAME);
         packageLabel = getResource("doclet.Package");
+        moduleLabel = getResource("doclet.Module");
         useLabel = getResource("doclet.navClassUse");
         prevLabel = getResource("doclet.Prev");
         nextLabel = getResource("doclet.Next");
@@ -197,13 +216,17 @@
         deprecatedPhrase = getResource("doclet.Deprecated");
         allclassesLabel = getNonBreakResource("doclet.All_Classes");
         allpackagesLabel = getNonBreakResource("doclet.All_Packages");
+        allmodulesLabel = getNonBreakResource("doclet.All_Modules");
         indexLabel = getResource("doclet.Index");
         helpLabel = getResource("doclet.Help");
         seeLabel = getResource("doclet.See");
         descriptionLabel = getResource("doclet.Description");
         prevpackageLabel = getNonBreakResource("doclet.Prev_Package");
         nextpackageLabel = getNonBreakResource("doclet.Next_Package");
+        prevmoduleLabel = getNonBreakResource("doclet.Prev_Module");
+        nextmoduleLabel = getNonBreakResource("doclet.Next_Module");
         packagesLabel = getResource("doclet.Packages");
+        modulesLabel = getResource("doclet.Modules");
         methodDetailsLabel = getResource("doclet.Method_Detail");
         annotationTypeDetailsLabel = getResource("doclet.Annotation_Type_Member_Detail");
         fieldDetailsLabel = getResource("doclet.Field_Detail");