changeset 6531:0dd8397766ba

Merge
author coffeys
date Tue, 06 Aug 2013 14:01:58 +0100
parents c9e42ad7fb24 cf8cdc0fa8b8
children 9c037838185c
files
diffstat 26 files changed, 1547 insertions(+), 968 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Aug 02 17:57:00 2013 +0400
+++ b/.hgtags	Tue Aug 06 14:01:58 2013 +0100
@@ -333,3 +333,5 @@
 419939ecee8311c8a38ff624ae67e473f8c60e51 jdk7u40-b33
 7c1d6fc3b6da19c7b7c0aad0716a2d810dbb974b jdk7u40-b34
 0931b4a280b1e9b3b12936222d1bc6d427310f79 jdk7u40-b35
+cd7a4d0b218f98511068d8336aa3f4cbaf10b128 jdk7u40-b36
+04036faa7fc4ec11a268c190cf1712d19c77b4ba jdk7u40-b37
--- a/src/bsd/doc/man/java.1	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/bsd/doc/man/java.1	Tue Aug 06 14:01:58 2013 +0100
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH java 1 "10 May 2011"
+.TH java 1 "18 Jul 2013"
 
 .LP
 .SH "Name"
@@ -30,36 +30,36 @@
 .nf
 \f3
 .fl
-    \fP\f3java\fP [ options ] class [ argument ... ]
+\fP\f3java\fP [ \f2options\fP ] \f2class\fP [ \f2argument ...\fP ]
 .fl
-    \f3java\fP [ options ] \f3\-jar\fP file.jar [ argument ... ]
+\f3java\fP [ \f2options\fP ] \f3\-jar\fP \f2file.jar\fP [ \f2argument ...\fP ]
 .fl
 .fi
 
 .LP
 .RS 3
 .TP 3
-options
-Command\-line options.
+options 
+Command\-line options. See \f2Options\fP. 
 .TP 3
-class
-Name of the class to be invoked.
+class 
+The name of the class to be called. 
 .TP 3
-file.jar
-Name of the jar file to be invoked. Used only with \f2\-jar\fP.
+file.jar 
+The name of the JAR file to be called. Used only with the \f3\-jar\fP command. 
 .TP 3
-argument
-Argument passed to the \f3main\fP function.
+argument 
+The arguments passed to the \f3main\fP function. 
 .RE
 
 .LP
 .SH "DESCRIPTION"
 .LP
 .LP
-The \f3java\fP tool launches a Java application. It does this by starting a Java runtime environment, loading a specified class, and invoking that class's \f3main\fP method.
+The \f3java\fP command starts a Java application. It does this by starting a Java runtime environment, loading a specified class, and calling that class's \f3main\fP method.
 .LP
 .LP
-The method must be declared public and static, it must not return any value, and it must accept a \f2String\fP array as a parameter. The method declaration must look like the following:
+The method must be declared public and static, it must not return any value, and it must accept a String array as a parameter. The method declaration has the following form:
 .LP
 .nf
 \f3
@@ -71,7 +71,7 @@
 
 .LP
 .LP
-By default, the first non\-option argument is the name of the class to be invoked. A fully\-qualified class name should be used. If the \f3\-jar\fP option is specified, the first non\-option argument is the name of a \f3JAR\fP archive containing class and resource files for the application, with the startup class indicated by the \f3Main\-Class\fP manifest header.
+By default, the first argument without an option is the name of the class to be called. A fully qualified class name should be used. If the \f3\-jar\fP option is specified, then the first non\-option argument is the name of a JAR file containing class and resource files for the application, with the startup class indicated by the Main\-Class manifest header.
 .LP
 .LP
 The Java runtime searches for the startup class, and other classes used, in three sets of locations: the bootstrap class path, the installed extensions, and the user class path.
@@ -82,103 +82,99 @@
 .SH "OPTIONS"
 .LP
 .LP
-The launcher has a set of standard options that are supported on the current runtime environment and will be supported in future releases. In addition, the current implementations of the virtual machines support a set of non\-standard options that are subject to change in future releases.
+The launcher has a set of standard options that are supported in the current runtime environment.
 .LP
-.SH "Standard Options"
+.LP
+In addition, the current implementations of the virtual machines support a set of nonstandard options that are subject to change in future releases. See \f2Nonstandard Options\fP.
+.LP
+.SS 
+Standard Options
 .LP
 .RS 3
 .TP 3
-\-client
-Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM.
+\-client 
+Selects the Java HotSpot Client VM. A 64\-bit capable JDK currently ignores this option and instead uses the Java Hotspot Server VM.
 .br
 .br
-For default VM selection, see
-.na
-\f2Server\-Class Machine Detection\fP @
+For default Java VM selection, see \f2Server\-Class Machine Detection\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+.TP 3
+\-server 
+Selects the Java HotSpot Server VM. On a 64\-bit capable JDK, only the Java Hotspot Server VM is supported so the \f3\-\fP\f3server\fP option is implicit.
+.br
+.br
+For default a Java VM selection, see \f2Server\-Class Machine Detection\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+.TP 3
+\-agentlib:libname[=options] 
+Loads native agent library \f2libname\fP, for example: 
+.nf
+\f3
+.fl
+\-agentlib:hprof
+.fl
+ 
+.fl
+\-agentlib:jdwp=help
+.fl
+ 
+.fl
+\-agentlib:hprof=help
+.fl
+\fP
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html
+See \f2JVMTI Agent Command\-Line Options\fP at http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting 
 .TP 3
-\-server
-Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit.
+\-agentpath:pathname[=options] 
+Loads a native agent library by full \f2pathname\fP. See \f2JVMTI Command\-Line Options\fP at http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting 
+.TP 3
+\-classpath classpath, \-cp classpath 
+Specifies a list of directories, JAR files, and ZIP archives to search for class files. Separate class path entries with colons (:). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f2CLASSPATH\fP environment variable.
 .br
 .br
