X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action;h=20ede6901440a64035141708c3c35fc9ffaffc7e;hp=6ade04439532bce57177f032f019b3a07c213741;hb=a095b686f6bd19893060c6f129e99ae63b8fca4f;hpb=b2b7caccd48b3bdd07e3d3e2fd6f426f58da31e0

diff --git a/default.action b/default.action
index 6ade0443..20ede690 100644
--- a/default.action
+++ b/default.action
@@ -1,12 +1,18 @@
-#############################################################################
-# Sample actions file for Privoxy
+######################################################################
+# 
+#  File        :  $Source: /cvsroot/ijbswa/current/default.action,v $
+# 
+#  $Id: default.action,v 1.8 2002/03/30 03:41:02 oes Exp $
 #
-# For information, see http://ijbswa.sourceforge.net/
+#  Purpose     :  Default actions file, see
+#                 http://www.privoxy.org/faq/questions.html#CONFIGFILES
 #
-# $Id: default.action,v 1.1 2002/03/24 11:37:39 jongfoster Exp $
+#  Copyright   :  Written by and Copyright
+#                 Privoxy team. http://www.privoxy.org/
 #
-#  Purpose     :  Default actions file, see
-#                 http://ijbswa.sourceforge.net/faq/questions.html#CONFIGFILES
+#                 Based on the Internet Junkbuster originally written
+#                 by and Copyright (C) 1997 Anonymous Coders and
+#                 Junkbusters Corporation.  http://www.junkbusters.com
 # 
 # We value your feedback. However, to provide you with the best support,
 # please note:
@@ -204,7 +210,7 @@
 #    The +fast-redirects option enables interception of these requests
 #    by junkbuster, who will cut off all but the last valid URL in the
 #    request and send a local redirect back to your browser without
-#    contacting the remote site.
+#    contacting the intermediate sites.
 #
 # +filter{name}
 #    Filter the website through one or more regular expression filters.
@@ -261,18 +267,19 @@
 #    in which case a "blocked" image can be sent rather than a HTML page.
 #    See +image-blocker{} for the control over what is actually sent.
 #
-# +image-blocker{logo}
 # +image-blocker{blank}
 # +image-blocker{pattern}
 # +image-blocker{<URL>} with <url> being any valid image URL
 #    Decides what to do with URLs that end up tagged with {+block +image}.
-#    There are 5 options.  "-image-blocker" will send a HTML "blocked" page,
-#    usually resulting in a "broken image" icon.  "+image-blocker{logo}"
-#    will send a "JunkBuster" image.  "+image-blocker{blank}" will send
-#    a 1x1 transparent image, "+image-blocker{pattern}" will send a 4x4
-#    grey/white pattern which is less intrusive than the logo but easier
-#    to recognize than the transparent one. And finally, "+image-blocker{<URL>}"
-#    will send a HTTP temporary redirect to the specified image URL.
+#    There are 4 options:
+#      * "-image-blocker" will send a HTML "blocked" page, usually
+#        resulting in a "broken image" icon.
+#      * "+image-blocker{blank}" will send a 1x1 transparent image
+#      * "+image-blocker{pattern}" will send a 4x4 grey/white pattern
+#        which is less intrusive than the logo but easier to recognize
+#        than the transparent one.
+#      * "+image-blocker{<URL>}" will send a HTTP temporary redirect
+#        to the specified image URL.
 #
 #
 # +limit-connect{portlist}
@@ -389,7 +396,7 @@ myfilters \
 +hide-referer{forge} \
 -hide-user-agent \
 -image \
-+image-blocker{http://i.j.b/send-banner} \
++image-blocker{http://config.privoxy.org/send-banner} \
 +no-cookies-keep \
 -no-cookies-read \
 -no-cookies-set \
@@ -409,6 +416,13 @@ myfilters \
 privacy.net
 
 
+#############################################################################
+# Needed for automatic feedback evaluation; Please don't delete!
+#############################################################################
+{+add-header{X-Actions-File-Version: 1.0} -filter -no-popups}
+.privoxy.org/actions
+.oesterhelt.org/actions
+
 #############################################################################
 # Test for new GIF deanimation feature.
 # Just try http://www.oesterhelt.org/deanimate-demo with and without it.