aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authordvserg <dv_serg@mail.ru>2009-03-02 13:26:44 +0300
committerdvserg <dv_serg@mail.ru>2009-03-02 13:26:44 +0300
commit6ef722c129b21c88acac663153894678feeea2ba (patch)
tree04cc11c0dad099c945fa8bd191beb4a7f5864f79 /config
parent66cc19a6f46187978bb960d8eff3a7c12ac2ae9b (diff)
parent349d9b09a8c20a9bc68b8ed85f4f148da3ac0138 (diff)
downloadpfsense-packages-6ef722c129b21c88acac663153894678feeea2ba.tar.gz
pfsense-packages-6ef722c129b21c88acac663153894678feeea2ba.tar.bz2
pfsense-packages-6ef722c129b21c88acac663153894678feeea2ba.zip
Merge branch 'master' of http://gitweb.pfsense.org/pfsense-packages/mainline
Diffstat (limited to 'config')
-rw-r--r--config/squid/squid.xml8
-rw-r--r--config/squid3/squid.xml8
2 files changed, 8 insertions, 8 deletions
diff --git a/config/squid/squid.xml b/config/squid/squid.xml
index 4c8bc4ab..a119e647 100644
--- a/config/squid/squid.xml
+++ b/config/squid/squid.xml
@@ -169,15 +169,15 @@
<required/>
</field>
<field>
- <fielddescr>Do NOT proxy Private Address Space (RFC 1918)</fielddescr>
+ <fielddescr>Bypass proxy for Private Address Space (RFC 1918) destination</fielddescr>
<fieldname>private_subnet_proxy_off</fieldname>
- <description>Do not forward traffic to Private Address Space (RFC 1918) &lt;b&gt;destination&lt;/b&gt; through the proxy server.</description>
+ <description>Do not forward traffic to Private Address Space (RFC 1918) &lt;b&gt;destination&lt;/b&gt; through the proxy server but directly through the firewall.</description>
<type>checkbox</type>
</field>
<field>
- <fielddescr>Do NOT proxy these IPs</fielddescr>
+ <fielddescr>Bypass proxy for these source IPs</fielddescr>
<fieldname>defined_ip_proxy_off</fieldname>
- <description>Do not forward traffic from these &lt;b&gt;source&lt;/b&gt; IPs through the proxy server. Separate by semi-colons (;).</description>
+ <description>Do not forward traffic from these &lt;b&gt;source&lt;/b&gt; IPs through the proxy server but directly through the firewall. Separate by semi-colons (;).</description>
<type>input</type>
<size>80</size>
</field>
diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml
index 8529526e..662805da 100644
--- a/config/squid3/squid.xml
+++ b/config/squid3/squid.xml
@@ -169,15 +169,15 @@
<required/>
</field>
<field>
- <fielddescr>Do NOT proxy Private Address Space (RFC 1918)</fielddescr>
+ <fielddescr>Bypass proxy for Private Address Space (RFC 1918) destination</fielddescr>
<fieldname>private_subnet_proxy_off</fieldname>
- <description>Do not forward traffic to Private Address Space (RFC 1918) &lt;b&gt;destination&lt;/b&gt; through the proxy server.</description>
+ <description>Do not forward traffic to Private Address Space (RFC 1918) &lt;b&gt;destination&lt;/b&gt; through the proxy server but directly through the firewall.</description>
<type>checkbox</type>
</field>
<field>
- <fielddescr>Do NOT proxy these IPs</fielddescr>
+ <fielddescr>Bypass proxy for these source IPs</fielddescr>
<fieldname>defined_ip_proxy_off</fieldname>
- <description>Do not forward traffic from these &lt;b&gt;source&lt;/b&gt; IPs through the proxy server. Separate by semi-colons (;).</description>
+ <description>Do not forward traffic from these &lt;b&gt;source&lt;/b&gt; IPs through the proxy server but directly through the firewall. Separate by semi-colons (;).</description>
<type>input</type>
<size>80</size>
</field>