Merge branch 'pre-0.64'

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

diff --git a/doc/man-putt.but b/doc/man-putt.but
index 4c680121c61cf02c5796bb19065cba695a041019..76694def8ee112e249b10d101cf6b5a45176b771 100644 (file)
--- a/doc/man-putt.but
+++ b/doc/man-putt.but
@@ -219,10 +219,22 @@ pseudo-terminal at the server end.
 
 \dt \cw{\-i} \e{keyfile}
 
-\dd Specify a private key file to use for authentication. For SSH-2
+\dd Specify a private key file to use for user authentication. For SSH-2
 keys, this key file must be in PuTTY's format, not OpenSSH's or
 anyone else's.
 
+\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{\-sercfg} \e{configuration-string}
 
 \dd Specify the configuration parameters for the serial port, in