X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/ad58c9bc9403a7bdbbdb420ac1ae70db0b4a66c8..dd16bdddff1ec1d4f043d7a5807629252fe042c5:/doc/faq.but

diff --git a/doc/faq.but b/doc/faq.but
index 389f7cc3..0a6aa893 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1,4 +1,4 @@
-\versionid $Id: faq.but,v 1.48 2003/10/14 19:57:50 jacob Exp $
+\versionid $Id: faq.but,v 1.51 2003/11/19 19:09:07 jacob Exp $
 
 \A{faq} PuTTY FAQ
 
@@ -148,14 +148,15 @@ anyone else wants to try it.
 \S{faq-pscp-ascii}{Question} Can PSCP or PSFTP transfer files in
 ASCII mode?
 
-Unfortunately not. This is a limitation of the file transfer
-protocols: the SCP and SFTP protocols have no notion of transferring
-a file in anything other than binary mode.
+Unfortunately not.
 
-SFTP is designed to be extensible, so it's possible that an
-extension might be proposed at some later date that implements ASCII
-transfer. But the PuTTY team can't do anything about it until that
-happens.
+Until recently, this was a limitation of the file transfer protocols:
+the SCP and SFTP protocols had no notion of transferring a file in
+anything other than binary mode. (This is still true of SCP.)
+
+The current draft protocol spec of SFTP proposes a means of
+implementing ASCII transfer. At some point PSCP/PSFTP may implement
+this proposal.
 
 \H{faq-ports} Ports to other operating systems
 
@@ -424,8 +425,10 @@ of quotes in the obvious way:
 \S{faq-incorrect-mac}{Question} Why do I see \q{Incorrect MAC
 received on packet}?
 
-This is due to a bug in old SSH 2 servers distributed by
-\cw{ssh.com}. Version 2.3.0 and below of their SSH 2 server
+One possible cause of this that used to be common is a bug in old
+SSH 2 servers distributed by \cw{ssh.com}. (This is not the only
+possible cause; see \k{errors-crc} in the documentation.)
+Version 2.3.0 and below of their SSH 2 server
 constructs Message Authentication Codes in the wrong way, and
 expects the client to construct them in the same wrong way. PuTTY
 constructs the MACs correctly by default, and hence these old