Catch up with recent changes (more). Re-do example to match new actions files.

diff --git a/privoxy.1 b/privoxy.1
index d92ff11..e52f6f4 100644 (file)
--- a/privoxy.1
+++ b/privoxy.1
@@ -109,52 +109,68 @@ might look like:
  # Define a few useful custom aliases for later use
  {{alias}}
 
- # Don't accept cookies
- +no-cookies = +no-cookies-set +no-cookies-read
+ # Useful aliases
+ +prevent-cookies = +prevent-setting-cookies +prevent-reading-cookies
+ -prevent-cookies = -prevent-setting-cookies -prevent-reading-cookies
+ +imageblock      = +block +handle-as-image
 
- # Do accept cookies
- -no-cookies = -no-cookies-set -no-cookies-read
+ # Fragile sites should have the minimum changes
+ fragile     = -block -deanimate-gifs -fast-redirects -filter \\
+               -hide-referer -prevent-cookies -kill-popups
 
- # Treat these blocked URLs as images.
- +imageblock = +block +image
+ # Shops should be allowed to set persistent cookies
+ shop        = -filter -prevent-cookies -prevent-keeping-cookies
 
- # Define page filters we want to use.
- myfilters = +filter{html-annoyances} +filter{js-annoyances}\\
-             +filter{no-popups} +filter{webbugs}
+ # Your favourite blend of filters:
+ #
+ myfilters   = +filter{html-annoyances} +filter{js-annoyances} \\
+               +filter{popups} +filter{webbugs} +filter{banners-by-size} 
 
  ## Default Policies (actions) ############################
  { \\
-  -block \\
-  -downgrade \\
-  +fast-redirects \\
-  myfilters \\
-  +no-compression \\
-  +hide-forwarded \\
-  +hide-from{block} \\
-  +hide-referer{forge} \\
-  -hide-user-agent \\
-  -image \\
-  +image-blocker{blank} \\
-  +no-cookies-keep \\
-  -no-cookies-read \\
-  -no-cookies-set \\
-  +no-popups \\
-  -vanilla-wafer \\
-  -wafer \\
+ -add-header \\
+ -block \\
+ +deanimate-gifs{last} \\
+ -downgrade-http-version \\
+ -fast-redirects \\
+ +filter{html-annoyances} \\
+ +filter{js-annoyances} \\
+ +filter{content-cookies} \\
+ -filter{popups} \\
+ +filter{webbugs} \\
+ +filter{refresh-tags} \\
+ -filter{fun} \\
+ +filter{nimda} \\
+ +filter{banners-by-size} \\
+ -filter{shockwave-flash} \\
+ -filter{crude-prental} \\
+ +hide-forwarded-for-headers \\
+ +hide-from-header{block} \\
+ +hide-referrer{forge} \\
+ -hide-user-agent \\
+ -handle-as-image \\
+ +set-image-blocker{pattern} \\
+ -limit-connect \\
+ +prevent-compression \\
+ +session-cookies-only \\
+ +prevent-reading-cookies \\
+ +prevent-setting-cookies \\
+ -kill-popups \\
+ -send-vanilla-wafer \\
+ -send-wafer \\
  }
  /
-
  # Now set exceptions to the above defined policies #######
 
  # Sites where we want persistant cookies
- {-no-cookies -no-cookies-keep}
+ {-prevent-reading-cookies -prevent-setting-cookies}
   .redhat.com
   .sun.com
   .yahoo.com
   .msdn.microsoft.com
 
  # This site requires cookies AND 'fast-redirects' on
- {-no-cookies -no-cookies-keep -fast-redirects}
+ {-prevent-reading-cookies -prevent-setting-cookies -fast-redirects}
   .nytimes.com
 
  # Add custom headers, and turn off filtering of page source
@@ -164,36 +180,36 @@ might look like:
 
  # Block, and treat these URLs as 'images'.
  {+imageblock}
-  .ad.preferences.com/image.*
-  .ads.web.aol.com
-  .ad-adex3.flycast.com
-  .ad.doubleclick.net
-  .ln.doubleclick.net
-  .ad.de.doubleclick.net
-  /.*/count\\.cgi\\?.*df=
-  194.221.183.22[1-7]
-  a196.g.akamai.net/7/196/2670/000[12]/images.gmx.net/i4/images/.*/
+ ar.atwola.com 
+ .ad.doubleclick.net
+ .a.yimg.com/(?:(?!/i/).)*$
+ .a[0-9].yimg.com/(?:(?!/i/).)*$
+ bs*.gsanet.com
+ bs*.einets.com
+ .qkimg.net
+ ad.*.doubleclick.net
 
  # Block any URLs that match these patterns
  {+block}
-  /.*/(.*[-_.])?ads?[0-9]?(/|[-_.].*|\\.(gif|jpe?g))
-  /.*/(plain|live|rotate)[-_.]?ads?/
-  /.*/(sponsor)s?[0-9]?/
-  /.*/ad(server|stream|juggler)\\.(cgi|pl|dll|exe)
-  /.*/adbanners/
-  /.*/adv((er)?ts?|ertis(ing|ements?))?/
-  /.*/banners?/
-  /.*/popupads/
-  /.*/advert[0-9]+\\.jpg
-  /ad_images/
-  /.*/ads/
-  /images/.*/.*_anim\\.gif
-  /rotations/ 
-  /.*(ms)?backoff(ice)?.*\\.(gif|jpe?g)
-  195.63.104.*/(inbox|log|meld|folderlu|folderru|log(in|out)[lmr]u|)
-  .images.nytimes.com
-  .images.yahoo.com/adv/
-  /.*cnnstore\\.gif
+ ad*.
+ .*ads.
+ banner?.
+ count*.
+ /(?:.*/)?(ads(erver?|tream)?|.*?ads|adv(ert(s|enties|is(ing|e?ments)?)?)?|(ad)?[-_]?banner(s|ads?|farm)?)/
+ /.*count(er)?\\.(pl|cgi|exe|dll|asp|php[34]?)
+ /(?:.*/)?(publicite|werbung|rekla(ma|me|am)|annonse|maino(kset|nta|s)?)/
+ .hitbox.com 
+
+ # Make exceptions for these harmless ones that would be 
+ # caught by +block.
+ {-block}
+ include.ebay.com
+ adsl.
+ advice.
+ .edu
+ .ac.uk
+ .uni-*.de
+ .*downloads.
 .fi
 .PP
 See the comments in the configuration files themselves, or the