--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Thu Mar 16 16:34:36 2017 +0000
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Wed Mar 22 16:26:27 2017 +0000
@@ -24,12 +24,15 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Usage: {0} [options] class [args...]\n\
-\           (to execute a class)\n   or  {0} [options] -jar jarfile [args...]\n\
+java.launcher.opt.header  =   Usage: {0} [options] <mainclass> [args...]\n\
+\           (to execute a class)\n   or  {0} [options] -jar <jarfile> [args...]\n\
 \           (to execute a jar file)\n\
-\   or  {0} [options] -p <modulepath> -m <modulename>[/<mainclass>] [args...]\n\
+\   or  {0} [options] -m <module>[/<mainclass>] [args...]\n\
+\       {0} [options] --module <module>[/<mainclass>] [args...]\n\
 \           (to execute the main class in a module)\n\n\
-where options include:\n\n
+\ Arguments following the main class, -jar <jarfile>, -m or --module\n\
+\ <module>/<mainclass> are passed as the arguments to main class.\n\n\
+\ where options include:\n\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  Deprecated, will be removed in a future release\n
 java.launcher.opt.vmselect   =\    {0}\t  to select the "{1}" VM\n
@@ -49,10 +52,6 @@
 \                  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 <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\
 \    --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\
@@ -157,6 +156,10 @@
 \    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n\
 \                      updates <module> to open <package> to\n\
 \                      <target-module>, regardless of module declaration.\n\
+\    --permit-illegal-access\n\
+\                      permit illegal access to members of types in named modules\n\
+\                      by code in unnamed modules. This compatibility option will\n\
+\                      be removed in the next release.\n\
 \    --disable-@files  disable further argument file expansion\n\
 \    --patch-module <module>=<file>({0}<file>)*\n\
 \                      Override or augment a module with classes and resources\n\
@@ -208,4 +211,6 @@
 java.launcher.module.error3=\
     Error: Unable to load main class {0} from module {1}\n\
     \t{2}
+java.launcher.permitaccess.warning=\
+    WARNING: Main manifest of {0} contains {1} attribute to permit illegal access