X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=user.action;h=bff54abd2db16726965b41a5efa84cca0bab57ef;hb=b2cd0bfc7d4722ab805f3f2cbdf26c68d45689b2;hp=37e9cf57cb7ccd613c2f2ae24cce2a1a4360abe1;hpb=72081f829de368392d04076728f8c991178c0080;p=privoxy.git

diff --git a/user.action b/user.action
index 37e9cf57..bff54abd 100644
--- a/user.action
+++ b/user.action
@@ -2,7 +2,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/user.action,v $
 # 
-#  $Id: user.action,v 1.1.2.3 2004/01/30 16:48:26 oes Exp $
+#  $Id: user.action,v 1.6 2006/09/10 13:59:29 hal9 Exp $
 #
 #  Purpose     :  User-maintained actions file, see
 #                 http://www.privoxy.org/user-manual/actions-file.html
@@ -39,24 +39,25 @@
 +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 -filter{content-cookies}
- allow-popups       = -filter{popups} -kill-popups
+ allow-popups       = -filter{all-popups} -kill-popups -filter{unsolicited-popups}
 +block-as-image     = +block +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
+fragile     = -block -crunch-all-cookies -filter -fast-redirects -hide-referer -kill-popups -prevent-compression
 shop        = -crunch-all-cookies allow-popups
 
 # Your favourite blend of filters:
 #
-myfilters   = +filter{html-annoyances} +filter{js-annoyances} +filter{popups}\
+myfilters   = +filter{html-annoyances} +filter{js-annoyances} +filter{all-popups}\
               +filter{webbugs} +filter{banners-by-size} +filter{fun}
 
 # Allow ads for selected useful free sites:
 #
 allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
+#... etc.  Customize to your heart's content.
 
 ## end aliases ########################################################
 #######################################################################