--- a/jdk/src/java.base/share/classes/sun/misc/Version.java.template	Wed Sep 16 10:52:10 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/misc/Version.java.template	Thu Sep 17 14:41:39 2015 -0700
@@ -116,10 +116,8 @@
 
 
     /**
-     * Returns the major version of the running JVM if it's 1.6 or newer
-     * or any RE VM build. It will return 0 if it's an internal 1.5 or
-     * 1.4.x build.
-     *
+     * Returns the major version of the running JVM.
+     * @return the major version of the running JVM
      * @since 1.6
      */
     public static synchronized int jvmMajorVersion() {
@@ -130,9 +128,8 @@
     }
 
     /**
-     * Returns the minor version of the running JVM if it's 1.6 or newer
-     * or any RE VM build. It will return 0 if it's an internal 1.5 or
-     * 1.4.x build.
+     * Returns the minor version of the running JVM.
+     * @return the minor version of the running JVM
      * @since 1.6
      */
     public static synchronized int jvmMinorVersion() {
@@ -144,8 +141,9 @@
 
 
     /**
-     * Returns the security version of the running JVM 
-     * @since 1.6
+     * Returns the security version of the running JVM.
+     * @return the security version of the running JVM
+     * @since 9
      */
     public static synchronized int jvmSecurityVersion() {
         if (!versionsInitialized) {
@@ -155,8 +153,9 @@
     }
 
     /**
-     * Returns the patch release version of the running JVM
-     * @since JDK9
+     * Returns the patch release version of the running JVM.
+     * @return the patch release version of the running JVM
+     * @since 9
      */
     public static synchronized int jvmPatchVersion() {
         if (!versionsInitialized) {
@@ -166,7 +165,8 @@
     }
 
     /**
-     * Returns the build number of the running JVM
+     * Returns the build number of the running JVM.
+     * @return the build number of the running JVM
      * @since 1.6
      */
     public static synchronized int jvmBuildNumber() {
@@ -178,7 +178,7 @@
 
     /**
      * Returns the major version of the running JDK.
-     *
+     * @return the major version of the running JDK
      * @since 1.6
      */
     public static synchronized int jdkMajorVersion() {
@@ -190,6 +190,7 @@
 
     /**
      * Returns the minor version of the running JDK.
+     * @return the minor version of the running JDK
      * @since 1.6
      */
     public static synchronized int jdkMinorVersion() {
@@ -201,7 +202,8 @@
 
     /**
      * Returns the security version of the running JDK.
-     * @since 1.6
+     * @return the security version of the running JDK
+     * @since 9
      */
     public static synchronized int jdkSecurityVersion() {
         if (!versionsInitialized) {
@@ -211,7 +213,8 @@
     }
 
     /**
-     * Returns the patch release version of the running JDK
+     * Returns the patch release version of the running JDK.
+     * @return the patch release version of the running JDK
      * @since 9
      */
     public static synchronized int jdkPatchVersion() {
@@ -222,7 +225,8 @@
     }
 
     /**
-     * Returns the build number of the running JDK
+     * Returns the build number of the running JDK.
+     * @return the build number of the running JDK
      * @since 1.6
      */
     public static synchronized int jdkBuildNumber() {