From: oes Date: Wed, 24 Apr 2002 02:16:04 +0000 (+0000) Subject: Multiple action files: Add options and change comments X-Git-Tag: v_3_0_branchpoint~253 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=c4947f02a33d338bf7cdcf6001b8af7b0386d42a Multiple action files: Add options and change comments --- 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