From a0835c4be687ce1850417626f2d003e99569fc27 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 4 Feb 2007 17:26:14 +0000
Subject: [PATCH] Update Squid doc with 2.6 and later config info

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5359 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/Shorewall_Squid_Usage.xml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/Shorewall_Squid_Usage.xml b/docs/Shorewall_Squid_Usage.xml
index 33f6132cd..2bccc72b5 100644
--- a/docs/Shorewall_Squid_Usage.xml
+++ b/docs/Shorewall_Squid_Usage.xml
@@ -46,7 +46,7 @@
   </caution>
 
   <section>
-    <title>Squid as a Transparent Proxy</title>
+    <title>Squid as a Transparent (Interception) Proxy</title>
 
     <important>
       <para>This section gives instructions for transparent proxying of HTTP.
@@ -62,7 +62,23 @@
         <listitem>
           <para>In all cases, Squid should be configured to run as a
           transparent proxy as described at <ulink
-          url="http://www.tldp.org/HOWTO/TransparentProxy.html">http://www.tldp.org/HOWTO/TransparentProxy.html</ulink>.</para>
+          url="http://wiki.squid-cache.org/SquidFaq/InterceptionProxy">http://wiki.squid-cache.org/SquidFaq/InterceptionProxy</ulink>.</para>
+
+          <para>The bottom line of that article is that if you are running
+          <emphasis role="bold">Squid 2.6 or later</emphasis>, then you simply
+          need to add the word <firstterm>transparent</firstterm> to your
+          http_port specification:</para>
+
+          <programlisting>http_port 3128 transparent</programlisting>
+
+          <para>In <emphasis role="bold">earlier Squid versions</emphasis>,
+          you need to set several options:</para>
+
+          <programlisting>http_port 3128
+httpd_accel_host virtual
+httpd_accel_port 80
+httpd_accel_with_proxy  on
+httpd_accel_uses_host_header on</programlisting>
         </listitem>
 
         <listitem>