Update for latest mkfiles.pl kerfuffle

[sgt/putty] / doc / faq.but

diff --git a/doc/faq.but b/doc/faq.but
index 10a9820..0a6aa89 100644 (file)
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1,4 +1,4 @@
-\versionid $Id: faq.but,v 1.46 2003/03/29 01:44:39 owen Exp $
+\versionid $Id: faq.but,v 1.51 2003/11/19 19:09:07 jacob Exp $
 
 \A{faq} PuTTY FAQ
 
@@ -28,11 +28,6 @@ implemented.
 \S{faq-ssh2}{Question} Does PuTTY support SSH v2?
 
 Yes. SSH v2 support has been available in PuTTY since version 0.50.
-However, currently the \e{default} SSH protocol is v1; to select SSH
-v2 if your server supports both, go to the SSH panel and change the
-\e{Preferred SSH protocol version} option. (The factory default will
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/ssh2-default.html}{change to v2}
-in the next full release.)
 
 Public key authentication (both RSA and DSA) in SSH v2 is new in
 version 0.52.
@@ -153,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
 
@@ -194,16 +190,10 @@ or any other port of PuTTY, they were mistaken. We don't.
 
 It's currently being worked on. If you look at the nightly source
 snapshots, you should find a \c{unix} subdirectory, which should
-build you a Unix port of Plink, and also \c{pterm} - an
-\cw{xterm}-type program which supports the same terminal emulation
-as PuTTY.
-
-It isn't yet clear whether we will bother combining the terminal
-emulator and network back end into the same process, to provide a
-Unix port of the full GUI form of PuTTY. It wouldn't be as useful a
-thing on Unix as it would be on Windows; its major value would
-probably be as a pathfinding effort for other ports. If anyone
-really wants it, we'd be interested to know why :-)
+build you Unix ports of Plink, PuTTY itself, PSCP, PSFTP, and
+also \c{pterm} - an \cw{xterm}-type program which supports the
+same terminal emulation as PuTTY. We do not yet have Unix ports of
+Pageant or PuTTYgen.
 
 \S{faq-wince}{Question} Will there be a port to Windows CE or PocketPC?
 
@@ -435,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