--- old/src/jdk.hotspot.agent/share/man/jhsdb.1	2020-01-14 13:13:55.003294117 -0800
+++ new/src/jdk.hotspot.agent/share/man/jhsdb.1	2020-01-14 13:13:54.699280713 -0800
@@ -7,7 +7,7 @@
 .\"
 .\" This code is distributed in the hope that it will be useful, but WITHOUT
 .\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
 .\" version 2 for more details (a copy is included in the LICENSE file that
 .\" accompanied this code).
 .\"
@@ -21,7 +21,7 @@
 .\"
 .\" Automatically generated by Pandoc 2.3.1
 .\"
-.TH "JHSDB" "1" "2018" "JDK 13" "JDK Commands"
+.TH "JHSDB" "1" "2020" "JDK 14" "JDK Commands"
 .hy
 .SH NAME
 .PP
@@ -34,28 +34,33 @@
 \f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R]
 \f[I]coredump\f[R]]
 .PP
-\f[CB]jhsdb\f[R] \f[CB]debugd\f[R] [\f[I]options\f[R]] (\f[I]pid\f[R] |
-\f[I]executable\f[R] \f[I]coredump\f[R]) [\f[I]server\-id\f[R]]
-.PP
 \f[CB]jhsdb\f[R] \f[CB]hsdb\f[R] [\f[CB]\-\-pid\f[R] \f[I]pid\f[R] |
 \f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R]
 \f[I]coredump\f[R]]
 .PP
-\f[CB]jhsdb\f[R] \f[CB]jstack\f[R] [\f[CB]\-\-pid\f[R] \f[I]pid\f[R] |
-\f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R]
-\f[I]coredump\f[R]] [\f[I]options\f[R]]
-.PP
-\f[CB]jhsdb\f[R] \f[CB]jmap\f[R] [\f[CB]\-\-pid\f[R] \f[I]pid\f[R] |
-\f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R]
-\f[I]coredump\f[R]] [\f[I]options\f[R]]
-.PP
-\f[CB]jhsdb\f[R] \f[CB]jinfo\f[R] [\f[CB]\-\-pid\f[R] \f[I]pid\f[R] |
+\f[CB]jhsdb\f[R] \f[CB]debugd\f[R] (\f[CB]\-\-pid\f[R] \f[I]pid\f[R] |
 \f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R]
-\f[I]coredump\f[R]] [\f[I]options\f[R]]
+\f[I]coredump\f[R]) [\f[I]options\f[R]]
 .PP
-\f[CB]jhsdb\f[R] \f[CB]jsnap\f[R] [\f[I]options\f[R]] [\f[CB]\-\-pid\f[R]
-\f[I]pid\f[R] | \f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R]
-\f[I]coredump\f[R]]
+\f[CB]jhsdb\f[R] \f[CB]jstack\f[R] (\f[CB]\-\-pid\f[R] \f[I]pid\f[R] |
+\f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R] \f[I]coredump\f[R]
+| \f[CB]\-\-connect\f[R] \f[I][server\-id\@]debugd\-host\f[R])
+[\f[I]options\f[R]]
+.PP
+\f[CB]jhsdb\f[R] \f[CB]jmap\f[R] (\f[CB]\-\-pid\f[R] \f[I]pid\f[R] |
+\f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R] \f[I]coredump\f[R]
+| \f[CB]\-\-connect\f[R] \f[I][server\-id\@]debugd\-host\f[R])
+[\f[I]options\f[R]]
+.PP
+\f[CB]jhsdb\f[R] \f[CB]jinfo\f[R] (\f[CB]\-\-pid\f[R] \f[I]pid\f[R] |
+\f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R] \f[I]coredump\f[R]
+| \f[CB]\-\-connect\f[R] \f[I][server\-id\@]debugd\-host\f[R])
+[\f[I]options\f[R]]
+.PP
+\f[CB]jhsdb\f[R] \f[CB]jsnap\f[R] (\f[CB]\-\-pid\f[R] \f[I]pid\f[R] |
+\f[CB]\-\-exe\f[R] \f[I]executable\f[R] \f[CB]\-\-core\f[R] \f[I]coredump\f[R]
+| \f[CB]\-\-connect\f[R] \f[I][server\-id\@]debugd\-host\f[R])
+[\f[I]options\f[R]]
 .TP
 .B \f[I]pid\f[R]
 The process ID to which the \f[CB]jhsdb\f[R] tool should attach.
@@ -74,12 +79,6 @@
 the PID of the JVM.
 .RE
 .TP
-.B \f[I]server\-id\f[R]
-An optional unique ID to use when multiple debug servers are running on
-the same remote host.
-.RS
-.RE
-.TP
 .B \f[I]executable\f[R]
 The Java executable file from which the core dump was produced.
 .RS
@@ -90,19 +89,26 @@
 .RS
 .RE
 .TP
+.B \f[I][server\-id\@]debugd\-host\f[R]
+An optional server ID and the address of the remote debug server
+(debugd).
+.RS
+.RE
+.TP
 .B \f[I]options\f[R]
 The command\-line options for a \f[CB]jhsdb\f[R] mode.
