--- a/jdk/src/linux/doc/man/native2ascii.1	Tue May 10 19:57:30 2011 -0700
+++ b/jdk/src/linux/doc/man/native2ascii.1	Wed May 11 08:30:46 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1997, 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,23 +19,17 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH native2ascii 1 "02 Jun 2010"
+.TH native2ascii 1 "10 May 2011"
 
 .LP
 .SH "Name"
 native2ascii \- Native\-to\-ASCII Converter
 .LP
-.RS 3
-
-.LP
 .LP
-Converts a file with native\-encoded characters (characters which are non\-Latin 1 and non\-Unicode) to one with Unicode\-encoded characters.
+Converts a file with characters in any supported character encoding to one with ASCII and/or Unicode escapes, or visa versa.
 .LP
-.RE
 .SH "SYNOPSIS"
 .LP
-
-.LP
 .nf
 \f3
 .fl
@@ -46,31 +40,29 @@
 .LP
 .SH "DESCRIPTION"
 .LP
-
 .LP
-.LP
-The Java compiler and other Java tools can only process files which contain Latin\-1 and/or Unicode\-encoded (\\udddd notation) characters. \f2native2ascii\fP converts files which contain other character encodings into files containing Latin\-1 and/or Unicode\-encoded charaters.
+\f2native2ascii\fP converts files that are encoded to any character encoding that is supported by the Java runtime environment to files encoded in ASCII, using Unicode escapes ("\\uxxxx" notation) for all characters that are not part of the ASCII character set. This process is required for properties files containing characters not in ISO\-8859\-1 character sets. The tool can also perform the reverse conversion.
 .LP
 .LP
 If \f2outputfile\fP is omitted, standard output is used for output. If, in addition, \f2inputfile\fP is omitted, standard input is used for input.
 .LP
 .SH "OPTIONS"
 .LP
-
-.LP
 .RS 3
 .TP 3
 \-reverse 
-Perform the reverse operation: convert a file with Latin\-1 and/or Unicode encoded characters to one with native\-encoded characters.
+Perform the reverse operation: Convert a file encoded in ISO\-8859\-1 with Unicode escapes to a file in any character encoding supported by the Java runtime environment.
 .br
 .br
 .TP 3
 \-encoding encoding_name 
-Specify the encoding name which is used by the conversion procedure. The default encoding is taken from System property \f2file.encoding\fP. The \f2encoding_name\fP string must be taken from the first column of the table of supported encodings in the 
+Specifies the name of the character encoding to be used by the conversion procedure. If this option is not present, the default character encoding (as determined by the \f2java.nio.charset.Charset.defaultCharset\fP method) is used. The \f2encoding_name\fP string must be the name of a character encoding that is supported by the Java runtime environment \- see the 
 .na
 \f4Supported Encodings\fP @
 .fi
-http://java.sun.com/javase/6/docs/technotes/guides/intl/encoding.doc.html document. 
+http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document.
+.br
+.br
 .TP 3
 \-Joption 
 Pass \f2option\fP to the Java virtual machine, where \f2option\fP is one of the options described on the reference page for the java(1). For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes.