X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Fp-config.sgml;h=1ae21de644cd21bb1f9fbd7710c64ee34ddae672;hb=871d2748df537ed2d2dc21dc45836a754aaa264e;hp=ac3afa6bbe71491277a323508509f0a93e28b2d5;hpb=c688a5250b9f4e0db1eaf3cb774b8a87836ae26c;p=privoxy.git
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index ac3afa6b..1ae21de6 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.107 2014/06/16 10:16:53 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.112 2014/11/28 14:26:35 fabiankeil Exp $
Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/
See LICENSE.
@@ -97,7 +97,7 @@
Sample Configuration File for Privoxy &p-version;
- $Id: p-config.sgml,v 2.107 2014/06/16 10:16:53 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.112 2014/11/28 14:26:35 fabiankeil Exp $
Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/
@@ -743,13 +743,6 @@ actionsfile
Actions files contain all the per site and per URL configuration for
ad blocking, cookie management, privacy considerations, etc.
- There is no point in using Privoxy without at
- least one actions file.
-
-
- Note that since Privoxy 3.0.7, the complete filename, including the .action
- extension has to be specified. The syntax change was necessary to be consistent
- with the other file options and to allow previously forbidden characters.
@@ -1072,12 +1065,6 @@ actionsfile
so that you will notice when things go wrong. The other levels are
probably only of interest if you are hunting down a specific problem.
They can produce a hell of an output (especially 16).
-
-
-
- &my-app; used to ship with the debug levels recommended above enabled by
- default, but due to privacy concerns 3.0.7 and later are configured to
- only log fatal errors.
If you are used to the more verbose settings, simply enable the debug lines
@@ -2237,8 +2224,13 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t
forward-socks5t / 127.0.0.1:9050 .
-
-
+
+ Note that if you got Tor through one of the bundles, you may
+ have to change the port from 9050 to 9150 (or even another one).
+ For details, please check the documentation on the
+ Tor website.
+
+
The public Tor network can't be used to
reach your local network, if you need to access local servers you
therefore might want to make some exceptions:
@@ -3150,9 +3142,7 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t
This directive was added as a work-around for Firefox bug 492459:
-
- Websites are no longer rendered if SSL requests for JavaScripts are blocked by a proxy.
-
+ Websites are no longer rendered if SSL requests for JavaScripts are blocked by a proxy.
(https://bugzilla.mozilla.org/show_bug.cgi?id=492459),
the bug has been fixed for quite some time, but this directive is also useful