Correct man page description of -hostkey to match actual behaviour.

[originally from svn r10235]

diff --git a/doc/man-pl.but b/doc/man-pl.but
index b5c64dc9c2eeed64b6798575daa9de68966cb323..6a358ceaac314fb8f9b693e261ccb878a725b1f1 100644 (file)
--- a/doc/man-pl.but
+++ b/doc/man-pl.but
@@ -149,7 +149,9 @@ 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, and the host's key will not be cached. }
+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{-s}
 

diff --git a/doc/man-pscp.but b/doc/man-pscp.but
index e549279b9e70a274a23242546122f80dc600d6c8..5cd5ac8cd33c50a4b0e1a6a12cc669f5d292417a 100644 (file)
--- a/doc/man-pscp.but
+++ b/doc/man-pscp.but
@@ -103,7 +103,9 @@ 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, and the host's key will not be cached. }
+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}
 

diff --git a/doc/man-psft.but b/doc/man-psft.but
index a3a1362af313b397a6b2ddb3e4202692f96c6cef..f24d7206c4a10e09f33ee4abf83bc29aca95a05c 100644 (file)
--- a/doc/man-psft.but
+++ b/doc/man-psft.but
@@ -91,7 +91,9 @@ 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, and the host's key will not be cached. }
+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
 

diff --git a/doc/man-putt.but b/doc/man-putt.but
index 09d60a799819ccd3ae9ece24c17e6c5a782de9f1..76694def8ee112e249b10d101cf6b5a45176b771 100644 (file)
--- a/doc/man-putt.but
+++ b/doc/man-putt.but
@@ -231,7 +231,9 @@ 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, and the host's key will not be cached. }
+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}