--- a/jdk/src/linux/doc/man/unpack200.1	Tue May 10 19:57:30 2011 -0700
+++ b/jdk/src/linux/doc/man/unpack200.1	Wed May 11 08:30:46 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2004, 2011, 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 unpack200 1 "02 Jun 2010"
+.TH unpack200 1 "10 May 2011"
 
 .LP
 .SH "Name"
@@ -27,8 +27,6 @@
 .LP
 .SH "SYNOPSIS"
 .LP
-
-.LP
 .LP
 \f4unpack200\fP\f2 [ \fP\f2options\fP ] \f2input\-file\fP \f2JAR\-file\fP
 .LP
@@ -36,9 +34,6 @@
 Options may be in any order. The last option on the command line supersedes all previously specified options.
 .LP
 .RS 3
-
-.LP
-.RS 3
 .TP 3
 input\-file 
 Name of the input file, which can be a pack200 gzip file or a pack200 file. The input could also be JAR file produced by pack200(1) with an effort of 0. In this case the contents of the input file will be copied to the output JAR file with the Pack200 marker. 
@@ -48,107 +43,78 @@
 .RE
 
 .LP
-.RE
 .SH "DESCRIPTION"
 .LP
-
-.LP
 .LP
 \f2unpack200\fP is a native implementation that transforms a packed file produced by \f2pack200\fP(1) into a JAR file. Typical usage:
 .LP
-.RS 3
-
-.LP
 .LP
 \f2% unpack200 myarchive.pack.gz myarchive.jar\fP
 .LP
-.RE
 .LP
 In this example, the \f2myarchive.jar\fP is produced from \f2myarchive.pack.gz\fP using the default \f2unpack200\fP settings.
 .LP
 .SH "OPTIONS"
 .LP
-.SS 
-Standard Options
-.LP
-.RS 3
-
-.LP
 .LP
 \f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP
 .LP
-.RS 3
-
-.LP
 .LP
 Sets the deflation to be \f2true\fP, \f2false\fP, or \f2keep\fP on all entries within a JAR file. The default mode is \f2keep\fP. If \f2true\fP or \f2false\fP, overrides the default behavior and sets the deflation mode on all entries within the output JAR file.
 .LP
-.RE
-.RE
-.SS 
-Non\-Standard Options
-.LP
-.RS 3
-
-.LP
 .LP
 \f4\-r \-\-remove\-pack\-file\fP
 .LP
-.RS 3
-
-.LP
 .LP
 Removes the input packed file.
 .LP
-.RE
 .LP
 \f4\-v \-\-verbose\fP
 .LP
-.RS 3
-
-.LP
 .LP
 Outputs minimal messages. Multiple specification of this option will output more verbose messages.
 .LP
-.RE
 .LP
 \f4\-q \-\-quiet\fP
 .LP
-.RS 3
-
-.LP
 .LP
 Specifies quiet operation with no messages.
 .LP
-.RE
 .LP
 \f4\-lfilename \-\-log\-file=\fP\f2filename\fP
 .LP
-.RS 3
-
-.LP
 .LP
 Specifies a log file to output messages.
 .LP
-.RE
-.RE
+.LP
+\f4\-? \-h \-\-help\fP
+.LP
+.LP
+Prints help information about this command.
+.LP
+.LP
+\f4\-V \-\-version\fP
+.LP
+.LP
+Prints version information about this command.
+.LP
+.LP
+\f4\-J\fP\f2option\fP
+.LP
+.LP
+Passes \f2option\fP to the Java launcher called by \f2unpack200\fP.
+.LP
 .SH "EXIT STATUS"
 .LP
-
-.LP
 .LP
 The following exit values are returned:
 .LP
-.RS 3
-
-.LP
 .LP
 \f2\ 0\fP if successful completion;
 .LP
 .LP
 \f2>0\fP if an error occurred.
 .LP
-.RE
 .SH "SEE ALSO"
 .LP
 .RS 3
@@ -160,13 +126,13 @@
 .na
 \f2Java SE Documentation\fP @
 .fi
-http://java.sun.com/javase/6/docs/index.html 
+http://download.oracle.com/javase/7/docs/index.html 
 .TP 2
 o
 .na
 \f2Java Deployment Guide \- Pack200\fP @
 .fi
-http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
+http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
 .TP 2
 o
 jar(1) \- Java Archive Tool 
@@ -181,8 +147,6 @@
 .LP
 .SH "NOTES"
 .LP
-
-.LP
 .LP
 This command should not be confused with \f2unpack(1)\fP. They are distinctly separate products.
 .LP