X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=default.action;h=b69926b201f9488a6a357ce80c36b7ca374c25ef;hb=3c6406b7e0431bfac8206b6558d29d28051458e8;hp=f631e3b9543ca4ef1f3174393a83b44647608d7c;hpb=2120c692ee75b8dca0e0a399ce7bd673e9994217;p=privoxy.git

diff --git a/default.action b/default.action
index f631e3b9..b69926b2 100644
--- a/default.action
+++ b/default.action
@@ -2,7 +2,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action,v $
 # 
-#  $Id: default.action,v 1.9 2002/03/30 04:15:21 oes Exp $
+#  $Id: default.action,v 1.13 2002/04/08 20:34:59 swa Exp $
 #
 #  Purpose     :  Default actions file, see
 #                 http://www.privoxy.org/faq/questions.html#CONFIGFILES
@@ -121,7 +121,7 @@
 # regular expressions wouldn't fit here, but (FIXME) someone should paste
 # a concise intro to the regex language here.
 # 
-# If Junkbuster was compiled with pcre support (default), Perl compatible
+# If Privoxy was compiled with pcre support (default), Perl compatible
 # regular expressions are used. See the pcre/docs/ direcory or man perlre
 # (also available on http://www.perldoc.com/perl5.6/pod/perlre.html) for
 # details.
@@ -158,7 +158,7 @@
 #   -name         # disable totally
 #
 # The default (if you don't specify anything in this file) is not to take
-# any actions - i.e completely disabled, so JunkBuster will just be a
+# any actions - i.e completely disabled, so Privoxy will just be a
 # normal, non-blocking, non-anonymizing proxy.  You must specifically
 # enable the privacy and blocking features you need (although the 
 # provided default actions file will do that for you).
@@ -191,7 +191,7 @@
 # +downgrade
 #    Downgrade HTTP/1.1 client requests to HTTP/1.0 and downgrade the
 #    responses as well. Use this action for servers that use HTTP/1.1
-#    protocol features that Junkbuster currently can't handle yet.
+#    protocol features that Privoxy currently can't handle yet.
 #
 # +fast-redirects
 #    Many sites, like yahoo.com, don't just link to other sites.
@@ -210,7 +210,7 @@
 #    after the other. Plus, it feeds the advertisers.
 #
 #    The +fast-redirects option enables interception of these requests
-#    by junkbuster, who will cut off all but the last valid URL in the
+#    by Privoxy, 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 intermediate sites.
 #
@@ -260,8 +260,8 @@
 #    browser type.  (Breaks many web sites).  Specify the user-agent
 #    value you want - e.g., to pretend to be using Netscape on Linux:
 #      +hide-user-agent{Mozilla (X11; I; Linux 2.0.32 i586)}
-#    Or to identify yourself explicitly as a JunkBuster user:
-#      +hide-user-agent{JunkBuster/1.0}
+#    Or to identify yourself explicitly as a Privoxy user:
+#      +hide-user-agent{Privoxy/1.0}
 #    (Don't change the version number from 1.0 - after all, why tell them?)
 #
 # +image
@@ -291,7 +291,7 @@
 #   its connections to the cliant and to the remote proxy.
 #   This can be a big security hole, since CONNECT-enabled proxies can
 #   be abused as TCP relays very easily.
-#   By default, i.e. in the absence of a +limit-connect action, Junkbuster
+#   By default, i.e. in the absence of a +limit-connect action, Privoxy
 #   will only allow CONNECT requests to port 443, which is the standard port
 #   for https.
 #   If you want to allow CONNECT for more ports than that, or want to forbid
@@ -304,7 +304,7 @@
 #
 # +no-compression
 #    Prevent the website from compressing the data. Some websites do
-#    that, which is a problem for junkbuster, since +filter, +no-popup
+#    that, which is a problem for Privoxy, since +filter, +no-popup
 #    and +gif-deanimate will not work on compressed data. Will slow down
 #    connections to those websites, though.
 #
@@ -424,6 +424,7 @@ privacy.net
 .privoxy.org/actions
 .oesterhelt.org/actions
 
+
 #############################################################################
 # Test for new GIF deanimation feature.
 # Just try http://www.oesterhelt.org/deanimate-demo with and without it.
@@ -438,7 +439,6 @@ www.oesterhelt.org/deanimate-demo
 # FIXME: Now cookies are allowed by default, do any of these sites
 # need persistent cookies?
 #############################################################################
-
 #{-no-cookies}
 #.javasoft.com
 #.sun.com
@@ -491,11 +491,11 @@ edit.europe.yahoo.com
 .nytimes.com
 
 #############################################################################
-# Please don't re_filter code!
+# Please don't re_filter or modify code!
 #############################################################################
-{-filter}
+{-filter -no-popups}
 .sourceforge.net
-
+.sf.net
 
 #############################################################################
 # Imagelist: