From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Sat, 23 Feb 2008 23:56:22 +0000 (+0000)
Subject: Attempt to clarify what the various IP version selection options do.
X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/commitdiff_plain/2e523aed2a4deb0a1202549d4cd869c4725a3e55

Attempt to clarify what the various IP version selection options do.


git-svn-id: svn://svn.tartarus.org/sgt/putty@7882 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/doc/config.but b/doc/config.but
index 4ed912d4..16d15899 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -1700,8 +1700,13 @@ TCP keepalives are disabled by default.
 \cfg{winhelp-topic}{connection.ipversion}
 
 This option allows the user to select between the old and new
-Internet protocols and addressing schemes (\i{IPv4} and \i{IPv6}). The
-default setting is \q{Auto}, which means PuTTY will do something
+Internet protocols and addressing schemes (\i{IPv4} and \i{IPv6}).
+The selected protocol will be used for most outgoing network
+connections (including connections to \I{proxy}proxies); however,
+tunnels have their own configuration, for which see
+\k{config-ssh-portfwd-address-family}.
+
+The default setting is \q{Auto}, which means PuTTY will do something
 sensible and try to guess which protocol you wanted. (If you specify
 a literal \i{Internet address}, it will use whichever protocol that
 address implies. If you provide a \i{hostname}, it will see what kinds
@@ -2788,6 +2793,9 @@ incoming connections in both IPv4 and (if available) IPv6
 \b for a remote-to-local port forwarding, PuTTY will choose a
 sensible protocol for the outgoing connection.
 
+This overrides the general Internet protocol version preference
+on the Connection panel (see \k{config-address-family}).
+
 Note that some operating systems may listen for incoming connections
 in IPv4 even if you specifically asked for IPv6, because their IPv4
 and IPv6 protocol stacks are linked together. Apparently \i{Linux} does
diff --git a/doc/using.but b/doc/using.but
index 99905c38..0c7fcf88 100644
--- a/doc/using.but
+++ b/doc/using.but
@@ -870,7 +870,8 @@ PuTTY configuration box (see \k{config-ssh-prot}).
 \i{Internet protocol version}
 
 The \c{-4} and \c{-6} options force PuTTY to use the older Internet
-protocol \i{IPv4} or the newer \i{IPv6}.
+protocol \i{IPv4} or the newer \i{IPv6} for most outgoing
+connections.
 
 These options are equivalent to selecting your preferred Internet
 protocol version as \q{IPv4} or \q{IPv6} in the Connection panel of