--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties	Thu Apr 14 09:34:00 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties	Thu Apr 14 14:30:48 2016 -0700
@@ -37,6 +37,13 @@
 \  -help                            Display command line options and exit\n\
 \  -doclet <class>                  Generate output via alternate doclet\n\
 \  -docletpath <path>               Specify where to find doclet class files\n\
+\  -modulesourcepath <path>         Specify where to find input source files for multiple modules\n\
+\  -upgrademodulepath <path>        Override location of upgradeable modules\n\
+\  -modulepath <path>               Specify where to find application modules\n\
+\  -mp <path>                       Specify where to find application modules\n\
+\  -addmods <module>(,<module>)*    Root modules to resolve in addition to the initial modules,\n\
+\                                   or all modules on the module path if <module> is ALL-MODULE-PATH.\n\
+\  -limitmods <module>(,<module>)*  Limit the universe of observable modules\n\
 \  -sourcepath <pathlist>           Specify where to find source files\n\
 \  -classpath <pathlist>            Specify where to find user class files\n\
 \  -cp <pathlist>                   Specify where to find user class files\n\
@@ -56,14 +63,23 @@
 
 main.Xusage=\
 \  -Xmaxerrs <number>               Set the maximum number of errors to print\n\
-\  -Xmaxwarns <number>              Set the maximum number of warnings to print\n
+\  -Xmaxwarns <number>              Set the maximum number of warnings to print\n\
+\  -XaddExports:<module>/<package>=<other-module>(,<other-module>)*\n\
+\                                   Specify a package to be considered as exported from its \n\
+\                                   defining module to additional modules, or to all unnamed \n\
+\                                   modules if <other-module> is ALL-UNNAMED.\n\
+\  -XaddReads:<module>=<other-module>(,<other-module>)*\n\
+\                                   Specify additional modules to be considered as required by a\n\
+\                                   given module. <other-module> may be ALL-UNNAMED to require\n\
+\                                   the unnamed module.\n\
+\  -Xmodule:<module-name>           Specify a module to which the classes being compiled belong.\n\
+\  -Xpatch:<path>                   Specify location of module class files to patch\n  
 
 main.Xusage.foot=\
 These options are non-standard and subject to change without notice.
 
 main.doclet.usage.header=Provided by the {0} doclet:
 
-main.option.already.seen=The {0} option may be specified no more than once.
 main.requires_argument=option {0} requires an argument.
 main.invalid_flag=invalid flag: {0}
 main.No_packages_or_classes_specified=No packages or classes specified.