6837214: Update JDK7 man pages
Reviewed-by: darcy, bpatel, tbell
Contributed-by: jacob.royal@sun.com
diff --git a/src/linux/doc/man/javaws.1 b/src/linux/doc/man/javaws.1
index 429a4f1..8f67346 100644
--- a/src/linux/doc/man/javaws.1
+++ b/src/linux/doc/man/javaws.1
@@ -1,5 +1,3 @@
-.'" t
-."
." Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
."
@@ -20,15 +18,14 @@
." 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 javaws 1 "05 Aug 2006"
-." Generated by html2roff
+."
+.TH javaws 1 "04 May 2009"
+." Generated from HTML by html2man (author: Eric Armstrong)
.LP
.LP
-.SH NAME
+.SH "Name"
\f2javaws\fP Command Line
.LP
@@ -39,104 +36,93 @@
.SS
NAME
.LP
+.RS 3
.LP
.LP
\f2javaws\fP \- Java Web Start launcher command
.LP
+.RE
.SS
SYNOPSIS
.LP
+.RS 3
.LP
.LP
-\f2javaws [ options ] [ URL ]\fP
+\f2javaws [run\-options] <jnlp>\fP
.LP
+.LP
+\f2javaws [control\-options]\fP
+.LP
+.RE
.SS
PARAMETERS
.LP
+.RS 3
.LP
.LP
-\f2options\fP
+\f2[run\-options]\fP
.LP
.RS 3
.LP
.LP
-Command\-line options. Options may be in any order. For a discussion of the various options, see OPTIONS below.
+Command\-line run\-options. run\-options may be in any order. For a discussion of the various run\-options, see RUN\-OPTIONS below.
.LP
.RE
.LP
-\f2URL\fP
+\f2<jnlp>\fP
.LP
.RS 3
.LP
.LP
-Uniform Resource Locator (\f2URL\fP) of the JNLP (Java Net\-work Launching Protocol) file.
+This can be either the path of, or the Uniform Resource Locater (URL) of the JNLP (Java Network Launching Protocol) file.
.LP
.RE
+.LP
+\f2[control\-options]\fP
+.LP
+.RS 3
+
+.LP
+.LP
+Command\-line control\-options. control\-options may be in any order. For a discussion of the various control\-options, see CONTROL\-OPTIONS below.
+.LP
+.RE
+.RE
.SS
DESCRIPTION
.LP
+.RS 3
.LP
.LP
The \f2javaws\fP command launches Java Web Start, which is the reference implementation of the Java Network Launching Protocol (JNLP). Java Web Start launches Java applications/applets hosted on a network.
.LP
.LP
-Without any options \f2javaws\fP will launch the Java JNLP Application Manager, from which users can launch applications/applet or configure Java Web Start.
+If a JNLP file is specified, \f2javaws\fP will launch the Java application/applet specified in the JNLP file.
.LP
.LP
-If a \f2URL\fP for a JNLP file is specified, \f2javaws\fP will launch the Java application/applet specified in the JNLP file.
+The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release.
.LP
+.RE
.SS
-OPTIONS
+RUN\-OPTIONS
.LP
+.RS 3
.LP
.LP
-The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release. All \f2\-X\fP options are non\-standard and subject to change.
-.LP
-.LP
\f2\-offline\fP
.LP
.RS 3
.LP
.LP
-Runs Java Web Start in offline mode.
-.LP
-.RE
-.LP
-\f2\-uninstall <URL>\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Removes a specific application/applet from the user's cache, as indicated by the URL for the JNLP file. If \f2<URL>\fP is not specified, the entire cache is removed. Java Web Start will exit after the command is completed.
-.LP
-.RE
-.LP
-\f2\-updateVersions\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Updates the Java Web Start configuration file based on the current machine's settings. Java Web Start will exit after the command is completed.
-.LP
-.RE
-.LP
-\f2\-Xclearcache\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Clears the user's cache. Java Web Start will exit after the command is completed.
+run Java Web Start in offline mode.
.LP
.RE
.LP
@@ -146,67 +132,7 @@
.LP
.LP
-Disables the display of the initial splash screen.
-.LP
-.RE
-.LP
-\f2\-import\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Imports the application specified by URL into the user's cache but does not run it.
-.LP
-.RE
-.LP
-\f2\-silent\fP
-.LP
-.RS 3
-
-.LP
-.LP
-When used with the \f2\-import\fP option, imports in silent mode; i.e., there will be no UI pop up. The process exit code will be either 0 if successful or 1 if not.
-.LP
-.RE
-.LP
-\f2\-codebase <url>\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Replaces the codebase with \f2<url>\fP in the jnlp file specified when importing the resources. \f2<url>\fP must be a valid \f2URL\fP.
-.LP
-.RE
-.LP
-\f2\-system\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Uses the system cache instead of the user cache.
-.LP
-.RE
-.LP
-\f2\-shortcut\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Allows the creation of shortcuts during silent import.
-.LP
-.RE
-.LP
-\f2\-association\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Allows the creation of associations during silent import.
+disable the display of the initial splash screen.
.LP
.RE
.LP
@@ -236,37 +162,7 @@
.LP
.LP
-Runs in online mode (default behavior).
-.LP
-.RE
-.LP
-\f2\-viewer\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Runs the Java Application Cache Viewer (default if no URL is specified).
-.LP
-.RE
-.LP
-\f2\-userConfig <property name>\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Clears the specified deployment property.
-.LP
-.RE
-.LP
-\f2\-userConfig <property name> <property value>\fP
-.LP
-.RS 3
-
-.LP
-.LP
-Sets the specified deployment property to the specified value.
+run in online mode (default behavior).
.LP
.RE
.LP
@@ -280,11 +176,159 @@
.LP
.RE
.LP
-\
+\f2\-verbose\fP
.LP
+.RS 3
+
+.LP
+.LP
+display additional output.
+.LP
+.RE
+.LP
+\f2\-J<option>\fP
+.LP
+.RS 3
+
+.LP
+.LP
+supply options to the vm.
+.LP
+.RE
+.LP
+\f2\-system\fP
+.LP
+.RS 3
+
+.LP
+.LP
+run the application from the system cache only.
+.LP
+.RE
+.RE
+.SS
+CONTROL\-OPTIONS
+.LP
+.RS 3
+
+.LP
+.LP
+\f2\-viewer\fP
+.LP
+.RS 3
+
+.LP
+.LP
+show the Cache Viewer in the java control panel
+.LP
+.RE
+.LP
+\f2\-userConfig <property name>\fP
+.LP
+.RS 3
+
+.LP
+.LP
+clear the specified deployment property.
+.LP
+.RE
+.LP
+\f2\-userConfig <property name> <property value>\fP
+.LP
+.RS 3
+
+.LP
+.LP
+set the specified deployment property to the specified value.
+.LP
+.RE
+.LP
+\f2\-uninstall\fP
+.LP
+.RS 3
+
+.LP
+.LP
+remove all applications from the cache.
+.LP
+.RE
+.LP
+\f2\-uninstall <jnlp>\fP
+.LP
+.RS 3
+
+.LP
+.LP
+remove the application from the cache.
+.LP
+.RE
+.LP
+\f2\-import [import\-options] <jnlp>\fP
+.LP
+.RS 3
+
+.LP
+.LP
+import the application to the cache.
+.LP
+.RE
+\f3IMPORT\-OPTIONS\fP
+.LP
+.LP
+\f2\-silent\fP
+.LP
+.RS 3
+
+.LP
+.LP
+import silently (with no user interface).
+.LP
+.RE
+.LP
+\f2\-system\fP
+.LP
+.RS 3
+
+.LP
+.LP
+import application to the system cache.
+.LP
+.RE
+.LP
+\f2\-codebase <url>\fP
+.LP
+.RS 3
+
+.LP
+.LP
+retrieve resources from the given codebase.
+.LP
+.RE
+.LP
+\f2\-shortcut\fP
+.LP
+.RS 3
+
+.LP
+.LP
+install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
+.LP
+.RE
+.LP
+\f2\-association\fP
+.LP
+.RS 3
+
+.LP
+.LP
+install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
+.LP
+.RE
+.RE
.SS
FILES
.LP
+.RS 3
.LP
.LP
@@ -294,15 +338,17 @@
.fi
http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/properties.html.
.LP
+.RE
.SS
MORE INFORMATION
.LP
+.RS 3
.LP
.LP
For more information about Java Web Start, see
.na
-\f2Java Web Start version 1.5.0\fP @
+\f2Java Web Start\fP @
.fi
http://java.sun.com/javase/6/docs/technotes/guides/javaws/index.html.
.LP
@@ -313,4 +359,7 @@
\
.LP
.RE
+.RE
+
+.LP