X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=bb64ac3face65e31ec9020cd3f1d8c113f19d75b;hp=c19d26dc578f5d1966b248975647d8ad1e57ac6b;hb=1d2a21ed0350fd3cad3b8e08f9c72fd3404d5c3b;hpb=0c07a9821c86b1ed8b23cb1a1905520a2cb3421b

diff --git a/default.action.master b/default.action.master
index c19d26dc..bb64ac3f 100644
--- a/default.action.master
+++ b/default.action.master
@@ -9,7 +9,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 # 
-#  $Id: default.action.master,v 1.118 2008/03/24 11:31:10 fabiankeil Exp $
+#  $Id: default.action.master,v 1.121 2008/03/28 15:13:39 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.9 or later due to 
 #                 syntax changes.
@@ -176,7 +176,7 @@
 #   +name{param}  # enable and set parameter to "param"
 #   -name         # disable
 #
-# Multi-value (e.g. "add-header", "send-wafer"):
+# Multi-value (e.g. "add-header", "filter"):
 #   +name{param}  # enable and add parameter "param"
 #   -name{param}  # remove the parameter "param"
 #   -name         # disable totally
@@ -380,9 +380,6 @@
 #    in which case a "blocked" image can be sent rather than a HTML page.
 #    See +set-image-blocker{} for the control over what is actually sent.
 #
-# +inspect-jpegs
-#    Scan jpeg headers for malformed comment blocks and correct them.
-#
 # +limit-connect{portlist}
 #   The CONNECT methods exists in HTTP to allow access to secure websites
 #   (https:// URLs) through proxies. It works very simply: The proxy
@@ -421,9 +418,9 @@
 #  
 # +prevent-compression
 #    Prevent the website from compressing the data. Some websites do
-#    that, which is a problem for Privoxy, since +filter, +kill-popups
-#    and +gif-deanimate will not work on compressed data. Will slow down
-#    connections to those websites, though.
+#    that, which is a problem for Privoxy when build without zlib support,
+#    since +filter and +gif-deanimate will not work on compressed data.
+#    Will slow down connections to those websites, though.
 #
 # +server-header-filter{name}
 #    All server headers to which this action applies are filtered on-the-fly
@@ -469,28 +466,12 @@
 # +crunch-incoming-cookies
 #    Prevent the website from setting cookies
 #
-# +kill-popups (deprecated)
-#    Filter the website through a built-in filter to disable
-#    window.open() etc.  The two alternative spellings are
-#    equivalent.
-#
 # +redirect{<URL>}
 # +redirect{<pcrs command>}
 #    Convinces the browser that the requested document has been moved to
 #    another location and the browser should get it from the specified
 #    URL.
 #
-# +send-vanilla-wafer
-#    This action only applies if you are using a jarfile.  It sends a
-#    cookie to every site stating that you do not accept any copyright
-#    on cookies sent to you, and asking them not to track you.  Of
-#    course, this is a (relatively) unique header they could use to 
-#    track you.
-#
-# +send-wafer{name=value}
-#    This allows you to add an arbitrary cookie.  Specify it multiple
-#    times in order to add several cookies.
-#
 #############################################################################
 
 #############################################################################
@@ -529,14 +510,14 @@ for-privoxy-version=3.0.9
 +crunch-all-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
 -crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
  allow-all-cookies  = -crunch-all-cookies -session-cookies-only 
- allow-popups       = -filter{all-popups} -kill-popups -filter{unsolicited-popups}
+ allow-popups       = -filter{all-popups} -filter{unsolicited-popups}
 +block-as-image     = +block{Blocked image request.} +handle-as-image
 -block-as-image     = -block
 
 # These aliases define combinations of actions
 # that are useful for certain types of sites:
 #
-fragile     = -block -crunch-all-cookies -filter -fast-redirects -hide-referer -kill-popups -prevent-compression
+fragile     = -block -crunch-all-cookies -filter -fast-redirects -hide-referer -prevent-compression
 shop        = -crunch-all-cookies allow-popups
 
 # Your favourite blend of filters:
@@ -1502,7 +1483,7 @@ mail.google.
 #----------------------------------------------------------------------------
 # Semi-fragile, allow for blocks.
 #----------------------------------------------------------------------------
-{ -crunch-all-cookies -filter -fast-redirects -hide-referer -kill-popups -prevent-compression }
+{ -crunch-all-cookies -filter -fast-redirects -hide-referer -prevent-compression }
 #MASTER# REMARKS: Problem URL: adserver.yahoo.com 10/01/06
 #MASTER# REMARKS: This is much too broad for my taste. It forces me to add
 #MASTER# REMARKS: a special yahoo section in my user.action file, just to