-For default VM selection, see
-.na
-\f2Server\-Class Machine Detection\fP @
+If \f3\-classpath\fP and \f3\-cp\fP are not used and \f2CLASSPATH\fP is not set, then the user class path consists of the current directory (.).
+.br
+.br
+As a special convenience, a class path element that contains a base name of \f3*\fP is considered equivalent to specifying a list of all the files in the directory with the extension .jar or .JAR. A Java program cannot tell the difference between the two invocations.
+.br
+.br
+For example, if directory mydir contains a.jar and b.JAR, then the class path element \f3mydir/*\fP is expanded to a A.jar:b.JAR, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A class path entry consisting simply of \f3*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any class path wildcard expansion occurs before the Java VM is started. No Java program will ever see wild cards that are not expanded except by querying the environment. For example, by calling \f3System.getenv("CLASSPATH")\fP. 
+.TP 3
+\-Dproperty=value 
+Sets a system property value. 
+.TP 3
+\-d32 
+Run the application in a 32\-bit environment. If a 32\-bit environment is not installed or is not supported, an error will be reported. By default, the application is run in a 32\-bit environment unless a 64\-bit only system is used. 
+.TP 3
+\-d64 
+Run the application in a 64\-bit environment. If a 64\-bit environment is not installed or is not supported, an error will be reported. By default, the application is run in a 32\-bit environment unless a 64\-bit only system is used.
+.br
+.br
+Currently only the Java HotSpot Server VM supports 64\-bit operation, and the \f3\-server\fP option is implicit with the use of \f3\-d64\fP. The \f3\-client\fP option is ignored with the use of \f3\-d64\fP. This is subject to change in a future release. 
+.TP 3
+\-disableassertions[:package name"..." | :class name ], \-da[:package name"..." | :class name ] 
+Disable assertions. This is the default.
+.br
+.br
+With no arguments, \f3\-disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f3"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is \f3"..."\fP, then the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f3"..."\fP, the switch disables assertions in the specified class.
+.br
+.br
+To run a program with assertions enabled in \f3package com.wombat.fruitbat\fP but disabled in class \f3com.wombat.fruitbat.Brickbat\fP, the following command could be used: 
+.nf
+\f3
+.fl
+java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat <Main Class>
+.fl
+\fP
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html
+The \f3\-disableassertions\fP and \f3\-da\fP switches apply to all class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do not apply to system. This makes it easy to turn on asserts in all classes except for system classes. The \f3\-disablesystemassertions\fP option provides a separate swith to enable assertions in all system classes. 
 .TP 3
-\-agentlib:libname[=options]
-Load native agent library \f2libname\fP, e.g.
-.br
-.br
-\-agentlib:hprof
-.br
-.br
-\-agentlib:jdwp=help
-.br
-.br
-\-agentlib:hprof=help
-.br
-.br
-For more information, see
-.na
-\f2JVMTI Agent Command Line Options\fP @
-.fi
-http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting.
-.TP 3
-\-agentpath:pathname[=options]
-Load a native agent library by full pathname. For more information, see
-.na
-\f2JVMTI Agent Command Line Options\fP @
-.fi
-http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting.
-.TP 3
-\-classpath classpath
-.TP 3
-\-cp classpath
-Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable.
-.br
-.br
-If \f3\-classpath\fP and \f3\-cp\fP are not used and \f3CLASSPATH\fP is not set, the user class path consists of the current directory (\f4.\fP).
-.br
-.br
-As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations).
-.br
-.br
-For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.
-.br
-.br
-For more information on class paths, see
-.na
-\f2Setting the Class Path\fP @
-.fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath.
-.TP 3
-\-Dproperty=value
-Set a system property value.
-.TP 3
-\-d32
-.TP 3
-\-d64
-Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported.
-.br
-.br
-Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release.
-.br
-.br
-If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release.
-.TP 3
-\-enableassertions[:<package name>"..." | :<class name> ]
-.TP 3
-\-ea[:<package name>"..." | :<class name> ]
+\-enableassertions[:package name"..." | :class name ], \-ea[:package name"..." | :class name ] 
 Enable assertions. Assertions are disabled by default.
 .br
 .br
-With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
+With no arguments, \f3\-enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f3"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is \f3"..."\fP, then the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f3"..."\fP, the switch enables assertions in the specified class.
 .br
 .br
-If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used:
+If a single command contains multiple instances of these switches, then they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package com.wombat.fruitbat (and any subpackages), the following command could be used: 
 .nf
 \f3
 .fl
@@ -186,86 +182,63 @@
 .fl
 \fP
 .fi
-The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below.
+The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to all class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do not apply to system. This makes it easy to turn on asserts in all classes except for system classes. The \f3\-enablesystemassertions\fP option provides a separate switch to enable assertions in all system classes. 
 .TP 3
-\-disableassertions[:<package name>"..." | :<class name> ]
+\-enablesystemassertions, \-esa 
+Enable assertions in all system classes (sets the default assertion status for system classes to true). 
 .TP 3
-\-da[:<package name>"..." | :<class name> ]
-Disable assertions. This is the default.
-.br
-.br
-With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class.
-.br
-.br
-To run a program with assertions enabled in package \f2com.wombat.fruitbat\fP but disabled in class \f2com.wombat.fruitbat.Brickbat\fP, the following command could be used:
-.nf
-\f3
-.fl
-java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat \fP\f4<Main Class>\fP\f3
-.fl
-\fP
-.fi
-The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below.
+\-disablesystemassertions, \-dsa 
+Disables assertions in all system classes. 
 .TP 3
-\-enablesystemassertions
+\-help or \-? 
+Displays usage information and exit. 
 .TP 3
-\-esa
-Enable asserts in all system classes (sets the \f2default assertion status\fP for system classes to \f2true\fP).
-.TP 3
-\-disablesystemassertions
-.TP 3
-\-dsa
-Disables asserts in all system classes.
-.TP 3
-\-jar
-Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the
-.na
-\f2Java Tutorial\fP @
-.fi
-http://download.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests.
+\-jar 
+Executes a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. For this option to work, the manifest of the JAR file must contain a line in the form \f3Main\-Class\fP: \f2classname\fP. Here, \f2classname\fP identifies the class with the \f3public static void main(String[] args)\fP method that serves as your application's starting point.
 .br
 .br
 When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
 .br
 .br
-Note that JAR files that can be run with the "java \-jar" option can have their execute permissions set so they can be run without using "java \-jar". Refer to
+JAR files that can be run with the \f3java \-jar\fP option can have their execute permissions set so they can be run without using \f3java \-jar\fP. See \f2JAR File Overview\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html 
+.TP 3
+\-javaagent:jarpath[=options] 
+Loads a Java programming language agent. For more information about instrumenting Java applications, see the java.lang.instrument package description in the Java API documentation at
+.br
 .na
-\f2Java Archive (JAR) Files\fP @
+\f2http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/index.html.
+http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html 
 .TP 3
-\-javaagent:jarpath[=options]
-Load a Java programming language agent, see
-.na
-\f2java.lang.instrument\fP @
-.fi
-http://download.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html.
+\-jre\-restrict\-search 
+Includes user\-private JREs in the version search. 
 .TP 3
-\-jre\-restrict\-search
-Include user\-private JREs in the version search.
+\-no\-jre\-restrict\-search 
+Excludes user\-private JREs in the version search. 
 .TP 3
-\-no\-jre\-restrict\-search
-Exclude user\-private JREs in the version search.
+\-showversion 
+Displays version information and continues. 
 .TP 3
-\-verbose
+\-splash:imagepath 
+Shows splash screen with image specified by \f2imagepath\fP. 
 .TP 3
-\-verbose:class
-Display information about each class loaded.
+\-verbose, \-verbose:class 
+Displays information about each class loaded. 
 .TP 3
-\-verbose:gc
-Report on each garbage collection event.
+\-verbose:gc 
+Reports on each garbage collection event. 
 .TP 3
-\-verbose:jni
-Report information about use of native methods and other Java Native Interface activity.
+\-verbose:jni 
+Reports information about use of native methods and other Java Native Interface activity. 
 .TP 3
-\-version
-Display version information and exit.
+\-version 
+Displays version information and exits. See also the \f3\-showversion\fP option. 
 .TP 3
-\-version:release
-Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used.
+\-version:release 
+Specifies that the version specified by the release is required by the class or JAR file specified on the command line. If the version of the \f3java\fP command called does not meet this specification and an appropriate implementation is found on the system, then the appropriate implementation will be used.
 .br
 .br
-\f2release\fP not only can specify an exact version, but can also specify a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a version\-id, a version\-id followed by a star (*), a version\-id followed by a plus sign (+) , or two version\-ranges combined using an ampersand (&). The star means prefix match, the plus sign means this version or greater, and the ampersand means the logical anding of the two version\-ranges. For example:
+The \f3release\fP option specifies an exact version and a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a \f2version\-id\fP, a \f2version\-id\fP followed by an asterisk (\f3*\fP), a \f2version\-id\fP followed by a plus sign (\f3+\fP), or a version range that consists of two \f2version\-ids\fP combined using an ampersand (\f3&\fP). The asterisk means prefix match, the plus sign means this version or greater, and the ampersand means the logical \f3and\fP of the two version\-ranges, for example: 
 .nf
 \f3
 .fl
@@ -273,164 +246,227 @@
 .fl
 \fP
 .fi
-The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56).
+The meaning of the previous example is that the class or JAR file requires either version 1.6.0_13, or a version with 1.6 as a \f2version\-id\fP prefix and that is not less than 1.6.0_10. The exact syntax and definition of version strings can be found in Appendix A of the \f2Java Network Launching Protocol & API Specification (JSR\-56)\fP.
 .br
 .br
-For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line.
+For JAR files, the preference is to specify version requirements in the JAR file manifest rather than on the command line.
 .br
 .br
-See the following NOTES section for important policy information on the use of this option.
-.TP 3
-\-showversion
-Display version information and continue.
-.TP 3
-\-?
-.TP 3
-\-help
-Display usage information and exit.
-.TP 3
-\-splash:imagepath
-Show splash screen with image specified by \f2imagepath\fP.
-.TP 3
-\-X
-Display information about non\-standard options and exit.
+See \f2Notes\fP for important policy information on the use of this option. 
 .RE
 
 .LP
-.SS
+.SS 
 Non\-Standard Options
 .LP
 .RS 3
 .TP 3
-\-Xint
-Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode.
+\-X 
+Displays information about nonstandard options and exits. 
 .TP 3
-\-Xbatch
-Disable background compilation. Normally the VM will compile the method as a background task, running the method in interpreter mode until the background compilation is finished. The \f2\-Xbatch\fP flag disables background compilation so that compilation of all methods proceeds as a foreground task until completed.
+\-Xint 
+Operates in interpreted\-only mode. Compilation to native code is disabled, and all bytecode is executed by the interpreter. The performance benefits offered by the Java HotSpot Client VM adaptive compiler is not present in this mode. 
 .TP 3
-\-Xbootclasspath:bootclasspath
-Specify a colon\-separated list of directories, JAR archives, and ZIP archives to search for boot class files. These are used in place of the boot class files included in the Java platform JDK. \f2Note: Applications that use this option for the purpose of overriding a class in rt.jar should not be deployed as doing so would contravene the Java Runtime Environment binary code license.\fP
+\-Xbatch 
+Disables background compilation. Typically, the Java VM compiles the method as a background task, running the method in interpreter mode until the background compilation is finished. The \-Xbatch flag disables background compilation so that compilation of all methods proceeds as a foreground task until completed. 
 .TP 3
-\-Xbootclasspath/a:path
-Specify a colon\-separated path of directires, JAR archives, and ZIP archives to append to the default bootstrap class path.
+\-Xbootclasspath:bootclasspath 
+Specifies a colon\-separated list of directories, JAR files, and ZIP archives to search for boot class files. These are used in place of the boot class files included in the Java platform JDK.
+.br
+.br
+Applications that use this option for the purpose of overriding a class in rt.jar should not be deployed because doing so would contravene the Java Runtime Environment binary code license. 
 .TP 3
-\-Xbootclasspath/p:path
-Specify a colon\-separated path of directires, JAR archives, and ZIP archives to prepend in front of the default bootstrap class path. \f2Note: Applications that use this option for the purpose of overriding a class in rt.jar should not be deployed as doing so would contravene the Java Runtime Environment binary code license.\fP
+\-Xbootclasspath/a:path 
+Specifies a colon\-separated path of directories, JAR files, and ZIP archives to append to the default bootstrap class path. 
 .TP 3
-\-Xcheck:jni
-Perform additional checks for Java Native Interface (JNI) functions. Specifically, the Java Virtual Machine validates the parameters passed to the JNI function as well as the runtime environment data before processing the JNI request. Any invalid data encountered indicates a problem in the native code, and the Java Virtual Machine will terminate with a fatal error in such cases. Expect a performance degradation when this option is used.
+\-Xbootclasspath/p:path 
+Specifies a colon\-separated path of directories, JAR files, and ZIP archives to add in front of the default bootstrap class path.
+.br
+.br
+Do not deploy applications that use this option to override a class in rt.jar because this violates the Java Runtime Environment binary code license. 
 .TP 3
-\-Xfuture
-Perform strict class\-file format checks. For purposes of backwards compatibility, the default format checks performed by the JDK's virtual machine are no stricter than the checks performed by 1.1.x versions of the JDK software. The \f3\-Xfuture\fP flag turns on stricter class\-file format checks that enforce closer conformance to the class\-file format specification. Developers are encouraged to use this flag when developing new code because the stricter checks will become the default in future releases of the Java application launcher.
+\-Xcheck:jni 
+Performs additional checks for Java Native Interface (JNI) functions. Specifically, the Java Virtual Machine validates the parameters passed to the JNI function and the runtime environment data before processing the JNI request. Any invalid data encountered indicates a problem in the native code, and the Java Virtual Machine will terminate with a fatal error in such cases. Expect a performance degradation when this option is used. 
 .TP 3
-\-Xnoclassgc
-Disable class garbage collection. Use of this option will prevent memory recovery from loaded classes thus increasing overall memory usage. This could cause OutOfMemoryError to be thrown in some applications.
+\-Xfuture 
+Performs strict class\-file format checks. For backward compatibility, the default format checks performed by the Java virtual machine are no stricter than the checks performed by 1.1.x versions of the JDK software. The \f3\-Xfuture\fP option turns on stricter class\-file format checks that enforce closer conformance to the class\-file format specification. Developers are encouraged to use this flag when developing new code because the stricter checks will become the default in future releases of the Java application launcher. 
 .TP 3
-\-Xincgc
-Enable the incremental garbage collector. The incremental garbage collector, which is off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program.
+\-Xnoclassgc 
+Disables class garbage collection. Use of this option preven memory recovery from loaded classes thus increasing overall memory usage. This could cause \f3OutOfMemoryError\fP to be thrown in some applications. 
 .TP 3
-\-Xloggc:file
-Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event.
+\-Xincgc 
+Enables the incremental garbage collector. The incremental garbage collector, which is turned off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program. 
+.TP 3
+\-Xloggc:file 
+Reports on each garbage collection event, as with \f3\-verbose:gc\fP, but logs this data to a file. In addition to the information \f3\-verbose:gc\fP gives, each reported event will be preceded by the time (in seconds) since the first garbage\-collection event.
 .br
 .br
-Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line.
+Always use a local file system for storage of this file to avoid stalling the Java VM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f3\-verbose:gc\fP when both are specified on the command line. 
 .TP 3
-\-Xmsn
-Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see
-.na
-\f2HotSpot Ergonomics\fP @
-.fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+\-Xmnsize or \-XX:NewSize 
+Sets the size of the young generation (nursery). 
+.TP 3
+\-Xmsn 
+Specifies the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1 MB. Append the letter \f3k\fP or \f3K\fP to indicate kilobytes, or \f3m\fP or \f3M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. See \f2Garbage Collector Ergonomics\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
 .br
 .br
-Examples:
+Examples: 
 .nf
 \f3
 .fl
-       \-Xms6291456
+\-Xms6291456
 .fl
-       \-Xms6144k
+\-Xms6144k
 .fl
-       \-Xms6m
-.fl
-
+\-Xms6m
 .fl
 \fP
 .fi
 .TP 3
-\-Xmxn
-Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see
-.na
-\f2HotSpot Ergonomics\fP @
-.fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+\-Xmxn 
+Specifies the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2 MB. Append the letter \f3k\fP or \f3K\fP to indicate kilobytes, or \f3m\fP or \f3M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration.
 .br
 .br
-Examples:
+For server deployments, \f3\-Xms\fP and \f3\-Xmx\fP are often set to the same value. See \f2Garbage Collector Ergonomics\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+.br
+.br
+Examples: 
 .nf
 \f3
 .fl
-       \-Xmx83886080
+\-Xmx83886080
 .fl
-       \-Xmx81920k
+\-Xmx81920k
 .fl
-       \-Xmx80m
-.fl
-
+\-Xmx80m
 .fl
 \fP
 .fi
-On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000m minus overhead amounts. On Bsd platforms, the upper limit is approximately 2000m minus overhead amounts.
+On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000 m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000 m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000 m minus overhead amounts. 
 .TP 3
-\-Xprof
-Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems.
+\-Xprof 
+Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems. 
 .TP 3
-\-Xrs
-Reduces use of operating\-system signals by the Java virtual machine (JVM).
+\-Xrs 
+Reduces use of operating\-system signals by the Java VM.
 .br
 .br
-In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly.
+In an earlier release, the Shutdown Hooks facility was added to enable orderly shutdown of a Java application. The intent was to enable user cleanup code (such as closing database connections) to run at shutdown, even if the Java VM terminates abruptly.
 .br
 .br
-Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks.
+The Java VM catches signals to implement shutdown hooks for unexpected Java VM termination. The Java VM uses \f3SIGHUP\fP, \f3SIGINT\fP, and \f3SIGTERM\fP to initiate the running of shutdown hooks.
 .br
 .br
-The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps.
+The JVM uses a similar mechanism to implement the feature of dumping thread stacks for debugging purposes. The JVM uses \f3SIGQUIT\fP to perform thread dumps.
 .br
 .br
-Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed.
+Applications embedding the Java VM frequently need to trap signals such as \f3SIGINT\fP or \f3SIGTERM\fP, which can lead to interference with the Java VM signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on the Java VM, the signal masks for \f3SIGINT\fP, \f3SIGTERM\fP, \f3SIGHUP\fP, and \f3SIGQUIT\fP are not changed by the Java VM, and signal handlers for these signals are not installed.
 .br
 .br
-There are two consequences of specifying \f3\-Xrs\fP:
+There are two consequences of specifying \f3\-Xrs\fP: 
 .RS 3
 .TP 2
 o
-SIGQUIT thread dumps are not available.
+\f3SIGQUIT\fP thread dumps are not available. 
 .TP 2
 o
-User code is responsible for causing shutdown hooks to run, for example by calling System.exit() when the JVM is to be terminated.
+User code is responsible for causing shutdown hooks to run, for example by calling \f3System.exit()\fP when the Java VM is to be terminated. 
 .RE
 .TP 3
-\-Xssn
-Set thread stack size.
+\-Xssn 
+Sets the thread stack size. 
 .TP 3
-\-XX:+UseAltSigs
-The VM uses \f2SIGUSR1\fP and \f2SIGUSR2\fP by default, which can sometimes conflict with applications that signal\-chain \f2SIGUSR1\fP and \f2SIGUSR2\fP. The \f2\-XX:+UseAltSigs\fP option will cause the VM to use signals other than \f2SIGUSR1\fP and \f2SIGUSR2\fP as the default.
+\-XX:AllocationPrefetchStyle=n 
+Sets the style of prefetch used during allocation. default=2. 
+.TP 3
+\-XX:+AggressiveOpts 
+Enables aggressive optimization. 
+.TP 3
+\-XX:+|\-DisableAttachMechanism 
+Specifies whether commands (such as \f3jmap\fP and \f3jconsole\fP) can attach to the Java VM. By default, this feature is disabled. That is, attaching is enabled, for example: 
+.nf
+\f3
+.fl
+java \-XX:+DisableAttachMechanism
+.fl
+\fP
+.fi
+.TP 3
+\-XXLargePageSizeInBytes=n 
+Specifies the maximum size for large pages. 
+.TP 3
+\-XX:MaxGCPauseMillis=n 
+Sets a target for the maximum GC pause time.
+.br
+.br
+This is a soft goal, and the Java VM will make its best effort to achieve it. There is no maximum value set by default. 
+.TP 3
+\-XX:NewSize 
+Sets the size of the young generation (nursery). Sames as \f3\-Xmnsize\fP. 
+.TP 3
+\-XX:ParallelGCThreads=n 
+Sets the number of GC threads in the parallel collectors. 
+.TP 3
+\-XX:PredictedClassLoadCount=n 
+This option requires that the \f3UnlockExperimentalVMOptions\fP flag be set first. Use the \f3PredictedClassLoadCount\fP flag if your application loads a lot of classes and especially if \f3class.forName()\fP is used heavily. The recommended value is the number of classes loaded as shown in the output from \f3\-verbose:class\fP.
+.br
+.br
+Example: 
+.nf
+\f3
+.fl
+java \-XX:+UnlockExperimentalVMOptions \-XX:PredictedClassLoadCount=60013
+.fl
+\fP
+.fi
+.TP 3
+\-XX:+PrintCompilation 
+Prints verbose output from the Java HotSpot VM dynamic runtime compiler. 
+.TP 3
+\-XX:+PrintGCDetails \-XX:+PrintGCTimeStamps 
+Prints garbage collection output along with time stamps. 
+.TP 3
+\-XX:SoftRefLRUPolicyMSPerMB=0 
+This flag enables aggressive processing of software references. Use this flag if the software reference count has an impact on the Java HotSpot VM garbage collector. 
+.TP 3
+\-XX:TLABSize=n 
+Thread local allocation buffers (TLAB) are enabled by default in the Java HotSpot VM. The Java HotSpot VM sizes TLABs based on allocation patterns. The \f3\-XX:TLABSize\fP option enables fine\-tuning the size of TLABs. 
+.TP 3
+\-XX:+UseAltSigs 
+The Java VM uses \f3SIGUSR1\fP and \f3SIGUSR2\fP by default, which can sometimes conflict with applications that signal\-chain \f3SIGUSR1\fP and \f3SIGUSR2\fP. The \f3\-XX:+UseAltSigs\fP option causes the Java VM to use signals other than \f3SIGUSR1\fP and \f3SIGUSR2\fP as the default. 
+.TP 3
+\-XX:+|\-UseCompressedOops 
+Enables compressed references in 64\-bit Java VMs.
+.br
+.br
+This option is true by default. 
+.TP 3
+\-XX:+UseConcMarkSweepGC or \-XX:+UseG1GC 
+Enables either the Concurrent Mark Sweep (CMS) or the G1 garbage collectors. 
+.TP 3
+\-XX:+|\-UseLargePages 
+Enables large page support.
+.br
+.br
+Large pages are enabled by default on Solaris. 
+.TP 3
+\-XX:+UseParallelOldGC 
+Enables the parallel garbage collectors, which are optimized for throughput and average response time. 
 .RE
 
 .LP
 .SH "NOTES"
 .LP
 .LP
-The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
+The \f2\-version:release\fP option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
 .LP
 .RS 3
 .TP 3
 1.
-Any version, represented by not using this option.
+Any version, represented by not using this option. 
 .TP 3
 2.
-Any version greater than an arbitrarily precise version\-id. For example:
+Any version greater than an arbitrarily precise \f2version\-i\fPd value, for example: 
 .nf
 \f3
 .fl
@@ -438,10 +474,10 @@
 .fl
 \fP
 .fi
-This would utilize any version greater than \f21.6.0_10\fP. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified.
+This would utilize any version greater than 1.6.0_10. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. 
 .TP 3
 3.
-A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family. For example:
+A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family, for example: 
 .nf
 \f3
 .fl
@@ -451,7 +487,7 @@
 .fi
 .TP 3
 4.
-"Or" expressions of items 2. or 3. above. For example:
+An \f3or\fP expressions of items 2 or 3, for example: 
 .nf
 \f3
 .fl
@@ -459,22 +495,51 @@
 .fl
 \fP
 .fi
-Similar to item 2. this is useful when a change was introduced in a release (1.7) but also made available in updates to previous releases.
+Similar to item 2. This is useful when a change was introduced in a release (1.7) but also made available in updates to earlier releases. 
 .RE
 
 .LP
+.SH "Performance Tuning Examples"
+.LP
+.LP
+The following examples show how to use experimental tuning flags to optimize either throughput or faster response time.
+.LP
+.SS 
+Example 1, Tuning for Higher Throughput
+.LP
+.nf
+\f3
+.fl
+        java \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g 
+.fl
+\fP
+.fi
+
+.LP
+.SS 
+Example 2, Tuning for Lower Response Time
+.LP
+.nf
+\f3
+.fl
+        java \-d64 \-XX:+UseG1GC \-Xms26g Xmx26g \-XX:MaxGCPauseMillis=500 \-XX:+PrintGCTimeStamps 
+.fl
+\fP
+.fi
+
+.LP
 .SH "EXIT STATUS"
 .LP
 .LP
-The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP.
+The following exit values are typically returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f3System.exit(exitValue)\fP.
 .LP
 .RS 3
 .TP 2
 o
-\f20\fP: Successful completion
+\f30\fP: Successful completion 
 .TP 2
 o
-\f2>0\fP: An error occurred
+\f3>0\fP: An error occurred 
 .RE
 
 .LP
@@ -483,35 +548,17 @@
 .RS 3
 .TP 2
 o
-javac(1)
+javac(1) 
 .TP 2
 o
-jdb(1)
+jdb(1) 
 .TP 2
 o
-javah(1)
+javah(1) 
 .TP 2
 o
-jar(1)
-.TP 2
-o
-.na
-\f2The Java Extensions Framework\fP @
-.fi
-http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html
-.TP 2
-o
-.na
-\f2Security Features\fP @
-.fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/index.html.
-.TP 2
-o
-.na
-\f2HotSpot VM Specific Options\fP @
-.fi
-http://java.sun.com/docs/hotspot/VMOptions.html.
+jar(1) 
 .RE
 
 .LP
-
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/bsd/doc/man/jcmd.1	Tue Aug 06 14:01:58 2013 +0100
@@ -0,0 +1,113 @@
+." Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+."
+." This code is free software; you can redistribute it and/or modify it
+." under the terms of the GNU General Public License version 2 only, as
+." published by the Free Software Foundation.
+."
+." This code is distributed in the hope that it will be useful, but WITHOUT
+." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+." FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+." version 2 for more details (a copy is included in the LICENSE file that
+." accompanied this code).
+."
+." You should have received a copy of the GNU General Public License version
+." 2 along with this work; if not, write to the Free Software Foundation,
+." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+."
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
+."
+.TH jcmd 1 "18 Jul 2013"
+
+.LP
+.SH "Name"
+jcmd \- Sends diagnostic command requests to a running Java Virtual Machine
+.LP
+.SH "SYNOPSIS"
+.LP
+.nf
+\f3
+.fl
+\fP\f3jcmd\fP [ \f2options\fP ]
+.fl
+\f3jcmd\fP [ \f2pid\fP | \f2main\-class\fP ] \f3PerfCounter.print\fP
+.fl
+\f3jcmd\fP [ \f2pid\fP | \f2main\-class\fP ] \f2command [arguments]\fP
+.fl
+\f3jcmd\fP [ \f2pid\fP | \f2main\-class\fP ] \f3\-f\fP \f2file\fP
+.fl
+.fi
+
+.LP
+.RS 3
+.TP 3
+options 
+The command\-line options. See Options. 
+.TP 3
+pid 
+Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.TP 3
+main\-class 
+The main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring is matched. If several running Java processes share the same main class, then the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.TP 3
+command [arguments] 
+The main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring is matched. If several running Java processes share the same main class, then the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.TP 3
+Perfcounter.print 
+Print the performance counters available on the targeted Java processes. The list of performance counters might vary with the Java process. 
+.TP 3
+\-f file 
+Read commands from \f2file\fP and call them on the targeted Java processes. In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been called or when a line containing the \f3stop\fP keyword is read. 
+.RE
+
+.LP
+.SH "DESCRIPTION"
+.LP
+.LP
+\f3jcmd\fP is a utility to send diagnostic command requests to a Java Virtual Machine supporting this feature.
+.LP
+.LP
+Used without arguments or with the \f3\-l\fP option, \f3jcmd\fP prints the list of running Java processes with their process ID, their main class and their command\-line arguments.
+.LP
+.LP
+When a process ID is specified on the command line, \f3jcmd\fP sends the diagnostic command request to the process with this ID.
+.LP
+.LP
+When a main class is specified on the command line, \f3jcmd\fP sends the diagnostic command request to all Java processes for which the command\-line argument is a substring of the Java process' main class.
+.LP
+.LP
+With the \f3PerfCounter.print\fP argument, \f3jcmd\fP prints the performance counters available on the targeted Java processes.
+.LP
+.LP
+With the \f3\-f\fP option, \f3jcmd\fP sends to the targeted Java processes the diagnostic commands stored in the specified \f3file\fP.
+.LP
+.SH "OPTIONS"
+.LP
+.LP
+Options are mutually exclusive. Options, when used, must immediately follow the command name.
+.LP
+.RS 3
+.TP 3
+\-l 
+Prints the list of running Java processes with their process IDs, their main classes, and their command\-line arguments. 
+.TP 3
+\-h 
+Prints a help message. 
+.TP 3
+\-help 
+Prints a help message. 
+.RE
+
+.LP
+.SH "SEE ALSO"
+.LP
+.RS 3
+.TP 2
+o
+jps 
+.RE
+
+.LP
+ 
--- a/src/linux/doc/man/java.1	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/linux/doc/man/java.1	Tue Aug 06 14:01:58 2013 +0100
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH java 1 "20 Mar 2012"
+.TH java 1 "18 Jul 2013"
 
 .LP
 .SH "Name"
@@ -30,9 +30,9 @@
 .nf
 \f3
 .fl
-    \fP\f3java\fP [ options ] class [ argument ... ]
+\fP\f3java\fP [ \f2options\fP ] \f2class\fP [ \f2argument ...\fP ]
 .fl
-    \f3java\fP [ options ] \f3\-jar\fP file.jar [ argument ... ]
+\f3java\fP [ \f2options\fP ] \f3\-jar\fP \f2file.jar\fP [ \f2argument ...\fP ]
 .fl
 .fi
 
@@ -40,26 +40,26 @@
 .RS 3
 .TP 3
 options 
-Command\-line options. 
+Command\-line options. See \f2Options\fP. 
 .TP 3
 class 
-Name of the class to be invoked. 
+The name of the class to be called. 
 .TP 3
 file.jar 
-Name of the jar file to be invoked. Used only with \f2\-jar\fP. 
+The name of the JAR file to be called. Used only with the \f3\-jar\fP command. 
 .TP 3
 argument 
-Argument passed to the \f3main\fP function. 
+The arguments passed to the \f3main\fP function. 
 .RE
 
 .LP
 .SH "DESCRIPTION"
 .LP
 .LP
-The \f3java\fP tool launches a Java application. It does this by starting a Java runtime environment, loading a specified class, and invoking that class's \f3main\fP method.
+The \f3java\fP command starts a Java application. It does this by starting a Java runtime environment, loading a specified class, and calling that class's \f3main\fP method.
 .LP
 .LP
-The method must be declared public and static, it must not return any value, and it must accept a \f2String\fP array as a parameter. The method declaration must look like the following:
+The method must be declared public and static, it must not return any value, and it must accept a String array as a parameter. The method declaration has the following form:
 .LP
 .nf
 \f3
@@ -71,7 +71,7 @@
 
 .LP
 .LP
-By default, the first non\-option argument is the name of the class to be invoked. A fully\-qualified class name should be used. If the \f3\-jar\fP option is specified, the first non\-option argument is the name of a \f3JAR\fP archive containing class and resource files for the application, with the startup class indicated by the \f3Main\-Class\fP manifest header.
+By default, the first argument without an option is the name of the class to be called. A fully qualified class name should be used. If the \f3\-jar\fP option is specified, then the first non\-option argument is the name of a JAR file containing class and resource files for the application, with the startup class indicated by the Main\-Class manifest header.
 .LP
 .LP
 The Java runtime searches for the startup class, and other classes used, in three sets of locations: the bootstrap class path, the installed extensions, and the user class path.
@@ -82,122 +82,99 @@
 .SH "OPTIONS"
 .LP
 .LP
-The launcher has a set of standard options that are supported on the current runtime environment and will be supported in future releases. In addition, the current implementations of the virtual machines support a set of non\-standard options that are subject to change in future releases.
+The launcher has a set of standard options that are supported in the current runtime environment.
 .LP
-.SH "Standard Options"
+.LP
+In addition, the current implementations of the virtual machines support a set of nonstandard options that are subject to change in future releases. See \f2Nonstandard Options\fP.
+.LP
+.SS 
+Standard Options
 .LP
 .RS 3
 .TP 3
 \-client 
-Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM.
+Selects the Java HotSpot Client VM. A 64\-bit capable JDK currently ignores this option and instead uses the Java Hotspot Server VM.
 .br
 .br
-For default VM selection, see 
-.na
-\f2Server\-Class Machine Detection\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+For default Java VM selection, see \f2Server\-Class Machine Detection\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
 .TP 3
 \-server 
-Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit.
+Selects the Java HotSpot Server VM. On a 64\-bit capable JDK, only the Java Hotspot Server VM is supported so the \f3\-\fP\f3server\fP option is implicit.
 .br
 .br
-For default VM selection, see 
-.na
-\f2Server\-Class Machine Detection\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+For default a Java VM selection, see \f2Server\-Class Machine Detection\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
 .TP 3
 \-agentlib:libname[=options] 
-Load native agent library \f2libname\fP, e.g.
-.br
-.br
-\-agentlib:hprof
-.br
-.br
-\-agentlib:jdwp=help
-.br
-.br
-\-agentlib:hprof=help
-.br
-.br
-For more information, see 
-.na
-\f2JVMTI Agent Command Line Options\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
-.TP 3
-\-agentpath:pathname[=options] 
-Load a native agent library by full pathname. For more information, see 
-.na
-\f2JVMTI Agent Command Line Options\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
-.TP 3
-\-classpath classpath 
-.TP 3
-\-cp classpath 
-Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable.
-.br
-.br
-If \f3\-classpath\fP and \f3\-cp\fP are not used and \f3CLASSPATH\fP is not set, the user class path consists of the current directory (\f4.\fP).  
-.br
-.br
-As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations).
-.br
-.br
-For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.  
-.br
-.br
-For more information on class paths, see 
-.na
-\f2Setting the Class Path\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath. 
-.TP 3
-\-Dproperty=value 
-Set a system property value. 
-.TP 3
-\-d32 
-.TP 3
-\-d64 
-Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported.
-.br
-.br
-Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release.
-.br
-.br
-If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release. 
-.TP 3
-\-enableassertions[:<package name>"..." | :<class name> ] 
-.TP 3
-\-ea[:<package name>"..." | :<class name> ] 
-.TP 3
-\-disableassertions[:<package name>"..." | :<class name> ] 
-.TP 3
-\-da[:<package name>"..." | :<class name> ] 
-Disable assertions. This is the default.
-.br
-.br
-With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class.
-.br
-.br
-To run a program with assertions enabled in package \f2com.wombat.fruitbat\fP but disabled in class \f2com.wombat.fruitbat.Brickbat\fP, the following command could be used: 
+Loads native agent library \f2libname\fP, for example: 
 .nf
 \f3
 .fl
-java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat \fP\f4<Main Class>\fP\f3
+\-agentlib:hprof
+.fl
+ 
+.fl
+\-agentlib:jdwp=help
+.fl
+ 
+.fl
+\-agentlib:hprof=help
 .fl
 \fP
 .fi
-The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. 
+See \f2JVMTI Agent Command\-Line Options\fP at http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting 
+.TP 3
+\-agentpath:pathname[=options] 
+Loads a native agent library by full \f2pathname\fP. See \f2JVMTI Command\-Line Options\fP at http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting 
+.TP 3
+\-classpath classpath, \-cp classpath 
+Specifies a list of directories, JAR files, and ZIP archives to search for class files. Separate class path entries with colons (:). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f2CLASSPATH\fP environment variable.
+.br
+.br
+If \f3\-classpath\fP and \f3\-cp\fP are not used and \f2CLASSPATH\fP is not set, then the user class path consists of the current directory (.).
+.br
+.br
+As a special convenience, a class path element that contains a base name of \f3*\fP is considered equivalent to specifying a list of all the files in the directory with the extension .jar or .JAR. A Java program cannot tell the difference between the two invocations.
+.br
+.br
+For example, if directory mydir contains a.jar and b.JAR, then the class path element \f3mydir/*\fP is expanded to a A.jar:b.JAR, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A class path entry consisting simply of \f3*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any class path wildcard expansion occurs before the Java VM is started. No Java program will ever see wild cards that are not expanded except by querying the environment. For example, by calling \f3System.getenv("CLASSPATH")\fP. 
+.TP 3
+\-Dproperty=value 
+Sets a system property value. 
+.TP 3
+\-d32 
+Run the application in a 32\-bit environment. If a 32\-bit environment is not installed or is not supported, an error will be reported. By default, the application is run in a 32\-bit environment unless a 64\-bit only system is used. 
+.TP 3
+\-d64 
+Run the application in a 64\-bit environment. If a 64\-bit environment is not installed or is not supported, an error will be reported. By default, the application is run in a 32\-bit environment unless a 64\-bit only system is used.
+.br
+.br
+Currently only the Java HotSpot Server VM supports 64\-bit operation, and the \f3\-server\fP option is implicit with the use of \f3\-d64\fP. The \f3\-client\fP option is ignored with the use of \f3\-d64\fP. This is subject to change in a future release. 
+.TP 3
+\-disableassertions[:package name"..." | :class name ], \-da[:package name"..." | :class name ] 
+Disable assertions. This is the default.
+.br
+.br
+With no arguments, \f3\-disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f3"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is \f3"..."\fP, then the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f3"..."\fP, the switch disables assertions in the specified class.
+.br
+.br
+To run a program with assertions enabled in \f3package com.wombat.fruitbat\fP but disabled in class \f3com.wombat.fruitbat.Brickbat\fP, the following command could be used: 
+.nf
+\f3
+.fl
+java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat <Main Class>
+.fl
+\fP
+.fi
+The \f3\-disableassertions\fP and \f3\-da\fP switches apply to all class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do not apply to system. This makes it easy to turn on asserts in all classes except for system classes. The \f3\-disablesystemassertions\fP option provides a separate swith to enable assertions in all system classes. 
+.TP 3
+\-enableassertions[:package name"..." | :class name ], \-ea[:package name"..." | :class name ] 
 Enable assertions. Assertions are disabled by default.
 .br
 .br
-With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
+With no arguments, \f3\-enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f3"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is \f3"..."\fP, then the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f3"..."\fP, the switch enables assertions in the specified class.
 .br
 .br
-If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used: 
+If a single command contains multiple instances of these switches, then they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package com.wombat.fruitbat (and any subpackages), the following command could be used: 
 .nf
 \f3
 .fl
@@ -205,76 +182,63 @@
 .fl
 \fP
 .fi
-The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. 
+The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to all class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do not apply to system. This makes it easy to turn on asserts in all classes except for system classes. The \f3\-enablesystemassertions\fP option provides a separate switch to enable assertions in all system classes. 
 .TP 3
-\-enablesystemassertions 
+\-enablesystemassertions, \-esa 
+Enable assertions in all system classes (sets the default assertion status for system classes to true). 
 .TP 3
-\-esa 
-Enable asserts in all system classes (sets the \f2default assertion status\fP for system classes to \f2true\fP). 
-.TP 3
-\-disablesystemassertions 
-.TP 3
-\-dsa 
-Disables asserts in all system classes. 
+\-disablesystemassertions, \-dsa 
+Disables assertions in all system classes. 
 .TP 3
 \-help or \-? 
-Display usage information and exit. 
+Displays usage information and exit. 
 .TP 3
 \-jar 
-Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the 
-.na
-\f2Java Tutorial\fP @
-.fi
-http://docs.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests.\ 
+Executes a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. For this option to work, the manifest of the JAR file must contain a line in the form \f3Main\-Class\fP: \f2classname\fP. Here, \f2classname\fP identifies the class with the \f3public static void main(String[] args)\fP method that serves as your application's starting point.
 .br
 .br
 When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
 .br
 .br
-Note that JAR files that can be run with the "java \-jar" option can have their execute permissions set so they can be run without using "java \-jar". Refer to 
-.na
-\f2Java Archive (JAR) Files\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/jar/index.html. 
+JAR files that can be run with the \f3java \-jar\fP option can have their execute permissions set so they can be run without using \f3java \-jar\fP. See \f2JAR File Overview\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html 
 .TP 3
 \-javaagent:jarpath[=options] 
-Load a Java programming language agent, see 
+Loads a Java programming language agent. For more information about instrumenting Java applications, see the java.lang.instrument package description in the Java API documentation at
+.br
 .na
-\f2java.lang.instrument\fP @
+\f2http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html\fP @
 .fi
-http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html. 
+http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html 
 .TP 3
 \-jre\-restrict\-search 
-Include user\-private JREs in the version search. 
+Includes user\-private JREs in the version search. 
 .TP 3
 \-no\-jre\-restrict\-search 
-Exclude user\-private JREs in the version search. 
+Excludes user\-private JREs in the version search. 
 .TP 3
 \-showversion 
-Display version information and continue. (See also \f3\-version\fP.) 
+Displays version information and continues. 
 .TP 3
 \-splash:imagepath 
-Show splash screen with image specified by \f2imagepath\fP. 
+Shows splash screen with image specified by \f2imagepath\fP. 
 .TP 3
-\-verbose 
-.TP 3
-\-verbose:class 
-Display information about each class loaded. 
+\-verbose, \-verbose:class 
+Displays information about each class loaded. 
 .TP 3
 \-verbose:gc 
-Report on each garbage collection event. 
+Reports on each garbage collection event. 
 .TP 3
 \-verbose:jni 
-Report information about use of native methods and other Java Native Interface activity. 
+Reports information about use of native methods and other Java Native Interface activity. 
 .TP 3
 \-version 
-Display version information and exit. (See also \f3\-showversion\fP.) 
+Displays version information and exits. See also the \f3\-showversion\fP option. 
 .TP 3
 \-version:release 
-Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used.
+Specifies that the version specified by the release is required by the class or JAR file specified on the command line. If the version of the \f3java\fP command called does not meet this specification and an appropriate implementation is found on the system, then the appropriate implementation will be used.
 .br
 .br
-\f2release\fP not only can specify an exact version, but can also specify a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a version\-id, a version\-id followed by a star (*), a version\-id followed by a plus sign (+) , or two version\-ranges combined using an ampersand (&). The star means prefix match, the plus sign means this version or greater, and the ampersand means the logical anding of the two version\-ranges. For example: 
+The \f3release\fP option specifies an exact version and a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a \f2version\-id\fP, a \f2version\-id\fP followed by an asterisk (\f3*\fP), a \f2version\-id\fP followed by a plus sign (\f3+\fP), or a version range that consists of two \f2version\-ids\fP combined using an ampersand (\f3&\fP). The asterisk means prefix match, the plus sign means this version or greater, and the ampersand means the logical \f3and\fP of the two version\-ranges, for example: 
 .nf
 \f3
 .fl
@@ -282,13 +246,13 @@
 .fl
 \fP
 .fi
-The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56).
+The meaning of the previous example is that the class or JAR file requires either version 1.6.0_13, or a version with 1.6 as a \f2version\-id\fP prefix and that is not less than 1.6.0_10. The exact syntax and definition of version strings can be found in Appendix A of the \f2Java Network Launching Protocol & API Specification (JSR\-56)\fP.
 .br
 .br
-For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line.
+For JAR files, the preference is to specify version requirements in the JAR file manifest rather than on the command line.
 .br
 .br
-See the following NOTES section for important policy information on the use of this option. 
+See \f2Notes\fP for important policy information on the use of this option. 
 .RE
 
 .LP
@@ -298,213 +262,211 @@
 .RS 3
 .TP 3
 \-X 
-Display information about non\-standard options and exit. 
+Displays information about nonstandard options and exits. 
 .TP 3
 \-Xint 
-Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode. 
+Operates in interpreted\-only mode. Compilation to native code is disabled, and all bytecode is executed by the interpreter. The performance benefits offered by the Java HotSpot Client VM adaptive compiler is not present in this mode. 
 .TP 3
 \-Xbatch 
-Disable background compilation. Normally the VM will compile the method as a background task, running the method in interpreter mode until the background compilation is finished. The \f2\-Xbatch\fP flag disables background compilation so that compilation of all methods proceeds as a foreground task until completed. 
+Disables background compilation. Typically, the Java VM compiles the method as a background task, running the method in interpreter mode until the background compilation is finished. The \-Xbatch flag disables background compilation so that compilation of all methods proceeds as a foreground task until completed. 
 .TP 3
 \-Xbootclasspath:bootclasspath 
-Specify a colon\-separated list of directories, JAR archives, and ZIP archives to search for boot class files. These are used in place of the boot class files included in the Java platform JDK. \f2Note: Applications that use this option for the purpose of overriding a class in rt.jar should not be deployed as doing so would contravene the Java Runtime Environment binary code license.\fP 
+Specifies a colon\-separated list of directories, JAR files, and ZIP archives to search for boot class files. These are used in place of the boot class files included in the Java platform JDK.
+.br
+.br
+Applications that use this option for the purpose of overriding a class in rt.jar should not be deployed because doing so would contravene the Java Runtime Environment binary code license. 
 .TP 3
 \-Xbootclasspath/a:path 
-Specify a colon\-separated path of directires, JAR archives, and ZIP archives to append to the default bootstrap class path. 
+Specifies a colon\-separated path of directories, JAR files, and ZIP archives to append to the default bootstrap class path. 
 .TP 3
 \-Xbootclasspath/p:path 
-Specify a colon\-separated path of directires, JAR archives, and ZIP archives to prepend in front of the default bootstrap class path. \f2Note: Applications that use this option for the purpose of overriding a class in rt.jar should not be deployed as doing so would contravene the Java Runtime Environment binary code license.\fP 
+Specifies a colon\-separated path of directories, JAR files, and ZIP archives to add in front of the default bootstrap class path.
+.br
+.br
+Do not deploy applications that use this option to override a class in rt.jar because this violates the Java Runtime Environment binary code license. 
 .TP 3
 \-Xcheck:jni 
-Perform additional checks for Java Native Interface (JNI) functions. Specifically, the Java Virtual Machine validates the parameters passed to the JNI function as well as the runtime environment data before processing the JNI request. Any invalid data encountered indicates a problem in the native code, and the Java Virtual Machine will terminate with a fatal error in such cases. Expect a performance degradation when this option is used. 
+Performs additional checks for Java Native Interface (JNI) functions. Specifically, the Java Virtual Machine validates the parameters passed to the JNI function and the runtime environment data before processing the JNI request. Any invalid data encountered indicates a problem in the native code, and the Java Virtual Machine will terminate with a fatal error in such cases. Expect a performance degradation when this option is used. 
 .TP 3
 \-Xfuture 
-Perform strict class\-file format checks. For purposes of backwards compatibility, the default format checks performed by the JDK's virtual machine are no stricter than the checks performed by 1.1.x versions of the JDK software. The \f3\-Xfuture\fP flag turns on stricter class\-file format checks that enforce closer conformance to the class\-file format specification. Developers are encouraged to use this flag when developing new code because the stricter checks will become the default in future releases of the Java application launcher. 
+Performs strict class\-file format checks. For backward compatibility, the default format checks performed by the Java virtual machine are no stricter than the checks performed by 1.1.x versions of the JDK software. The \f3\-Xfuture\fP option turns on stricter class\-file format checks that enforce closer conformance to the class\-file format specification. Developers are encouraged to use this flag when developing new code because the stricter checks will become the default in future releases of the Java application launcher. 
 .TP 3
 \-Xnoclassgc 
-Disable class garbage collection. Use of this option will prevent memory recovery from loaded classes thus increasing overall memory usage. This could cause OutOfMemoryError to be thrown in some applications. 
+Disables class garbage collection. Use of this option preven memory recovery from loaded classes thus increasing overall memory usage. This could cause \f3OutOfMemoryError\fP to be thrown in some applications. 
 .TP 3
 \-Xincgc 
-Enable the incremental garbage collector. The incremental garbage collector, which is off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program. 
+Enables the incremental garbage collector. The incremental garbage collector, which is turned off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program. 
 .TP 3
 \-Xloggc:file 
-Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event.
+Reports on each garbage collection event, as with \f3\-verbose:gc\fP, but logs this data to a file. In addition to the information \f3\-verbose:gc\fP gives, each reported event will be preceded by the time (in seconds) since the first garbage\-collection event.
 .br
 .br
-Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. 
+Always use a local file system for storage of this file to avoid stalling the Java VM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f3\-verbose:gc\fP when both are specified on the command line. 
 .TP 3
 \-Xmnsize or \-XX:NewSize 
 Sets the size of the young generation (nursery). 
 .TP 3
 \-Xmsn 
-Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see 
-.na
-\f2HotSpot Ergonomics\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+Specifies the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1 MB. Append the letter \f3k\fP or \f3K\fP to indicate kilobytes, or \f3m\fP or \f3M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. See \f2Garbage Collector Ergonomics\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
 .br
 .br
 Examples: 
 .nf
 \f3
 .fl
-       \-Xms6291456
+\-Xms6291456
 .fl
-       \-Xms6144k
+\-Xms6144k
 .fl
-       \-Xms6m
-.fl
-
+\-Xms6m
 .fl
 \fP
 .fi
 .TP 3
 \-Xmxn 
-Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see 
-.na
-\f2HotSpot Ergonomics\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+Specifies the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2 MB. Append the letter \f3k\fP or \f3K\fP to indicate kilobytes, or \f3m\fP or \f3M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration.
+.br
+.br
+For server deployments, \f3\-Xms\fP and \f3\-Xmx\fP are often set to the same value. See \f2Garbage Collector Ergonomics\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
 .br
 .br
 Examples: 
 .nf
 \f3
 .fl
-       \-Xmx83886080
+\-Xmx83886080
 .fl
-       \-Xmx81920k
+\-Xmx81920k
 .fl
-       \-Xmx80m
-.fl
-
+\-Xmx80m
 .fl
 \fP
 .fi
-On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000m minus overhead amounts. 
+On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000 m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000 m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000 m minus overhead amounts. 
 .TP 3
 \-Xprof 
-Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems.  
+Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems. 
 .TP 3
 \-Xrs 
-Reduces use of operating\-system signals by the Java virtual machine (JVM).
+Reduces use of operating\-system signals by the Java VM.
 .br
 .br
-In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly.
+In an earlier release, the Shutdown Hooks facility was added to enable orderly shutdown of a Java application. The intent was to enable user cleanup code (such as closing database connections) to run at shutdown, even if the Java VM terminates abruptly.
 .br
 .br
-Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks.
+The Java VM catches signals to implement shutdown hooks for unexpected Java VM termination. The Java VM uses \f3SIGHUP\fP, \f3SIGINT\fP, and \f3SIGTERM\fP to initiate the running of shutdown hooks.
 .br
 .br
-The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps.
+The JVM uses a similar mechanism to implement the feature of dumping thread stacks for debugging purposes. The JVM uses \f3SIGQUIT\fP to perform thread dumps.
 .br
 .br
-Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed.
+Applications embedding the Java VM frequently need to trap signals such as \f3SIGINT\fP or \f3SIGTERM\fP, which can lead to interference with the Java VM signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on the Java VM, the signal masks for \f3SIGINT\fP, \f3SIGTERM\fP, \f3SIGHUP\fP, and \f3SIGQUIT\fP are not changed by the Java VM, and signal handlers for these signals are not installed.
 .br
 .br
 There are two consequences of specifying \f3\-Xrs\fP: 
 .RS 3
 .TP 2
 o
-SIGQUIT thread dumps are not available. 
+\f3SIGQUIT\fP thread dumps are not available. 
 .TP 2
 o
-User code is responsible for causing shutdown hooks to run, for example by calling System.exit() when the JVM is to be terminated. 
+User code is responsible for causing shutdown hooks to run, for example by calling \f3System.exit()\fP when the Java VM is to be terminated. 
 .RE
 .TP 3
 \-Xssn 
-Set thread stack size. 
+Sets the thread stack size. 
 .TP 3
 \-XX:AllocationPrefetchStyle=n 
-Sets the style of prefetch used during allocation. default=2.
-.br
+Sets the style of prefetch used during allocation. default=2. 
 .TP 3
 \-XX:+AggressiveOpts 
-Enables aggressive optimization.
-.br
+Enables aggressive optimization. 
 .TP 3
 \-XX:+|\-DisableAttachMechanism 
-This option specifies whether tools (such as \f2jmap\fP and \f2jconsole\fP) are allowed to attach to the JVM. By default, this feature is disabled. That is, attaching is enabled. Example usage: 
+Specifies whether commands (such as \f3jmap\fP and \f3jconsole\fP) can attach to the Java VM. By default, this feature is disabled. That is, attaching is enabled, for example: 
 .nf
 \f3
 .fl
-      java \-XX:+DisableAttachMechanism
+java \-XX:+DisableAttachMechanism
 .fl
 \fP
 .fi
 .TP 3
 \-XXLargePageSizeInBytes=n 
-This option specifies the maximum size for large pages. 
+Specifies the maximum size for large pages. 
 .TP 3
 \-XX:MaxGCPauseMillis=n 
 Sets a target for the maximum GC pause time.
 .br
-This is a soft goal, and the JVM will make its best effort to achieve it. 
+.br
+This is a soft goal, and the Java VM will make its best effort to achieve it. There is no maximum value set by default. 
 .TP 3
 \-XX:NewSize 
-Sets the size of the young generation (nursery). Sames as \f3\-Xmn\fP\f4size\fP. 
+Sets the size of the young generation (nursery). Sames as \f3\-Xmnsize\fP. 
 .TP 3
 \-XX:ParallelGCThreads=n 
-Sets the number of GC threads in the parallel collectors.
-.br
+Sets the number of GC threads in the parallel collectors. 
 .TP 3
 \-XX:PredictedClassLoadCount=n 
-This option requires that the \f3UnlockExperimentalVMOptions\fP flag be set first. Use the \f3PredictedClassLoadCount\fP flag if your application loads a lot of classes, and especially if \f3class.forName()\fP is used heavily. The recommended value is the number of classes loaded as shown in the output from \f3\-verbose:class\fP.
+This option requires that the \f3UnlockExperimentalVMOptions\fP flag be set first. Use the \f3PredictedClassLoadCount\fP flag if your application loads a lot of classes and especially if \f3class.forName()\fP is used heavily. The recommended value is the number of classes loaded as shown in the output from \f3\-verbose:class\fP.
 .br
-Example usage: 
+.br
+Example: 
 .nf
 \f3
 .fl
-      java \-XX:+UnlockExperimentalVMOptions \-XX:PredictedClassLoadCount=60013
+java \-XX:+UnlockExperimentalVMOptions \-XX:PredictedClassLoadCount=60013
 .fl
 \fP
 .fi
 .TP 3
 \-XX:+PrintCompilation 
-Prints verbose output from the HotSpot dynamic runtime compiler.
-.br
+Prints verbose output from the Java HotSpot VM dynamic runtime compiler. 
 .TP 3
 \-XX:+PrintGCDetails \-XX:+PrintGCTimeStamps 
-Prints garbage collection output along with time stamps.
-.br
+Prints garbage collection output along with time stamps. 
 .TP 3
 \-XX:SoftRefLRUPolicyMSPerMB=0 
-This flag enables aggressive processing of software references. Use this flag if HotSpot GC is impacted by the software reference count. 
+This flag enables aggressive processing of software references. Use this flag if the software reference count has an impact on the Java HotSpot VM garbage collector. 
 .TP 3
 \-XX:TLABSize=n 
-Thread local allocation buffers (TLAB) are enabled by default in HotSpot. HotSpot automatically sizes TLABs based on allocation patterns. The \f3\-XX:TLABSize\fP option allows fine\-tuning the size of TLABs.
-.br
+Thread local allocation buffers (TLAB) are enabled by default in the Java HotSpot VM. The Java HotSpot VM sizes TLABs based on allocation patterns. The \f3\-XX:TLABSize\fP option enables fine\-tuning the size of TLABs. 
 .TP 3
 \-XX:+UseAltSigs 
-The VM uses \f2SIGUSR1\fP and \f2SIGUSR2\fP by default, which can sometimes conflict with applications that signal\-chain \f2SIGUSR1\fP and \f2SIGUSR2\fP. The \f2\-XX:+UseAltSigs\fP option will cause the VM to use signals other than \f2SIGUSR1\fP and \f2SIGUSR2\fP as the default. 
+The Java VM uses \f3SIGUSR1\fP and \f3SIGUSR2\fP by default, which can sometimes conflict with applications that signal\-chain \f3SIGUSR1\fP and \f3SIGUSR2\fP. The \f3\-XX:+UseAltSigs\fP option causes the Java VM to use signals other than \f3SIGUSR1\fP and \f3SIGUSR2\fP as the default. 
 .TP 3
 \-XX:+|\-UseCompressedOops 
-Enables compressed references in 64\-bit JVMs.
+Enables compressed references in 64\-bit Java VMs.
 .br
-This option is true by default.
 .br
+This option is true by default. 
 .TP 3
 \-XX:+UseConcMarkSweepGC or \-XX:+UseG1GC 
-These flags enable either the Concurrent Mark Sweep (CMS) or the G1 garbage collectors.
-.br
+Enables either the Concurrent Mark Sweep (CMS) or the G1 garbage collectors. 
 .TP 3
 \-XX:+|\-UseLargePages 
-Use this flag to enable large page support. Large pages are enabled by default on Solaris.
+Enables large page support.
 .br
+.br
+Large pages are enabled by default on Solaris. 
 .TP 3
 \-XX:+UseParallelOldGC 
-Enables the parallel garbage collectors, which are optimized for throughput and average response time.
-.br
-.SH "NOTES" 
+Enables the parallel garbage collectors, which are optimized for throughput and average response time. 
+.RE
+
 .LP
-The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: 
+.SH "NOTES"
+.LP
+.LP
+The \f2\-version:release\fP option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
+.LP
 .RS 3
 .TP 3
 1.
 Any version, represented by not using this option. 
 .TP 3
 2.
-Any version greater than an arbitrarily precise version\-id. For example: 
+Any version greater than an arbitrarily precise \f2version\-i\fPd value, for example: 
 .nf
 \f3
 .fl
@@ -512,10 +474,10 @@
 .fl
 \fP
 .fi
-This would utilize any version greater than \f21.6.0_10\fP. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. 
+This would utilize any version greater than 1.6.0_10. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. 
 .TP 3
 3.
-A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family. For example: 
+A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family, for example: 
 .nf
 \f3
 .fl
@@ -525,7 +487,7 @@
 .fi
 .TP 3
 4.
-"Or" expressions of items 2. or 3. above. For example: 
+An \f3or\fP expressions of items 2 or 3, for example: 
 .nf
 \f3
 .fl
@@ -533,20 +495,56 @@
 .fl
 \fP
 .fi
-Similar to item 2. this is useful when a change was introduced in a release (1.7) but also made available in updates to previous releases. 
+Similar to item 2. This is useful when a change was introduced in a release (1.7) but also made available in updates to earlier releases. 
 .RE
-.SH "EXIT STATUS" 
+
 .LP
-The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP. 
+.SH "Performance Tuning Examples"
+.LP
+.LP
+The following examples show how to use experimental tuning flags to optimize either throughput or faster response time.
+.LP
+.SS 
+Example 1, Tuning for Higher Throughput
+.LP
+.nf
+\f3
+.fl
+        java \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g 
+.fl
+\fP
+.fi
+
+.LP
+.SS 
+Example 2, Tuning for Lower Response Time
+.LP
+.nf
+\f3
+.fl
+        java \-d64 \-XX:+UseG1GC \-Xms26g Xmx26g \-XX:MaxGCPauseMillis=500 \-XX:+PrintGCTimeStamps 
+.fl
+\fP
+.fi
+
+.LP
+.SH "EXIT STATUS"
+.LP
+.LP
+The following exit values are typically returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f3System.exit(exitValue)\fP.
+.LP
 .RS 3
 .TP 2
 o
-\f20\fP: Successful completion 
+\f30\fP: Successful completion 
 .TP 2
 o
-\f2>0\fP: An error occurred 
+\f3>0\fP: An error occurred 
 .RE
-.SH "SEE ALSO" 
+
+.LP
+.SH "SEE ALSO"
+.LP
 .RS 3
 .TP 2
 o
@@ -560,25 +558,6 @@
 .TP 2
 o
 jar(1) 
-.TP 2
-o
-.na
-\f2The Java Extensions Framework\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
-.TP 2
-o
-.na
-\f2Security Features\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/security/index.html. 
-.TP 2
-o
-.na
-\f2HotSpot VM Specific Options\fP @
-.fi
-http://java.sun.com/docs/hotspot/VMOptions.html. 
-.RE
 .RE
 
 .LP
--- a/src/linux/doc/man/jcmd.1	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/linux/doc/man/jcmd.1	Tue Aug 06 14:01:58 2013 +0100
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,60 +19,79 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jcmd 1 "10 Jul 2012"
+.TH jcmd 1 "18 Jul 2013"
 
 .LP
 .SH "Name"
-jcmd \- Diagnostic Command
-.LP
-.LP
-\f3jcmd\fP is a utility to send diagnostic command requests to a running Java Virtual Machine.
+jcmd \- Sends diagnostic command requests to a running Java Virtual Machine
 .LP
 .SH "SYNOPSIS"
 .LP
 .nf
 \f3
 .fl
-    \fP\f3jcmd\fP [ option ] 
+\fP\f3jcmd\fP [ \f2options\fP ]
 .fl
-    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> PerfCounter.print
+\f3jcmd\fP [ \f2pid\fP | \f2main\-class\fP ] \f3PerfCounter.print\fP
 .fl
-    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \f2command\fP [\f2arguments\fP]
+\f3jcmd\fP [ \f2pid\fP | \f2main\-class\fP ] \f2command [arguments]\fP
 .fl
-    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \-f \f2file\fP
+\f3jcmd\fP [ \f2pid\fP | \f2main\-class\fP ] \f3\-f\fP \f2file\fP
 .fl
 .fi
 
 .LP
+.RS 3
+.TP 3
+options 
+The command\-line options. See Options. 
+.TP 3
+pid 
+Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.TP 3
+main\-class 
+The main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring is matched. If several running Java processes share the same main class, then the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.TP 3
+command [arguments] 
+The main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring is matched. If several running Java processes share the same main class, then the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.TP 3
+Perfcounter.print 
+Print the performance counters available on the targeted Java processes. The list of performance counters might vary with the Java process. 
+.TP 3
+\-f file 
+Read commands from \f2file\fP and call them on the targeted Java processes. In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been called or when a line containing the \f3stop\fP keyword is read. 
+.RE
+
+.LP
 .SH "DESCRIPTION"
 .LP
 .LP
 \f3jcmd\fP is a utility to send diagnostic command requests to a Java Virtual Machine supporting this feature.
 .LP
 .LP
-Used without arguments or with the \-l option, jcmd prints the list of running Java processes with their process id, their main class and their command line arguments.
+Used without arguments or with the \f3\-l\fP option, \f3jcmd\fP prints the list of running Java processes with their process ID, their main class and their command\-line arguments.
 .LP
 .LP
-When a process id is specified on the command line, jcmd sends the diagnostic command request to the process with this id.
+When a process ID is specified on the command line, \f3jcmd\fP sends the diagnostic command request to the process with this ID.
 .LP
 .LP
-When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes for which the command line argument is a substring of the Java process' main class.
+When a main class is specified on the command line, \f3jcmd\fP sends the diagnostic command request to all Java processes for which the command\-line argument is a substring of the Java process' main class.
 .LP
 .LP
-With the PerfCounter.print argument, jcmd prints the performance counters available on the targeted Java process(es).
+With the \f3PerfCounter.print\fP argument, \f3jcmd\fP prints the performance counters available on the targeted Java processes.
 .LP
 .LP
-With the \-f option, jcmd sends to the targeted Java process(es) the diagnostic commands stored in the file \f2file\fP.
+With the \f3\-f\fP option, \f3jcmd\fP sends to the targeted Java processes the diagnostic commands stored in the specified \f3file\fP.
 .LP
 .SH "OPTIONS"
 .LP
 .LP
-Options are mutually exclusive. Options, if used, should follow immediately after the command name.
+Options are mutually exclusive. Options, when used, must immediately follow the command name.
 .LP
 .RS 3
 .TP 3
 \-l 
-Prints the list of running Java processes with their process id, their main class and their command line arguments. 
+Prints the list of running Java processes with their process IDs, their main classes, and their command\-line arguments. 
 .TP 3
 \-h 
 Prints a help message. 
@@ -82,37 +101,13 @@
 .RE
 
 .LP
-.SH "PARAMETERS"
-.LP
-.RS 3
-.TP 3
-pid 
-Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
-.TP 3
-main class 
-Main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring will be matched. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
-.TP 3
-command [arguments] 
-Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the the command name followed by \f3help\fP. 
-.TP 3
-PerfCounter.print 
-Print the performance counters available on the targeted Java process(es). The list of performance counters may vary with the Java process. 
-.TP 3
-\-f file 
-Read commands from \f2file\fP and invoke them on the targeted Java process(es). In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been invoked or when a line containing the \f3stop\fP keyword is read. 
-.RE
-
-.LP
 .SH "SEE ALSO"
 .LP
 .RS 3
 .TP 2
 o
-jps(1) 
+jps 
 .RE
 
 .LP
-.LP
-jps(1)
-.LP
  
--- a/src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java	Tue Aug 06 14:01:58 2013 +0100
@@ -107,10 +107,6 @@
             loc = rootComponent.getLocation();
         }
 
-        //It sure will be LWComponentPeer instance as rootComponent is a Window
-        PlatformWindow platformWindow = ((LWComponentPeer)rootComponent.getPeer()).getPlatformWindow();
-        long nativeViewPtr = CPlatformWindow.getNativeViewPtr(platformWindow);
-
         // If there isn't any drag image make one of default appearance:
         if (fDragImage == null)
             this.setDefaultDragImage(component);
@@ -137,6 +133,11 @@
         }
 
         try {
+            //It sure will be LWComponentPeer instance as rootComponent is a Window
+            PlatformWindow platformWindow = ((LWComponentPeer)rootComponent.getPeer()).getPlatformWindow();
+            long nativeViewPtr = CPlatformWindow.getNativeViewPtr(platformWindow);
+            if (nativeViewPtr == 0L) throw new InvalidDnDOperationException("Unsupported platform window implementation");
+
             // Create native dragging source:
             final long nativeDragSource = createNativeDragSource(component, nativeViewPtr, transferable, triggerEvent,
                 (int) (dragOrigin.getX()), (int) (dragOrigin.getY()), extModifiers,
--- a/src/macosx/classes/sun/lwawt/macosx/CDropTarget.java	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/macosx/classes/sun/lwawt/macosx/CDropTarget.java	Tue Aug 06 14:01:58 2013 +0100
@@ -52,6 +52,8 @@
         fPeer = peer;
 
         long nativePeer = CPlatformWindow.getNativeViewPtr(((LWComponentPeer) peer).getPlatformWindow());
+        if (nativePeer == 0L) return; // Unsupported for a window without a native view (plugin)
+
         // Create native dragging destination:
         fNativeDropTarget = this.createNativeDropTarget(dropTarget, component, peer, nativePeer);
         if (fNativeDropTarget == 0) {
--- a/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java	Tue Aug 06 14:01:58 2013 +0100
@@ -38,7 +38,8 @@
 public class CEmbeddedFrame extends EmbeddedFrame {
 
     private CPlatformResponder responder;
-    private boolean focused = true;
+    private static final Object classLock = new Object();
+    private static volatile CEmbeddedFrame focusedWindow;
     private boolean parentWindowActive = true;
 
     public CEmbeddedFrame() {
@@ -110,9 +111,16 @@
         responder.handleInputEvent(text);
     }
 
+    // handleFocusEvent is called when the applet becames focused/unfocused.
+    // This method can be called from different threads.
     public void handleFocusEvent(boolean focused) {
-        this.focused = focused;
-        if (focused) {
+        synchronized (classLock) {
+            // In some cases an applet may not receive the focus lost event
+            // from the parent window (see 8012330)
+            focusedWindow = (focused) ? this
+                    : ((focusedWindow == this) ? null : focusedWindow);
+        }
+        if (focusedWindow == this) {
             // see bug 8010925
             // we can't put this to handleWindowFocusEvent because
             // it won't be invoced if focuse is moved to a html element
@@ -126,6 +134,10 @@
     }
 
     /**
+     * handleWindowFocusEvent is called for all applets, when the browser
+     * becames active/inactive. This event should be filtered out for
+     * non-focused applet. This method can be called from different threads.
+     *
      * When the window is activated and had focus before the deactivation
      * calling this method triggers focus events in the following order:
      *  1. WINDOW_ACTIVATED for this EmbeddedFrame
@@ -140,7 +152,7 @@
         this.parentWindowActive = parentWindowActive;
         // ignore focus "lost" native request as it may mistakenly
         // deactivate active window (see 8001161)
-        if (focused && parentWindowActive) {
+        if (focusedWindow == this && parentWindowActive) {
             responder.handleWindowFocusEvent(parentWindowActive, null);
         }
     }
--- a/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java	Tue Aug 06 14:01:58 2013 +0100
@@ -48,7 +48,7 @@
 import com.sun.awt.AWTUtilities;
 
 public class CPlatformWindow extends CFRetainedResource implements PlatformWindow {
-    private native long nativeCreateNSWindow(long nsViewPtr, long styleBits, double x, double y, double w, double h);
+    private native long nativeCreateNSWindow(long nsViewPtr,long ownerPtr, long styleBits, double x, double y, double w, double h);
     private static native void nativeSetNSWindowStyleBits(long nsWindowPtr, int mask, int data);
     private static native void nativeSetNSWindowMenuBar(long nsWindowPtr, long menuBarPtr);
     private static native Insets nativeGetNSWindowInsets(long nsWindowPtr);
@@ -234,7 +234,8 @@
         contentView = createContentView();
         contentView.initialize(peer, responder);
 
-        final long nativeWindowPtr = nativeCreateNSWindow(contentView.getAWTView(), styleBits, 0, 0, 0, 0);
+        final long ownerPtr = owner != null ? owner.getNSWindowPtr() : 0L;
+        final long nativeWindowPtr = nativeCreateNSWindow(contentView.getAWTView(), ownerPtr, styleBits, 0, 0, 0, 0);
         setPtr(nativeWindowPtr);
 
         // TODO: implement on top of JObjC bridged class
@@ -932,8 +933,6 @@
             nativePeer = ((CPlatformWindow) platformWindow).getContentView().getAWTView();
         } else if (platformWindow instanceof CViewPlatformEmbeddedFrame){
             nativePeer = ((CViewPlatformEmbeddedFrame) platformWindow).getNSViewPtr();
-        } else {
-            throw new IllegalArgumentException("Unsupported platformWindow implementation");
         }
         return nativePeer;
     }
--- a/src/macosx/native/sun/awt/AWTWindow.h	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/macosx/native/sun/awt/AWTWindow.h	Tue Aug 06 14:01:58 2013 +0100
@@ -45,6 +45,7 @@
     jint styleBits;
     BOOL isEnabled;
     NSWindow *nsWindow;
+    AWTWindow *ownerWindow;
 }
 
 // An instance of either AWTWindow_Normal or AWTWindow_Panel
@@ -53,12 +54,14 @@
 @property (nonatomic, retain) JNFWeakJObjectWrapper *javaPlatformWindow;
 @property (nonatomic, retain) CMenuBar *javaMenuBar;
 @property (nonatomic, retain) NSWindow *growBoxWindow;
+@property (nonatomic, retain) AWTWindow *ownerWindow;
 @property (nonatomic) NSSize javaMinSize;
 @property (nonatomic) NSSize javaMaxSize;
 @property (nonatomic) jint styleBits;
 @property (nonatomic) BOOL isEnabled;
 
 - (id) initWithPlatformWindow:(JNFWeakJObjectWrapper *)javaPlatformWindow
+                  ownerWindow:owner
                     styleBits:(jint)styleBits
                     frameRect:(NSRect)frameRect
                   contentView:(NSView *)contentView;
--- a/src/macosx/native/sun/awt/AWTWindow.m	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/macosx/native/sun/awt/AWTWindow.m	Tue Aug 06 14:01:58 2013 +0100
@@ -140,6 +140,7 @@
 @synthesize javaMaxSize;
 @synthesize styleBits;
 @synthesize isEnabled;
+@synthesize ownerWindow;
 
 - (void) updateMinMaxSize:(BOOL)resizable {
     if (resizable) {
@@ -235,6 +236,7 @@
 }
 
 - (id) initWithPlatformWindow:(JNFWeakJObjectWrapper *)platformWindow
+                  ownerWindow:owner
                     styleBits:(jint)bits
                     frameRect:(NSRect)rect
                   contentView:(NSView *)view
@@ -279,6 +281,7 @@
     self.isEnabled = YES;
     self.javaPlatformWindow = platformWindow;
     self.styleBits = bits;
+    self.ownerWindow = owner;
     [self setPropertiesForStyleBits:styleBits mask:MASK(_METHOD_PROP_BITMASK)];
 
     if ([self shouldShowGrowBox]) {
@@ -385,7 +388,7 @@
     self.growBoxWindow = nil;
 
     self.nsWindow = nil;
-
+    self.ownerWindow = nil;
     [super dealloc];
 }
 
@@ -582,11 +585,18 @@
 AWT_ASSERT_APPKIT_THREAD;
     [AWTToolkit eventCountPlusPlus];
     AWTWindow *opposite = [AWTWindow lastKeyWindow];
-    if (!IS(self.styleBits, IS_DIALOG)) {
-        [CMenuBar activate:self.javaMenuBar modallyDisabled:NO];
-    } else if ((opposite != NULL) && IS(self.styleBits, IS_MODAL)) {
-        [CMenuBar activate:opposite->javaMenuBar modallyDisabled:YES];
+    
+    // Finds appropriate menubar in our hierarchy,
+    AWTWindow *awtWindow = self;
+    while (awtWindow.ownerWindow != nil) {
+        awtWindow = awtWindow.ownerWindow;
     }
+    CMenuBar *menuBar = nil;
+    if ([awtWindow.nsWindow isVisible]){
+        menuBar = awtWindow.javaMenuBar;
+    }
+    [CMenuBar activate:menuBar modallyDisabled:!awtWindow.isEnabled];
+
     [AWTWindow setLastKeyWindow:nil];
 
     [self _deliverWindowFocusEvent:YES oppositeWindow: opposite];
@@ -787,7 +797,7 @@
  * Signature: (JJIIII)J
  */
 JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeCreateNSWindow
