Initial 'merge -s ours' from 0.66 release branch.

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

diff --git a/doc/man-psft.but b/doc/man-psft.but
index a71e918e38cb64d4ef18252a4c12a7525312491f..f24d7206c4a10e09f33ee4abf83bc29aca95a05c 100644 (file)
--- 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.
@@ -76,7 +81,19 @@ commands such as \q{\c{w}}).
 
 \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. }
 
 \S{psftp-manpage-commands} COMMANDS