X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fp-config.sgml;h=2d8c1817187a5a5c456a53215723c849e31e802a;hp=590f800eb81b4911cb145e6f5e6a129e4c930ee4;hb=7629bc44c1537497c2b33bef1332b9fedb7a83d7;hpb=962ed628ec708d487afd1494813141fc048143d6
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 590f800e..2d8c1817 100644
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -3,9 +3,9 @@
Purpose : Used with other docs and files only.
- $Id: p-config.sgml,v 2.34 2008/12/14 15:46:23 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.42 2009/03/23 04:17:47 ler762 Exp $
- Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
+ Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
See LICENSE.
========================================================================
@@ -95,10 +95,10 @@
Sample Configuration File for Privoxy v&p-version;
- $Id: p-config.sgml,v 2.34 2008/12/14 15:46:23 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.42 2009/03/23 04:17:47 ler762 Exp $
-Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
+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]]>