diff --git a/langtools/src/java.compiler/share/classes/module-info.java b/langtools/src/java.compiler/share/classes/module-info.java
index 561e02dbfda..3d937e09f0c 100644
--- a/langtools/src/java.compiler/share/classes/module-info.java
+++ b/langtools/src/java.compiler/share/classes/module-info.java
@@ -30,7 +30,7 @@
  * and define interfaces for tools such as compilers which can be invoked
  * from a program.
  * <p>
- * This module is upgradeble.
+ * This module is upgradeable.
  *
  * @moduleGraph
  * @since 9
diff --git a/langtools/src/jdk.compiler/share/classes/module-info.java b/langtools/src/jdk.compiler/share/classes/module-info.java
index c2603662e8c..8283f5a0acc 100644
--- a/langtools/src/jdk.compiler/share/classes/module-info.java
+++ b/langtools/src/jdk.compiler/share/classes/module-info.java
@@ -25,7 +25,7 @@
 
 /**
  * Defines the implementation of the
- * {@link javax.tools.ToolProvider#getSystemJavaCompiler system Java compiler}
+ * {@linkplain javax.tools.ToolProvider#getSystemJavaCompiler system Java compiler}
  * and its command line equivalent, <em>{@index javac javac tool}</em>,
  * as well as <em>{@index javah javah tool}</em>.
  *
@@ -40,7 +40,7 @@
  *
  * <p> Instances of the tools 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 "javac"}.
  *
  * <p>
diff --git a/langtools/src/jdk.javadoc/share/classes/module-info.java b/langtools/src/jdk.javadoc/share/classes/module-info.java
index d4973a4652b..6355645f96d 100644
--- a/langtools/src/jdk.javadoc/share/classes/module-info.java
+++ b/langtools/src/jdk.javadoc/share/classes/module-info.java
@@ -25,7 +25,7 @@
 
 /**
  * Defines the implementation of the
- * {@link javax.tools.ToolProvider#getSystemDocumentationTool system documentation tool}
+ * {@linkplain javax.tools.ToolProvider#getSystemDocumentationTool system documentation tool}
  * and its command line equivalent, <em>{@index javadoc javadoc tool}</em>.
  *
  * <h2 style="font-family:'DejaVu Sans Mono', monospace; font-style:italic">javadoc</h2>
@@ -39,7 +39,7 @@
  *
  * <p> Instances of the tools 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 "javadoc"}.
  *
  * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
diff --git a/langtools/src/jdk.jdeps/share/classes/module-info.java b/langtools/src/jdk.jdeps/share/classes/module-info.java
index 55e202b9cb0..0a061df8211 100644
--- a/langtools/src/jdk.jdeps/share/classes/module-info.java
+++ b/langtools/src/jdk.jdeps/share/classes/module-info.java
@@ -26,7 +26,7 @@
 /**
  * Defines tools for analysing dependencies in Java libraries and programs,
  * including the <em>{@index jdeps jdeps tool}</em>,
- * <em>{@index javap javap tool}</em> and
+ * <em>{@index javap javap tool}</em>, and
  * <em>{@index jdeprscan jdeprscan tool}</em> tools.
  *
  * <p>
@@ -37,7 +37,7 @@
  *
  * <p> Instances of the tools 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 "javap"} or {@code "jdeps"} as appropriate.
  *
  * <p>