-See \f[B]Common Options for jhsdb Modes\f[R], \f[B]Options for the debugd
-Mode\f[R], \f[B]Options for the jinfo Mode\f[R], \f[B]Options for the jmap
-Mode\f[R], \f[B]Options for the jmap Mode\f[R], \f[B]Options for the
-jstack Mode\f[R], and \f[B]Options for the jsnap Mode\f[R].
+See \f[B]Options for the debugd Mode\f[R], \f[B]Options for the jstack
+Mode\f[R], \f[B]Options for the jmap Mode\f[R], \f[B]Options for the jinfo
+Mode\f[R], and \f[B]Options for the jsnap Mode\f[R].
 .RS
 .RE
 .PP
 \f[B]Note:\f[R]
 .PP
 Either the \f[I]pid\f[R] or the pair of \f[I]executable\f[R] and
-\f[I]core\f[R] files must be provided.
+\f[I]core\f[R] files or the \f[I][server\-id\@]debugd\-host\f[R] must be
+provided for \f[CB]debugd\f[R], \f[CB]jstack\f[R], \f[CB]jmap\f[R],
+\f[CB]jinfo\f[R] and \f[CB]jsnap\f[R] modes.
 .SH DESCRIPTION
 .PP
 You can use the \f[CB]jhsdb\f[R] tool to attach to a Java process or to
@@ -124,13 +130,13 @@
 .RS
 .RE
 .TP
-.B \f[CB]jhsdb\ debugd\f[R]
-Starts the remote debug server.
+.B \f[CB]jhsdb\ hsdb\f[R]
+Starts the interactive GUI debugger.
 .RS
 .RE
 .TP
-.B \f[CB]jhsdb\ hsdb\f[R]
-Starts the interactive GUI debugger.
+.B \f[CB]jhsdb\ debugd\f[R]
+Starts the remote debug server.
 .RS
 .RE
 .TP
@@ -153,44 +159,19 @@
 Prints performance counter information.
 .RS
 .RE
-.SH COMMON OPTIONS FOR JHSDB MODES
-.PP
-In addition to any required \f[CB]jstack\f[R], \f[CB]jmap\f[R],
-\f[CB]jinfo\f[R] or \f[CB]jsnap\f[R] mode specific options, the
-\f[CB]pid\f[R], \f[CB]exe\f[R], or \f[CB]core\f[R] options must be provided
-for all modes.
-The following options are available for all modes.
 .TP
-.B \f[CB]\-\-pid\f[R]
-The process ID of the hanging process.
-.RS
-.RE
-.TP
-.B \f[CB]\-\-exe\f[R]
-The executable file name.
-.RS
-.RE
-.TP
-.B \f[CB]\-\-core\f[R]
-The core dump file name.
-.RS
-.RE
-.TP
-.B \f[CB]\-\-help\f[R]
-Displays the options available for the command.
+.B \f[CB]jhsdb\f[R] \f[I]command\f[R] \f[CB]\-\-help\f[R]
+Displays the options available for the \f[I]command\f[R].
 .RS
 .RE
 .SH OPTIONS FOR THE DEBUGD MODE
 .TP
-.B \f[I]server\-id\f[R]
+.B \f[CB]\-\-serverid\f[R] \f[I]server\-id\f[R]
 An optional unique ID for this debug server.
 This is required if multiple debug servers are run on the same machine.
 .RS
 .RE
 .SH OPTIONS FOR THE JINFO MODE
-.PP
-Without specified options, the \f[CB]jhsdb\ jinfo\f[R] prints both flags
-and properties.
 .TP
 .B \f[CB]\-\-flags\f[R]
 Prints the VM flags.
@@ -207,10 +188,6 @@
 .RS
 .RE
 .SH OPTIONS FOR THE JMAP MODE
-.PP
-In addition to the following mode specific options, the \f[CB]pid\f[R],
-\f[CB]exe\f[R], or \f[CB]core\f[R] options described in \f[B]Common Options
-for jhsdb Modes\f[R] must be provided.
 .TP
 .B no option
 Prints the same information as Solaris \f[CB]pmap\f[R].
@@ -227,8 +204,8 @@
 .RS
 .RE
 .TP
-.B \f[CB]\-\-dumpfile\f[R]
-Prints the name of the dumpfile.
+.B \f[CB]\-\-dumpfile\f[R] \f[I]name\f[R]
+The name of the dumpfile.
 .RS
 .RE
 .TP
@@ -247,10 +224,6 @@
 .RS
 .RE
 .SH OPTIONS FOR THE JSTACK MODE
-.PP
-In addition to the following mode specific options, the \f[CB]pid\f[R],
-\f[CB]exe\f[R], or \f[CB]core\f[R] options described in \f[B]Common Options
-for jhsdb Modes\f[R] must be provided.
 .TP
 .B \f[CB]\-\-locks\f[R]
 Prints the \f[CB]java.util.concurrent\f[R] locks information.
@@ -263,10 +236,6 @@
 .RS
 .RE
 .SH OPTIONS FOR THE JSNAP MODE
-.PP
-In addition to the following mode specific option, the \f[CB]pid\f[R],
-\f[CB]exe\f[R], or \f[CB]core\f[R] options described in \f[B]Common Options
-for jhsdb Modes\f[R] must be provided.
 .TP
 .B \f[CB]\-\-all\f[R]
 Prints all performance counters.