X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fp-config.sgml;h=9ed8f15cc033db621547953a33e9cd18746fd5ec;hp=603e1eded82ba837af38a647214901ff83e09bb6;hb=df9616f1dacac74ba9469d6c334d0105a6effe15;hpb=8ef1cce0e3dfe6b68730d19d68cbb628219ebf39
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 603e1ede..9ed8f15c 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.31 2008/06/14 13:16:40 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.43 2009/03/28 15:33:41 fabiankeil 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.31 2008/06/14 13:16:40 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.43 2009/03/28 15:33:41 fabiankeil 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,13 +668,13 @@ actionsfile
- standard.action # Internal purposes, no editing recommended
+ match-all.action # Actions that are applied to all sites and maybe overruled later on.
- default.action # Main actions file
+ default.action # Main actions file
- user.action # User customizations
+ user.action # User customizations
@@ -694,9 +694,8 @@ actionsfile
Multiple actionsfile lines are permitted, and are in fact recommended!
- The default values include standard.action, which is used
- for internal purposes and should be loaded, default.action,
- which is the main
actions file maintained by the developers, and
+ The default values are default.action, which is the
+ main
actions file maintained by the developers, and
user.action, where you can make your personal additions.
@@ -716,7 +715,7 @@ actionsfile
-@@actionsfile standard.action # Internal purpose, recommended]]>
+@@actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.]]>
@@actionsfile default.action # Main actions file]]>