Sync actions list with default.action.master, +minor_changes.

[privoxy.git] / doc / source / privoxy-man-page.sgml

diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index afb2465..445a715 100644 (file)
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,9 +5,9 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: privoxy-man-page.sgml,v 2.5 2006/07/18 14:48:51 david__schmidt Exp $
+ $Id: privoxy-man-page.sgml,v 2.6 2006/08/26 02:37:27 hal9 Exp $
 
- Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ Copyright (C) 2001-2006 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
 
  ========================================================================
@@ -43,7 +43,7 @@
 <!entity license SYSTEM "license.sgml">
 <!entity authors SYSTEM "p-authors.sgml">
 <!entity p-version "3.0.4">
-<!entity p-status "BETA">
+<!entity p-status "beta">
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
 <!entity % p-text "IGNORE">           <!-- define we are not a text only doc -->
@@ -207,6 +207,8 @@
  The Secure (SSL) Proxy should also be set to the same values, otherwise
  https: URLs will not be proxied. Note: <command>Privoxy</command> can only
  proxy HTTP and HTTPS traffic. Do not try it with FTP or other protocols.
+ HTTPS presents some limitations, and not all features will work with HTTPS 
+ connections.
 </para>
 
 <para>
@@ -233,8 +235,8 @@
 <para>
  See the <ulink
  url="http://www.privoxy.org/user-manual/">user-manual</ulink> for a complete
- explanation of general usage, configuration options, new features and notes for 
- upgrading.
+ explanation of installation, general usage, all configuration options, new
+ features and notes on upgrading.
 </para>
 <para>
  The actions list (ad blocks, etc) can also be configured with your
@@ -267,43 +269,68 @@
                -hide-referer -prevent-cookies -kill-popups
 
  ## Turn some actions on ################################
- { \
- -add-header \
- -block \
- -content-type-overwrite \
- -crunch-if-none-match \
- +crunch-incoming-cookies \
- +crunch-outgoing-cookies \
- +crunch-server-header {no-cache} \
- +deanimate-gifs{last} \
- -downgrade-http-version \
- -fast-redirects \
- -force-text-mode \
- -filter{html-annoyances} \
- -filter{js-annoyances} \
- +filter{content-cookies} \
- +filter{webbugs} \
- -filter{banners-by-size} \
- -handle-as-empty-document \
- +hide-accept-language{en-ca} \
- +hide-content-disposition {block} \
- +hide-forwarded-for-headers \
- +hide-from-header{block} \
- +hide-if-modified-since {-1} \
- +hide-referrer{forge} \
- -hide-user-agent \
- -handle-as-image \
- -inspect-jpegs \
- -kill-popups \
- +set-image-blocker{pattern} \
- -limit-connect \
- +overwrite-last-modified {randomize} \
- +prevent-compression \
- +session-cookies-only \
- +treat-forbidden-connects-like-blocks \
- -crunch-cookies \
- }
- /   # '/' Matches *all* URL patterns
+ ## NOTE: Actions are off by default, unless explictily turned on 
+ ## otherwise with the '+' operator.
+
+{ \
+-add-header \
+-block \
+-content-type-overwrite \
+-crunch-client-header \
+-crunch-if-none-match \
+-crunch-outgoing-cookies \
+-crunch-incoming-cookies \
+-crunch-server-header \
++deanimate-gifs{last} \
+-downgrade-http-version \
+-fast-redirects \
++filter{js-annoyances} \
+-filter{js-events} \
++filter{html-annoyances} \
+-filter{content-cookies} \
++filter{refresh-tags} \
++filter{unsolicited-popups} \
+-filter{all-popups} \
++filter{img-reorder} \
++filter{banners-by-size} \
+-filter{banners-by-link} \
++filter{webbugs} \
+-filter{tiny-textforms} \
++filter{jumping-windows} \
+-filter{frameset-borders} \
+-filter{demoronizer} \
+-filter{shockwave-flash} \
+-filter{quicktime-kioskmode} \
+-filter{fun} \
+-filter{crude-parental} \
++filter{ie-exploits} \
+-filter{site-specifics} \
+-filter-client-headers \
+-filter-server-headers \
+-force-text-mode \
+-handle-as-empty-document
+-handle-as-image \
+-hide-accept-language \
+-hide-content-disposition \
+-hide-if-modified-since \
++hide-forwarded-for-headers \
++hide-from-header{block} \
++hide-referrer{forge} \
+-hide-user-agent \
+-inspect-jpegs \
+-kill-popups \
+-limit-connect \
+-overwrite-last-modified \
+-redirect \
++prevent-compression \
+-send-vanilla-wafer \
+-send-wafer \
++session-cookies-only \
++set-image-blocker{pattern} \
+-treat-forbidden-connects-like-blocks \
+}
+/ # '/' Match *all* URL patterns
+
  
  # Block, and treat these URL patterns as if they were 'images'.
  # We would expect these to be ads.
@@ -383,7 +410,7 @@
 
 <para>
  Various other files should be included, but may vary depending on platform
- and build configuration. More documentation should be included in the local
+ and build configuration. Additional documentation should be included in the local
  documentation directory.
 </para>