X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=doc%2Fman-pl.but;h=b597b83f923cb8370a11c7693b7ef6c6f1d993ef;hb=91653a10c6e6b9d57688e1d7dd7403625ea670a0;hp=1f34dc1a7f845eb2907c1fc9980f0aefdaf114c0;hpb=d3b8ed615256985956cf92e833fb11465bf82042;p=PuTTY.git

diff --git a/doc/man-pl.but b/doc/man-pl.but
index 1f34dc1a..b597b83f 100644
--- a/doc/man-pl.but
+++ b/doc/man-pl.but
@@ -23,6 +23,11 @@ The command-line options supported by \cw{plink} are:
 
 \dd Show version information and exit.
 
+\dt \cw{-pgpfp}
+
+\dd Display the fingerprints of the PuTTY PGP Master Keys and exit,
+to aid in verifying new files released by the PuTTY team.
+
 \dt \cw{-v}
 
 \dd Show verbose messages.
@@ -47,6 +52,10 @@ The command-line options supported by \cw{plink} are:
 
 \dd Force raw mode.
 
+\dt \cw{-serial}
+
+\dd Force serial mode.
+
 \dt \cw{-P} \e{port}
 
 \dd Connect to port \e{port}.
@@ -130,12 +139,65 @@ tunnel all their connections. Only works in SSH.
 
 \dt \cw{-i} \e{path}
 
-\dd Private key file for authentication.
+\dd Private key file for user authentication.
+
+\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}
 
 \dd Remote command is SSH subsystem (SSH-2 only).
 
+\dt \cw{-N}
+
+\dd Don't start a remote command or shell at all (SSH-2 only).
+
+\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.
+}
+
 \S{plink-manpage-more-information} MORE INFORMATION
 
 For more information on plink, it's probably best to go and look at