Merge branch 'pre-0.64'

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

diff --git a/doc/man-putt.but b/doc/man-putt.but
index 74c14b5932d2aefda52b17062479a019751b9f67..76694def8ee112e249b10d101cf6b5a45176b771 100644 (file)
--- a/doc/man-putt.but
+++ b/doc/man-putt.but
@@ -37,7 +37,7 @@ Sorry.)
 If the \cw{BoldAsColour} resource is set to 1 (the default), bold
 text will be displayed in different colours instead of a different
 font, so this option will be ignored. If \cw{BoldAsColour} is set to
-0 and you do not specify a bold font, \cw{putty} will overprint the
+0 or 2 and you do not specify a bold font, \cw{putty} will overprint the
 normal font to make it look bolder.
 
 \dt \cw{\-fw} \e{font-name}
@@ -49,7 +49,7 @@ Chinese, Japanese and Korean text) displayed in the terminal.
 
 \dd Specify the font to use for bold double-width characters
 (typically Chinese, Japanese and Korean text). Like \cw{-fb}, this
-will be ignored unless the \cw{BoldAsColour} resource is set to 0.
+will be ignored unless the \cw{BoldAsColour} resource is set to 0 or 2.
 
 \dt \cw{\-geometry} \e{geometry}
 
@@ -73,12 +73,12 @@ terminal.
 \dt \cw{\-bfg} \e{colour}
 
 \dd Specify the foreground colour to use for bold text, if the
-\cw{BoldAsColour} resource is set to 1 (the default).
+\cw{BoldAsColour} resource is set to 1 (the default) or 2.
 
 \dt \cw{\-bbg} \e{colour}
 
 \dd Specify the foreground colour to use for bold reverse-video
-text, if the \cw{BoldAsColour} resource is set to 1 (the default).
+text, if the \cw{BoldAsColour} resource is set to 1 (the default) or 2.
 (This colour is best thought of as the bold version of the
 background colour; so it only appears when text is displayed \e{in}
 the background colour.)
@@ -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