--- a/jdk/src/linux/doc/man/java.1 Thu Apr 30 15:04:39 2009 -0700
+++ b/jdk/src/linux/doc/man/java.1 Mon May 04 18:28:26 2009 -0700
@@ -1,5 +1,4 @@
-.'" t
-." ." Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+." Copyright 2002-2006 Sun Microsystems, Inc. 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,13 +18,12 @@
." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
." CA 95054 USA or visit www.sun.com if you need additional information or
." have any questions.
-."
-." `
-.TH java 1 "07 Aug 2006"
-." Generated by html2man
+."
+.TH java 1 "04 May 2009"
+." Generated from HTML by html2man (author: Eric Armstrong)
.LP
-.SH NAME
+.SH "Name"
java \- the Java application launcher
.LP
.SH "SYNOPSIS"
@@ -105,13 +103,21 @@
.LP
Select the Java HotSpot Client VM. A 64\-bit capable jdk currently ignores this option and instead uses the Java Hotspot Server VM.
.LP
-For default VM selection, see Server\-Class Machine Detection
+For default VM selection, see
+.na
+\f2Server\-Class Machine Detection\fP @
+.fi
+http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html
.TP 3
\-server
.LP
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.
.LP
-For default VM selection, see Server\-Class Machine Detection
+For default VM selection, see
+.na
+\f2Server\-Class Machine Detection\fP @
+.fi
+http://java.sun.com/javase/6/docs/technotes/guides/vm/server\-class.html
.TP 3
\-agentlib:libname[=options]
Load native agent library \f2libname\fP, e.g.
@@ -122,10 +128,18 @@
.LP
\-agentlib:hprof=help
.LP
-For more information, see JVMTI Agent Command Line Options.
+For more information, see
+.na
+\f2JVMTI Agent Command Line Options\fP @
+.fi
+http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting.
.TP 3
\-agentpath:pathname[=options]
-Load a native agent library by full pathname. For more information, see JVMTI Agent Command Line Options.
+Load a native agent library by full pathname. For more information, see
+.na
+\f2JVMTI Agent Command Line Options\fP @
+.fi
+http://java.sun.com/javase/6/docs/platform/jvmti/jvmti.html#starting.
.TP 3
\-classpath classpath
.TP 3
@@ -139,7 +153,11 @@
.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.
.LP
-For more information on class paths, see Setting the Class Path.
+For more information on class paths, see
+.na
+\f2Setting the Class Path\fP @
+.fi
+http://java.sun.com/javase/6/docs/technotes/tools/index.html#classpath.
.TP 3
\-Dproperty=value
Set a system property value.
@@ -201,7 +219,7 @@
.LP
.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 tool reference page and the Jar trail of the
+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
@@ -209,10 +227,18 @@
.LP
When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
.LP
-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 Java Archive (JAR) Files.
+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://java.sun.com/javase/6/docs/technotes/guides/jar/index.html.
.TP 3
\-javaagent:jarpath[=options]
-Load a Java programming language agent, see java.lang.instrument.
+Load a Java programming language agent, see
+.na
+\f2java.lang.instrument\fP @
+.fi
+http://java.sun.com/javase/6/docs/api/java/lang/instrument/package\-summary.html.
.TP 3
\-verbose
.TP 3
@@ -235,11 +261,11 @@
.nf
\f3
.fl
-\-version:"1.5.0_04 1.5*&1.5.1_02+"
+\-version:"1.6.0_13 1.6*&1.6.0_10+"
.fl
\fP
.fi
-The meaning of the above is that the class or jar file requires either version 1.5.0_02, or a version with 1.5 as a version\-id prefix and that is not less than 1.5.1_02. 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 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).
.LP
For jar files, the usual preference is to specify version requirements in the jar file manifest rather than on the command line.
.LP
@@ -345,7 +371,7 @@
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.
.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 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.
.LP
.TP 3
\-Xrs
@@ -393,19 +419,19 @@
.nf
\f3
.fl
-"1.5.0_03+"
+"1.6.0_10+"
.fl
\fP
.fi
.LP
-Would utilize any version greater than 1.5.0_03. This is useful for a case where an interface was introduced (or a bug fixed) in the release specified.
+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:
.nf
\f3
.fl
-"1.5.0_03+&1.5*"
+"1.6.0_10+&1.6*"
.fl
\fP
.fi
@@ -415,11 +441,11 @@
.nf
\f3
.fl
-"1.4.2_05+&1.4* 1.5+"
+"1.6.0_10+&1.6* 1.7+"
.fl
\fP
.fi
-Similar to item 2. this is useful when a change was introduced in a release (1.5) 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 previous releases.
.RE
.LP
@@ -430,22 +456,28 @@
.RS 3
.TP 2
o
-javac \- the Java programming language compiler
+javac(1)
.TP 2
o
-jdb \- Java Application Debugger
+jdb(1)
+.TP 2
+o
+javah(1)
.TP 2
o
-javah \- C Header and Stub File Generator
+jar(1)
.TP 2
o
-jar \- JAR Archive Tool
+.na
+\f2The Java Extensions Framework\fP @
+.fi
+http://java.sun.com/javase/6/docs/technotes/guides/extensions/index.html
.TP 2
o
-The Java Extensions Framework
-.TP 2
-o
-Security Features.
+.na
+\f2Security Features\fP @
+.fi
+http://java.sun.com/javase/6/docs/technotes/guides/security/index.html.
.TP 2
o
.na