8042148: Ensure that the java launcher help is consistent with the manpage where they report common information
Reviewed-by: ksrini
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties Thu Sep 15 21:08:59 2016 +0000
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties Fri Sep 16 10:57:02 2016 -0700
@@ -103,34 +103,42 @@
# Translators please note do not translate the options themselves
java.launcher.X.usage=\
-\ -Xmixed mixed mode execution (default)\n\
-\ -Xint interpreted mode execution only\n\
+\ -Xbatch disable background compilation\n\
\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\
\ append to end of bootstrap class path\n\
+\ -Xcheck:jni perform additional checks for JNI functions\n\
+\ -Xcomp forces compilation of methods on first invocation\n\
+\ -Xdebug provided for backward compatibility\n\
\ -Xdiag show additional diagnostic messages\n\
\ -Xdiag:resolver show resolver diagnostic messages\n\
-\ -Xnoclassgc disable class garbage collection\n\
+\ -Xdisable-@files disable further argument file expansion\n\
+\ -Xfuture enable strictest checks, anticipating future default\n\
+\ -Xint interpreted mode execution only\n\
+\ -Xinternalversion\n\
+\ displays more detailed JVM version information than the\n\
+\ -version option\n\
\ -Xloggc:<file> log GC status to a file with time stamps\n\
-\ -Xbatch disable background compilation\n\
+\ -Xmixed mixed mode execution (default)\n\
+\ -Xmn<size> sets the initial and maximum size (in bytes) of the heap\n\
+\ for the young generation (nursery)\n\
\ -Xms<size> set initial Java heap size\n\
\ -Xmx<size> set maximum Java heap size\n\
-\ -Xss<size> set java thread stack size\n\
+\ -Xnoclassgc disable class garbage collection\n\
\ -Xprof output cpu profiling data\n\
-\ -Xfuture enable strictest checks, anticipating future default\n\
\ -Xrs reduce use of OS signals by Java/VM (see documentation)\n\
-\ -Xcheck:jni perform additional checks for JNI functions\n\
+\ -Xshare:auto use shared class data if possible (default)\n\
\ -Xshare:off do not attempt to use shared class data\n\
-\ -Xshare:auto use shared class data if possible (default)\n\
\ -Xshare:on require using shared class data, otherwise fail.\n\
\ -XshowSettings show all settings and continue\n\
\ -XshowSettings:all\n\
\ show all settings and continue\n\
-\ -XshowSettings:vm show all vm related settings and continue\n\
+\ -XshowSettings:locale\n\
+\ show all locale related settings and continue\n\
\ -XshowSettings:properties\n\
\ show all property settings and continue\n\
-\ -XshowSettings:locale\n\
-\ show all locale related settings and continue\n\
-\ -Xdisable-@files disable further argument file expansion\n\
+\ -XshowSettings:vm show all vm related settings and continue\n\
+\ -Xss<size> set java thread stack size\n\
+\ -Xverify sets the mode of the bytecode verifier\n\
\ --add-reads <module>=<target-module>(,<target-module>)*\n\
\ updates <module> to read <target-module>, regardless\n\
\ of module declaration. \n\