X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=config;h=e10fa7743fe3693c8891753daf95a3b5a7d8ca47;hp=42b58e1baeb8769c57c86d3d80a8712b18d7d674;hb=2431eb5a3b22fc176ad63c9b4e91f1bf589a4da3;hpb=cfde9e72a36e0e9291726b684a89d0a6bb00ad9d

diff --git a/config b/config
index 42b58e1b..e10fa774 100644
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #  Sample Configuration file for Privoxy
 
 #
-# $Id: config,v 1.33 2002/04/15 19:06:43 jongfoster Exp $
+# $Id: config,v 1.34 2002/04/22 12:34:09 oes Exp $
 #
 ###################################################################
 #                                                                 #
@@ -134,24 +134,31 @@ logdir .
 #     
 #  Type of value:
 #     
-#      File name, relative to confdir
-#     
-#  Default value:
+#      File name, relative to confdir, without the .action (Unix)
+#      or .action.txt (Windows) extension.
 #     
-#      default.action (Unix) or default.action.txt (Windows)
+#  Default values:
+#      standard  # Internal purpose, recommended
+#      default   # Main actions file
+#      user      # User customizations
 #     
 #  Effect if unset:
 #     
 #      No action is taken at all. Simple neutral proxying.
 #     
 #  Notes:
+#      Multiple actionsfile lines are OK 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
+#      user.action, where you can make your personal additions.
 #     
-#      There is no point in using Privoxy without an actions file. There
-#      are three different actions files included in the distribution,
-#      with varying degrees of aggressiveness: default.action,
-#      intermediate.action and advanced.action.
+#      There is no point in using Privoxy without an actions file.
 #
-actionsfile default.action
+actionsfile standard  # Internal purpose, recommended
+actionsfile default   # Main actions file
+actionsfile user      # User customizations
 
 
 #  1.4. filterfile