X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=config;h=429a67f9bd1195b24742c7c0f4a7a449b39b5e31;hb=cb1c5ab8d5d827c5ac8c96177c39599937dd087c;hp=482a0729b54e8ee418aa998149beb66606f4a68c;hpb=0120de6d047a78a51e07445dd8ba9dfc9ac39a8d;p=privoxy.git diff --git a/config b/config index 482a0729..429a67f9 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # Sample Configuration File for Privoxy v3.0.17 # -# $Id: config,v 1.91 2010/11/06 12:56:15 fabiankeil Exp $ +# $Id: config,v 1.93 2010/11/13 12:48:18 fabiankeil Exp $ # # Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/ # @@ -113,7 +113,6 @@ # # user-manual /usr/share/doc/privoxy/user-manual # -# # The User Manual is then available to anyone with # access to Privoxy, by following the built-in URL: # http://config.privoxy.org/user-manual/ (or the shortcut: @@ -124,7 +123,6 @@ # # user-manual http://example.com/privoxy/user-manual/ # -# # WARNING!!! # # If set, this option should be the first option in the config @@ -729,13 +727,11 @@ logfile logfile # # listen-address 192.168.0.1:8118 # -# # Suppose you are running Privoxy on an IPv6-capable machine and # you want it to listen on the IPv6 address of the loopback device: # # listen-address [::1]:8118 # -# listen-address 127.0.0.1:8118 # # @@ -1008,10 +1004,10 @@ enforce-blocks 0 # names. If a DNS name resolves to multiple IP addresses, only # the first one is used. # -# Some systems allows IPv4 client to connect to IPv6 server -# socket. Then the client's IPv4 address will be translated by +# Some systems allow IPv4 clients to connect to IPv6 server +# sockets. Then the client's IPv4 address will be translated by the # system into IPv6 address space with special prefix ::ffff:0:0/96 -# (so called IPv4 mapped IPv6 address). Privoxy can handle it +# (so called IPv4 mapped IPv6 address). Privoxy can handle it # and maps such ACL addresses automatically. # # Denying access to particular sites by ACL may have undesired @@ -1171,7 +1167,7 @@ buffer-limit 4096 # # Parent proxy specified by an IPv6 address: # -# foward / [2001:DB8::1]:8000 +# forward / [2001:DB8::1]:8000 # # # Suppose your parent proxy doesn't support IPv6: @@ -1278,7 +1274,6 @@ buffer-limit 4096 # # # -# # 5.3. forwarded-connect-retries # =============================== # @@ -1558,6 +1553,7 @@ keep-alive-timeout 5 # #default-server-timeout 60 # +# # 6.6. connection-sharing # ======================== #