langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties Wed Aug 10 13:52:02 2016 -0700
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties Wed Aug 10 15:47:46 2016 -0700
@@ -41,61 +41,73 @@
main.opt.help=\
-\ -help --help -? Print this usage message
+\ -help --help -? Print this usage message
main.opt.version=\
-\ -version Version information
+\ -version Version information
main.opt.v=\
-\ -v -verbose Print additional information
+\ -v -verbose Print additional information
main.opt.l=\
-\ -l Print line number and local variable tables
+\ -l Print line number and local variable tables
main.opt.public=\
-\ -public Show only public classes and members
+\ -public Show only public classes and members
main.opt.protected=\
-\ -protected Show protected/public classes and members
+\ -protected Show protected/public classes and members
main.opt.package=\
-\ -package Show package/protected/public classes\n\
-\ and members (default)
+\ -package Show package/protected/public classes\n\
+\ and members (default)
main.opt.p=\
-\ -p -private Show all classes and members
+\ -p -private Show all classes and members
main.opt.c=\
-\ -c Disassemble the code
+\ -c Disassemble the code
main.opt.s=\
-\ -s Print internal type signatures
+\ -s Print internal type signatures
+
+main.opt.class_path=\
+\ --class-path <path> Specify where to find user class files
main.opt.classpath=\
-\ -classpath <path> Specify where to find user class files
+\ -classpath <path> Specify where to find user class files
main.opt.cp=\
-\ -cp <path> Specify where to find user class files
+\ -cp <path> Specify where to find user class files
main.opt.bootclasspath=\
-\ -bootclasspath <path> Override location of bootstrap class files
+\ -bootclasspath <path> Override location of bootstrap class files
-main.opt.upgrademodulepath=\
-\ -upgrademodulepath <path> Specify where to find upgradeable modules
+main.opt.upgrade_module_path=\
+\ --upgrade-module-path <path> Specify where to find upgradeable modules
main.opt.system=\
-\ -system <jdk> Specify where to find system modules
+\ --system <jdk> Specify where to find system modules
-main.opt.modulepath=\
-\ -modulepath <path> Specify where to find application modules
+main.opt.module_path=\
+\ --module-path <path> Specify where to find application modules
main.opt.constants=\
-\ -constants Show final constants
-
+\ -constants Show final constants
main.opt.sysinfo=\
-\ -sysinfo Show system info (path, size, date, MD5 hash)\n\
-\ of class being processed
+\ -sysinfo Show system info (path, size, date, MD5 hash)\n\
+\ of class being processed
+
+main.opt.module=\
+\ --module <module>, -m <module> Specify module containing classes to be disassembled
-main.opt.m=\
-\ -m <module-name> Specify module containing classes to be disassembled
+main.usage.foot=\n\
+GNU-style options may use '=' instead of whitespace to separate the name of an option\n\
+from its value.\n\
+\n\
+Each class to be shown may be specified by a filename, a URL, or by its fully\n\
+qualified class name. Examples:\n\
+\ path/to/MyClass.class\n\
+\ jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n\
+\ java.lang.Object\n