X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/2d24892b096bdd7cf97e2888b67bab53626af93f..8e97579565606eb5386c85717640ee534a8606dc:/doc/config.but

diff --git a/doc/config.but b/doc/config.but
index c9bf6657..6af3546e 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -1,4 +1,4 @@
-\versionid $Id: config.but,v 1.38 2002/09/10 12:30:45 jacob Exp $
+\versionid $Id: config.but,v 1.42 2002/09/26 18:37:33 simon Exp $
 
 \C{config} Configuring PuTTY
 
@@ -1375,6 +1375,8 @@ The Nagle algorithm is disabled by default.
 
 \H{config-proxy} The Proxy panel
 
+\cfg{winhelp-topic}{proxy.main}
+
 The Proxy panel allows you to configure PuTTY to use various types
 of proxy in order to make its network connections. The settings in
 this panel affect the primary network connection forming your PuTTY
@@ -1383,6 +1385,8 @@ forwarding (see \k{using-port-forwarding}).
 
 \S{config-proxy-type} Setting the proxy type
 
+\cfg{winhelp-topic}{proxy.type}
+
 The \q{Proxy type} radio buttons allow you to configure what type of
 proxy you want PuTTY to use for its network connections. The default
 setting is \q{None}; in this mode no proxy is used for any
@@ -1403,6 +1407,8 @@ PuTTY to use this type of proxy.
 
 \S{config-proxy-exclude} Excluding parts of the network from proxying
 
+\cfg{winhelp-topic}{proxy.exclude}
+
 Typically you will only need to use a proxy to connect to non-local
 parts of your network; for example, your proxy might be required for
 connections outside your company's internal network. In the
@@ -1430,15 +1436,25 @@ This excludes both of the above ranges at once.
 
 \S{config-proxy-auth} Username and password
 
+\cfg{winhelp-topic}{proxy.auth}
+
 If your proxy requires authentication, you can enter a username and
 a password in the \q{Username} and \q{Password} boxes.
 
-Currently only the \q{Username} box has any effect, and that only for
-SOCKS 4 proxies. ( [FIXME] No forms of authentication are supported
-for other types of proxy.)
+Authentication is not supported for all forms of proxy:
+
+\b Username and password authentication is supported for HTTP
+proxies and SOCKS 5 proxies.
+
+\b SOCKS 4 can use the \q{Username} field, but does not support
+passwords.
+
+\b Authentication is meaningless in Telnet proxies.
 
 \S{config-proxy-command} Specifying the Telnet proxy command
 
+\cfg{winhelp-topic}{proxy.command}
+
 If you are using the Telnet proxy type, the usual command required
 by the firewall's Telnet server is \c{connect}, followed by a host
 name and a port number. If your proxy needs a different command,
@@ -1456,6 +1472,8 @@ literal \c{%} sign, enter \c{%%}.
 
 \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
@@ -1987,7 +2005,7 @@ server, communication will fail.
 
 This is an SSH2-specific bug.
 
-\S{config-ssh-bug-ssh} \q{Requires padding on SSH2 RSA signatures}
+\S{config-ssh-bug-sig} \q{Requires padding on SSH2 RSA signatures}
 
 \cfg{winhelp-topic}{ssh.bugs.rsapad2}
 
@@ -2006,6 +2024,23 @@ to talking to OpenSSH.
 
 This is an SSH2-specific bug.
 
+\S{config-ssh-bug-dhgex} \q{Chokes on Diffie-Hellman group exchange}
+
+\cfg{winhelp-topic}{ssh.bugs.dhgex2}
+
+We have anecdotal evidence that some SSH servers claim to be able to
+perform Diffie-Hellman group exchange, but fail to actually do so
+when PuTTY tries to. If your SSH2 sessions spontaneously close
+immediately after opening the PuTTY window, it might be worth
+enabling the workaround for this bug to see if it helps.
+
+We have no hard evidence that any specific version of specific
+server software reliably demonstrates this bug. Therefore, PuTTY
+will never \e{assume} a server has this bug; if you want the
+workaround, you need to enable it manually.
+
+This is an SSH2-specific bug.
+
 \H{config-file} Storing configuration in a file
 
 PuTTY does not currently support storing its configuration in a file