X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=default.action.master;h=d8f034aaddd352452a7cd9a18b2d5513f184cc54;hb=2aafef68f695a9bb13671e141fcf0a6924f57342;hp=d2271962d122899c321ee53b26d98e8fe8b97627;hpb=d486c52f2b5449a77d99ff836f51b29e7ca70717;p=privoxy.git

diff --git a/default.action.master b/default.action.master
index d2271962..d8f034aa 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.125 2008/04/20 16:08:29 fabiankeil Exp $
+#  $Id: default.action.master,v 1.127 2008/05/11 14:58:39 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.9 or later due to 
 #                 syntax changes.
@@ -208,7 +208,8 @@
 #
 #    Client-header filters predefined in the supplied default.filter include:
 #
-#     hide-tor-exit-notation: Removes the Tor exit node notation in Host and Referer headers
+#     hide-tor-exit-notation: Removes the Tor exit node notation in Host and Referer headers.
+#     privoxy-control:        Removes X-Privoxy-Control headers.
 #
 # +client-header-tagger{string}
 #    Tag requests based on their headers. Client headers to which this
@@ -217,6 +218,17 @@
 #    Client-header taggers are the first actions that are executed and their
 #    tags can be used to control every other action.
 #
+#    Client-header taggers predefined in the supplied default.filter include:
+#
+#     image-requests:    Tags detected image requests as "IMAGE-REQUEST".
+#     css-requests:      Tags detected CSS requests as "CSS-REQUEST".
+#     client-ip-address: Tags the request with the client's IP address.
+#     http-method:       Tags the request with its HTTP method.
+#     allow-post:        Tags POST requests as "ALLOWED-POST".
+#     complete-url:      Tags the request with the whole request URL.
+#     user-agent:        Tags the request with the complete User-Agent header.
+#     privoxy-control:   Creates tags with the content of X-Privoxy-Control headers.
+#
 # +content-type-overwrite
 #    Replaces the "Content-Type:" HTTP server header, so that unwanted
 #    download menus will not pop up, or changes the browser's rendering mode.
@@ -282,32 +294,32 @@
 #   
 #    Filters predefined in the supplied default.filter include:
 #
-#     js-annoyances:         Get rid of particularly annoying JavaScript abuse
-#     js-events:             Kill all JS event bindings (Radically destructive! Use only on real suckers)
-#     html-annoyances:       Get rid of particularly annoying HTML abuse
-#     content-cookies:       Kill cookies that come in the HTML or JS content
-#     refresh-tags:          Kill automatic refresh tags (for dial-on-demand setups)
-#     unsolicited-popups:    Disable only unsolicited pop-up windows
-#     all-popups:            Kill all popups in JavaScript and HTML
-#     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 
-#     webbugs:               Squish WebBugs (1x1 invisible GIFs used for user tracking)
-#     tiny-textforms:        Extend those tiny textareas up to 40x80 and kill the hard wrap
-#     jumping-windows:       Prevent windows from resizing and moving themselves
-#     frameset-borders:      Give frames a border
-#     demoronizer:           Fix MS's non-standard use of standard charsets
-#     shockwave-flash:       Kill embedded Shockwave Flash objects
-#     quicktime-kioskmode:   Make Quicktime movies saveable
-#     fun:                   Text replacements  for subversive browsing fun!
-#     crude-parental:        Kill all web pages that contain the words "sex" or "warez"
-#     ie-exploits:           Disable some known Internet Explorer bug exploits
-#     site-specifics:        Cure for site-specific problems. Don't apply generally!
-#     google:                Removes text ads and other Google specific improvements
-#     yahoo:                 Removes text ads and other Yahoo specific improvements
-#     msn:                   Removes text ads and other MSN specific improvements
-#     blogspot:              Cleans up Blogspot blogs
-#     no-ping:               Removes non-standard ping attributes from anchor and area tags
+#     js-annoyances:       Get rid of particularly annoying JavaScript abuse.
+#     js-events:           Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites).
+#     html-annoyances:     Get rid of particularly annoying HTML abuse.
+#     content-cookies:     Kill cookies that come in the HTML or JS content.
+#     refresh-tags:        Kill automatic refresh tags (for dial-on-demand setups).
+#     unsolicited-popups:  Disable only unsolicited pop-up windows.
+#     all-popups:          Kill all popups in JavaScript and HTML.
+#     img-reorder:         Reorder attributes in <img> tags to make the banners-by-* filters more effective.
+#     banners-by-size:     Kill banners by size.
+#     banners-by-link:     Kill banners by their links to known clicktrackers.
+#     webbugs:             Squish WebBugs (1x1 invisible GIFs used for user tracking).
+#     tiny-textforms:      Extend those tiny textareas up to 40x80 and kill the hard wrap.
+#     jumping-windows:     Prevent windows from resizing and moving themselves.
+#     frameset-borders:    Give frames a border and make them resizable.
+#     demoronizer:         Fix MS's non-standard use of standard charsets.
+#     shockwave-flash:     Kill embedded Shockwave Flash objects.
+#     quicktime-kioskmode: Make Quicktime movies saveable.
+#     fun:                 Text replacements for subversive browsing fun!
+#     crude-parental:      Crude parental filtering. Note that this filter doesn't work reliable.
+#     ie-exploits:         Disable some known Internet Explorer bug exploits.
+#     site-specifics:      Cure for site-specific problems. Don't apply generally!
+#     no-ping:             Removes non-standard ping attributes in <a> and <area> tags.
+#     google:              CSS-based block for Google text ads. Also removes a width limitation and the toolbar advertisement.
+#     yahoo:               CSS-based block for Yahoo text ads. Also removes a width limitation.
+#     msn:                 CSS-based block for MSN text ads. Also removes tracking URLs and a width limitation.
+#     blogspot:            Cleans up some Blogspot blogs. Read the fine print before using this.
 #
 # +force-text-mode
 #    Declares a document as plain text, even if the "Content-Type:" isn't detected 
@@ -428,8 +440,11 @@
 #
 #    Server-header filters predefined in the supplied default.filter include:
 #
-#     html-to-xml:           Changes the Content-Type header from html to xml
-#     xml-to-html:           Changes the Content-Type header from xml to html
+#     x-httpd-php-to-html:   Changes the Content-Type header from x-httpd-php to html.
+#     html-to-xml:           Changes the Content-Type header from html to xml.
+#     xml-to-html:           Changes the Content-Type header from xml to html.
+#     less-download-windows: Prevent annoying download windows for content types the browser can handle itself.
+#     privoxy-control:       Removes X-Privoxy-Control headers.
 #
 # +server-header-tagger{content-type}
 #    Server headers to which this action applies are filtered on-the-fly
@@ -439,6 +454,11 @@
 #    control all of the other server-header actions, the content filters and
 #    the crunch actions (redirect and block). 
 #
+#    Server-header taggers predefined in the supplied default.filter include:
+#
+#     content-type:    Tags the request with the content type declared by the server.
+#     privoxy-control: Creates tags with the content of X-Privoxy-Control headers.
+#
 # +session-cookies-only
 #    If the website sets cookies, make sure they are erased when you exit
 #    and restart your web browser.  This makes profiling cookies useless,