-(JNIEnv *env, jobject obj, jlong contentViewPtr, jlong styleBits, jdouble x, jdouble y, jdouble w, jdouble h)
+(JNIEnv *env, jobject obj, jlong contentViewPtr, jlong ownerPtr, jlong styleBits, jdouble x, jdouble y, jdouble w, jdouble h)
 {
     __block AWTWindow *window = nil;
 
@@ -796,13 +806,14 @@
     JNFWeakJObjectWrapper *platformWindow = [JNFWeakJObjectWrapper wrapperWithJObject:obj withEnv:env];
     NSView *contentView = OBJC(contentViewPtr);
     NSRect frameRect = NSMakeRect(x, y, w, h);
-
+    AWTWindow *owner = [OBJC(ownerPtr) delegate];
     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
 
         window = [[AWTWindow alloc] initWithPlatformWindow:platformWindow
-                                                  styleBits:styleBits
-                                                  frameRect:frameRect
-                                                contentView:contentView];
+                                               ownerWindow:owner
+                                                 styleBits:styleBits
+                                                 frameRect:frameRect
+                                               contentView:contentView];
         // the window is released is CPlatformWindow.nativeDispose()
 
         if (window) CFRetain(window.nsWindow);
--- a/src/macosx/native/sun/awt/CMenuBar.m	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/macosx/native/sun/awt/CMenuBar.m	Tue Aug 06 14:01:58 2013 +0100
@@ -63,7 +63,7 @@
         if (excludingAppleMenu && ![currMenu isJavaMenu]) {
             continue;
         }
