nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 03:22:48 -05:00
Code Issues Projects Releases Wiki Activity

Yesterday's proxy enhancements also slightly nadgered the config

Browse Source 
box, in that it started to expand under the weight of proxy options.
Now fixed, by folding the SOCKS version selector into the general
proxy type selector so there's one single 5- or 6-way radio button
set split over two lines. settings.c has of course grown a backwards
compatibility wart to deal with legacy config data.

[originally from svn r3168]
This commit is contained in:
Simon Tatham
2003-05-07 12:07:23 +00:00
parent ef53af1e8d
commit 8460ecd27d
6 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
doc/config.but
View File

@ -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.64 2003/05/07 12:07:23 simon Exp $
\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}.
\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
@ -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.
\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