X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=doc%2Fman-psft.but;h=961262b9987fdecb18e38a9b72f68c11d7ed8c86;hb=145ecf611238c4f1e39d89d3eee40319a2c54fe8;hp=5375f6f73584ab457384fc795cdcddeaefb9d138;hpb=2b4e286954882420ca3122464b5a40f16362dda9;p=PuTTY.git

diff --git a/doc/man-psft.but b/doc/man-psft.but
index 5375f6f7..961262b9 100644
--- a/doc/man-psft.but
+++ b/doc/man-psft.but
@@ -24,6 +24,11 @@ The command-line options supported by \cw{psftp} 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{-b} \e{batchfile}
 
 \dd Use specified batchfile.
@@ -58,7 +63,9 @@ The command-line options supported by \cw{psftp} are:
 
 \dt \cw{-pw} \e{password}
 
-\dd Set remote password to \e{password}.
+\dd Set remote password to \e{password}. \e{CAUTION:} this will likely
+make the password visible to other users of the local machine (via
+commands such as \q{\c{w}}).
 
 \dt \cw{-1}
 
@@ -72,9 +79,41 @@ The command-line options supported by \cw{psftp} are:
 
 \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 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{\-sshlog} \e{logfile}
+
+\dt \cw{\-sshrawlog} \e{logfile}
+
+\dd These options make \cw{psftp} log protocol details to a file.
+(Some of these may be sensitive, although by default an effort is made
+to suppress obvious passwords.)
 
-\dd Private key file for authentication.
+\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{psftp-manpage-commands} COMMANDS