diff -r bad7bbf42755 -r 345bc8d65b19 jdk/src/linux/doc/man/jstatd.1
--- a/jdk/src/linux/doc/man/jstatd.1	Thu Apr 30 15:04:39 2009 -0700
+++ b/jdk/src/linux/doc/man/jstatd.1	Mon May 04 18:28:26 2009 -0700
@@ -1,6 +1,4 @@
-.'" t
-."
-." Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
+." Copyright 2003 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
@@ -20,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 jstatd 1 "05 Aug 2006"
-." Generated by html2roff
+."
+.TH jstatd 1 "04 May 2009"
+." Generated from HTML by html2man (author: Eric Armstrong)
 
 .LP
-.SH NAME
+.SH "Name"
 jstatd \- Virtual Machine jstat Daemon
 .LP
 .SH "SYNOPSIS"
@@ -48,9 +45,12 @@
 .LP
 
 .LP
+.RS 3
 .TP 3
 options 
 Command\-line options. The options may be in any order. If there are redundant or contradictory options, the last option specified will take precedence. 
+.RE
+
 .LP
 .SH "DESCRIPTION"
 .LP
@@ -72,6 +72,7 @@
 .LP
 The \f3jstatd\fP command supports the following options:
 .LP
+.RS 3
 .TP 3
 \-nr 
 Do not attempt to create an internal RMI registry within the \f2jstatd\fP process when an existing RMI registry is not found. 
@@ -80,10 +81,12 @@
 Port number where the RMI registry is expected to be found, or, if not found, created if \f2\-nr\fP is not specified. 
 .TP 3
 \-n\  rminame 
-Name to which the remote RMI object is bound in the RMI registry. The default name is \f2JStatRemoteHost\fP. If multiple \f3jstatd\fP servers are started on the same host, the name of the exported RMI object for each server can be made unique by by specifying this option. However, doing so will require that the unique server name be included in the monitoring client's \f2hostid\fP and \f2vmid\fP strings. 
+Name to which the remote RMI object is bound in the RMI registry. The default name is \f2JStatRemoteHost\fP. If multiple \f3jstatd\fP servers are started on the same host, the name of the exported RMI object for each server can be made unique by specifying this option. However, doing so will require that the unique server name be included in the monitoring client's \f2hostid\fP and \f2vmid\fP strings. 
 .TP 3
 \-Joption 
 Pass \f2option\fP to the \f3java\fP launcher called by \f3javac\fP. For example, \f3\-J\-Xms48m\fP sets the startup memory to 48 megabytes. It is a common convention for \f3\-J\fP to pass options to the underlying VM executing applications written in Java. 
+.RE
+
 .LP
 .SH "SECURITY"
 .LP
@@ -141,8 +144,7 @@
 .LP
 For sites with more restrictive security practices, it is possible to use a custom policy file to limit access to specific trusted hosts or networks, though such techniques are subject to IP addreess spoofing attacks. If your security concerns cannot be addressed with a customized policy file, then the safest action is to not run the \f3jstatd\fP server and use the \f3jstat\fP and \f3jps\fP tools locally.
 .LP
-.SH "REMOTE
-INTERFACE"
+.SH "REMOTE INTERFACE"
 .LP
 
 .LP
@@ -157,8 +159,7 @@
 Here are some examples of starting \f3jstatd\fP. Note that the \f3jstatd\fP scripts automatically start the server in the background.
 .LP
 .SS 
-Using Internal RMI
-Registry
+Using Internal RMI Registry
 .LP
 .LP
 This example demonstrates starting \f3jstatd\fP with an internal RMI registry. This example assumes that no other server is bound to the default RMI Registry port (port 1099).
@@ -173,8 +174,7 @@
 
 .LP
 .SS 
-Using
-External RMI Registry
+Using External RMI Registry
 .LP
 .LP
 This example demonstrates starting \f3jstatd\fP with a external RMI registry.
@@ -219,8 +219,7 @@
 
 .LP
 .SS 
-Inhibiting creation of an in\-process RMI
-registry
+Inhibiting creation of an in\-process RMI registry
 .LP
 .LP
 This example demonstrates starting \f3jstatd\fP such that it will not create a RMI registry if one is not found. This example assumes an RMI registry is already running. If it is not, an appropriate error message is emitted.
@@ -235,8 +234,7 @@
 
 .LP
 .SS 
-Enabling RMI
-logging capabilities.
+Enabling RMI logging capabilities.
 .LP
 .LP
 This example demonstrates starting \f3jstatd\fP with RMI logging capabilities enabled. This technique is useful as a troubleshooting aid or for monitoring server activities.
@@ -254,17 +252,20 @@
 .LP
 .RS 3
 .TP 2
-*
-java \- the Java Application Launcher 
+o
+java(1) \- the Java Application Launcher 
 .TP 2
-*
-jps \- the Java Process Status Application 
+o
+jps(1) \- the Java Process Status Application 
 .TP 2
-*
-jstat \- the Java Virtual Machine Statistics Monitoring Tool 
+o
+jstat(1) \- the Java Virtual Machine Statistics Monitoring Tool 
 .TP 2
-*
-rmiregistry \- the Java Remote Object Registry 
+o
+.na
+\f2rmiregistry\fP @
+.fi
+http://java.sun.com/javase/6/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry 
 .RE
 
 .LP