Add 'plink -shareexists' to man page.

[PuTTY.git] / doc / man-pl.but

diff --git a/doc/man-pl.but b/doc/man-pl.but
index d70ae965f5a5566e2f6cc79f79f50251d00f778a..0ba0e845e33e798104aa67a43e902611c24ce789 100644 (file)
--- a/doc/man-pl.but
+++ b/doc/man-pl.but
@@ -52,6 +52,10 @@ to aid in verifying new files released by the PuTTY team.
 
 \dd Force raw mode.
 
+\dt \cw{-serial}
+
+\dd Force serial mode.
+
 \dt \cw{-P} \e{port}
 
 \dd Connect to port \e{port}.
@@ -129,13 +133,45 @@ tunnel all their connections. Only works in SSH.
 
 \dd Force use of SSH protocol version 2.
 
+\dt \cw{-4}, \cw{-6}
+
+\dd Force use of IPv4 or IPv6 for network connections.
+
 \dt \cw{-C}
 
 \dd Enable SSH compression.
 
-\dt \cw{-i} \e{path}
+\dt \cw{-i} \e{keyfile}
+
+\dd Private key file for user authentication. For SSH-2 keys, this key
+file must be in PuTTY's PPK format, not OpenSSH's format or anyone
+else's.
+
+\lcont{ If you are using an authentication agent, you can also specify
+a \e{public} key here (in RFC 4716 or OpenSSH format), to identify
+which of the agent's keys to use. }
+
+\dt \cw{\-noagent}
+
+\dd Don't try to use an authentication agent for local authentication.
+(This doesn't affect agent forwarding.)
 
-\dd Private key file for authentication.
+\dt \cw{\-agent}
+
+\dd Allow use of an authentication agent. (This option is only necessary
+to override a setting in a saved session.)
+
+\dt \cw{\-hostkey} \e{key}
+
+\dd Specify an acceptable host public key. This option may be specified
+multiple times; each key can be either a fingerprint (\cw{99:aa:bb:...}) or
+a base64-encoded blob in OpenSSH's one-line format.
+
+\lcont{ Specifying this option overrides automated host key
+management; \e{only} the key(s) specified on the command-line will be
+accepted (unless a saved session also overrides host keys, in which
+case those will be added to), and the host key cache will not be
+written. }
 
 \dt \cw{-s}
 
@@ -145,6 +181,59 @@ tunnel all their connections. Only works in SSH.
 
 \dd Don't start a remote command or shell at all (SSH-2 only).
 
+\dt \cw{\-nc} \e{host}:\e{port}
+
+\dd Make a remote network connection from the server instead of
+starting a shell or command.
+
+\dt \cw{\-sercfg} \e{configuration-string}
+
+\dd Specify the configuration parameters for the serial port, in
+\cw{-serial} mode. \e{configuration-string} should be a
+comma-separated list of configuration parameters as follows:
+
+\lcont{
+
+\b Any single digit from 5 to 9 sets the number of data bits.
+
+\b \cq{1}, \cq{1.5} or \cq{2} sets the number of stop bits.
+
+\b Any other numeric string is interpreted as a baud rate.
+
+\b A single lower-case letter specifies the parity: \cq{n} for none,
+\cq{o} for odd, \cq{e} for even, \cq{m} for mark and \cq{s} for space.
+
+\b A single upper-case letter specifies the flow control: \cq{N} for
+none, \cq{X} for XON/XOFF, \cq{R} for RTS/CTS and \cq{D} for
+DSR/DTR.
+
+}
+
+\dt \cw{\-sshlog} \e{logfile}
+
+\dt \cw{\-sshrawlog} \e{logfile}
+
+\dd For SSH connections, these options make \cw{plink} log protocol
+details to a file. (Some of these may be sensitive, although by default
+an effort is made to suppress obvious passwords.)
+
+\lcont{
+\cw{\-sshlog} logs decoded SSH packets and other events (those that
+\cw{\-v} would print). \cw{\-sshrawlog} additionally logs the raw
+encrypted packet data.
+}
+
+\dt \cw{\-shareexists}
+
+\dd Instead of making a new connection, test for the presence of an
+existing connection that can be shared. The desired session can be
+specified in any of the usual ways.
+
+\lcont{
+Returns immediately with a zero exit status if a suitable \q{upstream}
+exists, nonzero otherwise.
+}
+
 \S{plink-manpage-more-information} MORE INFORMATION
 
 For more information on plink, it's probably best to go and look at