Update documentation for v2 protocol

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index c2d88587b7f0070d18915cb84ab7e5943c2f535b..262768ca2a49b647f266728a6cb7d81930bd28b3 100644 (file)
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -171,7 +171,10 @@ Most user-facing changes are reflected in squid.conf (see below).
    relay the original client source details without having to alter or understand
    the protocol being relayed on the connection.
 
-<p>Squid currently supports receiving version 1 of the protocol.
+<p>Squid currently supports receiving version 1 or 2 of the protocol.
+   A port which has been configured to receive this protocol may only be used to
+   receive traffic from client software sending in this protocol.
+   Regular forward-proxy HTTP traffic is not accepted.
 
 <p>Squid can be configured by adding an <em>http_port</em> or <em>https_port</em>
    with the <em>proxy-surrogate</em> mode flag. The <em>proxy_forwarded_access</em>

diff --git a/src/cf.data.pre b/src/cf.data.pre
index dc8de91884a3748caccf5b8af8456ad19524ff56..1abab6d6c910b9257f33f15d5eb7bce632093355 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1540,7 +1540,7 @@ DOC_START
           accel        Accelerator / reverse proxy mode
 
           proxy-surrogate
-                       Support for PROXY protocol version 1 connections.
+                       Support for PROXY protocol version 1 or 2 connections.
                        The proxy_forwarded_access is required to whitelist
                        downstream proxies which can be trusted.