--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties Wed Aug 10 22:48:25 2016 +0100
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties Wed Aug 10 15:51:25 2016 -0700
@@ -27,7 +27,7 @@
java.launcher.opt.header = Usage: {0} [options] class [args...]\n\
\ (to execute a class)\n or {0} [options] -jar jarfile [args...]\n\
\ (to execute a jar file)\n\
-\ or {0} [options] -mp <modulepath> -m <modulename>[/<mainclass>] [args...]\n\
+\ or {0} [options] -p <modulepath> -m <modulename>[/<mainclass>] [args...]\n\
\ (to execute the main class in a module)\n\
where options include:\n
@@ -41,24 +41,28 @@
# Translators please note do not translate the options themselves
java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n\
\ -classpath <class search path of directories and zip/jar files>\n\
+\ --class-path <class search path of directories and zip/jar files>\n\
\ A {0} separated list of directories, JAR archives,\n\
\ and ZIP archives to search for class files.\n\
-\ -mp <module path>\n\
-\ -modulepath <module path>...\n\
+\ -p <module path>\n\
+\ --module-path <module path>...\n\
\ A {0} separated list of directories, each directory\n\
\ is a directory of modules.\n\
-\ -upgrademodulepath <module path>...\n\
+\ --upgrade-module-path <module path>...\n\
\ A {0} separated list of directories, each directory\n\
\ is a directory of modules that replace upgradeable\n\
\ modules in the runtime image\n\
-\ -m <modulename>[/<mainclass>]\n\
+\ -m <module>[/<mainclass>]\n\
+\ --module <modulename>[/<mainclass>]\n\
\ the initial module to resolve, and the name of the main class\n\
\ to execute if not specified by the module\n\
-\ -addmods <modulename>[,<modulename>...]\n\
-\ root modules to resolve in addition to the initial module\n\
-\ -limitmods <modulename>[,<modulename>...]\n\
+\ --add-modules <modulename>[,<modulename>...]\n\
+\ root modules to resolve in addition to the initial module.\n\
+\ <modulename> can also be ALL-DEFAULT, ALL-SYSTEM,\n\
+\ ALL-MODULE-PATH.\n\
+\ --limit-modules <modulename>[,<modulename>...]\n\
\ limit the universe of observable modules\n\
-\ -listmods[:<modulename>[,<modulename>...]]\n\
+\ --list-modules [<modulename>[,<modulename>...]]\n\
\ list the observable modules and exit\n\
\ --dry-run create VM but do not execute main method.\n\
\ This --dry-run option may be useful for validating the\n\
@@ -69,7 +73,8 @@
\ enable verbose output\n\
\ -version print product version and exit\n\
\ -showversion print product version and continue\n\
-\ -? -help print this help message\n\
+\ -? -help --help\n\
+\ print this help message\n\
\ -X print help on non-standard options\n\
\ -ea[:<packagename>...|:<classname>]\n\
\ -enableassertions[:<packagename>...|:<classname>]\n\
@@ -91,6 +96,8 @@
\ -splash:<imagepath>\n\
\ show splash screen with specified image\n\
\ @<filepath> read options from the specified file\n\
+\To specify an argument for a long option, you can use --<name>=<value> or\n\
+\--<name> <value>.\n\
See http://www.oracle.com/technetwork/java/javase/documentation/index.html for more details.
@@ -123,17 +130,21 @@
\ show all property settings and continue\n\
\ -XshowSettings:locale\n\
\ show all locale related settings and continue\n\
-\ -XaddReads:<module>=<other-module>(,<other-module>)*\n\
-\ <module> reads other modules,\n\
-\ regardless of module declaration\n\
-\ -XaddExports:<module>/<package>=<other-module>(,<other-module>)*\n\
-\ <module> exports <package> to other modules,\n\
-\ regardless of module declaration\n\
-\ -Xpatch:<module>=<file>({0}<file>)*\n\
+\ -Xdisable-@files disable further argument file expansion\n\
+\ --add-reads <module>=<target-module>(,<target-module>)*\n\
+\ updates <module> to read <target-module>, regardless\n\
+\ of module declaration. \n\
+\ <target-module> can be ALL-UNNAMED to read all unnamed\n\
+\ modules.\n\
+\ --add-exports <module>/<package>=<target-module>(,<target-module>)*\n\
+\ updates <module> to export <package> to <target-module>,\n\
+\ regardless of module declaration.\n\
+\ <target-module> can be ALL-UNNAMED to export to all\n\
+\ unnamed modules.\n\
+\ --patch-module <module>=<file>({0}<file>)*\n\
\ Override or augment a module with classes and resources\n\
-\ in JAR files or directories\n\
-\ -Xdisable-@files disable further argument file expansion\n\n\
-The -X options are non-standard and subject to change without notice.\n
+\ in JAR files or directories.\n\n\
+These options are non-standard and subject to change without notice.\n
# Translators please note do not translate the options themselves
java.launcher.X.macosx.usage=\