--- a/ChangeLog	Mon Oct 11 22:31:47 2010 +0100
+++ b/ChangeLog	Tue Oct 12 15:44:58 2010 +0100
@@ -1,3 +1,19 @@
+2010-10-12  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(add-netx): Ensure directory exists before
+	copying javaws man page.
+	(add-netx-debug): Likewise.
+
+2010-09-13  Omair Majid  <omajid@redhat.com>
+
+	Add a new man page for netx's javaws.
+	* NEWS: Updated to indicate the new man page for javaws.
+	* Makefile.am
+	(icedtea.stamp): Copy over the javaws man page into the build.
+	(icedtea-debug.stamp): Copy over the javaws man page.
+	* netx/javaws.1: New man page for netx's javaws.
+
 2010-10-11  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS: Add CVE numbers and list 6925672

--- a/Makefile.am	Mon Oct 11 22:31:47 2010 +0100
+++ b/Makefile.am	Tue Oct 12 15:44:58 2010 +0100
@@ -1352,6 +1352,14 @@
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \
 	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+	if [ -d $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ] ; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ; \
+	fi
+	if [ -d $(BUILD_OUTPUT_DIR)/j2re-image/man/man1 ] ; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \
+	fi
 if ZERO_BUILD
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
@@ -1442,6 +1450,14 @@
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib ; \
 	cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
+	if [ -d $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ] ; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ; \
+	fi
+	if [ -d $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1 ] ; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \
+	fi
 if ZERO_BUILD
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif

--- a/NEWS	Mon Oct 11 22:31:47 2010 +0100
+++ b/NEWS	Tue Oct 12 15:44:58 2010 +0100
@@ -46,6 +46,7 @@
   - Run programs that inherit main(String[]) in their main-class
   - Run JNLP files that use 1.6 as the spec version
   - RH601281: Possible NullPointerException in splash screen code
+  - New man page for javaws
 * Plugin 
  - RH560193: Fix ziperror when applet jar contained another 0-byte jar
   - PR519: 100% CPU usage when displaying applets in Webkit based browsers

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javaws.1	Tue Oct 12 15:44:58 2010 +0100
@@ -0,0 +1,123 @@
+.TH javaws 1 "9 Sep 2010"
+.SH NAME
+javaws - a Java Web Start client
+.SH SYNOPSYS
+.B javaws
+[-run-options] jnlp-file
+.br
+.B javaws
+[-control-option]
+.SH DESCRIPTION
+.B javaws
+is an implementation of a JNLP  client. It uses a JNLP (Java Network
+Launch Protocol) file to securely run a remote Java application or
+a Java applet.  This implementation of
+.B javaws
+is from the IcedTea project and is based on the NetX project.
+.PP
+A JNLP file is an xml file that describes how to securely run a
+remote Java application or a Java applet.
+
+.SH OPTIONS
+When specifying options, the name of the jnlp file must be the last
+argument to
+.B javaws
+- all the options must preceede it.
+.PP
+The jnlp-file can either be a url or a local path.
+.PP
+.B Control Options
+.PP
+By default
+.B javaws
+will launch the jnlp file specified on the command line. The control
+options can be used to change this behaviour.
+.TP 12
+\-about
+Shows a sample application that can be used to test the basic functionality
+of this implementation.
+.TP
+\-viewer
+Shows the trusted certificate viewer. This allows a user to list, examine, remove
+or export trusted certificates. Note that this only reflects the certificates
+trusted by
+.B javaws
+and not any other certificates or programs.
+
+.PP
+.B Run Options
+.PP
+In the default mode, the following run-options can be used:
+.TP 12
+\-basedir dir
+Directory where the cache and certificates to be used are stored.
+.TP
+\-arg arg
+Adds an application argument before launching.
+.TP
+\-param name=value
+Adds an applet parameter before launching.
+.TP
+\-property name=value
+Sets a system property before launching.
+.TP
+\-update seconds
+Update check if seconds since last checked.
+.TP
+\-license
+Display the GPL license and exit.
+.TP
+\-verbose
+Enable verbose output. Very useful in debugging.
+.TP
+\-nosecurity
+Disables the secure runtime environment.
+.TP
+\-noupdate
+Disables checking for updates.
+.TP
+\-headless
+Disables download window, other UIs.
+.TP
+\-strict
+Enables strict checking of JNLP file format. Any deviations from
+the JNLP DTD will cause
+.B javaws
+to abort.
+.TP
+\-umask=value
+Sets the umask for files created by an application.
+.TP
+\-Xnofork
+Do not create another JVM, even if the JNLP file asks for running in
+a separate JVM. This is useful for debugging.
+.TP
+\-Jjava-option
+This passes along java-option to the java binary that is running
+javaws. For example, to make javaws run with a max heap size
+of 80m, use -J-Xmx80m.
+.TP
+\-help
+Print a help message and exit.
+
+.SH FILES
+~/.netxrc specifies the location of the base directory
+
+.SH BUGS
+There arent any known bugs. If you come across one, please file it at
+    http://icedtea.classpath.org/bugzilla/
+.br
+Please run javaws in verbose mode and include that output along
+with the jnlp file when filing out the bug report.
+
+.SH AUTHOR
+Originally written by Jon. A. Maxwell.
+.br
+Currently maintained by the IcedTea contributors.
+
+.SH SEE ALSO
+.BR java (1)
+.br
+http://icedtea.classpath.org/
+.br
+http://jnlp.sourceforge.net/netx/