X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=87b0cb9551e4b47ac8b1db6aff8afb3565c18ede;hp=be53f7a3f67a20cba6e610f298e9efc486b8a895;hb=4358bf8b00f9591e18d2d7baa94f83efc5224e6c;hpb=cc3e1e7d64f3fa85c60ddcc933297da73b74dc56

diff --git a/default.action.master b/default.action.master
index be53f7a3..87b0cb95 100644
--- a/default.action.master
+++ b/default.action.master
@@ -2,10 +2,10 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 # 
-#  $Id: default.action.master,v 1.2 2002/09/04 15:32:10 oes Exp $
+#  $Id: default.action.master,v 1.7 2003/02/20 14:00:55 hal9 Exp $
 #
 #  Purpose     :  Default actions file, see
-#                 http://www.privoxy.org/faq/questions.html#CONFIGFILES
+#                 http://www.privoxy.org/user-manual/actions-file.html
 #
 #  Copyright   :  Written by and Copyright
 #                 Privoxy team. http://www.privoxy.org/
@@ -229,21 +229,22 @@
 #   
 #    Filters predefined in the supplied default.action include:
 #
-#     html-annoyances:  Get rid of particularly annoying HTML abuse
-#     js-annoyances:    Get rid of particularly annoying JavaScript abuse
-#     content-cookies:  Kill cookies that come in the HTML or JS content
-#     popups:           Kill all popups in JS and HTML
-#     frameset-borders: Give frames a border
-#     webbugs:          Squish WebBugs (1x1 invisible GIFs used for user tracking)
-#     refresh-tags:     Kill automatic refresh tags (for dial-on-demand setups)
-#     fun:              Text replacements  for subversive browsing fun!
-#     nimda:            Remove Nimda (virus) code.
-#     img-reorder:      Reorder attributes in <img> tags to make the banners-by-* filters more effective
-#     banners-by-size:  Kill banners by size (very efficient!)
-#     banners-by-link:  Kill banners by their links to known clicktrackers 
-#     shockwave-flash:  Kill embedded Shockwave Flash objects
-#     crude-parental:   Kill all web pages that contain the words "sex" or "warez"
-#     js-events:        Kill all JS event bindings (Radically destructive! Use only on real suckers)
+#     js-annoyances:       Get rid of particularly annoying JavaScript abuse
+#     html-annoyances:     Get rid of particularly annoying HTML abuse
+#     content-cookies:     Kill cookies that come in the HTML or JS content
+#     webbugs:             Squish WebBugs (1x1 invisible GIFs used for user tracking)
+#     popups:              Kill all popups in JS and HTML
+#     frameset-borders:    Give frames a border
+#     refresh-tags:        Kill automatic refresh tags (for dial-on-demand setups)
+#     img-reorder:         Reorder attributes in <img> tags to make the banners-by-* filters more effective
+#     banners-by-size:     Kill banners by size (very efficient!)
+#     banners-by-link:     Kill banners by their links to known clicktrackers 
+#     fun:                 Text replacements  for subversive browsing fun!
+#     nimda:               Remove Nimda (virus) code.
+#     shockwave-flash:     Kill embedded Shockwave Flash objects
+#     quicktime-kioskmode: Make Quicktime movies saveable
+#     js-events:           Kill all JS event bindings (Radically destructive! Use only on real suckers)
+#     crude-parental:      Kill all web pages that contain the words "sex" or "warez"
 #
 # +hide-forwarded-for-headers
 #    Block any existing X-Forwarded-for header, and do not add a new one.
@@ -284,15 +285,17 @@
 #
 # +set-image-blocker{blank}
 # +set-image-blocker{pattern}
+# +set-image-blocker{custom}
 # +set-image-blocker{<URL>} with <url> being any valid image URL
 #    Decides what to do with URLs that end up tagged with {+block +handle-as-image}.
-#    There are 4 options:
+#    There are 5 options:
 #      * "-set-image-blocker" will send a HTML "blocked" page, usually
 #         resulting in a "broken image" icon.
 #      * "+set-image-blocker{blank}" will send a 1x1 transparent image
 #      * "+set-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.
+#        which is easier to recognize than the transparent one.
+#      * "+set-image-blocker{custom}" will send an image file as specified
+#        in the config file (see image-blocker-custom-file within config).
 #      * "+set-image-blocker{<URL>}" will send a HTTP temporary redirect
 #        to the specified image URL.
 #
@@ -800,6 +803,8 @@ login.passport.com/logout\.(asp|srf)\?
 #MASTER# PROBLEM-URL: http://www.fileplanet.com
 download.com.com/redir\?
 www.fileplanet.com/redir\.asp\?
+#MASTER# PROBLEM-URL: http://www.washingtonpost.com/
+.washingtonpost.com
 
 #----------------------------------------------------------------------------
 # No filtering for sourcecode
@@ -891,7 +896,7 @@ www.ameritrade.com
 # These sites are so abusive that we need to kill all JS event bindings (and
 # probably a break a lot along the way)
 #----------------------------------------------------------------------------
-{+filter{js-radical}}
+{+filter{js-events}}
 #MASTER# PROBLEM-URL: http://www..planetspiele.de/
 .planetspiele.de
 216.12.219.40