diff -r 043f1af70518 -r 9d0388c6b336 jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Tue Mar 15 13:48:26 2016 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Thu Mar 17 19:04:16 2016 +0000
@@ -27,6 +27,8 @@
 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> | <modulename>/<mainclass>\n\
+\           (to execute the main class in a module)\n\
 where options include:\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  use a {0}-bit data model if available\n
@@ -41,6 +43,22 @@
 \    -classpath <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\
+\                  A {0} separated list of directories, each directory\n\
+\                  is a directory of modules.\n\
+\    -upgrademodulepath <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> | <modulename>/<mainclass>\n\
+\                  the initial or main module to resolve\n\
+\    -addmods <modulename>[,<modulename>...]\n\
+\                  root modules to resolve in addition to the initial module\n\
+\    -limitmods <modulename>[,<modulename>...]\n\
+\                  limit the universe of observable modules\n\
+\    -listmods[:<modulename>[,<modulename>...]]\n\
+\                  list the observable modules and exit\n\
 \    -D<name>=<value>\n\
 \                  set a system property\n\
 \    -verbose:[class|gc|jni]\n\
@@ -76,13 +94,10 @@
 java.launcher.X.usage=\
 \    -Xmixed           mixed mode execution (default)\n\
 \    -Xint             interpreted mode execution only\n\
-\    -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\
-\                      set search path for bootstrap classes and resources\n\
 \    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\
 \                      append to end of bootstrap class path\n\
-\    -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\
-\                      prepend in front of bootstrap class path\n\
 \    -Xdiag            show additional diagnostic messages\n\
+\    -Xdiag:resolver   show resolver diagnostic messages\n\
 \    -Xnoclassgc       disable class garbage collection\n\
 \    -Xincgc           enable incremental garbage collection\n\
 \    -Xloggc:<file>    log GC status to a file with time stamps\n\
@@ -105,6 +120,15 @@
 \                      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\
+\                      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
 
@@ -142,3 +166,7 @@
 java.launcher.javafx.error1=\
     Error: The JavaFX launchApplication method has the wrong signature, it\n\
     must be declared static and return a value of type void
+java.launcher.module.error1=\
+    module {0} does not have a MainClass attribute, use -m <module>/<main-class>
+java.launcher.module.error2=\
+    Error: Could not find or load main class {0} in module {1}