X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Fp-config.sgml;h=d08714497450c2e6cdec6fba7102e913021b2497;hb=ad70ee7ab4cd85607b402a16bda85963a6e02583;hp=0eb745a2265fcce34553d12d05617a4ac05a76f5;hpb=ab6b9fbd7d0bf309a1fd6b2eadb284515291785b;p=privoxy.git
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 0eb745a2..d0871449 100644
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -3,7 +3,7 @@
Purpose : Used with other docs and files only.
- $Id: p-config.sgml,v 2.64 2010/10/30 16:01:01 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.67 2011/01/09 12:10:34 fabiankeil Exp $
Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/
See LICENSE.
@@ -97,7 +97,7 @@
Sample Configuration File for Privoxy v&p-version;
- $Id: p-config.sgml,v 2.64 2010/10/30 16:01:01 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.67 2011/01/09 12:10:34 fabiankeil Exp $
Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/
@@ -1711,8 +1711,8 @@ ACLs: permit-access and deny-access
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 system into
+ 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
and maps such ACL addresses automatically.
@@ -2790,9 +2790,9 @@ forward-socks4, forward-socks4a and forward-socks5
Notes:
- For SOCKS requests the timeout currently doesn't start until
- the SOCKS server accepted the request. This will be fixed in
- the next release.
+ The default is quite high and you probably want to reduce it.
+ If you aren't using an occasionally slow proxy like Tor, reducing
+ it to a few seconds should be fine.
@@ -2892,19 +2892,6 @@ forward-socks4, forward-socks4a and forward-socks5
handle-as-empty-doc-returns-ok
-
- Note:
-
-
- This is a work-around for Firefox bug 492459:
-
- Websites are no longer rendered if SSL requests for JavaScripts are blocked by a proxy.
-
- (https://bugzilla.mozilla.org/show_bug.cgi?id=492459)
-
-
-
Specifies:
@@ -2946,8 +2933,24 @@ forward-socks4, forward-socks4a and forward-socks5
+
+ Notes:
+
+
+ This is a work-around for Firefox bug 492459:
+
+ Websites are no longer rendered if SSL requests for JavaScripts are blocked by a proxy.
+
+ (https://bugzilla.mozilla.org/show_bug.cgi?id=492459)
+ As the bug has been fixed for quite some time this option should no longer
+ be needed and will be removed in a future release. Please speak up if you
+ have a reason why the option should be kept around.
+
+
+
-@@handle-as-empty-doc-returns-ok 1]]>
+@@#handle-as-empty-doc-returns-ok 1]]>