-
+        [currItem setSubmenu:nil];
         [theMainMenu removeItemAtIndex:index];
     }
 
@@ -154,7 +154,10 @@
     // Clean up extra items
     NSUInteger removedIndex, removedCount = [removedMenuArray count];
     for (removedIndex=removedCount; removedIndex > 0; removedIndex--) {
-        [theMainMenu removeItemAtIndex:[[removedMenuArray objectAtIndex:(removedIndex-1)] integerValue]];
+        NSUInteger index = [[removedMenuArray objectAtIndex:(removedIndex-1)] integerValue];
+        NSMenuItem *currItem = [theMainMenu itemAtIndex:index];
+        [currItem setSubmenu:nil];
+        [theMainMenu removeItemAtIndex:index];
     }
 
     i = cmenuIndex;
--- a/src/share/classes/sun/misc/VM.java	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/share/classes/sun/misc/VM.java	Tue Aug 06 14:01:58 2013 +0100
@@ -216,12 +216,13 @@
         return allowArraySyntax;
     }
 
-    private static boolean allowGetCallerClass = false;
+    private static boolean allowGetCallerClass = true;
 
-    // Reflection.getCallerClass(int) is disabled by default.
-    // It can be enabled by setting the system property
-    // "jdk.reflect.allowGetCallerClass" and also used by
-    // logging stack walk of a resource bundle if it is turned on.
+    // Reflection.getCallerClass(int) is enabled by default.
+    // It can be disabled by setting the system property
+    // "jdk.reflect.allowGetCallerClass" to "false". It cannot be
+    // disabled if the logging stack walk (to find resource bundles)
+    // is enabled.
     public static boolean allowGetCallerClass() {
         return allowGetCallerClass;
     }
