Merge branch 'pre-0.64'

[PuTTY.git] / doc / faq.but

diff --git a/doc/faq.but b/doc/faq.but
index 07c913ed8e6e1284cbb68db76f882ff8d5b65053..06448cb81b8680e32606d2b117a9f14b7c13273a 100644 (file)
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1,5 +1,3 @@
-\define{versionidfaq} \versionid $Id$
-
 \A{faq} PuTTY \i{FAQ}
 
 This FAQ is published on the PuTTY web site, and also provided as an
@@ -65,6 +63,9 @@ files into PuTTY's format.
 
 Yes. SSH-1 support has always been available in PuTTY.
 
+However, the SSH-1 protocol has many weaknesses and is no longer
+considered secure; it should be avoided if at all possible.
+
 \S{faq-localecho}{Question} Does PuTTY support \i{local echo}?
 
 Yes. Version 0.52 has proper support for local echo.
@@ -151,13 +152,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 +1077,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?
@@ -1188,7 +1190,7 @@ Partly, because we don't want to move the web site location (see
 Also, security reasons. PuTTY is a security product, and as such it
 is particularly important to guard the code and the web site against
 unauthorised modifications which might introduce subtle security
-flaws. Therefore, we prefer that the Subversion repository, web site and
+flaws. Therefore, we prefer that the Git repository, web site and
 FTP site remain where they are, under the direct control of system
 administrators we know and trust personally, rather than being run
 by a large organisation full of people we've never met and which is