Add some index terms for host key overrides.

[PuTTY.git] / doc / faq.but

diff --git a/doc/faq.but b/doc/faq.but
index 07c913ed8e6e1284cbb68db76f882ff8d5b65053..b8650df95d1f8952e70c19ac2cd9d7955d02ec6b 100644 (file)
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -151,13 +151,14 @@ military-strength cipher. That insignificant host key prompt really
 does make \e{that} much difference.
 
 If you're having a specific problem with host key checking - perhaps
-you want an automated batch job to make use of PSCP or Plink, and
-the interactive host key prompt is hanging the batch process - then
-the right way to fix it is to add the correct host key to the
-Registry in advance. That way, you retain the \e{important} feature
-of host key checking: the right key will be accepted and the wrong
-ones will not. Adding an option to turn host key checking off
-completely is the wrong solution and we will not do it.
+you want an automated batch job to make use of PSCP or Plink, and the
+interactive host key prompt is hanging the batch process - then the
+right way to fix it is to add the correct host key to the Registry in
+advance, or if the Registry is not available, to use the \cw{-hostkey}
+command-line option. That way, you retain the \e{important} feature of
+host key checking: the right key will be accepted and the wrong ones
+will not. Adding an option to turn host key checking off completely is
+the wrong solution and we will not do it.
 
 If you have host keys available in the common \i\c{known_hosts} format,
 we have a script called 
@@ -1075,7 +1076,7 @@ actively malicious PC and get away with typing passwords into it.
 If you do trust the PC, then it's probably OK to use PuTTY on it
 (but if you don't trust the network, then the PuTTY download might
 be tampered with, so it would be better to carry PuTTY with you on a
-floppy).
+USB stick).
 
 \S{faq-cleanup}{Question} What does PuTTY leave on a system? How can
 I \i{clean up} after it?