@@ -290,14 +291,13 @@
                                ? defaultAllowArraySyntax
                                : Boolean.parseBoolean(s));
 
-        // Reflection.getCallerClass(int) is disabled by default.
-        // It can be enabled by setting the system property
-        // "jdk.reflect.allowGetCallerClass" and also used by
-        // logging stack walk of a resource bundle if it is turned on.
+        // Reflection.getCallerClass(int) is enabled by default.
+        // It can be disabled by setting a system property (but only if
+        // the logging stack walk is not enabled)
         s = props.getProperty("jdk.reflect.allowGetCallerClass");
         allowGetCallerClass = (s != null
                                    ? (s.isEmpty() || Boolean.parseBoolean(s))
-                                   : false) ||
+                                   : true) ||
              Boolean.valueOf(props.getProperty("jdk.logging.allowStackWalkSearch"));
 
         // Remove other private system properties
--- a/src/share/classes/sun/reflect/Reflection.java	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/share/classes/sun/reflect/Reflection.java	Tue Aug 06 14:01:58 2013 +0100
@@ -59,8 +59,8 @@
     public static native Class getCallerClass();
 
     /**
-     * @deprecated No replacement.  This method will be removed in the next
-     * JDK 7 update release.
+     * @deprecated No replacement. This method will be removed in a future
+     *   release.
      */
     @Deprecated
     @CallerSensitive
@@ -68,12 +68,8 @@
         if (sun.misc.VM.allowGetCallerClass()) {
             return getCallerClass0(depth+1);
         }
-        throw new UnsupportedOperationException("This method is in the sun.* " +
-             "namespace so it is not a supported, public interface. " +
-             "The 7u40 release notes describe a temporary mechanism " +
-             "to reenable the historical functionality of this method. " +
-             "Update code to function properly and this method will be " +
-             "removed without further warning in a subsequent 7 update release.");
+        throw new UnsupportedOperationException("This method has been disabled by a " +
+            "system property");
     }
 
     // If the VM enforces getting caller class with @CallerSensitive,
--- a/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Aug 06 14:01:58 2013 +0100
@@ -701,8 +701,7 @@
                 singleExtensions = Collections.emptyMap();
             }
 
-            long now = (dateCheckedAgainst == null) ?
-                System.currentTimeMillis() : dateCheckedAgainst.getTime();
+            long now = System.currentTimeMillis();
             Date nowPlusSkew = new Date(now + MAX_CLOCK_SKEW);
             Date nowMinusSkew = new Date(now - MAX_CLOCK_SKEW);
             if (DEBUG != null) {
--- a/src/share/native/java/net/net_util.c	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/share/native/java/net/net_util.c	Tue Aug 06 14:01:58 2013 +0100
@@ -75,7 +75,7 @@
 
 static int initialized = 0;
 
-void init(JNIEnv *env) {
+static void initInetAddrs(JNIEnv *env) {
     if (!initialized) {
         Java_java_net_InetAddress_init(env, 0);
         Java_java_net_Inet4Address_init(env, 0);
@@ -96,42 +96,43 @@
 
 void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address) {
     jobject holder;
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia_holderID);
     (*env)->SetIntField(env, holder, iac_addressID, address);
 }
 
 void setInetAddress_family(JNIEnv *env, jobject iaObj, int family) {
     jobject holder;
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia_holderID);
     (*env)->SetIntField(env, holder, iac_familyID, family);
 }
 
 void setInetAddress_hostName(JNIEnv *env, jobject iaObj, jobject host) {
     jobject holder;
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia_holderID);
     (*env)->SetObjectField(env, holder, iac_hostNameID, host);
 }
 
 int getInetAddress_addr(JNIEnv *env, jobject iaObj) {
     jobject holder;
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia_holderID);
     return (*env)->GetIntField(env, holder, iac_addressID);
 }
 
 int getInetAddress_family(JNIEnv *env, jobject iaObj) {
     jobject holder;
-    init(env);
+
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia_holderID);
     return (*env)->GetIntField(env, holder, iac_familyID);
 }
 
 jobject getInetAddress_hostName(JNIEnv *env, jobject iaObj) {
     jobject holder;
-    init(env);
+    initInetAddrs(env);
     holder = (*env)->GetObjectField(env, iaObj, ia_holderID);
     return (*env)->GetObjectField(env, holder, iac_hostNameID);
 }
