X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Fp-config.sgml;h=c2fd53a63fa62526364bd94b69e3101abad207c0;hb=cb55b61769015017aa64c553daecc52b6a070888;hp=b2c49b86dd3d16a60faccf820fb55ff911d54177;hpb=46efa6f8fea119c9671cd61aa2e29b2a3f2ad75c;p=privoxy.git
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index b2c49b86..c2fd53a6 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.35 2009/01/13 16:44:32 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.47 2009/04/17 11:40:48 fabiankeil Exp $
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
See LICENSE.
@@ -95,7 +95,7 @@
Sample Configuration File for Privoxy v&p-version;
- $Id: p-config.sgml,v 2.35 2009/01/13 16:44:32 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.47 2009/04/17 11:40:48 fabiankeil Exp $
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
@@ -338,7 +338,7 @@ II. FORMAT OF THE CONFIGURATION FILE
Default value:
- Two example URLs are provided
+ Unset
@@ -369,8 +369,8 @@ II. FORMAT OF THE CONFIGURATION FILE
-@@trust-info-url http://www.example.com/why_we_block.html]]>
-@@trust-info-url http://www.example.com/what_we_allow.html]]>
+@@#trust-info-url http://www.example.com/why_we_block.html]]>
+@@#trust-info-url http://www.example.com/what_we_allow.html]]>
@@ -668,10 +668,13 @@ actionsfile
- default.action # Main actions file
+ match-all.action # Actions that are applied to all sites and maybe overruled later on.
+
+
+ default.action # Main actions file
- user.action # User customizations
+ user.action # User customizations
@@ -712,6 +715,7 @@ actionsfile
+@@actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.]]>
@@actionsfile default.action # Main actions file]]>