Add section on "Access denied". This was mostly inspired by the password

[u/mdw/putty] / doc / config.but

diff --git a/doc/config.but b/doc/config.but
index e4fd819..1dc0ad4 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -1,4 +1,4 @@
-\versionid $Id: config.but,v 1.63 2003/04/26 13:22:25 simon Exp $
+\versionid $Id: config.but,v 1.66 2003/06/25 15:52:29 jacob Exp $

 
 \C{config} Configuring PuTTY
 
 
 \C{config} Configuring PuTTY
 


@@ -1457,8 +1457,8 @@ connection.
 web server supporting the HTTP \cw{CONNECT} command, as documented
 in \W{http://www.ietf.org/rfc/rfc2817.txt}{RFC 2817}.
 
 web server supporting the HTTP \cw{CONNECT} command, as documented
 in \W{http://www.ietf.org/rfc/rfc2817.txt}{RFC 2817}.
 

-\b Selecting \q{SOCKS} allows you to proxy your connections through
-a SOCKS server.
+\b Selecting \q{SOCKS 4} or \q{SOCKS 5} allows you to proxy your
+connections through a SOCKS server.

 
 \b Many firewalls implement a less formal type of proxy in which a
 user can make a Telnet connection directly to the firewall machine
 
 \b Many firewalls implement a less formal type of proxy in which a
 user can make a Telnet connection directly to the firewall machine


@@ -1587,15 +1587,6 @@ port. Note that if you do not include the \c{%user} or \c{%pass}
 tokens in the Telnet command, then the \q{Username} and \q{Password}
 configuration fields will be ignored.
 
 tokens in the Telnet command, then the \q{Username} and \q{Password}
 configuration fields will be ignored.
 

-\S{config-proxy-socksver} Selecting the version of the SOCKS protocol
-
-\cfg{winhelp-topic}{proxy.socksver}
-
-SOCKS servers exist in two versions: version 5
-(\W{http://www.ietf.org/rfc/rfc1928.txt}{RFC 1928}) and the earlier
-version 4. The \q{SOCKS Version} radio buttons allow you to select
-which one to use, if you have selected the SOCKS proxy type.
-

 \H{config-telnet} The Telnet panel
 
 The Telnet panel allows you to configure options that only apply to
 \H{config-telnet} The Telnet panel
 
 The Telnet panel allows you to configure options that only apply to


@@ -1813,6 +1804,16 @@ you make an SSH connection, PuTTY will search down the list from the
 top until it finds an algorithm supported by the server, and then
 use that.
 
 top until it finds an algorithm supported by the server, and then
 use that.
 

+PuTTY currently supports the following algorithms:
+
+\b AES (Rijndael) - 256, 192, or 128-bit CBC (SSH-2 only)
+
+\b Blowfish - 128-bit CBC
+
+\b Triple-DES - 168-bit CBC
+
+\b Single-DES - 56-bit CBC (see below for SSH-2)
+

 If the algorithm PuTTY finds is below the \q{warn below here} line,
 you will see a warning box when you make the connection:
 
 If the algorithm PuTTY finds is below the \q{warn below here} line,
 you will see a warning box when you make the connection:
 


@@ -2258,7 +2259,7 @@ line options, so it's all automatic. Here is what you need in
 \c regedit /s putty.reg
 \c regedit /s puttyrnd.reg
 \c start /w putty.exe
 \c regedit /s putty.reg
 \c regedit /s puttyrnd.reg
 \c start /w putty.exe

-\c regedit /e puttynew.reg HKEY_CURRENT_USER\Software\SimonTatham\PuTTY
+\c regedit /ea puttynew.reg HKEY_CURRENT_USER\Software\SimonTatham\PuTTY

 \c copy puttynew.reg putty.reg
 \c del puttynew.reg
 \c regedit /s puttydel.reg
 \c copy puttynew.reg putty.reg
 \c del puttynew.reg
 \c regedit /s puttydel.reg