Remove an unnecessary "{Includes}" from the example Rez command.

[sgt/putty] / doc / faq.but

diff --git a/doc/faq.but b/doc/faq.but
index b24a408..914f5aa 100644 (file)
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1,4 +1,4 @@
-\versionid $Id: faq.but,v 1.37 2002/11/02 16:27:17 simon Exp $
+\versionid $Id: faq.but,v 1.39 2002/11/22 00:07:31 ben Exp $

 
 \A{faq} PuTTY FAQ
 
 
 \A{faq} PuTTY FAQ
 


@@ -29,7 +29,9 @@ it probably \e{hasn't} been implemented.
 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
 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.
+\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.
 
 Public key authentication (both RSA and DSA) in SSH v2 is new in
 version 0.52.


@@ -162,7 +164,7 @@ happens.
 \H{faq-ports} Ports to other operating systems
 
 The eventual goal is for PuTTY to be a multi-platform program, able
 \H{faq-ports} Ports to other operating systems
 
 The eventual goal is for PuTTY to be a multi-platform program, able

-to run on at least Windows, MacOS and Unix.
+to run on at least Windows, Mac OS and Unix.

 
 Porting will become easier once PuTTY has a generalised porting
 layer, drawing a clear line between platform-dependent and
 
 Porting will become easier once PuTTY has a generalised porting
 layer, drawing a clear line between platform-dependent and


@@ -175,8 +177,9 @@ be working so far.
 
 Currently, release versions of PuTTY only run on full Win32 systems.
 This includes Windows 95, 98, and ME, and it includes Windows NT,
 
 Currently, release versions of PuTTY only run on full Win32 systems.
 This includes Windows 95, 98, and ME, and it includes Windows NT,

-Windows 2000 and Windows XP. In the development code, a partial port
-to Unix is under way (see \k{faq-unix}).
+Windows 2000 and Windows XP. In the development code, partial ports
+to Unix (see \k{faq-unix}) and the Mac OS (see \k{faq-mac-port}).
+are under way.

 
 Currently PuTTY does \e{not} run on Windows CE (see \k{faq-wince}),
 and it does not quite run on the Win32s environment under Windows
 
 Currently PuTTY does \e{not} run on Windows CE (see \k{faq-wince}),
 and it does not quite run on the Win32s environment under Windows


@@ -230,10 +233,9 @@ testing in this area would be very welcome!
 
 \S{faq-mac-port}{Question} Will there be a port to the Mac?
 
 
 \S{faq-mac-port}{Question} Will there be a port to the Mac?
 

-A Mac port was started once and is half-finished, but development
-has been static for some time and the main PuTTY code has moved on,
-so it's not clear how quickly development would resume even if
-developer effort were available.
+Eventually.  The terminal emulation code has been ported, as has the
+saved-settings infrastructure, but networking and a configuration GUI
+still need to be done before the port will be of any use.

 
 \S{faq-epoc}{Question} Will there be a port to EPOC?
 
 
 \S{faq-epoc}{Question} Will there be a port to EPOC?