Resyncing HEAD with v_3_0_branch for two OSX fixes:

[privoxy.git] / config

diff --git a/config b/config
index 8e34eb8..5aac5a3 100644 (file)
--- a/config
+++ b/config
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 Privoxy Developers http://privoxy.org
 #
-#  $Id: config,v 1.43 2003/02/20 13:51:50 hal9 Exp $
+#  $Id: config,v 1.45 2003/09/22 00:33:01 david__schmidt Exp $
 #
 ####################################################################
 #                                                                  #
@@ -104,7 +104,7 @@
 #      flat, except for confdir/templates, where the HTML templates
 #      for CGI output reside (e.g. Privoxy's 404 error page).
 #
-confdir /home/hal/ptmp/etc
+confdir .
 
 #
 #  1.2. logdir
@@ -131,7 +131,7 @@ confdir /home/hal/ptmp/etc
 #
 #      No trailing "/", please
 #
-logdir /home/hal/ptmp/var/log/privoxy
+logdir .
 
 #
 #  1.3. actionsfile
@@ -325,6 +325,37 @@ jarfile jarfile
 #
 #trustfile trust
 
+#
+#  1.8. image-blocker-custom-file
+#  ==============
+#
+#  Specifies:
+#
+#      The custom image to display for blocked images when
+#      +set-image-blocker{custom} is in effect in an action file
+#
+#  Type of value:
+#
+#      File name, relative to confdir; can be a jpeg, png or gif image
+#
+#  Default value:
+#
+#      Unset
+#
+#  Effect if unset:
+#
+#      If a custom image is called for and it is unset, the "pattern"
+#      built-in image will be sent instead.  I.e. it is as if you had
+#      specified "+set-image-blocker{pattern}" instead of
+#      "+set-image-blocker{custom}".
+#
+#  Notes:
+#
+#      If the specified file signature is not found to be jpeg, png
+#      or gif, the the built-in "pattern" image will be sent instead.
+#
+#image-blocker-custom-file my-custom-image.jpg
+
 #
 #  2. LOCAL SET-UP DOCUMENTATION
 #  =============================