X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=doc%2Ffaq.but;h=040d61e70acd4ce33aef6825afa5b957dc50a83f;hb=145ecf611238c4f1e39d89d3eee40319a2c54fe8;hp=854207cdd60bccda580d11e2f1f288126e75e936;hpb=a1e622523e48125b7322cf4e53d504b9a6614c15;p=PuTTY.git

diff --git a/doc/faq.but b/doc/faq.but
index 854207cd..040d61e7 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -64,7 +64,11 @@ 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.
+considered secure; you should use SSH-2 instead if at all possible.
+
+\#{XXX-REVIEW-BEFORE-RELEASE:
+As of 0.68, PuTTY will no longer fall back to SSH-1 if the server
+doesn't appear to support SSH-2; you must explicitly ask for SSH-1. }
 
 \S{faq-localecho}{Question} Does PuTTY support \i{local echo}?
 
@@ -228,8 +232,8 @@ In the development code, a partial port to Mac OS exists (see
 Currently PuTTY does \e{not} run on Windows CE (see \k{faq-wince}).
 
 We do not have release-quality ports for any other systems at the
-present time. If anyone told you we had an EPOC port, or an iPaq port,
-or any other port of PuTTY, they were mistaken. We don't.
+present time. If anyone told you we had an Android port, or an iOS
+port, or any other port of PuTTY, they were mistaken. We don't.
 
 There are some third-party ports to various platforms, mentioned
 on the