@@ -139,7 +140,7 @@
 JNIEXPORT jobject JNICALL
 NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) {
     jobject iaObj;
-    init(env);
+    initInetAddrs(env);
 #ifdef AF_INET6
     if (him->sa_family == AF_INET6) {
         jbyteArray ipaddress;
--- a/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Tue Aug 06 14:01:58 2013 +0100
@@ -106,7 +106,7 @@
 /******************** StreamBuffer definition ************************/
 
 typedef struct streamBufferStruct {
-    jobject stream;            // ImageInputStream or ImageOutputStream
+    jweak ioRef;               // weak reference to a provider of I/O routines
     jbyteArray hstreamBuffer;  // Handle to a Java buffer for the stream
     JOCTET *buf;               // Pinned buffer pointer */
     size_t bufferOffset;          // holds offset between unpin and the next pin
@@ -125,6 +125,15 @@
  */
 #define STREAMBUF_SIZE 4096
 
+#define GET_IO_REF(io_name)                                            \
+    do {                                                               \
+        if ((*env)->IsSameObject(env, sb->ioRef, NULL) ||              \
+            ((io_name) = (*env)->NewLocalRef(env, sb->ioRef)) == NULL) \
+        {                                                              \
+            cinfo->err->error_exit((j_common_ptr) cinfo);              \
+        }                                                              \
+    } while (0)                                                        \
+
 /*
  * Used to signal that no data need be restored from an unpin to a pin.
  * I.e. the buffer is empty.
@@ -159,7 +168,7 @@
     }
 
 
-    sb->stream = NULL;
+    sb->ioRef = NULL;
 
     sb->buf = NULL;
 
@@ -191,9 +200,9 @@
  * All other state is reset.
  */
 static void resetStreamBuffer(JNIEnv *env, streamBufferPtr sb) {
-    if (sb->stream != NULL) {
-        (*env)->DeleteGlobalRef(env, sb->stream);
-        sb->stream = NULL;
+    if (sb->ioRef != NULL) {
+        (*env)->DeleteWeakGlobalRef(env, sb->ioRef);
+        sb->ioRef = NULL;
     }
     unpinStreamBuffer(env, sb, NULL);
     sb->bufferOffset = NO_DATA;
@@ -571,7 +580,7 @@
 static void imageio_set_stream(JNIEnv *env,
                                j_common_ptr cinfo,
                                imageIODataPtr data,
-                               jobject stream){
+                               jobject io){
     streamBufferPtr sb;
     sun_jpeg_error_ptr jerr;
 
@@ -579,13 +588,13 @@
 
     resetStreamBuffer(env, sb);  // Removes any old stream
 
-    /* Now we need a new global reference for the stream */
-    if (stream != NULL) { // Fix for 4411955
-        sb->stream = (*env)->NewGlobalRef(env, stream);
-        if (sb->stream == NULL) {
+    /* Now we need a new weak global reference for the I/O provider */
+    if (io != NULL) { // Fix for 4411955
+        sb->ioRef = (*env)->NewWeakGlobalRef(env, io);
+        if (sb->ioRef == NULL) {
             JNU_ThrowByName(env,
                             "java/lang/OutOfMemoryError",
-                            "Setting Stream");
+                            "Setting I/O provider");
             return;
         }
     }
@@ -895,6 +904,7 @@
     streamBufferPtr sb = &data->streamBuf;
     JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
     int ret;
+    jobject input = NULL;
 
     /* This is where input suspends */
     if (sb->suspendable) {
@@ -920,9 +930,11 @@
      * Now fill a complete buffer, or as much of one as the stream
      * will give us if we are near the end.
      */
+    GET_IO_REF(input);
+
     RELEASE_ARRAYS(env, data, src->next_input_byte);
     ret = (*env)->CallIntMethod(env,
-                                sb->stream,
+                                input,
                                 JPEGImageReader_readInputDataID,
                                 sb->hstreamBuffer, 0,
                                 sb->bufferLength);
@@ -982,6 +994,7 @@
     JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
     jint ret;
     size_t offset, buflen;
+    jobject input = NULL;
 
     /*
      * The original (jpegdecoder.c) had code here that called
@@ -1003,6 +1016,9 @@
     if (src->next_input_byte > sb->buf) {
         memcpy(sb->buf, src->next_input_byte, offset);
     }
+
+    GET_IO_REF(input);
+
     RELEASE_ARRAYS(env, data, src->next_input_byte);
     buflen = sb->bufferLength - offset;
     if (buflen <= 0) {
@@ -1012,7 +1028,7 @@
         return;
     }
 
-    ret = (*env)->CallIntMethod(env, sb->stream,
+    ret = (*env)->CallIntMethod(env, input,
                                 JPEGImageReader_readInputDataID,
                                 sb->hstreamBuffer,
                                 offset, buflen);
@@ -1075,6 +1091,7 @@
     JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
     jlong ret;
     jobject reader;
+    jobject input = NULL;
 
     if (num_bytes < 0) {
         return;
@@ -1104,9 +1121,11 @@
         return;
     }
 
+    GET_IO_REF(input);
+
     RELEASE_ARRAYS(env, data, src->next_input_byte);
     ret = (*env)->CallLongMethod(env,
-                                 sb->stream,
+                                 input,
                                  JPEGImageReader_skipInputBytesID,
                                  (jlong) num_bytes);
     if ((*env)->ExceptionOccurred(env)
@@ -2285,11 +2304,14 @@
     imageIODataPtr data = (imageIODataPtr) cinfo->client_data;
     streamBufferPtr sb = &data->streamBuf;
     JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+    jobject output = NULL;
+
+    GET_IO_REF(output);
 
     RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
 
     (*env)->CallVoidMethod(env,
-                           sb->stream,
+                           output,
                            JPEGImageWriter_writeOutputDataID,
                            sb->hstreamBuffer,
                            0,
@@ -2322,11 +2344,16 @@
     /* find out how much needs to be written */
     /* this conversion from size_t to jint is safe, because the lenght of the buffer is limited by jint */
     jint datacount = (jint)(sb->bufferLength - dest->free_in_buffer);
+
     if (datacount != 0) {
+        jobject output = NULL;
+
+        GET_IO_REF(output);
+
         RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
 
         (*env)->CallVoidMethod(env,
-                               sb->stream,
+                               output,
                                JPEGImageWriter_writeOutputDataID,
                                sb->hstreamBuffer,
                                0,
--- a/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Tue Aug 06 14:01:58 2013 +0100
@@ -2606,38 +2606,37 @@
 
 #define ERR_BAD_IMAGE_LAYOUT (-2)
 
-#define CHECK_DST_ARRAY(start_offset, elements_per_pixel)             \
-    do {                                                              \
-        int offset = (start_offset);                                  \
-        int lastScanOffset;                                           \
-                                                                      \
-        if (!SAFE_TO_MULT(rasterP->scanlineStride,                    \
-                          (rasterP->height - 1)))                     \
-        {                                                             \
-            return ERR_BAD_IMAGE_LAYOUT;                              \
-        }                                                             \
-        lastScanOffset = rasterP->scanlineStride *                    \
-            (rasterP->height - 1);                                    \
-                                                                      \
-        if (!SAFE_TO_ADD(offset, lastScanOffset)) {                   \
-            return ERR_BAD_IMAGE_LAYOUT;                              \
-        }                                                             \
-        lastScanOffset += offset;                                     \
-                                                                      \
-        if (!SAFE_TO_MULT((elements_per_pixel), rasterP->width)) {    \
-            return ERR_BAD_IMAGE_LAYOUT;                              \
-        }                                                             \
-        offset = (elements_per_pixel) * rasterP->width;               \
-                                                                      \
-        if (!SAFE_TO_ADD(offset, lastScanOffset)) {                   \
-            return ERR_BAD_IMAGE_LAYOUT;                              \
-        }                                                             \
-        lastScanOffset += offset;                                     \
-                                                                      \
-        if (dataArrayLength < lastScanOffset) {                       \
-            return ERR_BAD_IMAGE_LAYOUT;                              \
-        }                                                             \
-    } while(0);                                                       \
+#define CHECK_DST_ARRAY(start_offset, elements_per_scan, elements_per_pixel) \
+    do {                                                                     \
+        int offset = (start_offset);                                         \
+        int lastScanOffset;                                                  \
+                                                                             \
+        if (!SAFE_TO_MULT((elements_per_scan),                               \
+                          (rasterP->height - 1)))                            \
+        {                                                                    \
+            return ERR_BAD_IMAGE_LAYOUT;                                     \
+        }                                                                    \
+        lastScanOffset = (elements_per_scan) * (rasterP->height - 1);        \
+                                                                             \
+        if (!SAFE_TO_ADD(offset, lastScanOffset)) {                          \
+            return ERR_BAD_IMAGE_LAYOUT;                                     \
+        }                                                                    \
+        lastScanOffset += offset;                                            \
+                                                                             \
+        if (!SAFE_TO_MULT((elements_per_pixel), rasterP->width)) {           \
+            return ERR_BAD_IMAGE_LAYOUT;                                     \
+        }                                                                    \
+        offset = (elements_per_pixel) * rasterP->width;                      \
+                                                                             \
+        if (!SAFE_TO_ADD(offset, lastScanOffset)) {                          \
+            return ERR_BAD_IMAGE_LAYOUT;                                     \
+        }                                                                    \
+        lastScanOffset += offset;                                            \
+                                                                             \
+        if (dataArrayLength < lastScanOffset) {                              \
+            return ERR_BAD_IMAGE_LAYOUT;                                     \
+        }                                                                    \
+    } while(0);                                                              \
 
 static int
 storeImageArray(JNIEnv *env, BufImageS_t *srcP, BufImageS_t *dstP,
@@ -2665,39 +2664,33 @@
 
     if (hintP->packing == BYTE_INTERLEAVED) {
         /* Write it back to the destination */
-        CHECK_DST_ARRAY(hintP->channelOffset, hintP->numChans);
+        if (rasterP->dataType != BYTE_DATA_TYPE) {
+            /* We are working with a raster which was marked
+               as a byte interleaved due to performance reasons.
+               So, we have to convert the length of the data
+               array to bytes as well.
+            */
+            if (!SAFE_TO_MULT(rasterP->dataSize, dataArrayLength)) {
+                return ERR_BAD_IMAGE_LAYOUT;
+            }
+            dataArrayLength *= rasterP->dataSize;
+        }
+
+        CHECK_DST_ARRAY(hintP->dataOffset, hintP->sStride, hintP->numChans);
         cmDataP = (unsigned char *) mlib_ImageGetData(mlibImP);
         mStride = mlib_ImageGetStride(mlibImP);
         dataP = (unsigned char *)(*env)->GetPrimitiveArrayCritical(env,
                                                       rasterP->jdata, NULL);
         if (dataP == NULL) return 0;
-        cDataP = dataP + hintP->channelOffset;
+        cDataP = dataP + hintP->dataOffset;
         for (y=0; y < rasterP->height;
-             y++, cmDataP += mStride, cDataP += rasterP->scanlineStride)
+             y++, cmDataP += mStride, cDataP += hintP->sStride)
         {
             memcpy(cDataP, cmDataP, rasterP->width*hintP->numChans);
         }
         (*env)->ReleasePrimitiveArrayCritical(env, rasterP->jdata, dataP,
                                               JNI_ABORT);
     }
-    else if (hintP->packing == SHORT_INTERLEAVED) {
-        /* Write it back to the destination */
-        unsigned short *sdataP, *sDataP;
-        unsigned short *smDataP = (unsigned short *)mlib_ImageGetData(mlibImP);
-        CHECK_DST_ARRAY(hintP->channelOffset, hintP->numChans);
-        mStride = mlib_ImageGetStride(mlibImP);
-        sdataP = (unsigned short *)(*env)->GetPrimitiveArrayCritical(env,
-                                                      rasterP->jdata, NULL);
-        if (sdataP == NULL) return -1;
-        sDataP = sdataP + hintP->channelOffset;
-        for (y=0; y < rasterP->height;
-            y++, smDataP += mStride, sDataP += rasterP->scanlineStride)
-        {
-            memcpy(sDataP, smDataP, rasterP->width*hintP->numChans);
-        }
-        (*env)->ReleasePrimitiveArrayCritical(env, rasterP->jdata, sdataP,
-                                              JNI_ABORT);
-    }
     else if (dstP->cmodel.cmType == DIRECT_CM_TYPE) {
         /* Just need to move bits */
         if (mlibImP->type == MLIB_BYTE) {
@@ -3499,7 +3492,7 @@
     }
 
     dataArrayLength = (*env)->GetArrayLength(env, jOutDataP);
-    CHECK_DST_ARRAY(rasterP->chanOffsets[0], 1);
+    CHECK_DST_ARRAY(rasterP->chanOffsets[0], rasterP->scanlineStride, 1);
 
     outDataP = (*env)->GetPrimitiveArrayCritical(env, jOutDataP, 0);
     if (outDataP == NULL) {
@@ -3575,7 +3568,7 @@
     }
 
     dataArrayLength = (*env)->GetArrayLength(env, jOutDataP);
-    CHECK_DST_ARRAY(rasterP->chanOffsets[0], 1);
+    CHECK_DST_ARRAY(rasterP->chanOffsets[0], rasterP->scanlineStride, 1);
 
     outDataP = (*env)->GetPrimitiveArrayCritical(env, jOutDataP, 0);
     if (outDataP == NULL) {
@@ -3651,7 +3644,7 @@
     }
 
     dataArrayLength = (*env)->GetArrayLength(env, jOutDataP);
-    CHECK_DST_ARRAY(rasterP->chanOffsets[0], 1);
+    CHECK_DST_ARRAY(rasterP->chanOffsets[0], rasterP->scanlineStride, 1);
 
     outDataP = (*env)->GetPrimitiveArrayCritical(env, jOutDataP, 0);
     if (outDataP == NULL) {
@@ -3730,7 +3723,7 @@
     }
 
     dataArrayLength = (*env)->GetArrayLength(env, jOutDataP);
-    CHECK_DST_ARRAY(rasterP->chanOffsets[0], 1);
+    CHECK_DST_ARRAY(rasterP->chanOffsets[0], rasterP->scanlineStride, 1);
 
     outDataP = (*env)->GetPrimitiveArrayCritical(env, jOutDataP, 0);
     if (outDataP == NULL) {
@@ -3827,7 +3820,7 @@
         return -1;
     }
     dataArrayLength = (*env)->GetArrayLength(env, jOutDataP);
-    CHECK_DST_ARRAY(rasterP->chanOffsets[0], 1);
+    CHECK_DST_ARRAY(rasterP->chanOffsets[0], rasterP->scanlineStride, 1);
 
     outDataP = (*env)->GetPrimitiveArrayCritical(env, jOutDataP, 0);
     if (outDataP == NULL) {
@@ -3925,7 +3918,7 @@
     }
 
     dataArrayLength = (*env)->GetArrayLength(env, jOutDataP);
-    CHECK_DST_ARRAY(rasterP->chanOffsets[0], 1);
+    CHECK_DST_ARRAY(rasterP->chanOffsets[0], rasterP->scanlineStride, 1);
 
     outDataP = (*env)->GetPrimitiveArrayCritical(env, jOutDataP, 0);
     if (outDataP == NULL) {
--- a/src/solaris/doc/sun/man/man1/java.1	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/solaris/doc/sun/man/man1/java.1	Tue Aug 06 14:01:58 2013 +0100
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH java 1 "20 Mar 2012"
+.TH java 1 "18 Jul 2013"
 
 .LP
 .SH "Name"
@@ -30,9 +30,9 @@
 .nf
 \f3
 .fl
-    \fP\f3java\fP [ options ] class [ argument ... ]
+\fP\f3java\fP [ \f2options\fP ] \f2class\fP [ \f2argument ...\fP ]
 .fl
-    \f3java\fP [ options ] \f3\-jar\fP file.jar [ argument ... ]
+\f3java\fP [ \f2options\fP ] \f3\-jar\fP \f2file.jar\fP [ \f2argument ...\fP ]
 .fl
 .fi
 
@@ -40,26 +40,26 @@
 .RS 3
 .TP 3
 options 
-Command\-line options. 
+Command\-line options. See \f2Options\fP. 
 .TP 3
 class 
-Name of the class to be invoked. 
+The name of the class to be called. 
 .TP 3
 file.jar 
-Name of the jar file to be invoked. Used only with \f2\-jar\fP. 
+The name of the JAR file to be called. Used only with the \f3\-jar\fP command. 
 .TP 3
 argument 
-Argument passed to the \f3main\fP function. 
+The arguments passed to the \f3main\fP function. 
 .RE
 
 .LP
 .SH "DESCRIPTION"
 .LP
 .LP
-The \f3java\fP tool launches a Java application. It does this by starting a Java runtime environment, loading a specified class, and invoking that class's \f3main\fP method.
+The \f3java\fP command starts a Java application. It does this by starting a Java runtime environment, loading a specified class, and calling that class's \f3main\fP method.
 .LP
 .LP
-The method must be declared public and static, it must not return any value, and it must accept a \f2String\fP array as a parameter. The method declaration must look like the following:
+The method must be declared public and static, it must not return any value, and it must accept a String array as a parameter. The method declaration has the following form:
 .LP
 .nf
 \f3
@@ -71,7 +71,7 @@
 
 .LP
 .LP
-By default, the first non\-option argument is the name of the class to be invoked. A fully\-qualified class name should be used. If the \f3\-jar\fP option is specified, the first non\-option argument is the name of a \f3JAR\fP archive containing class and resource files for the application, with the startup class indicated by the \f3Main\-Class\fP manifest header.
+By default, the first argument without an option is the name of the class to be called. A fully qualified class name should be used. If the \f3\-jar\fP option is specified, then the first non\-option argument is the name of a JAR file containing class and resource files for the application, with the startup class indicated by the Main\-Class manifest header.
 .LP
 .LP
 The Java runtime searches for the startup class, and other classes used, in three sets of locations: the bootstrap class path, the installed extensions, and the user class path.
@@ -82,122 +82,99 @@
 .SH "OPTIONS"
 .LP
 .LP
-The launcher has a set of standard options that are supported on the current runtime environment and will be supported in future releases. In addition, the current implementations of the virtual machines support a set of non\-standard options that are subject to change in future releases.
+The launcher has a set of standard options that are supported in the current runtime environment.
 .LP
-.SH "Standard Options"
+.LP
+In addition, the current implementations of the virtual machines support a set of nonstandard options that are subject to change in future releases. See \f2Nonstandard Options\fP.
+.LP
+.SS 
+Standard Options
 .LP
 .RS 3
 .TP 3
 \-client 
-Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM.
+Selects the Java HotSpot Client VM. A 64\-bit capable JDK currently ignores this option and instead uses the Java Hotspot Server VM.
 .br
 .br
-For default VM selection, see 
-.na
-\f2Server\-Class Machine Detection\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+For default Java VM selection, see \f2Server\-Class Machine Detection\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
 .TP 3
 \-server 
-Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit.
+Selects the Java HotSpot Server VM. On a 64\-bit capable JDK, only the Java Hotspot Server VM is supported so the \f3\-\fP\f3server\fP option is implicit.
 .br
 .br
-For default VM selection, see 
-.na
-\f2Server\-Class Machine Detection\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+For default a Java VM selection, see \f2Server\-Class Machine Detection\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
 .TP 3
 \-agentlib:libname[=options] 
-Load native agent library \f2libname\fP, e.g.
-.br
-.br
-\-agentlib:hprof
-.br
-.br
-\-agentlib:jdwp=help
-.br
-.br
-\-agentlib:hprof=help
-.br
-.br
-For more information, see 
-.na
-\f2JVMTI Agent Command Line Options\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
-.TP 3
-\-agentpath:pathname[=options] 
-Load a native agent library by full pathname. For more information, see 
-.na
-\f2JVMTI Agent Command Line Options\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
-.TP 3
-\-classpath classpath 
-.TP 3
-\-cp classpath 
-Specify a list of directories, JAR archives, and ZIP archives to search for class files. Class path entries are separated by colons (\f3:\fP). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f3CLASSPATH\fP environment variable.
-.br
-.br
-If \f3\-classpath\fP and \f3\-cp\fP are not used and \f3CLASSPATH\fP is not set, the user class path consists of the current directory (\f4.\fP).  
-.br
-.br
-As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a java program cannot tell the difference between the two invocations).
-.br
-.br
-For example, if directory \f2foo\fP contains \f2a.jar\fP and \f2b.JAR\fP, then the class path element \f2foo/*\fP is expanded to a \f2A.jar:b.JAR\fP, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A classpath entry consisting simply of \f2*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any classpath wildcard expansion occurs before the Java virtual machine is started \-\- no Java program will ever see unexpanded wildcards except by querying the environment. For example; by invoking \f2System.getenv("CLASSPATH")\fP.  
-.br
-.br
-For more information on class paths, see 
-.na
-\f2Setting the Class Path\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath. 
-.TP 3
-\-Dproperty=value 
-Set a system property value. 
-.TP 3
-\-d32 
-.TP 3
-\-d64 
-Request that the program to be run in a 32\-bit or 64\-bit environment, respectively. If the requested environment is not installed or is not supported, an error is reported.
-.br
-.br
-Currently only the Java HotSpot Server VM supports 64\-bit operation, and the "\-server" option is implicit with the use of \-d64. And the "\-client" option is ignored with the use of \-d64. This is subject to change in a future release.
-.br
-.br
-If neither \f3\-d32\fP nor \f3\-d64\fP is specified, the default is to run in a 32\-bit environment, except for 64\-bit only systems. This is subject to change in a future release. 
-.TP 3
-\-enableassertions[:<package name>"..." | :<class name> ] 
-.TP 3
-\-ea[:<package name>"..." | :<class name> ] 
-.TP 3
-\-disableassertions[:<package name>"..." | :<class name> ] 
-.TP 3
-\-da[:<package name>"..." | :<class name> ] 
-Disable assertions. This is the default.
-.br
-.br
-With no arguments, \f3disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f2"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch disables assertions in the specified class.
-.br
-.br
-To run a program with assertions enabled in package \f2com.wombat.fruitbat\fP but disabled in class \f2com.wombat.fruitbat.Brickbat\fP, the following command could be used: 
+Loads native agent library \f2libname\fP, for example: 
 .nf
 \f3
 .fl
-java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat \fP\f4<Main Class>\fP\f3
+\-agentlib:hprof
+.fl
+ 
+.fl
+\-agentlib:jdwp=help
+.fl
+ 
+.fl
+\-agentlib:hprof=help
 .fl
 \fP
 .fi
-The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. 
+See \f2JVMTI Agent Command\-Line Options\fP at http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting 
+.TP 3
+\-agentpath:pathname[=options] 
+Loads a native agent library by full \f2pathname\fP. See \f2JVMTI Command\-Line Options\fP at http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting 
+.TP 3
+\-classpath classpath, \-cp classpath 
+Specifies a list of directories, JAR files, and ZIP archives to search for class files. Separate class path entries with colons (:). Specifying \f3\-classpath\fP or \f3\-cp\fP overrides any setting of the \f2CLASSPATH\fP environment variable.
+.br
+.br
+If \f3\-classpath\fP and \f3\-cp\fP are not used and \f2CLASSPATH\fP is not set, then the user class path consists of the current directory (.).
+.br
+.br
+As a special convenience, a class path element that contains a base name of \f3*\fP is considered equivalent to specifying a list of all the files in the directory with the extension .jar or .JAR. A Java program cannot tell the difference between the two invocations.
+.br
+.br
+For example, if directory mydir contains a.jar and b.JAR, then the class path element \f3mydir/*\fP is expanded to a A.jar:b.JAR, except that the order of jar files is unspecified. All jar files in the specified directory, even hidden ones, are included in the list. A class path entry consisting simply of \f3*\fP expands to a list of all the jar files in the current directory. The \f2CLASSPATH\fP environment variable, where defined, will be similarly expanded. Any class path wildcard expansion occurs before the Java VM is started. No Java program will ever see wild cards that are not expanded except by querying the environment. For example, by calling \f3System.getenv("CLASSPATH")\fP. 
+.TP 3
+\-Dproperty=value 
+Sets a system property value. 
+.TP 3
+\-d32 
+Run the application in a 32\-bit environment. If a 32\-bit environment is not installed or is not supported, an error will be reported. By default, the application is run in a 32\-bit environment unless a 64\-bit only system is used. 
+.TP 3
+\-d64 
+Run the application in a 64\-bit environment. If a 64\-bit environment is not installed or is not supported, an error will be reported. By default, the application is run in a 32\-bit environment unless a 64\-bit only system is used.
+.br
+.br
+Currently only the Java HotSpot Server VM supports 64\-bit operation, and the \f3\-server\fP option is implicit with the use of \f3\-d64\fP. The \f3\-client\fP option is ignored with the use of \f3\-d64\fP. This is subject to change in a future release. 
+.TP 3
+\-disableassertions[:package name"..." | :class name ], \-da[:package name"..." | :class name ] 
+Disable assertions. This is the default.
+.br
+.br
+With no arguments, \f3\-disableassertions\fP or \f3\-da\fP disables assertions. With one argument ending in \f3"..."\fP, the switch disables assertions in the specified package and any subpackages. If the argument is \f3"..."\fP, then the switch disables assertions in the unnamed package in the current working directory. With one argument not ending in \f3"..."\fP, the switch disables assertions in the specified class.
+.br
+.br
+To run a program with assertions enabled in \f3package com.wombat.fruitbat\fP but disabled in class \f3com.wombat.fruitbat.Brickbat\fP, the following command could be used: 
+.nf
+\f3
+.fl
+java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat <Main Class>
+.fl
+\fP
+.fi
+The \f3\-disableassertions\fP and \f3\-da\fP switches apply to all class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do not apply to system. This makes it easy to turn on asserts in all classes except for system classes. The \f3\-disablesystemassertions\fP option provides a separate swith to enable assertions in all system classes. 
+.TP 3
+\-enableassertions[:package name"..." | :class name ], \-ea[:package name"..." | :class name ] 
 Enable assertions. Assertions are disabled by default.
 .br
 .br
-With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
+With no arguments, \f3\-enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f3"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is \f3"..."\fP, then the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f3"..."\fP, the switch enables assertions in the specified class.
 .br
 .br
-If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used: 
+If a single command contains multiple instances of these switches, then they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package com.wombat.fruitbat (and any subpackages), the following command could be used: 
 .nf
 \f3
 .fl
@@ -205,76 +182,63 @@
 .fl
 \fP
 .fi
-The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. 
+The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to all class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do not apply to system. This makes it easy to turn on asserts in all classes except for system classes. The \f3\-enablesystemassertions\fP option provides a separate switch to enable assertions in all system classes. 
 .TP 3
-\-enablesystemassertions 
+\-enablesystemassertions, \-esa 
+Enable assertions in all system classes (sets the default assertion status for system classes to true). 
 .TP 3
-\-esa 
-Enable asserts in all system classes (sets the \f2default assertion status\fP for system classes to \f2true\fP). 
-.TP 3
-\-disablesystemassertions 
-.TP 3
-\-dsa 
-Disables asserts in all system classes. 
+\-disablesystemassertions, \-dsa 
+Disables assertions in all system classes. 
 .TP 3
 \-help or \-? 
-Display usage information and exit. 
+Displays usage information and exit. 
 .TP 3
 \-jar 
-Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the 
-.na
-\f2Java Tutorial\fP @
-.fi
-http://docs.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests.\ 
+Executes a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. For this option to work, the manifest of the JAR file must contain a line in the form \f3Main\-Class\fP: \f2classname\fP. Here, \f2classname\fP identifies the class with the \f3public static void main(String[] args)\fP method that serves as your application's starting point.
 .br
 .br
 When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
 .br
 .br
-Note that JAR files that can be run with the "java \-jar" option can have their execute permissions set so they can be run without using "java \-jar". Refer to 
-.na
-\f2Java Archive (JAR) Files\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/jar/index.html. 
+JAR files that can be run with the \f3java \-jar\fP option can have their execute permissions set so they can be run without using \f3java \-jar\fP. See \f2JAR File Overview\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html 
 .TP 3
 \-javaagent:jarpath[=options] 
-Load a Java programming language agent, see 
+Loads a Java programming language agent. For more information about instrumenting Java applications, see the java.lang.instrument package description in the Java API documentation at
+.br
 .na
-\f2java.lang.instrument\fP @
+\f2http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html\fP @
 .fi
-http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html. 
+http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html 
 .TP 3
 \-jre\-restrict\-search 
-Include user\-private JREs in the version search. 
+Includes user\-private JREs in the version search. 
 .TP 3
 \-no\-jre\-restrict\-search 
-Exclude user\-private JREs in the version search. 
+Excludes user\-private JREs in the version search. 
 .TP 3
 \-showversion 
-Display version information and continue. (See also \f3\-version\fP.) 
+Displays version information and continues. 
 .TP 3
 \-splash:imagepath 
-Show splash screen with image specified by \f2imagepath\fP. 
+Shows splash screen with image specified by \f2imagepath\fP. 
 .TP 3
-\-verbose 
-.TP 3
-\-verbose:class 
-Display information about each class loaded. 
+\-verbose, \-verbose:class 
+Displays information about each class loaded. 
 .TP 3
 \-verbose:gc 
-Report on each garbage collection event. 
+Reports on each garbage collection event. 
 .TP 3
 \-verbose:jni 
-Report information about use of native methods and other Java Native Interface activity. 
+Reports information about use of native methods and other Java Native Interface activity. 
 .TP 3
 \-version 
-Display version information and exit. (See also \f3\-showversion\fP.) 
+Displays version information and exits. See also the \f3\-showversion\fP option. 
 .TP 3
 \-version:release 
-Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used.
+Specifies that the version specified by the release is required by the class or JAR file specified on the command line. If the version of the \f3java\fP command called does not meet this specification and an appropriate implementation is found on the system, then the appropriate implementation will be used.
 .br
 .br
-\f2release\fP not only can specify an exact version, but can also specify a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a version\-id, a version\-id followed by a star (*), a version\-id followed by a plus sign (+) , or two version\-ranges combined using an ampersand (&). The star means prefix match, the plus sign means this version or greater, and the ampersand means the logical anding of the two version\-ranges. For example: 
+The \f3release\fP option specifies an exact version and a list of versions called a version string. A version string is an ordered list of version ranges separated by spaces. A version range is either a \f2version\-id\fP, a \f2version\-id\fP followed by an asterisk (\f3*\fP), a \f2version\-id\fP followed by a plus sign (\f3+\fP), or a version range that consists of two \f2version\-ids\fP combined using an ampersand (\f3&\fP). The asterisk means prefix match, the plus sign means this version or greater, and the ampersand means the logical \f3and\fP of the two version\-ranges, for example: 
 .nf
 \f3
 .fl
@@ -282,13 +246,13 @@
 .fl
 \fP
 .fi
-The meaning of the above is that the class or jar file requires either version 1.6.0_13, or a version with 1.6 as a version\-id prefix and that is not less than 1.6.0_10.. The exact syntax and definition of version strings may be found in Appendix A of the Java Network Launching Protocol & API Specification (JSR\-56).
+The meaning of the previous example is that the class or JAR file requires either version 1.6.0_13, or a version with 1.6 as a \f2version\-id\fP prefix and that is not less than 1.6.0_10. The exact syntax and definition of version strings can be found in Appendix A of the \f2Java Network Launching Protocol & API Specification (JSR\-56)\fP.
 .br
 .br
-For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line.
+For JAR files, the preference is to specify version requirements in the JAR file manifest rather than on the command line.
 .br
 .br
-See the following NOTES section for important policy information on the use of this option. 
+See \f2Notes\fP for important policy information on the use of this option. 
 .RE
 
 .LP
@@ -298,213 +262,211 @@
 .RS 3
 .TP 3
 \-X 
-Display information about non\-standard options and exit. 
+Displays information about nonstandard options and exits. 
 .TP 3
 \-Xint 
-Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode. 
+Operates in interpreted\-only mode. Compilation to native code is disabled, and all bytecode is executed by the interpreter. The performance benefits offered by the Java HotSpot Client VM adaptive compiler is not present in this mode. 
 .TP 3
 \-Xbatch 
-Disable background compilation. Normally the VM will compile the method as a background task, running the method in interpreter mode until the background compilation is finished. The \f2\-Xbatch\fP flag disables background compilation so that compilation of all methods proceeds as a foreground task until completed. 
+Disables background compilation. Typically, the Java VM compiles the method as a background task, running the method in interpreter mode until the background compilation is finished. The \-Xbatch flag disables background compilation so that compilation of all methods proceeds as a foreground task until completed. 
 .TP 3
 \-Xbootclasspath:bootclasspath 
-Specify a colon\-separated list of directories, JAR archives, and ZIP archives to search for boot class files. These are used in place of the boot class files included in the Java platform JDK. \f2Note: Applications that use this option for the purpose of overriding a class in rt.jar should not be deployed as doing so would contravene the Java Runtime Environment binary code license.\fP 
+Specifies a colon\-separated list of directories, JAR files, and ZIP archives to search for boot class files. These are used in place of the boot class files included in the Java platform JDK.
+.br
+.br
+Applications that use this option for the purpose of overriding a class in rt.jar should not be deployed because doing so would contravene the Java Runtime Environment binary code license. 
 .TP 3
 \-Xbootclasspath/a:path 
-Specify a colon\-separated path of directires, JAR archives, and ZIP archives to append to the default bootstrap class path. 
+Specifies a colon\-separated path of directories, JAR files, and ZIP archives to append to the default bootstrap class path. 
 .TP 3
 \-Xbootclasspath/p:path 
-Specify a colon\-separated path of directires, JAR archives, and ZIP archives to prepend in front of the default bootstrap class path. \f2Note: Applications that use this option for the purpose of overriding a class in rt.jar should not be deployed as doing so would contravene the Java Runtime Environment binary code license.\fP 
+Specifies a colon\-separated path of directories, JAR files, and ZIP archives to add in front of the default bootstrap class path.
+.br
+.br
+Do not deploy applications that use this option to override a class in rt.jar because this violates the Java Runtime Environment binary code license. 
 .TP 3
 \-Xcheck:jni 
-Perform additional checks for Java Native Interface (JNI) functions. Specifically, the Java Virtual Machine validates the parameters passed to the JNI function as well as the runtime environment data before processing the JNI request. Any invalid data encountered indicates a problem in the native code, and the Java Virtual Machine will terminate with a fatal error in such cases. Expect a performance degradation when this option is used. 
+Performs additional checks for Java Native Interface (JNI) functions. Specifically, the Java Virtual Machine validates the parameters passed to the JNI function and the runtime environment data before processing the JNI request. Any invalid data encountered indicates a problem in the native code, and the Java Virtual Machine will terminate with a fatal error in such cases. Expect a performance degradation when this option is used. 
 .TP 3
 \-Xfuture 
-Perform strict class\-file format checks. For purposes of backwards compatibility, the default format checks performed by the JDK's virtual machine are no stricter than the checks performed by 1.1.x versions of the JDK software. The \f3\-Xfuture\fP flag turns on stricter class\-file format checks that enforce closer conformance to the class\-file format specification. Developers are encouraged to use this flag when developing new code because the stricter checks will become the default in future releases of the Java application launcher. 
+Performs strict class\-file format checks. For backward compatibility, the default format checks performed by the Java virtual machine are no stricter than the checks performed by 1.1.x versions of the JDK software. The \f3\-Xfuture\fP option turns on stricter class\-file format checks that enforce closer conformance to the class\-file format specification. Developers are encouraged to use this flag when developing new code because the stricter checks will become the default in future releases of the Java application launcher. 
 .TP 3
 \-Xnoclassgc 
-Disable class garbage collection. Use of this option will prevent memory recovery from loaded classes thus increasing overall memory usage. This could cause OutOfMemoryError to be thrown in some applications. 
+Disables class garbage collection. Use of this option preven memory recovery from loaded classes thus increasing overall memory usage. This could cause \f3OutOfMemoryError\fP to be thrown in some applications. 
 .TP 3
 \-Xincgc 
-Enable the incremental garbage collector. The incremental garbage collector, which is off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program. 
+Enables the incremental garbage collector. The incremental garbage collector, which is turned off by default, will reduce the occasional long garbage\-collection pauses during program execution. The incremental garbage collector will at times execute concurrently with the program and during such times will reduce the processor capacity available to the program. 
 .TP 3
 \-Xloggc:file 
-Report on each garbage collection event, as with \-verbose:gc, but log this data to \f2file\fP. In addition to the information \f2\-verbose:gc\fP gives, each reported event will be preceeded by the time (in seconds) since the first garbage\-collection event.
+Reports on each garbage collection event, as with \f3\-verbose:gc\fP, but logs this data to a file. In addition to the information \f3\-verbose:gc\fP gives, each reported event will be preceded by the time (in seconds) since the first garbage\-collection event.
 .br
 .br
-Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. 
+Always use a local file system for storage of this file to avoid stalling the Java VM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f3\-verbose:gc\fP when both are specified on the command line. 
 .TP 3
 \-Xmnsize or \-XX:NewSize 
 Sets the size of the young generation (nursery). 
 .TP 3
 \-Xmsn 
-Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see 
-.na
-\f2HotSpot Ergonomics\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+Specifies the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1 MB. Append the letter \f3k\fP or \f3K\fP to indicate kilobytes, or \f3m\fP or \f3M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. See \f2Garbage Collector Ergonomics\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
 .br
 .br
 Examples: 
 .nf
 \f3
 .fl
-       \-Xms6291456
+\-Xms6291456
 .fl
-       \-Xms6144k
+\-Xms6144k
 .fl
-       \-Xms6m
-.fl
-
+\-Xms6m
 .fl
 \fP
 .fi
 .TP 3
 \-Xmxn 
-Specify the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see 
-.na
-\f2HotSpot Ergonomics\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+Specifies the maximum size, in bytes, of the memory allocation pool. This value must a multiple of 1024 greater than 2 MB. Append the letter \f3k\fP or \f3K\fP to indicate kilobytes, or \f3m\fP or \f3M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration.
+.br
+.br
+For server deployments, \f3\-Xms\fP and \f3\-Xmx\fP are often set to the same value. See \f2Garbage Collector Ergonomics\fP at http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
 .br
 .br
 Examples: 
 .nf
 \f3
 .fl
-       \-Xmx83886080
+\-Xmx83886080
 .fl
-       \-Xmx81920k
+\-Xmx81920k
 .fl
-       \-Xmx80m
-.fl
-
+\-Xmx80m
 .fl
 \fP
 .fi
-On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000m minus overhead amounts. 
+On Solaris 7 and Solaris 8 SPARC platforms, the upper limit for this value is approximately 4000 m minus overhead amounts. On Solaris 2.6 and x86 platforms, the upper limit is approximately 2000 m minus overhead amounts. On Linux platforms, the upper limit is approximately 2000 m minus overhead amounts. 
 .TP 3
 \-Xprof 
-Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems.  
+Profiles the running program, and sends profiling data to standard output. This option is provided as a utility that is useful in program development and is not intended to be used in production systems. 
 .TP 3
 \-Xrs 
-Reduces use of operating\-system signals by the Java virtual machine (JVM).
+Reduces use of operating\-system signals by the Java VM.
 .br
 .br
-In a previous release, the Shutdown Hooks facility was added to allow orderly shutdown of a Java application. The intent was to allow user cleanup code (such as closing database connections) to run at shutdown, even if the JVM terminates abruptly.
+In an earlier release, the Shutdown Hooks facility was added to enable orderly shutdown of a Java application. The intent was to enable user cleanup code (such as closing database connections) to run at shutdown, even if the Java VM terminates abruptly.
 .br
 .br
-Sun's JVM catches signals to implement shutdown hooks for abnormal JVM termination. The JVM uses SIGHUP, SIGINT, and SIGTERM to initiate the running of shutdown hooks.
+The Java VM catches signals to implement shutdown hooks for unexpected Java VM termination. The Java VM uses \f3SIGHUP\fP, \f3SIGINT\fP, and \f3SIGTERM\fP to initiate the running of shutdown hooks.
 .br
 .br
-The JVM uses a similar mechanism to implement the pre\-1.2 feature of dumping thread stacks for debugging purposes. Sun's JVM uses SIGQUIT to perform thread dumps.
+The JVM uses a similar mechanism to implement the feature of dumping thread stacks for debugging purposes. The JVM uses \f3SIGQUIT\fP to perform thread dumps.
 .br
 .br
-Applications embedding the JVM frequently need to trap signals like SIGINT or SIGTERM, which can lead to interference with the JVM's own signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on Sun's JVM, the signal masks for SIGINT, SIGTERM, SIGHUP, and SIGQUIT are not changed by the JVM, and signal handlers for these signals are not installed.
+Applications embedding the Java VM frequently need to trap signals such as \f3SIGINT\fP or \f3SIGTERM\fP, which can lead to interference with the Java VM signal handlers. The \f3\-Xrs\fP command\-line option is available to address this issue. When \f3\-Xrs\fP is used on the Java VM, the signal masks for \f3SIGINT\fP, \f3SIGTERM\fP, \f3SIGHUP\fP, and \f3SIGQUIT\fP are not changed by the Java VM, and signal handlers for these signals are not installed.
 .br
 .br
 There are two consequences of specifying \f3\-Xrs\fP: 
 .RS 3
 .TP 2
 o
-SIGQUIT thread dumps are not available. 
+\f3SIGQUIT\fP thread dumps are not available. 
 .TP 2
 o
-User code is responsible for causing shutdown hooks to run, for example by calling System.exit() when the JVM is to be terminated. 
+User code is responsible for causing shutdown hooks to run, for example by calling \f3System.exit()\fP when the Java VM is to be terminated. 
 .RE
 .TP 3
 \-Xssn 
-Set thread stack size. 
+Sets the thread stack size. 
 .TP 3
 \-XX:AllocationPrefetchStyle=n 
-Sets the style of prefetch used during allocation. default=2.
-.br
+Sets the style of prefetch used during allocation. default=2. 
 .TP 3
 \-XX:+AggressiveOpts 
-Enables aggressive optimization.
-.br
+Enables aggressive optimization. 
 .TP 3
 \-XX:+|\-DisableAttachMechanism 
-This option specifies whether tools (such as \f2jmap\fP and \f2jconsole\fP) are allowed to attach to the JVM. By default, this feature is disabled. That is, attaching is enabled. Example usage: 
+Specifies whether commands (such as \f3jmap\fP and \f3jconsole\fP) can attach to the Java VM. By default, this feature is disabled. That is, attaching is enabled, for example: 
 .nf
 \f3
 .fl
-      java \-XX:+DisableAttachMechanism
+java \-XX:+DisableAttachMechanism
 .fl
 \fP
 .fi
 .TP 3
 \-XXLargePageSizeInBytes=n 
-This option specifies the maximum size for large pages. 
+Specifies the maximum size for large pages. 
 .TP 3
 \-XX:MaxGCPauseMillis=n 
 Sets a target for the maximum GC pause time.
 .br
-This is a soft goal, and the JVM will make its best effort to achieve it. 
+.br
+This is a soft goal, and the Java VM will make its best effort to achieve it. There is no maximum value set by default. 
 .TP 3
 \-XX:NewSize 
-Sets the size of the young generation (nursery). Sames as \f3\-Xmn\fP\f4size\fP. 
+Sets the size of the young generation (nursery). Sames as \f3\-Xmnsize\fP. 
 .TP 3
 \-XX:ParallelGCThreads=n 
-Sets the number of GC threads in the parallel collectors.
-.br
+Sets the number of GC threads in the parallel collectors. 
 .TP 3
 \-XX:PredictedClassLoadCount=n 
-This option requires that the \f3UnlockExperimentalVMOptions\fP flag be set first. Use the \f3PredictedClassLoadCount\fP flag if your application loads a lot of classes, and especially if \f3class.forName()\fP is used heavily. The recommended value is the number of classes loaded as shown in the output from \f3\-verbose:class\fP.
+This option requires that the \f3UnlockExperimentalVMOptions\fP flag be set first. Use the \f3PredictedClassLoadCount\fP flag if your application loads a lot of classes and especially if \f3class.forName()\fP is used heavily. The recommended value is the number of classes loaded as shown in the output from \f3\-verbose:class\fP.
 .br
-Example usage: 
+.br
+Example: 
 .nf
 \f3
 .fl
-      java \-XX:+UnlockExperimentalVMOptions \-XX:PredictedClassLoadCount=60013
+java \-XX:+UnlockExperimentalVMOptions \-XX:PredictedClassLoadCount=60013
 .fl
 \fP
 .fi
 .TP 3
 \-XX:+PrintCompilation 
-Prints verbose output from the HotSpot dynamic runtime compiler.
-.br
+Prints verbose output from the Java HotSpot VM dynamic runtime compiler. 
 .TP 3
 \-XX:+PrintGCDetails \-XX:+PrintGCTimeStamps 
-Prints garbage collection output along with time stamps.
-.br
+Prints garbage collection output along with time stamps. 
 .TP 3
 \-XX:SoftRefLRUPolicyMSPerMB=0 
-This flag enables aggressive processing of software references. Use this flag if HotSpot GC is impacted by the software reference count. 
+This flag enables aggressive processing of software references. Use this flag if the software reference count has an impact on the Java HotSpot VM garbage collector. 
 .TP 3
 \-XX:TLABSize=n 
-Thread local allocation buffers (TLAB) are enabled by default in HotSpot. HotSpot automatically sizes TLABs based on allocation patterns. The \f3\-XX:TLABSize\fP option allows fine\-tuning the size of TLABs.
-.br
+Thread local allocation buffers (TLAB) are enabled by default in the Java HotSpot VM. The Java HotSpot VM sizes TLABs based on allocation patterns. The \f3\-XX:TLABSize\fP option enables fine\-tuning the size of TLABs. 
 .TP 3
 \-XX:+UseAltSigs 
-The VM uses \f2SIGUSR1\fP and \f2SIGUSR2\fP by default, which can sometimes conflict with applications that signal\-chain \f2SIGUSR1\fP and \f2SIGUSR2\fP. The \f2\-XX:+UseAltSigs\fP option will cause the VM to use signals other than \f2SIGUSR1\fP and \f2SIGUSR2\fP as the default. 
+The Java VM uses \f3SIGUSR1\fP and \f3SIGUSR2\fP by default, which can sometimes conflict with applications that signal\-chain \f3SIGUSR1\fP and \f3SIGUSR2\fP. The \f3\-XX:+UseAltSigs\fP option causes the Java VM to use signals other than \f3SIGUSR1\fP and \f3SIGUSR2\fP as the default. 
 .TP 3
 \-XX:+|\-UseCompressedOops 
-Enables compressed references in 64\-bit JVMs.
+Enables compressed references in 64\-bit Java VMs.
 .br
-This option is true by default.
 .br
+This option is true by default. 
 .TP 3
 \-XX:+UseConcMarkSweepGC or \-XX:+UseG1GC 
-These flags enable either the Concurrent Mark Sweep (CMS) or the G1 garbage collectors.
-.br
+Enables either the Concurrent Mark Sweep (CMS) or the G1 garbage collectors. 
 .TP 3
 \-XX:+|\-UseLargePages 
-Use this flag to enable large page support. Large pages are enabled by default on Solaris.
+Enables large page support.
 .br
+.br
+Large pages are enabled by default on Solaris. 
 .TP 3
 \-XX:+UseParallelOldGC 
-Enables the parallel garbage collectors, which are optimized for throughput and average response time.
-.br
-.SH "NOTES" 
+Enables the parallel garbage collectors, which are optimized for throughput and average response time. 
+.RE
+
 .LP
-The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: 
+.SH "NOTES"
+.LP
+.LP
+The \f2\-version:release\fP option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
+.LP
 .RS 3
 .TP 3
 1.
 Any version, represented by not using this option. 
 .TP 3
 2.
-Any version greater than an arbitrarily precise version\-id. For example: 
+Any version greater than an arbitrarily precise \f2version\-i\fPd value, for example: 
 .nf
 \f3
 .fl
@@ -512,10 +474,10 @@
 .fl
 \fP
 .fi
-This would utilize any version greater than \f21.6.0_10\fP. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. 
+This would utilize any version greater than 1.6.0_10. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified. 
 .TP 3
 3.
-A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family. For example: 
+A version greater than an arbitrarily precise version\-id, bounded by the upper bound of that release family, for example: 
 .nf
 \f3
 .fl
@@ -525,7 +487,7 @@
 .fi
 .TP 3
 4.
-"Or" expressions of items 2. or 3. above. For example: 
+An \f3or\fP expressions of items 2 or 3, for example: 
 .nf
 \f3
 .fl
@@ -533,20 +495,56 @@
 .fl
 \fP
 .fi
-Similar to item 2. this is useful when a change was introduced in a release (1.7) but also made available in updates to previous releases. 
+Similar to item 2. This is useful when a change was introduced in a release (1.7) but also made available in updates to earlier releases. 
 .RE
-.SH "EXIT STATUS" 
+
 .LP
-The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP. 
+.SH "Performance Tuning Examples"
+.LP
+.LP
+The following examples show how to use experimental tuning flags to optimize either throughput or faster response time.
+.LP
+.SS 
+Example 1, Tuning for Higher Throughput
+.LP
+.nf
+\f3
+.fl
+        java \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g 
+.fl
+\fP
+.fi
+
+.LP
+.SS 
+Example 2, Tuning for Lower Response Time
+.LP
+.nf
+\f3
+.fl
+        java \-d64 \-XX:+UseG1GC \-Xms26g Xmx26g \-XX:MaxGCPauseMillis=500 \-XX:+PrintGCTimeStamps 
+.fl
+\fP
+.fi
+
+.LP
+.SH "EXIT STATUS"
+.LP
+.LP
+The following exit values are typically returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f3System.exit(exitValue)\fP.
+.LP
 .RS 3
 .TP 2
 o
-\f20\fP: Successful completion 
+\f30\fP: Successful completion 
 .TP 2
 o
-\f2>0\fP: An error occurred 
+\f3>0\fP: An error occurred 
 .RE
-.SH "SEE ALSO" 
+
+.LP
+.SH "SEE ALSO"
+.LP
 .RS 3
 .TP 2
 o
@@ -560,25 +558,6 @@
 .TP 2
 o
 jar(1) 
-.TP 2
-o
-.na
-\f2The Java Extensions Framework\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
-.TP 2
-o
-.na
-\f2Security Features\fP @
-.fi
-http://docs.oracle.com/javase/7/docs/technotes/guides/security/index.html. 
-.TP 2
-o
-.na
-\f2HotSpot VM Specific Options\fP @
-.fi
-http://java.sun.com/docs/hotspot/VMOptions.html. 
-.RE
 .RE
 
 .LP
--- a/src/solaris/doc/sun/man/man1/jcmd.1	Fri Aug 02 17:57:00 2013 +0400
+++ b/src/solaris/doc/sun/man/man1/jcmd.1	Tue Aug 06 14:01:58 2013 +0100
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,60 +19,79 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jcmd 1 "10 Jul 2012"
+.TH jcmd 1 "18 Jul 2013"
 
 .LP
 .SH "Name"
-jcmd \- Diagnostic Command
-.LP
-.LP
-\f3jcmd\fP is a utility to send diagnostic command requests to a running Java Virtual Machine.
+jcmd \- Sends diagnostic command requests to a running Java Virtual Machine
 .LP
 .SH "SYNOPSIS"
 .LP
 .nf
 \f3
 .fl
-    \fP\f3jcmd\fP [ option ] 
+\fP\f3jcmd\fP [ \f2options\fP ]
 .fl
-    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> PerfCounter.print
+\f3jcmd\fP [ \f2pid\fP | \f2main\-class\fP ] \f3PerfCounter.print\fP
 .fl
-    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \f2command\fP [\f2arguments\fP]
+\f3jcmd\fP [ \f2pid\fP | \f2main\-class\fP ] \f2command [arguments]\fP
 .fl
-    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \-f \f2file\fP
+\f3jcmd\fP [ \f2pid\fP | \f2main\-class\fP ] \f3\-f\fP \f2file\fP
 .fl
 .fi
 
 .LP
+.RS 3
+.TP 3
+options 
+The command\-line options. See Options. 
+.TP 3
+pid 
+Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.TP 3
+main\-class 
+The main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring is matched. If several running Java processes share the same main class, then the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.TP 3
+command [arguments] 
+The main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring is matched. If several running Java processes share the same main class, then the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.TP 3
+Perfcounter.print 
+Print the performance counters available on the targeted Java processes. The list of performance counters might vary with the Java process. 
+.TP 3
+\-f file 
+Read commands from \f2file\fP and call them on the targeted Java processes. In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been called or when a line containing the \f3stop\fP keyword is read. 
+.RE
+
+.LP
 .SH "DESCRIPTION"
 .LP
 .LP
 \f3jcmd\fP is a utility to send diagnostic command requests to a Java Virtual Machine supporting this feature.
 .LP
 .LP
-Used without arguments or with the \-l option, jcmd prints the list of running Java processes with their process id, their main class and their command line arguments.
+Used without arguments or with the \f3\-l\fP option, \f3jcmd\fP prints the list of running Java processes with their process ID, their main class and their command\-line arguments.
 .LP
 .LP
-When a process id is specified on the command line, jcmd sends the diagnostic command request to the process with this id.
+When a process ID is specified on the command line, \f3jcmd\fP sends the diagnostic command request to the process with this ID.
 .LP
 .LP
-When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes for which the command line argument is a substring of the Java process' main class.
+When a main class is specified on the command line, \f3jcmd\fP sends the diagnostic command request to all Java processes for which the command\-line argument is a substring of the Java process' main class.
 .LP
 .LP
-With the PerfCounter.print argument, jcmd prints the performance counters available on the targeted Java process(es).
+With the \f3PerfCounter.print\fP argument, \f3jcmd\fP prints the performance counters available on the targeted Java processes.
 .LP
 .LP
-With the \-f option, jcmd sends to the targeted Java process(es) the diagnostic commands stored in the file \f2file\fP.
+With the \f3\-f\fP option, \f3jcmd\fP sends to the targeted Java processes the diagnostic commands stored in the specified \f3file\fP.
 .LP
 .SH "OPTIONS"
 .LP
 .LP
-Options are mutually exclusive. Options, if used, should follow immediately after the command name.
+Options are mutually exclusive. Options, when used, must immediately follow the command name.
 .LP
 .RS 3
 .TP 3
 \-l 
-Prints the list of running Java processes with their process id, their main class and their command line arguments. 
+Prints the list of running Java processes with their process IDs, their main classes, and their command\-line arguments. 
 .TP 3
 \-h 
 Prints a help message. 
@@ -82,37 +101,13 @@
 .RE
 
 .LP
-.SH "PARAMETERS"
-.LP
-.RS 3
-.TP 3
-pid 
-Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
-.TP 3
-main class 
-Main class of the process that receives the diagnostic command requests. When matching processes, any process whose main class name contains the specified string as a substring will be matched. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
-.TP 3
-command [arguments] 
-Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the the command name followed by \f3help\fP. 
-.TP 3
-PerfCounter.print 
-Print the performance counters available on the targeted Java process(es). The list of performance counters may vary with the Java process. 
-.TP 3
-\-f file 
-Read commands from \f2file\fP and invoke them on the targeted Java process(es). In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been invoked or when a line containing the \f3stop\fP keyword is read. 
-.RE
-
-.LP
 .SH "SEE ALSO"
 .LP
 .RS 3
 .TP 2
 o
-jps(1) 
+jps 
 .RE
 
 .LP
-.LP
-jps(1)
-.LP
  
--- a/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java	Fri Aug 02 17:57:00 2013 +0400
+++ b/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java	Tue Aug 06 14:01:58 2013 +0100
@@ -29,6 +29,7 @@
  * @build  ResourceBundleSearchTest IndirectlyLoadABundle LoadItUp1 LoadItUp2 TwiceIndirectlyLoadABundle LoadItUp2Invoker
  * @run main/othervm ResourceBundleSearchTest
  * @run main/othervm -Djdk.logging.allowStackWalkSearch=true ResourceBundleSearchTest
+ * @run main/othervm -Djdk.reflect.allowGetCallerClass=false -Djdk.logging.allowStackWalkSearch=true ResourceBundleSearchTest
  */
 import java.net.URL;
 import java.net.URLClassLoader;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java	Tue Aug 06 14:01:58 2013 +0100
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug     8020983
+ * @summary Test verifies that jpeg writer instances are collected
+ *          even if destroy() or reset() methods is not invoked.
+ *
+ * @run main JpegWriterLeakTest
+ */
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Random;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
+
+public class JpegWriterLeakTest {
+
+    public static void main(String[] args) {
+        final ReferenceQueue<ImageWriter> queue = new ReferenceQueue<>();
+        final ArrayList<Reference<? extends ImageWriter>> refs = new ArrayList<>();
+
+        int count = 2;
+
+        do {
+            ImageWriter writer =
+                    ImageIO.getImageWritersByFormatName("jpeg").next();
+
+            final WeakReference<? extends ImageWriter> ref =
+                    new WeakReference<>(writer, queue);
+
+            refs.add(ref);
+
+
+            try {
+                final ImageOutputStream os =
+                        ImageIO.createImageOutputStream(new ByteArrayOutputStream());
+                writer.setOutput(os);
+
+                writer.write(getImage());
+
+
+                // NB: dispose() or reset() workarounds the problem.
+            } catch (IOException e) {
+            } finally {
+                writer = null;
+            }
+            count--;
+        } while (count > 0);
+
+
+        System.out.println("Wait for GC...");
+
+        final long testTimeOut = 60000L;
+
+        final long startTime = System.currentTimeMillis();
+
+        while (!refs.isEmpty()) {
+            // check for the test timeout
+            final long now = System.currentTimeMillis();
+
+            if (now - startTime > testTimeOut) {
+                System.out.println();
+                throw new RuntimeException("Test FAILED.");
+            }
+
+            System.gc();
+
+            try {
+                System.out.print(".");
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+            };
+
+            Reference<? extends ImageWriter> r = queue.poll();
+            if (r != null) {
+                System.out.println("Got reference: " + r);
+                refs.remove(r);
+            }
+        }
+        System.out.println("Test PASSED.");
+    }
+
+    private static BufferedImage getImage() {
+        int width = 2500;
+        int height = new Random().nextInt(2500) + 1;
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+
+        Graphics2D g = image.createGraphics();
+        g.setColor(Color.blue);
+        g.fillRect(0, 0, width, height);
+
+        return image;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/xml/jaxp/parsers/8021148/JAXPSAXParserTest.java	Tue Aug 06 14:01:58 2013 +0100
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8021148
+ * @summary test that JAXPSAXParser works even if referenced directly
+ * @run main/othervm JAXPSAXParserTest
+ */
+import java.io.StringReader;
+import java.io.StringWriter;
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+/**
+ * test that JAXPSAXParser works even if referenced directly as
+ * NetBeans did. **Note that JAXPSAXParser is an internal implementation, this
+ * may therefore change.
+ *
+ * @author huizhe.wang@oracle.com
+ */
+public class JAXPSAXParserTest extends TestBase {
+
+    public JAXPSAXParserTest(String name) {
+        super(name);
+    }
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) {
+        JAXPSAXParserTest test = new JAXPSAXParserTest("JAXP 1.5 regression");
+        test.setUp();
+        test.testTransform();
+        test.tearDown();
+    }
+
+    public final void testTransform() {
+        String data =
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                + "<r>\n"
+                + "    <e/>\n"
+                + "</r>\n";
+        String IDENTITY_XSLT_WITH_INDENT = // #5064280 workaround
+                "<xsl:stylesheet version='1.0' "
+                + "xmlns:xsl='http://www.w3.org/1999/XSL/Transform' "
+                + "xmlns:xalan='http://xml.apache.org/xslt' "
+                + "exclude-result-prefixes='xalan'>"
+                + "<xsl:output method='xml' indent='yes' xalan:indent-amount='4'/>"
+                + "<xsl:template match='@*|node()'>"
+                + "<xsl:copy>"
+                + "<xsl:apply-templates select='@*|node()'/>"
+                + "</xsl:copy>"
+                + "</xsl:template>"
+                + "</xsl:stylesheet>";
+        try {
+            //Skip the default XMLReader
+            System.setProperty("org.xml.sax.driver", "com.sun.org.apache.xerces.internal.jaxp.SAXParserImpl$JAXPSAXParser");
+
+            StringWriter sw = new StringWriter();
+            TransformerFactory tf = TransformerFactory.newInstance();
+            Transformer t = tf.newTransformer(new StreamSource(new StringReader(IDENTITY_XSLT_WITH_INDENT)));
+            Result result = new StreamResult(sw);
+            t.transform(new StreamSource(new StringReader(data)), result);
+            success("JAXPSAXParserTest passed");
+        } catch (Exception e) {
+            /**
+             * JAXPSAXParser throws NullPointerException since the jaxp 1.5 security
+             * manager is not initialized when JAXPSAXParser is instantiated using
+             * the default constructor.
+            */
+            fail(e.toString());
+        } finally {
+            System.clearProperty("org.xml.sax.driver");
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/xml/jaxp/parsers/8021148/TestBase.java	Tue Aug 06 14:01:58 2013 +0100
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.Policy;
+
+/**
+ *
+ *
+ * @author huizhe.wang@oracle.com
+ */
+public class TestBase {
+    String filePath;
+    boolean hasSM;
+    String curDir;
+    Policy origPolicy;
+
+    String testName;
+    static String errMessage;
+
+    int passed = 0, failed = 0;
+
+    /**
+     * Creates a new instance of StreamReader
+     */
+    public TestBase(String name) {
+        testName = name;
+    }
+
+    //junit @Override
+    protected void setUp() {
+        if (System.getSecurityManager() != null) {
+            hasSM = true;
+            System.setSecurityManager(null);
+        }
+
+        filePath = System.getProperty("test.src");
+        if (filePath == null) {
+            //current directory
+            filePath = System.getProperty("user.dir");
+        }
+        origPolicy = Policy.getPolicy();
+
+    }
+
+    //junit @Override
+    public void tearDown() {
+        // turn off security manager and restore policy
+        System.setSecurityManager(null);
+        Policy.setPolicy(origPolicy);
+        if (hasSM) {
+            System.setSecurityManager(new SecurityManager());
+        }
+        System.out.println("\nNumber of tests passed: " + passed);
+        System.out.println("Number of tests failed: " + failed + "\n");
+
+        if (errMessage != null ) {
+            throw new RuntimeException(errMessage);
+        }
+    }
+
+    void fail(String errMsg) {
+        if (errMessage == null) {
+            errMessage = errMsg;
+        } else {
+            errMessage = errMessage + "\n" + errMsg;
+        }
+        failed++;
+    }
+
+    void success(String msg) {
+        passed++;
+        System.out.println(msg);
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/awt/image/ImagingLib/SamePackingTypeTest.java	Tue Aug 06 14:01:58 2013 +0100
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug     8019201
+ * @summary Test verifies that medialib glue code does not throw
+ *          an ImagingOpException for certain pairs of source and
+ *          destination images.
+ *
+ * @run main SamePackingTypeTest
+ */
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR;
+import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR_PRE;
+import static java.awt.image.BufferedImage.TYPE_INT_ARGB;
+import static java.awt.image.BufferedImage.TYPE_INT_ARGB_PRE;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ConvolveOp;
+import java.awt.image.ImagingOpException;
+import java.awt.image.Kernel;
+import java.util.Arrays;
+
+
+public class SamePackingTypeTest {
+
+    public static void main(String[] args) {
+        BufferedImageOp op = createTestOp();
+
+        try {
+            System.out.print("Integer-based images... ");
+            doTest(op, TYPE_INT_ARGB, TYPE_INT_ARGB_PRE);
+            System.out.println("done.");
+
+            System.out.print("Byte-based images... ");
+            doTest(op, TYPE_4BYTE_ABGR, TYPE_4BYTE_ABGR_PRE);
+            System.out.println("done");
+        } catch (ImagingOpException e) {
+            throw new RuntimeException("Test FAILED", e);
+        }
+    }
+
+    private static void doTest(BufferedImageOp op, int stype, int dtype) {
+        final int size = 100;
+
+        final BufferedImage src = new BufferedImage(size, size, stype);
+        Graphics2D g = src.createGraphics();
+        g.setColor(Color.red);
+        g.fillRect(0, 0, size, size);
+        g.dispose();
+
+
+        final BufferedImage dst = new BufferedImage(size, size, dtype);
+        g = dst.createGraphics();
+        g.setColor(Color.blue);
+        g.fillRect(0, 0, size, size);
+        g.dispose();
+
+        op.filter(src, dst);
+
+        final int rgb = dst.getRGB(size - 1, size - 1);
+        System.out.printf("dst: 0x%X ", rgb);
+
+        if (rgb != 0xFFFF0000) {
+            throw new RuntimeException(String.format("Wrong color in dst: 0x%X", rgb));
+        }
+    }
+
+    private static BufferedImageOp createTestOp() {
+        final int size = 1;
+        final float v = 1f / (size * size);
+        final float[] k_data = new float[size * size];
+        Arrays.fill(k_data, v);
+
+        Kernel k = new Kernel(size, size, k_data);
+        return new ConvolveOp(k);
+    }
+}
--- a/test/sun/reflect/GetCallerClass.java	Fri Aug 02 17:57:00 2013 +0400
+++ b/test/sun/reflect/GetCallerClass.java	Tue Aug 06 14:01:58 2013 +0100
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8016814 8014925
+ * @bug 8016814 8014925 8021946
  * @summary Test sun.reflect.Reflection.getCallerClass(int) disabled by default
  * @compile -XDignore.symbol.file GetCallerClass.java
  * @run main/othervm GetCallerClass
@@ -36,10 +36,10 @@
     public static void main(String[] args) throws Exception {
         String s = System.getProperty("jdk.reflect.allowGetCallerClass");
         boolean allowed;
-        if (s == null || s.equals("false")) {
+        if (s == null || s.equals("") || s.equals("true")) {
+            allowed = true;
+        } else if (s.equals("false")) {
             allowed = false;
-        } else if (s.equals("") || s.equals("true")) {
-            allowed = true;
         } else {
             throw new RuntimeException("Unsupported test setting");
         }