Merge branch 'master' of ssh://tartarus.org/putty

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

diff --git a/doc/man-pscp.but b/doc/man-pscp.but
index d848043bd2514d78461658e87c7992ae08763e47..b225f22a127fdcda40be77a567cbe87c3e759bfb 100644 (file)
--- a/doc/man-pscp.but
+++ b/doc/man-pscp.but
@@ -28,6 +28,11 @@ The command-line options supported by \e{pscp} 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{-ls}
 
 \dd Remote directory listing.
@@ -86,9 +91,27 @@ commands such as \q{\c{w}}).
 
 \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{\-hostkey} \e{key}
 
-\dd Private key file for authentication.
+\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{-scp}
 
@@ -98,6 +121,20 @@ commands such as \q{\c{w}}).
 
 \dd Force use of SFTP protocol.
 
+\dt \cw{\-sshlog} \e{logfile}
+
+\dt \cw{\-sshrawlog} \e{logfile}
+
+\dd These options make \cw{pscp} 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{pscp-manpage-more-information} MORE INFORMATION
 
 For more information on \cw{pscp} it's probably best to go and look at