--- a/jdk/src/java.base/share/classes/module-info.java	Mon Jul 03 10:27:42 2017 +0200
+++ b/jdk/src/java.base/share/classes/module-info.java	Mon Jul 03 13:18:56 2017 -0700
@@ -26,8 +26,8 @@
 /**
  * Defines the foundational APIs of the Java SE Platform.
  *
- * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
- * <dt class="simpleTagLabel">Providers:</dt>
+ * <dl>
+ * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Providers:</dt>
  * <dd> The JDK implementation of this module provides an implementation of
  *      the {@index jrt jrt} {@linkplain java.nio.file.spi.FileSystemProvider
  *      file system provider} to enumerate and read the class and resource
@@ -36,8 +36,8 @@
  *      {@link java.nio.file.FileSystems#newFileSystem
  *      FileSystems.newFileSystem(URI.create("jrt:/"))}.
  *      <p></dd>
- * <dt class="simpleTagLabel">Tool Guides:</dt>
- * <dd> {@extLink java_tool_reference java launcher},
+ * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Tool Guides:</dt>
+ * <dd style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif"> {@extLink java_tool_reference java launcher},
  *      {@extLink keytool_tool_reference keytool}</dd>
  * </dl>
  *

--- a/jdk/src/java.management.rmi/share/classes/module-info.java	Mon Jul 03 10:27:42 2017 +0200
+++ b/jdk/src/java.management.rmi/share/classes/module-info.java	Mon Jul 03 13:18:56 2017 -0700
@@ -27,16 +27,16 @@
  * Defines the {@linkplain javax.management.remote.rmi RMI connector}
  * for the Java Management Extensions (JMX) Remote API.
  *
- * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
- * <dt class="simpleTagLabel">Providers:</dt>
- * <dd>This module provides
- * {@link javax.management.remote.JMXConnectorProvider} service
- * that creates the JMX connector clients using RMI protocol.
+ * <dl>
+ * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Providers:</dt>
+ * <dd>This module provides the
+ * {@link javax.management.remote.JMXConnectorProvider} service,
+ * which creates JMX connector clients using the RMI protocol.
  * Instances of {@code JMXConnector} can be obtained via the
  * {@link javax.management.remote.JMXConnectorFactory#newJMXConnector
  * JMXConnectorFactory.newJMXConnector} factory method.
- * It also provides {@link javax.management.remote.JMXConnectorServerProvider} service
- * that creates the JMX connector servers using RMI protocol.
+ * It also provides the {@link javax.management.remote.JMXConnectorServerProvider} service,
+ * which creates JMX connector servers using the RMI protocol.
  * Instances of {@code JMXConnectorServer} can be obtained via the
  * {@link javax.management.remote.JMXConnectorServerFactory#newJMXConnectorServer
  * JMXConnectorServerFactory.newJMXConnectorServer} factory method.

--- a/jdk/src/java.se.ee/share/classes/module-info.java	Mon Jul 03 10:27:42 2017 +0200
+++ b/jdk/src/java.se.ee/share/classes/module-info.java	Mon Jul 03 13:18:56 2017 -0700
@@ -26,8 +26,9 @@
 /**
  * Defines the full API of the Java SE Platform.
  * <P>
- * This module requires {@code java.se} and supplements it with modules
- * that define CORBA and Java EE APIs. These modules are upgradeable.
+ * This module requires the <a href="java.se-summary.html">{@code java.se}</a>
+ * module and supplements it with modules that define the CORBA and Java EE
+ * APIs. These modules are upgradeable.
  *
  * @moduleGraph
  * @since 9

--- a/jdk/src/java.se/share/classes/module-info.java	Mon Jul 03 10:27:42 2017 +0200
+++ b/jdk/src/java.se/share/classes/module-info.java	Mon Jul 03 13:18:56 2017 -0700
@@ -26,11 +26,12 @@
 /**
  * Defines the core Java SE API.
  * <P>
- * The modules defining CORBA and Java EE APIs are not required by
- * this module, but they are required by {@code java.se.ee}.
+ * The modules defining the CORBA and Java EE APIs are not required by
+ * this module, but they are required by the
+ * <a href="java.se.ee-summary.html">{@code java.se.ee}</a> module.
  *
- * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
- * <dt class="simpleTagLabel">Optional for Java SE Platform:</dt>
+ * <dl>
+ * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Optional for the Java SE Platform:</dt>
  * <dd>
  *   <a href="../specs/jni/index.html">Java Native Interface (JNI)</a><br>
  *   <a href="../specs/jvmti.html">Java Virtual Machine Tool Interface (JVM TI)</a><br>

--- a/jdk/src/java.transaction/share/classes/module-info.java	Mon Jul 03 10:27:42 2017 +0200
+++ b/jdk/src/java.transaction/share/classes/module-info.java	Mon Jul 03 13:18:56 2017 -0700
@@ -24,10 +24,10 @@
  */
 
 /**
- * Defines a subset of the Java Transaction API (JTA) to support CORBA interop.
+ * Defines a subset of the Java Transaction API (JTA) to support CORBA interoperation.
  * <P>
  * The subset consists of RMI exception types which are mapped to CORBA system
- * exceptions by the 'Java Language to IDL Mapping Specification'.
+ * exceptions by the <em>Java Language to IDL Mapping Specification</em>.
  *
  * @moduleGraph
  * @since 9

--- a/jdk/src/jdk.httpserver/share/classes/module-info.java	Mon Jul 03 10:27:42 2017 +0200
+++ b/jdk/src/jdk.httpserver/share/classes/module-info.java	Mon Jul 03 13:18:56 2017 -0700
@@ -24,7 +24,7 @@
  */
 
 /**
- * Defines the JDK-specific API for HTTP server.
+ * Defines the JDK-specific HTTP server API.
  *
  * @uses com.sun.net.httpserver.spi.HttpServerProvider
  *

--- a/jdk/src/jdk.jartool/share/classes/module-info.java	Mon Jul 03 10:27:42 2017 +0200
+++ b/jdk/src/jdk.jartool/share/classes/module-info.java	Mon Jul 03 13:18:56 2017 -0700
@@ -32,7 +32,7 @@
  * <em>jar</em> via the {@link java.util.spi.ToolProvider ToolProvider} SPI.
  * Instances of the tool can be obtained by calling
  * {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst}
- * or the {@link java.util.ServiceLoader service loader} with the name
+ * or the {@linkplain java.util.ServiceLoader service loader} with the name
  * {@code "jar"}.
  *
  * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">

--- a/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java	Mon Jul 03 10:27:42 2017 +0200
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java	Mon Jul 03 13:18:56 2017 -0700
@@ -24,10 +24,10 @@
  */
 
 /**
- * This package contains Oracle Corporation's platform extension to
- * the implementation of the
+ * This package contains the JDK's extension to
+ * the standard implementation of the
  * {@link java.lang.management} API and also defines the management
- * interface for some other components for the platform.
+ * interface for some other components of the platform.
  *
  * <p>
  * All platform MBeans are registered in the <em>platform MBeanServer</em>

--- a/jdk/src/jdk.management/share/classes/module-info.java	Mon Jul 03 10:27:42 2017 +0200
+++ b/jdk/src/jdk.management/share/classes/module-info.java	Mon Jul 03 13:18:56 2017 -0700
@@ -24,7 +24,7 @@
  */
 
 /**
- * Defines the JDK-specific Management Interfaces for JVM.
+ * Defines JDK-specific management interfaces for the JVM.
  *
  * @moduleGraph
  * @since 9