Change for crunch-cookie actions, and other small changes.

[privoxy.git] / doc / source / user-manual.sgml

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 06daeb7..29ce5b1 100644 (file)
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -8,7 +8,8 @@
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
-<!entity p-version "2.9.14">
+<!entity license SYSTEM "license.sgml">
+<!entity p-version "2.9.15">
 <!entity p-status "beta">
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
@@ -17,6 +18,7 @@
 <!entity % p-readme "IGNORE">
 <!entity % p-config "IGNORE">
 <!entity % p-supp-userman "IGNORE"> <!-- Omit some from supported.sgml    -->
+<!entity  my-copy "&copy;">         <!-- kludge for docbook2man           -->
 ]>
 <!--
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/user-manual.sgml,v $
@@ -25,15 +27,10 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: user-manual.sgml,v 1.100 2002/04/29 03:05:55 hal9 Exp $
-
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
-
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and 
- Junkbusters Corporation.  http://www.junkbusters.com
+ $Id: user-manual.sgml,v 1.110 2002/05/14 19:10:45 oes Exp $
 
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ========================================================================
  NOTE: Please read developer-manual/documentation.html before touching 
@@ -44,19 +41,46 @@
 
 <article id="index">
 <artheader>
+
 <title>Privoxy User Manual</title>
 
-<pubdate>$Id: user-manual.sgml,v 1.100 2002/04/29 03:05:55 hal9 Exp $</pubdate>
+<pubdate>
+ <subscript>
+<!-- Completely the wrong markup, but very little is allowed  -->
+<!-- in this part of an article. FIXME -->
+ <link linkend="copyright">Copyright</link> &my-copy; 2001, 2002 by 
+ <ulink url="http://www.privoxy.org">Privoxy Developers</ulink>
+ </subscript>
+</pubdate>
+
+<pubdate>$Id: user-manual.sgml,v 1.110 2002/05/14 19:10:45 oes Exp $</pubdate>
+
+<!--
+
+Note: the following should generate a separate page, and a live link to it,
+all nicely done. But it doesn't for some mysterious reason. Please leave
+commented unless it can be fixed proper. For the time being, the
+copyright/license declarations will be in their own sgml.
+
+Hal.
+
+<copyright>
+  <year>2001</year>
+  <year>2002</year>
+  <holder>Privoxy Developers</holder>
+</copyright>
+
+<legalnotice id="legalnotice"> 
+ <para>
+  text goes here ........
+ </para>
+</legalnotice>
+
+-->
 
-<authorgroup>
- <author>
-  <affiliation>
-   <orgname>By: Privoxy Developers</orgname>
-   </affiliation>
- </author>
-</authorgroup>
 
 <abstract>
+
 <![%dummy;[
  <para>
  <comment>
@@ -71,7 +95,7 @@
   The user manual gives users information on how to install, configure and use
   <ulink
   url="http://www.privoxy.org/"><application>Privoxy</application></ulink>.
-  </para>
+ </para>
 
 <!-- Include privoxy.sgml boilerplate: -->
  &p-intro;
@@ -82,7 +106,7 @@
   url="http://www.privoxy.org/user-manual/">http://www.privoxy.org/user-manual/</ulink>.
   Please see the <ulink url="contact.html">Contact section</ulink> on how to
   contact the developers.
-  </para>
+ </para>
 
 <!--   <para> -->
 <!--    Feel free to send a note to the developers at <email>ijbswa-developers@lists.sourceforge.net</email>. -->
@@ -91,13 +115,6 @@
 
 </artheader>
 
-<!--   ~~~~~       New section      ~~~~~     -->
-<sect1 id="intro" label=""><title></title>
-<!-- dummy section to force TOC on page by itself -->
-<!-- DO NOT REMOVE! please ;) -->
-<para> </para>
-</sect1>
-
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 label="1" id="introduction"><title>Introduction</title>
 <para>
@@ -147,39 +164,28 @@
  packages for a wide range of operating systems, and as raw source code.
  For most users, we recommend using the packages, which can be downloaded from our
  <ulink url="http://sourceforge.net/projects/ijbswa/">Privoxy Project
- Page</ulink>. For installing and compiling the source code, please look 
- into our Developer Manual.
-</para>
-
-<para>
- If you like to live on the bleeding edge and are not afraid of using
- possibly unstable development versions, you can check out the up-to-the-minute
- version directly from <ulink url="http://sourceforge.net/cvs/?group_id=11118">the
- CVS repository</ulink> or simply download <ulink
- url="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.gz">the nightly CVS
- tarball.</ulink> Again, we refer you to the Developer Manual.
+ Page</ulink>.
 </para>
 
-<!-- Include supported.sgml boilerplate -->
- &supported; 
-<!-- end boilerplate -->
-
 <para>
  Note: If you have a previous <application>Junkbuster</application> or
  <application>Privoxy</application> installation on your system, you
  will need to remove it.  Some platforms do this for you as part 
  of their installation procedure. (See below for your platform).
-</para>
-
-<para>
  In any case <emphasis>be sure to backup your old configuration
  if it is valuable to you.</emphasis> See the
  <link linkend="upgradersnote">note to upgraders</link> section
  below.
 </para>
 
+<!--   ~~~~~       New section      ~~~~~     --> 
+<sect2 id="installation-packages"><title>Binary Packages</title>
+<para>
+How to install the binary packages depends on your operating system:
+</para>
+
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect2 id="installation-pack-rpm"><title>Red Hat and SuSE RPMs</title>
+<sect3 id="installation-pack-rpm"><title>Red Hat and SuSE RPMs</title>
 
 <para>
  RPMs can be installed with <literal>rpm -Uvh privoxy-&p-version;-1.rpm</literal>,
@@ -207,17 +213,17 @@ automatically start Privoxy in the boot process.
  Otherwise, RPM will try to remove <application>Junkbuster</application>
  automatically, before installing <application>Privoxy</application>.
 </para>
-</sect2>
+</sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect2 id="installation-deb"><title>Debian</title>
+<sect3 id="installation-deb"><title>Debian</title>
 <para>
  FIXME.
 </para>
-</sect2>
+</sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect2 id="installation-pack-win"><title>Windows</title>
+<sect3 id="installation-pack-win"><title>Windows</title>
 
 <para>
  Just double-click the installer, which will guide you through
@@ -225,20 +231,20 @@ automatically start Privoxy in the boot process.
  in the same directory as you installed Privoxy in. We do not
  use the registry of Windows. 
 </para>
-</sect2>
+</sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect2 id="installation-pack-bintgz"><title>Solaris, NetBSD, FreeBSD, HP-UX</title>
+<sect3 id="installation-pack-bintgz"><title>Solaris, NetBSD, FreeBSD, HP-UX</title>
 
 <para>
  Create a new directory, <literal>cd</literal> to it, then unzip and
  untar the archive. For the most part, you'll have to figure out where
  things go. FIXME.
 </para>
-</sect2>
+</sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect2 id="installation-os2"><title>OS/2</title>
+<sect3 id="installation-os2"><title>OS/2</title>
 
 <para>
  First, make sure that no previous installations of
@@ -258,10 +264,10 @@ automatically start Privoxy in the boot process.
  The directory you choose to install <application>Privoxy</application>
  into will contain all of the configuration files.
 </para>
-</sect2>
+</sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect2 id="installation-mac"><title>Max OSX</title>
+<sect3 id="installation-mac"><title>Max OSX</title>
 <para>
  Unzip the downloaded package (you can either double-click on the file
  in the finder, or on the desktop if you downloaded it there).  Then,
@@ -273,10 +279,10 @@ automatically start Privoxy in the boot process.
  automatically on system bring-up via
  <literal>/System/Library/StartupItems/Privoxy</literal>.
 </para>
-</sect2>
+</sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect2 id="installation-amiga"><title>AmigaOS</title>
+<sect3 id="installation-amiga"><title>AmigaOS</title>
 <para>
  Copy and then unpack the <filename>lha</filename> archive to a suitable location. 
  All necessary files will be installed into <application>Privoxy</application>
@@ -292,7 +298,33 @@ automatically start Privoxy in the boot process.
  TCP/IP stack (just ignore the harmless warning your TCP/IP stack may display that
  <application>Privoxy</application> is still running).
 </para>
+</sect3>
+</sect2>
+
+<!--   ~~~~~       New section      ~~~~~     -->
+<sect2 id="installation-source"><title>Building from Source</title>
+
+<para>
+ The most convenient way to obtain the <application>Privoxy</application> sources
+ is to download the source tarball from our <ulink url="http://sf.net/projects/ijbswa/">project
+ page</ulink>.
+</para>
+
+<para>
+ If you like to live on the bleeding edge and are not afraid of using
+ possibly unstable development versions, you can check out the up-to-the-minute
+ version directly from <ulink url="http://sourceforge.net/cvs/?group_id=11118">the
+ CVS repository</ulink> or simply download <ulink
+ url="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.gz">the nightly CVS
+ tarball.</ulink>
+</para>
+
+<!-- include buildsource.sgml boilerplate: -->
+&buildsource;
+<!-- end boilerplate -->
+
 </sect2>
+
 </sect1>
 
 <!--  ~  End section  ~  -->
@@ -301,14 +333,17 @@ automatically start Privoxy in the boot process.
 <sect1 id="upgradersnote">
 <title>Note to Upgraders</title>
 <para>
- There are very significant changes from older versions of 
- <application>Junkbuster</application> to the current
- <application>Privoxy</application>. Configuration is substantially 
- changed. <application>Junkbuster 2.0.x</application> and earlier 
- configuration files will not migrate. The functionality of the old
- <filename>blockfile</filename>, <filename>cookiefile</filename> and
- <filename>imagelist</filename>, are now combined into the
- <ulink url="actions-file.html"><quote>actions files</quote></ulink>.  
+ There are very significant changes from earlier 
+ <application>Junkbuster</application> versions to the current
+ <application>Privoxy</application>. The number, names, syntax, and
+ purposes of configuration files have substantially  changed.
+ <application>Junkbuster 2.0.x</application> configuration
+ files will not migrate, <application>Junkbuster 2.9.x</application>
+ and <application>Privoxy</application> configurations will need to be
+ ported. The functionalities of the old <filename>blockfile</filename>,
+ <filename>cookiefile</filename> and <filename>imagelist</filename> 
+ are now combined into the <ulink url="actions-file.html"><quote>actions
+ files</quote></ulink>.  
  <filename>default.action</filename>, is the main actions file. Local
  exceptions should best be put into <filename>user.action</filename>.
 </para>
@@ -385,32 +420,68 @@ automatically start Privoxy in the boot process.
 
  <listitem>
   <para>
-  Install <application>Privoxy</application>. See the section <link linkend="installation">Installing</link>.
+   If upgrading, please back up any configuration files. See 
+   the <link linkend="upgradersnote">Note to Upgraders</link> Section.
   </para>
+</listitem> 
+ <listitem>
+  <para>
+  Install <application>Privoxy</application>. See the <link
+  linkend="installation">Installation Section</link> for platform specific
+  information. 
+ </para>
  </listitem>  
 
  <listitem>
   <para>
-  Start <application>Privoxy</application>. See the section <link linkend="startup">Starting <application>Privoxy</application></link>.
+  Start <application>Privoxy</application>, if the installation program has
+  not done this already. See the section <link linkend="startup">Starting
+  <application>Privoxy</application></link>.
   </para>
  </listitem>  
 
  <listitem>
   <para>
-  Change your browser's configuration to use the proxy <literal>localhost</literal> on port
-  <literal>8118</literal>. See the section <link linkend="startup">Starting <application>Privoxy</application></link>.
+  Set your browser to use <application>Privoxy</application> as HTTP and HTTPS
+  proxy by setting the proxy configuration for address of
+  <literal>127.0.0.1</literal> and port <literal>8118</literal>.
+  (<application>Junkbuster</application> and earlier versions of
+  <application>Privoxy</application> used port 8000.) See the section <link
+  linkend="startup">Starting <application>Privoxy</application></link>.
   </para>
  </listitem>  
 
  <listitem>
   <para>
-  Enjoy surfing with enhanced comfort and privacy. Please see the section
-  <link linkend="contact">Contacting the Developers</link> on how to report
-  bugs or problems with websites or to get help. You may want to change the
-  file <filename>user.action</filename> to further tweak your new browsing
-  experience.
+    Flush your browser's caches, to remove any cached ad images.
   </para>
- </listitem>  
+</listitem> 
+
+ <listitem>
+  <para>
+  Enjoy surfing with enhanced comfort and privacy.  You may want to customize the
+  <link linkend="actions-file"><filename>user.action</filename></link> file to
+  personalize your new browsing experience. See the <link
+  linkend="configuration">Configuration section</link> for more configuration
+  options, and how to further customize your installation.
+  </para>
+ </listitem> 
+ 
+ <listitem>
+  <para>
+   If you experience problems with sites that <quote>misbehave</quote>, see
+   the <link linkend="actionsanat">Anatomy of an Action</link> section in the
+   Appendix.
+  </para>
+ </listitem> 
+ 
+ <listitem>
+  <para>
+   Please see the section <link linkend="contact">Contacting the
+   Developers</link> on how to report bugs or problems with websites or to get
+   help. 
+  </para>
+ </listitem> 
 
  </itemizedlist>
 </para>
@@ -424,8 +495,8 @@ automatically start Privoxy in the boot process.
  Before launching <application>Privoxy</application> for the first time, you
  will want to configure your browser(s) to use
  <application>Privoxy</application> as a HTTP and HTTPS proxy. The default is
- localhost for the proxy address, and port 8118 (earlier versions used port
- 8000). This is the one configuration step that must be done!
+ 127.0.0.1 (or localhost) for the proxy address, and port 8118 (earlier versions
+ used port 8000). This is the one configuration step that must be done!
 </para>
  
 <para> 
@@ -435,7 +506,7 @@ automatically start Privoxy in the boot process.
  For <application>Internet Explorer</application>: <literal>Tools -&gt;
  Internet Properties -&gt; Connections -&gt; LAN Setting</literal>. Then,
  check <quote>Use Proxy</quote> and fill in the appropriate info (Address:
- localhost, Port: 8118). Include if HTTPS proxy support too.
+ 127.0.0.1, Port: 8118). Include if HTTPS proxy support too.
 </para>
 
 <para>
@@ -759,8 +830,8 @@ must find a better place for this paragraph
 
 <para>
  This should be self-explanatory. Note the first item leads to an editor for the
- <quote>actions list</quote>, which is where the ad, banner, cookie,
- and URL blocking magic is configured as well as other advanced features of
+ <link linkend="actions-file">actions files</link>, which is where the ad, banner,
+ cookie, and URL blocking magic is configured as well as other advanced features of
  <application>Privoxy</application>. This is an easy way to adjust various
  aspects of <application>Privoxy</application> configuration. The actions
  file, and other configuration files, are explained in detail below. 
@@ -771,7 +842,8 @@ must find a better place for this paragraph
  have problems with your current actions and filters. You can in fact use
  it as a test to see whether it is <application>Privoxy</application> 
  causing the problem or not. <application>Privoxy</application> continues 
- to run as a proxy in this case, but all filtering is disabled. There
+ to run as a proxy in this case, but all manipulation is disabled, i.e.
+ <application>Privoxy</application> acts like a normal forwarding proxy. There
  is even a toggle <link linkend="bookmarklets">Bookmarklet</link> offered, so
  that you can toggle <application>Privoxy</application> with one click from
  your browser.
@@ -808,7 +880,7 @@ must find a better place for this paragraph
 
   <listitem>
    <para>
-     The main configuration file is named <link linkend="config">config</link>
+     The <link linkend="config">main configuration file</link> is named <filename>config</filename>
      on Linux, Unix, BSD, OS/2, and AmigaOS and <filename>config.txt</filename>
      on Windows. This is a required file.
    </para>
@@ -816,25 +888,29 @@ must find a better place for this paragraph
 
   <listitem>
    <para>
-    <filename>default.action</filename> (the main <link linkend="actions-file">actions file</link>) is used to define
-    the default settings for various <quote>actions</quote> relating to images, banners, 
-    pop-ups, access restrictions, banners and cookies.
+    <filename>default.action</filename> (the main <link linkend="actions-file">actions file</link>)
+    is used to define which <quote>actions</quote> relating to banner-blocking, images, pop-ups,
+    content modification, cookie handling etc should be applied by default. It also defines many
+    exceptions (both positive and negative) from this default set of actions that enable 
+    <application>Privoxy</application> to selectively eliminate the junk, and only the junk, on
+    as many websites as possible.
    </para>
    <para>
     Multiple actions files may be defined in <filename>config</filename>. These 
     are processed in the order they are defined. Local customizations and locally 
-    preferred exceptions to the default policies as defined in
-    <filename>default.action</filename> are probably best applied in
-    <filename>user.action</filename>, which should be preserved across
-    upgrades. <filename>standard.action</filename> is also included. This is mostly 
-    for <application>Privoxy's</application> internal use.
+    preferred exceptions to the default policies  as defined in
+    <filename>default.action</filename> (which you will most propably want
+    to define sooner or later) are probably best applied in
+    <filename>user.action</filename>, where you can preserve them across
+    upgrades. <filename>standard.action</filename> is for
+    <application>Privoxy's</application> internal use.
    </para>
    <para>    
     There is also a web based editor that can be accessed from
     <ulink
-    url="http://config.privoxy.org/show-status/">http://config.privoxy.org/show-status/</ulink>
+    url="http://config.privoxy.org/show-status">http://config.privoxy.org/show-status</ulink>
     (Shortcut: <ulink
-    url="http://p.p/show-status/">http://p.p/show-status/</ulink>) for the
+    url="http://p.p/show-status">http://p.p/show-status</ulink>) for the
     various actions files. 
    </para>
   </listitem> 
@@ -854,7 +930,7 @@ must find a better place for this paragraph
 
 <para>
  All files use the <quote><literal>#</literal></quote> character to denote a
- comment (the rest of the line will be ignored) angd understand line continuation
+ comment (the rest of the line will be ignored) and understand line continuation
  through placing a backslash ("<literal>\</literal>") as the very last character
  in a line. If the <literal>#</literal> is preceded by a backslash, it looses
  its special function. Placing a <literal>#</literal> in front of an otherwise
@@ -909,8 +985,7 @@ must find a better place for this paragraph
  <literal>
   <msgtext> 
    <literallayout>
-  <emphasis>confdir /etc/privoxy</emphasis>
-   </literallayout>
+  <emphasis>confdir /etc/privoxy</emphasis></literallayout>
   </msgtext>
  </literal> 
 </para>
@@ -952,61 +1027,6 @@ must find a better place for this paragraph
  be modified, such as log files.
 </para>
 
-<sect3 renderas="sect4" id="user-manual"><title>user-manual</title>
-<variablelist>
- <varlistentry>
-  <term>Specifies:</term>
-  <listitem>
-   <para>
-    Location of the <application>Privoxy</application> User Manual.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term>Type of value:</term>
-  <listitem>
-   <para>A fully qualified URI</para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term>Default value:</term>
-  <listitem>
-   <para><ulink url="http://www.privoxy.org/user-manual/">http://www.privoxy.org/user-manual/</ulink></para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term>Effect if unset:</term>
-  <listitem>
-   <para>
-    The default will be used.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term>Notes:</term>
-  <listitem>
-   <para>
-    The User Manual is used for help hints from some of the internal CGI pages. 
-    It is normally packaged with the binary distributions, and would make more 
-    sense to have this pointed at a locally installed copy.
-   </para>
-   <para>
-    A more useful example (Unix):
-   </para>
-  <para> 
-   &nbsp;&nbsp;<emphasis>user-manual&nbsp;&nbsp;file:///usr/share/doc/privoxy-&p-version;/user-manual/</emphasis>
-  </para>
-  <warning>
-   <para>
-    If this option is defined, it must come first! It is needed before the rest of 
-    <filename>config</filename> is read.
-   </para>
-  </warning>
-  </listitem>
- </varlistentry>
-</variablelist>
-</sect3>
-
 <sect3 renderas="sect4" id="confdir"><title>confdir</title>
 
 <variablelist>
@@ -1106,14 +1126,14 @@ actionsfile
   <term>Specifies:</term>
   <listitem>
    <para>
-    The <link linkend="actions">actions</link> file(s) to use
+    The <link linkend="actions-file">actions file(s)</link> to use
    </para>
   </listitem>
  </varlistentry>
  <varlistentry>
   <term>Type of value:</term>
   <listitem>
-   <para>File name, relative to <literal>confdir</literal></para>
+   <para>File name, relative to <literal>confdir</literal>, without the <literal>.action</literal> suffix</para>
   </listitem>
  </varlistentry>
  <varlistentry>
@@ -1121,7 +1141,7 @@ actionsfile
   <listitem>
    <simplelist>
     <member>
-     <msgtext><literallayout>  standard     # Internal purposes, recommended not editing</literallayout></msgtext>
+     <msgtext><literallayout>  standard     # Internal purposes, no editing recommended</literallayout></msgtext>
     </member>
     <member>
      <msgtext><literallayout>  default      # Main actions file</literallayout></msgtext>
@@ -1192,7 +1212,7 @@ actionsfile
    <para>
     No textual content filtering takes place, i.e. all
     <literal>+filter{<replaceable class="parameter">name</replaceable>}</literal>
-    actions in the actions files are turned off
+    actions in the actions files are turned neutral.
    </para>
   </listitem>
  </varlistentry>
@@ -1372,7 +1392,6 @@ actionsfile
  </varlistentry>
 </variablelist>
 </sect3>
-
 </sect2>
 
 <!--  ~  End section  ~  -->
@@ -1390,6 +1409,72 @@ actionsfile
     you, what you block and why you do that, your policies etc.
    </para>
 
+<sect3 renderas="sect4" id="user-manual"><title>user-manual</title>
+<variablelist>
+ <varlistentry>
+  <term>Specifies:</term>
+  <listitem>
+   <para>
+    Location of the <application>Privoxy</application> User Manual.
+   </para>
+  </listitem>
+ </varlistentry>
+ <varlistentry>
+  <term>Type of value:</term>
+  <listitem>
+   <para>A fully qualified URI</para>
+  </listitem>
+ </varlistentry>
+ <varlistentry>
+  <term>Default value:</term>
+  <listitem>
+   <para><emphasis>Unset</emphasis></para>
+  </listitem>
+ </varlistentry>
+ <varlistentry>
+  <term>Effect if unset:</term>
+  <listitem>
+   <para>
+    <ulink url="http://www.privoxy.org/user-manual/">http://www.privoxy.org/<replaceable class="parameter">version</replaceable>/user-manual/</ulink>
+    will be used, where <replaceable class="parameter">version</replaceable> is the <application>Privoxy</application> version.
+   </para>
+  </listitem>
+ </varlistentry>
+ <varlistentry>
+  <term>Notes:</term>
+  <listitem>
+    <para>
+    The User Manual URI is used for help links from some of the internal CGI pages. 
+    The manual itself is normally packaged with the binary distributions, so you propably want
+    to set this to a locally installed copy. For multi-user setups, you could provide a copy on
+    a local webserver for all your users and use the corresponding URL here.
+   </para>
+   <para>
+    Examples:
+   </para>
+  <para>
+   Unix, in local filesystem:
+  </para>
+  <para>
+   <screen>user-manual&nbsp;&nbsp;file:///usr/share/doc/privoxy-&p-version;/user-manual/</screen>
+  </para>
+  <para>
+   Any platform, on local webserver (called <quote>local-webserver</quote>):
+  </para>
+  <para>
+   <screen>user-manual&nbsp;&nbsp;http://local-webserver/privoxy-user-manual/</screen>
+  </para>
+  <warning>
+   <para>
+     If set, this option should be <emphasis>the first option in the config file</emphasis>, because
+     it is used while the config file is being read.
+   </para>
+  </warning>     
+ </listitem>
+ </varlistentry>
+</variablelist>
+</sect3>
+
 <sect3 renderas="sect4" id="trust-info-url"><title>trust-info-url</title>
 
 <variablelist>
@@ -1706,14 +1791,14 @@ actionsfile
  <varlistentry>
   <term>Default value:</term>
   <listitem>
-   <para>localhost:8118</para>
+   <para>127.0.0.1:8118</para>
   </listitem>
  </varlistentry>
  <varlistentry>
   <term>Effect if unset:</term>
   <listitem>
    <para>
-    Bind to localhost (127.0.0.1), port 8118. This is suitable and recommended for
+    Bind to 127.0.0.1 (localhost), port 8118. This is suitable and recommended for
     home users who run <application>Privoxy</application> on the same machine as
     their browser.
    </para>
@@ -1969,8 +2054,9 @@ ACLs: permit-access and deny-access</title>
     Access controls are included at the request of ISPs and systems
     administrators, and <emphasis>are not usually needed by individual users</emphasis>.
     For a typical home user, it will normally suffice to ensure that 
-    <application>Privoxy</application> only listens on the localhost or internal (home)
-    network address by means of the <literal>listen-address</literal> option.
+    <application>Privoxy</application> only listens on the localhost
+    (127.0.0.1) or internal (home) network address by means of the
+    <literal>listen-address</literal> option.
    </para>
    <para>
     Please see the warnings in the FAQ that this proxy is not intended to be a substitute
@@ -2571,7 +2657,7 @@ forward-socks4 and forward-socks4a</title>
 
 <para>
  The actions files are used to define what actions
- <application>Privoxy</application> takes for which URLs, and thus determines
+ <application>Privoxy</application> takes for which URLs, and thus determine
  how ad images, cookies and various other aspects of HTTP content and
  transactions are handled, and on which sites (or even parts thereof). There 
  are three such files included with <application>Privoxy</application> (as of 
@@ -2585,7 +2671,9 @@ forward-socks4 and forward-socks4a</title>
       <filename>standard.action</filename> - is used by the web based editor, 
       to set various pre-defined sets of rules for the default actions section
       in <filename>default.action</filename>. These have increasing levels of
-      aggressiveness. It is not recommend to edit this file.
+      aggressiveness <emphasis>and have no influence on your browsing unless
+      you select them explicitly in the editor</emphasis>. It is not recommend
+      to edit this file.
     </para>
    </listitem> 
    <listitem>
@@ -2618,11 +2706,18 @@ forward-socks4 and forward-socks4a</title>
 </para>
 
 <para>
- An actions file typically has sections. Near the top, <quote>aliases</quote> are 
- optionally defined (discussed <ulink
- url="actions-file.html#ALIASES">below</ulink>), then the default set of rules
- which will apply universally to all sites and pages. And then below that,
- exceptions to the defined universal policies. 
+ An actions file typically has multiple sections. If you want to use
+ <quote>aliases</quote> in an actions file, you have to place the (optional)
+ <link linkend="aliases">alias section</link> at the top of that file.
+ Then comes the default set of rules which will apply universally to all
+ sites and pages (be <emphasis>very careful</emphasis> with using such a
+ universal set in <filename>user.action</filename> or any other actions file after 
+ <filename>default.action</filename>, because it will override the result
+ from consulting any previous file). And then below that,
+ exceptions to the defined universal policies. You can regard
+ <filename>user.action</filename> as an appendix to <filename>default.action</filename>,
+ with the advantage that is a separate file, which makes preserving your
+ personal settings across <application>Privoxy</application> upgrades easier.
 </para>
 
 <para> 
@@ -2630,7 +2725,8 @@ forward-socks4 and forward-socks4a</title>
  just some obnoxious URL that you would rather not see. Cookies can be accepted
  or rejected, or accepted only during the current browser session (i.e. not
  written to disk), content can be modified, JavaScripts tamed, user-tracking
- fooled, and much more. See below for a complete list of actions.
+ fooled, and much more. See below for a <link linkend="actions">complete list
+ of actions</link>.
 </para>
 
 <!--   ~~~~~       New section      ~~~~~     -->
@@ -2661,14 +2757,18 @@ forward-socks4 and forward-socks4a</title>
 <sect2>
 <title>How to Edit</title>
 <para>
- The easiest way to edit the <quote>actions</quote> files is with a browser by
+ The easiest way to edit the actions files is with a browser by
  using our browser-based editor, which can be reached from <ulink
  url="http://config.privoxy.org/show-status">http://config.privoxy.org/show-status</ulink>.
+ The editor allows both fine-grained control over every single feature on a
+ per-URL basis, and easy choosing from wholesale sets of defaults like
+ <quote>Cautious</quote>, <quote>Medium</quote> or <quote>Advanced</quote>.
 </para>
 
 <para>
  If you prefer plain text editing to GUIs, you can of course also directly edit the
- the actions files.
+ the actions files. Look at <filename>default.action</filename> which is richly
+ commented.
 </para>
 </sect2>
 
@@ -2686,7 +2786,7 @@ forward-socks4 and forward-socks4a</title>
 
 <para>
  To determine which actions apply to a request, the URL of the request is
- compared to all patterns in this file. Every time it matches, the list of
+ compared to all patterns in each action file file. Every time it matches, the list of
  applicable actions for the URL is incrementally updated, using the heading
  of the section in which the pattern is located. If multiple matches for
  the same URL set the same action differently, the last match wins. If not, 
@@ -2697,7 +2797,7 @@ forward-socks4 and forward-socks4a</title>
 </para>
 
 <para>
- You can trace this process by visiting <ulink
+ You can trace this process for any given URL by visiting <ulink
  url="http://config.privoxy.org/show-url-info">http://config.privoxy.org/show-url-info</ulink>.
 </para>
 
@@ -2708,7 +2808,7 @@ forward-socks4 and forward-socks4a</title>
 </sect2>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect2>
+<sect2 id="af-patterns">
 <title>Patterns</title>
 <para>
  Generally, a pattern has the form <literal>&lt;domain&gt;/&lt;path&gt;</literal>,
@@ -2905,73 +3005,84 @@ forward-socks4 and forward-socks4a</title>
  All actions are disabled by default, until they are explicitly enabled
  somewhere in an actions file. Actions are turned on if preceded with a
  <quote>+</quote>, and turned off if preceded with a <quote>-</quote>. So a
- <quote>+action</quote> means <quote>do that action</quote>, e.g.
- <quote>+block</quote> means please <quote>block the following URL
- patterns</quote>. 
+ <literal>+action</literal> means <quote>do that action</quote>, e.g.
+ <literal>+block</literal> means <quote>please block URLs that match the
+ following patterns</quote>, and <literal>-block</literal> means <quote>don't
+ block URLs that match the following patterns, even if <literal>+block</literal>
+ previously applied.</quote>
+
+</para>
+
+<para> 
+ Again, actions are invoked by placing them on a line, enclosed in curly braces and
+ separated by whitespace, like in 
+ <literal>{+some-action -some-other-action{some-parameter}}</literal>,
+ followed by a list of URL patterns, one per line, to which they apply.
+ Together, the actions line and the following pattern lines make up a section
+ of the actions file. 
 </para>
 
 <para> 
- Actions are invoked by enclosing the action name in curly braces (e.g.
- {+some_action}), followed by a list of URLs (or patterns that match URLs) to
- which the action applies. There are three classes of actions: 
+ There are three classes of actions:
 </para>
 
 <para>
  <itemizedlist>
-
  <listitem>
   <para>  
-   Boolean, i.e the action can only be <quote>on</quote> or
-   <quote>off</quote>. Examples: 
- </para>
+   Boolean, i.e the action can only be <quote>enabled</quote> or
+   <quote>disabled</quote>. Syntax:
+  </para>
   <para>
-   <literal>
-    <msgtext> 
-     <literallayout>
-  <emphasis>{+name}</emphasis>        # enable this action
-  <emphasis>{-name}</emphasis>        # disable this action
-     </literallayout>
-    </msgtext> 
-   </literal>
+   <screen>
+  +<replaceable class="function">name</replaceable>        # enable action <replaceable class="parameter">name</replaceable>
+  -<replaceable class="function">name</replaceable>        # disable action <replaceable class="parameter">name</replaceable></screen>
+  </para>
+  <para>  
+   Example: <literal>+block</literal>
   </para>
  </listitem>
 
 
  <listitem>
   <para>  
-   Parameterized, e.g. <quote>+/-hide-user-agent{ Mozilla 1.0 }</quote>, 
-   where some value is required in order to enable this type of action.
-   Examples:
+   Parameterized, where some value is required in order to enable this type of action.
+   Syntax:
+  </para>
+  <para>
+   <screen>
+  +<replaceable class="function">name</replaceable>{<replaceable class="parameter">param</replaceable>}  # enable action and set parameter to <replaceable class="parameter">param</replaceable>,
+               # overwriting parameter from previous match if necessary
+  -<replaceable class="function">name</replaceable>         # disable action. The parameter can be omitted</screen>
   </para>
   <para>
-   <literal>
-    <msgtext> 
-     <literallayout>
-  <emphasis>{+name{param}}</emphasis>  # enable action and set parameter to <quote>param</quote>
-  <emphasis>{-name}</emphasis>         # disable action (<quote>parameter</quote>) can be omitted
-     </literallayout>
-    </msgtext> 
-   </literal>
+   Note that if the URL matches multiple positive forms of a parameterized action,
+   the last match wins, i.e. the params from earlier matches are simply ignored.
+  </para>
+  <para>  
+   Example: <literal>+hide-user-agent{ Mozilla 1.0 }</literal>
   </para>
  </listitem>
  
  <listitem>
   <para>  
-  <!-- oes, or someone, check this. Re-worded 04/20/02 HB. -->
-   Multi-value, e.g. <quote>{+/-add-header{Name: value}}</quote> or
-   <quote>{+/-send-wafer{name=value}}</quote>), where some value needs to be defined
-   in addition to simply enabling the action. Examples:
+   Multi-value. These look exactly like parameterized actions,
+   but they behave differently: If the action applies multiple times to the
+   same URL, but with different parameters, <emphasis>all</emphasis> the parameters
+   from <emphasis>all</emphasis> matches are remembered. This is used for actions
+   that can be executed for the same request repeatedly, like adding multiple
+   headers, or filtering through multiple filters. Syntax:
   </para>
   <para>
-   <literal>
-    <msgtext> 
-     <literallayout>
-  <emphasis>{+name{param=value}}</emphasis>   # enable action and set <quote>param</quote> to <quote>value</quote>
-  <emphasis>{-name{param=value}}</emphasis>   # remove the parameter <quote>param</quote> completely
-  <emphasis>{-name}</emphasis>                # disable this action totally and remove <application>param</application> too
-     </literallayout>
-    </msgtext> 
-   </literal>
+   <screen>
+  +<replaceable class="function">name</replaceable>{<replaceable class="parameter">param</replaceable>}   # enable action and add <replaceable class="parameter">param</replaceable> to the list of parameters
+  -<replaceable class="function">name</replaceable>{<replaceable class="parameter">param</replaceable>}   # remove the parameter <replaceable class="parameter">param</replaceable> from the list of parameters
+                # If it was the last one left, disable the action.
+  <replaceable class="parameter">-name</replaceable>          # disable this action completely and remove all parameters from the list</screen>
+  </para>
+  <para>  
+   Examples: <literal>+add-header{X-Fun-Header: Some text}</literal> and
+   <literal>+filter{html-annoyances}</literal>
   </para>
  </listitem>
 
@@ -2994,12 +3105,12 @@ forward-socks4 and forward-socks4a</title>
  Actions files are processed in the order they are defined in
  <filename>config</filename> (the default installation has three actions
  files). It also quite possible for any given URL pattern to match more than
- one action!
+ one pattern and thus more than one set of actions!
 </para>
 
 <!-- start actions listing -->
 <para>
- The list of valid <application>Privoxy</application> <quote>actions</quote> are:
+ The list of valid <application>Privoxy</application> actions are:
 </para>
 
 
@@ -3013,45 +3124,44 @@ forward-socks4 and forward-socks4a</title>
 <!--   ~~~~~       New section      ~~~~~     -->
 
 <sect3 renderas="sect4" id="add-header">
-<title><emphasis>+add-header</emphasis></title>
+<title><emphasis>add-header</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- boolean, parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Multi-value.</para>
+   <para>Confuse log analysis, custom applications</para>
   </listitem>
  </varlistentry>
- 
+
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Send a user defined HTTP header to the web server.
+    Sends a user defined HTTP header to the web server.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- boolean, parameterized, Multi-value -->
   <listitem>
-   <para>
-    Any value is possible. Validity of the defined HTTP headers is not checked.
-   </para>
+   <para>Multi-value.</para>
   </listitem>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Parameter:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+add-header{X-User-Tracking: sucks}}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    Any string value is possible. Validity of the defined HTTP headers is not checked.
+    It is recommended that you use the <quote><literal>X-</literal></quote> prefix
+    for custom headers.
+   </para>
   </listitem>
  </varlistentry>
-
+ 
 <varlistentry>
   <term>Notes:</term>
   <listitem>
@@ -3063,175 +3173,215 @@ forward-socks4 and forward-socks4a</title>
    </para>
   </listitem>
  </varlistentry>
+
+ <varlistentry>
+  <term>Example usage:</term>
+  <listitem>
+    <para>
+     <screen>+add-header{X-User-Tracking: sucks}</screen>
+   </para>
+  </listitem>
+ </varlistentry>
 </variablelist>
 </sect3>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect3 renderas="sect4" id="block">
-<title><emphasis>+block</emphasis></title>
+<title><emphasis>block</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- boolean, parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>Block ads or other obnoxious content</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Used to block a URL from reaching your browser. The URL may be 
-    anything, but is typically used to block ads or other obnoxious 
-    content.    
+    Requests for URLs to which this action applies are blocked, i.e. the requests are not
+    forwarded to the remote server, but answered locally with a substitute page or image,
+    as determined by the <literal><link linkend="handle-as-image">handle-as-image</link></literal>
+    and <literal><link linkend="set-image-blocker">set-image-blocker</link></literal> actions.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- boolean, parameterized, Multi-value -->
   <listitem>
-   <para>N/A</para>
+   <para>Boolean.</para>
   </listitem>
  </varlistentry>
- 
+
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Parameter:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+block}</emphasis>
-     <emphasis>.banners.example.com</emphasis>
-     <emphasis>.ads.r.us</emphasis>
-    </literallayout>
+   <para>N/A</para>
   </listitem>
  </varlistentry>
-
+ 
 <varlistentry>
   <term>Notes:</term>
   <listitem>
    <para>
-    If a URL matches one of the blocked patterns, <application>Privoxy</application>
-    will intercept the URL and display its special <quote>BLOCKED</quote> page
-    instead. If there is sufficient space, a large red banner will appear with
-    a friendly message about why the page was blocked, and a way to go there
-    anyway. If there is insufficient space a smaller <quote>BLOCKED</quote>
-    page will appear without the red banner. 
-    <ulink url="http://ads.bannerserver.example.com/nasty-ads/sponsor.html">Click here</ulink>
-    to view the default blocked HTML page (<application>Privoxy</application> must be running 
-    for this to work as intended!).
+    <application>Privoxy</application> sends a special <quote>BLOCKED</quote> page
+    for requests to blocked pages. This page contains links to find out why the request
+    was blocked, and a click-through to the blocked content (the latter only if compiled with the
+    force feature enabled). The <quote>BLOCKED</quote> page adapts to the available
+    screen space -- it displays full-blown if space allows, or minaturized and text-only
+    if loaded into a small frame or window. If you are using <application>Privoxy</application>
+    right now, you can take a look at the 
+    <ulink url="http://ads.bannerserver.example.com/nasty-ads/sponsor.html"><quote>BLOCKED</quote>
+    page</ulink>.
    </para>
-
    <para> 
-    A very important exception is if the URL <emphasis>matches both</emphasis>
-    <quote>+block</quote> and <ulink
-    url="actions-file.html#HANDLE-AS-IMAGE"><quote>+handle-as-image</quote></ulink>,
-    then it will be handled by 
-    <ulink url="actions-file.html#SET-IMAGE-BLOCKER"><quote>+set-image-blocker</quote></ulink>
-    (see below). It is important to understand this process, in order 
-    to understand how <application>Privoxy</application> is able to deal with 
-    ads and other objectionable content.
+    A very important exception occurs if <emphasis>both</emphasis> 
+    <literal>block</literal> and <literal><link linkend="handle-as-image">handle-as-image</link></literal>,
+    apply to the same request: it will then be replaced by an image. If 
+    <literal><link linkend="set-image-blocker">set-image-blocker</link></literal>
+    (see below) also applies, the type of image will be determined by its parameter,
+    if not, the standard checkerboard pattern is sent.
    </para>
    <para>
-    The <ulink url="actions-file.html#FILTER"><quote>+filter</quote></ulink>
-    action can also perform some of the 
-    same functionality as <quote>+block</quote>, but by virtue of very 
-    different programming techniques, and is most often used for different 
-    reasons.
+    It is important to understand this process, in order 
+    to understand how <application>Privoxy</application> deals with 
+    ads and other unwanted content.
    </para>
+   <para>
+    The <literal><link linkend="filter">filter</link></literal>
+    action can perform a very similar task, by <quote>blocking</quote>
+    banner images and other content through rewriting the relevant URLs in the
+    document's HTML source, so they don't get requested in the first place.
+    Note that this is a totally different technique, and it's easy to confuse the two.
+   </para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Example usage (section):</term>
+  <listitem>
+    <para>
+     <screen>{+block}      # Block and replace with "blocked" page
+.nasty-stuff.example.com
+
+{+block +handle-as-image} # Block and replace with image
+.ad.doubleclick.net
+.ads.r.us</screen>
+    </para>
   </listitem>
  </varlistentry>
 
+
 </variablelist>
 </sect3>
 
-
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="deanimate-gifs">
-<title><emphasis>+deanimate-gifs</emphasis></title>
+<sect3 renderas="sect4" id="crunch-incoming-cookies">
+<title><emphasis>crunch-incoming-cookies</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- boolean, parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Parameterized.</para>
+   <para>
+    Prevent the web server from setting any cookies on your system
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    To stop those annoying, distracting animated GIF images.
+    Deletes any <quote>Set-Cookie:</quote> HTTP headers from server replies.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Boolean.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
-    <quote>last</quote> or <quote>first</quote>
+    N/A
    </para>
   </listitem>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-      <emphasis>{+deanimate-gifs{last}}</emphasis>
-      <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    This action is only concerned with <emphasis>incoming</emphasis> cookies. For
+    <emphasis>outgoing</emphasis> cookies, use
+    <literal><link linkend="crunch-outgoing-cookies">crunch-outgoing-cookies</link></literal>.
+    Use <emphasis>both</emphasis> to disable cookies completely.
+   </para>
+   <para>
+    It makes <emphasis>no sense at all</emphasis> to use this action in conjunction
+    with the <literal><link linkend="session-cookies-only">session-cookies-only</link></literal> action,
+    since it would prevent the session cookies from being set.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage:</term>
   <listitem>
    <para>
-    De-animate all animated GIF images, i.e. reduce them to their last frame.
-    This will also shrink the images considerably (in bytes, not pixels!). If
-    the option <quote>first</quote> is given, the first frame of the animation
-    is used as the replacement. If <quote>last</quote> is given, the last
-    frame of the animation is used instead, which probably makes more sense for
-    most banner animations, but also has the risk of not showing the entire
-    last frame (if it is only a delta to an earlier frame).
+    <screen>+crunch-incoming-cookies</screen>
    </para>
   </listitem>
  </varlistentry>
-
 </variablelist>
 </sect3>
 
+
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="downgrade-http-version">
-<title><emphasis>+downgrade-http-version</emphasis></title>
+<sect3 renderas="sect4" id="crunch-outgoing-cookies">
+<title><emphasis>crunch-outgoing-cookies</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- boolean, parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>
+    Prevent the web server from reading any cookies from your system
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    <quote>+downgrade-http-version</quote> will downgrade HTTP/1.1 client requests to
-    HTTP/1.0 and downgrade the responses as well.
+    Deletes any <quote>Cookie:</quote> HTTP headers from client requests.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Boolean.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
     N/A
@@ -3240,23 +3390,27 @@ forward-socks4 and forward-socks4a</title>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+downgrade-http-version}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    This action is only concerned with <emphasis>outgoing</emphasis> cookies. For
+    <emphasis>incoming</emphasis> cookies, use
+    <literal><link linkend="crunch-incoming-cookies">crunch-incoming-cookies</link></literal>.
+    Use <emphasis>both</emphasis> to disable cookies completely.
+   </para>
+   <para>
+    It makes <emphasis>no sense at all</emphasis> to use this action in conjunction
+    with the <literal><link linkend="session-cookies-only">session-cookies-only</link></literal> action,
+    since it would prevent the session cookies from being read.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage:</term>
   <listitem>
    <para>
-    Use this action for servers that use HTTP/1.1 protocol features that
-    <application>Privoxy</application> doesn't handle well yet. HTTP/1.1 is
-    only partially implemented. Default is not to downgrade requests. This is
-    an infrequently needed action, and is used to help with rare problem sites only.
+    <screen>+crunch-outgoing-cookies</screen>
    </para>
   </listitem>
  </varlistentry>
@@ -3264,698 +3418,767 @@ forward-socks4 and forward-socks4a</title>
 </variablelist>
 </sect3>
 
+
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="fast-redirects">
-<title><emphasis>+fast-redirects</emphasis></title>
+<sect3 renderas="sect4" id="deanimate-gifs">
+<title><emphasis>deanimate-gifs</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- boolean, parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>Stop those annoying, distracting animated GIF images.</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    The <quote>+fast-redirects</quote> action enables interception of 
-    <quote>redirect</quote> requests from one server to another, which 
-    are used to track users.<application>Privoxy</application> can cut off
-    all but the last valid URL in a redirect request and send a local redirect
-    back to your browser without contacting the intermediate site(s).
+    De-animate GIF animations, i.e. reduce them to their first or last image.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- boolean, parameterized, Multi-value -->
   <listitem>
-   <para>
-    N/A
-   </para>
+   <para>Parameterized.</para>
   </listitem>
  </varlistentry>
- 
+
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Parameter:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+fast-redirects}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    <quote>last</quote> or <quote>first</quote>
+   </para>
   </listitem>
  </varlistentry>
-
+ 
  <varlistentry>
   <term>Notes:</term>
   <listitem>
-   <para>  
-    Many sites, like yahoo.com, don't just link to other sites. Instead, they
-    will link to some script on their own server, giving the destination as a
-    parameter, which will then redirect you to the final target. URLs
-    resulting from this scheme typically look like:
-    <emphasis>http://some.place/some_script?http://some.where-else</emphasis>.
-  </para>
    <para>
-    Sometimes, there are even multiple consecutive redirects encoded in the
-    URL. These redirections via scripts make your web browsing more traceable,
-    since the server from which you follow such a link can see where you go
-    to. Apart from that, valuable bandwidth and time is wasted, while your
-    browser ask the server for one redirect after the other. Plus, it feeds
-    the advertisers.
+    This will also shrink the images considerably (in bytes, not pixels!). If
+    the option <quote>first</quote> is given, the first frame of the animation
+    is used as the replacement. If <quote>last</quote> is given, the last
+    frame of the animation is used instead, which probably makes more sense for
+    most banner animations, but also has the risk of not showing the entire
+    last frame (if it is only a delta to an earlier frame).
    </para>
    <para>
-    This is a normally <quote>on</quote> feature, and often requires exceptions
-    for sites that are sensitive to defeating this mechanism.
+    You can safely use this action with patterns that will also match non-GIF
+    objects, because no attempt will be made at anything that doesn't look like
+    a GIF.
    </para>
   </listitem>
  </varlistentry>
 
+ <varlistentry>
+  <term>Example usage:</term>
+  <listitem>
+    <para>
+      <screen>+deanimate-gifs{last}</screen>
+    </para>
+  </listitem>
+ </varlistentry>
 </variablelist>
 </sect3>
 
-
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="filter">
-<title><emphasis>+filter</emphasis></title>
+<sect3 renderas="sect4" id="downgrade-http-version">
+<title><emphasis>downgrade-http-version</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- boolean, parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Parameterized.</para>
+   <para>Work around (very rare) problems with HTTP/1.1</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Apply page filtering as defined by named sections of the
-    <filename>default.filter</filename> file to the specified site(s). 
-    <quote>Filtering</quote> can be any modification of the raw 
-    page content, including re-writing or deletion of content.
+    Downgrades HTTP/1.1 client requests and server replies to HTTP/1.0.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- boolean, parameterized, Multi-value -->
+  <listitem>
+   <para>Boolean.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
-    <quote>+filter</quote> must include the name of one of the section identifiers
-    from <filename>default.filter</filename> (or whatever
-    <emphasis>filterfile</emphasis> is specified in <filename>config</filename>).
+    N/A
    </para>
   </listitem>
  </varlistentry>
  
- <varlistentry>
-  <term>Example usage (from the current <filename>default.filter</filename>):</term>
+<varlistentry>
+  <term>Notes:</term>
   <listitem>
-   <simplelist>
-   <member>
-    <anchor id="filter-html-annoyances">
-    <emphasis>+filter{html-annoyances}</emphasis>:  Get rid of particularly annoying HTML abuse.
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-js-annoyances">
-    <emphasis>+filter{js-annoyances}</emphasis>:    Get rid of particularly annoying JavaScript abuse
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-content-cookies">
-    <emphasis>+filter{content-cookies}</emphasis>:   Kill cookies that come in the HTML or JS content 
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-popups">
-    <emphasis>+filter{popups}</emphasis>:         Kill all popups in JS and HTML
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-frameset-borders">
-    <emphasis>+filter{frameset-borders}</emphasis>: Give frames a border and make them resizable 
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-webbugs">
-    <emphasis>+filter{webbugs}</emphasis>:          Squish WebBugs (1x1 invisible GIFs used for user tracking)
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-refresh-tags">
-    <emphasis>+filter{refresh-tags}</emphasis>:     Kill automatic refresh tags (for dial-on-demand setups) 
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-fun">
-    <emphasis>+filter{fun}</emphasis>:              Text replacements  for subversive browsing fun!
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-nimda">
-    <emphasis>+filter{nimda}</emphasis>:            Remove Nimda (virus) code.
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-banners-by-size">
-    <emphasis>+filter{banners-by-size}</emphasis>:  Kill banners by size (<emphasis>very</emphasis> efficient!)
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-shockwave-flash">
-    <emphasis>+filter{shockwave-flash}</emphasis>:   Kill embedded Shockwave Flash objects
-   </member>
-  </simplelist>
-  <simplelist>
-   <member>
-    <anchor id="filter-crude-parental">
-    <emphasis>+filter{crude-parental}</emphasis>:   Kill all web pages that contain the words "sex" or "warez"
-   </member>
-  </simplelist>
+   <para>
+    This is a left-over from the time when <application>Privoxy</application>
+    didn't support important HTTP/1.1 features well. It is left here for the
+    unlikely case that you experience HTTP/1.1 related problems with some server
+    out there. Not all (optional) HTTP/1.1 features are supported yet, so there
+    is a chance you might need this action.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage (section):</term>
   <listitem>
-   <para>
-    This is potentially a very powerful feature! And requires a knowledge 
-    of regular expressions if you want to <quote>roll your own</quote>.
-    Filtering operates on a line by line basis throughout the entire page.
-   </para>
-   <para>
-    Filtering requires buffering the page content, which may appear to
-    slow down page rendering since nothing is displayed until all content has
-    passed the filters. (It does not really take longer, but seems that way
-    since the page is not incrementally displayed.) This effect will be more
-    noticeable on slower connections.
-   </para>
-   <para>
-    Filtering can achieve some of the effects as the 
-    <ulink url="actions-file#BLOCK"><quote>+block</quote></ulink>
-    action, i.e. it can be used to block ads and banners. In the overall 
-    scheme of things, filtering is one of the first things <quote>Privoxy</quote> 
-    does with a web page. So other most other actions are applied to the 
-    already <quote>filtered</quote> page.
-   </para>
+    <para>
+     <screen>{+downgrade-http-version}
+problem-host.example.com</screen>
+    </para>
   </listitem>
  </varlistentry>
 
 </variablelist>
 </sect3>
 
-
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="hide-forwarded-for-headers">
-<title><emphasis>+hide-forwarded-for-headers</emphasis></title>
+<sect3 renderas="sect4" id="fast-redirects">
+<title><emphasis>fast-redirects</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>Fool some click-tracking scripts and speed up indirect links</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Block any existing X-Forwarded-for HTTP header, and do not add a new one.
+    Cut off all but the last valid URL from requests.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- boolean, parameterized, Multi-value -->
   <listitem>
-   <para>
-    N/A
-   </para>
+   <para>Boolean.</para>
   </listitem>
  </varlistentry>
- 
+
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Parameter:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+hide-forwarded-for-headers}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    N/A
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
   <term>Notes:</term>
   <listitem>
+   <para>  
+    Many sites, like yahoo.com, don't just link to other sites. Instead, they
+    will link to some script on their own servers, giving the destination as a
+    parameter, which will then redirect you to the final target. URLs
+    resulting from this scheme typically look like:
+    <emphasis>http://some.place/click-tracker.cgi?target=http://some.where.else</emphasis>.
+  </para>
    <para>
-    It is fairly safe to leave this on. It does not seem to break many sites.
+    Sometimes, there are even multiple consecutive redirects encoded in the
+    URL. These redirections via scripts make your web browsing more traceable,
+    since the server from which you follow such a link can see where you go
+    to. Apart from that, valuable bandwidth and time is wasted, while your
+    browser ask the server for one redirect after the other. Plus, it feeds
+    the advertisers.
+   </para>
+   <para>
+    This feature is currently not very smart and is scheduled for improvement.
+    It is likely to break some sites. There is a bunch of exceptions to this action in
+    <filename>default.action</filename>, should you decide to turn it on by default.
    </para>
   </listitem>
  </varlistentry>
 
+ <varlistentry>
+  <term>Example usage:</term>
+  <listitem>
+    <para>
+     <screen>{+fast-redirects}</screen>
+    </para>
+  </listitem>
+ </varlistentry>
+
 </variablelist>
 </sect3>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="hide-from-header">
-<title><emphasis>+hide-from-header</emphasis></title>
+<sect3 renderas="sect4" id="filter">
+<title><emphasis>filter</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Parameterized.</para>
+   <para>Get rid of HTML and JavaScript annoyances, banner advertisements (by size), do fun text replacements, etc.</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    To block the browser from sending your email address in a <quote>From:</quote>
-    header.
+    Text documents, including HTML and JavaScript, to which this action applies, are filterd on-the-fly
+    through the specified regular expression based substitutions.    
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- boolean, parameterized, Multi-value -->
+  <listitem>
+   <para>Parameterized.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
-    Keyword: <quote>block</quote>, or any user defined value.
+    The name of a filter, as defined in the <link linkend="filter-file">filter file</link>
+    (typically <filename>default.filter</filename>, set by the
+    <literal><link linkend="filterfile">filterfile</link></literal>
+    option in the <link linkend="config">config file</link>)
    </para>
   </listitem>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+hide-from-header{block}}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    For your convenience, there are a bunch of pre-defined filters available 
+    in the distribution filter file that you can use. See the example below for
+    a list.
+   </para>
+   <para>
+    This is potentially a very powerful feature!  But <quote>rolling your own</quote>
+    filters requires a knowledge of regular expressions and HTML.
+   </para>
+   <para>
+    Filtering requires buffering the page content, which may appear to
+    slow down page rendering since nothing is displayed until all content has
+    passed the filters. (It does not really take longer, but seems that way
+    since the page is not incrementally displayed.) This effect will be more
+    noticeable on slower connections.
+   </para>
+   <para>
+    At this time, <application>Privoxy</application> cannot (yet!) uncompress compressed
+    documents. If you want filtering to work on all documents, even those that
+    would normally be sent compressed, use the
+    <literal><link linkend="prevent-compression">prevent-compression</link></literal>
+    action in conjuction with <literal>filter</literal>.
+   </para>
+   <para>
+    Filtering can achieve some of the effects as the 
+    <literal><link linkend="block">block</link></literal>
+    action, i.e. it can be used to block ads and banners. 
+   </para>
+   <para>
+    <link linkend="contact">Feedback</link> with suggestions for new or improved filters is particularly
+    welcome!
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage (with filters from the distribution <filename>default.filter</filename> file):</term>
   <listitem>
    <para>
-    The keyword <quote>block</quote> will completely remove the header 
-    (not to be confused with the <ulink
-    url="actions-file.html#BLOCK"><quote>+block</quote></ulink> action).
-    Alternately, you can specify any value you prefer to send to the web
-    server.
+    <anchor id="filter-html-annoyances">
+    <screen>+filter{html-annoyances}     # Get rid of particularly annoying HTML abuse.</screen>
+   </para>
+   <para>
+    <anchor id="filter-js-annoyances">
+    <screen>+filter{js-annoyances}       # Get rid of particularly annoying JavaScript abuse</screen>
+   </para>
+   <para>
+    <anchor id="filter-banners-by-size">
+    <screen>+filter{banners-by-size}     # Kill banners by size (<emphasis>very</emphasis> efficient!)</screen>
+   </para>
+   <para>
+    <anchor id="filter-content-cookies">
+    <screen>+filter{content-cookies}     # Kill cookies that come sneaking in the HTML or JS content</screen>
+   </para>
+   <para>
+    <anchor id="filter-popups">
+    <screen>+filter{popups}              # Kill all popups in JS and HTML</screen>
+   </para>
+   <para>
+    <anchor id="filter-webbugs">
+    <screen>+filter{webbugs}             # Squish WebBugs (1x1 invisible GIFs used for user tracking)</screen>
+   </para>
+   <para>
+    <anchor id="filter-fun">
+    <screen>+filter{fun}                 # Text replacements for subversive browsing fun!</screen>
+   </para>
+   <para>
+    <anchor id="filter-frameset-borders">
+    <screen>+filter{frameset-borders}    # Give frames a border and make them resizable</screen> 
+   </para>
+   <para>
+    <anchor id="filter-refresh-tags">
+    <screen>+filter{refresh-tags}        # Kill automatic refresh tags (for dial-on-demand setups)</screen>
+   </para>
+   <para>
+    <anchor id="filter-nimda">
+    <screen>+filter{nimda}               # Remove Nimda (virus) code.</screen>
+   </para>
+   <para>
+    <anchor id="filter-shockwave-flash">
+    <screen>+filter{shockwave-flash}     # Kill embedded Shockwave Flash objects</screen>
+   </para>
+   <para>
+    <anchor id="filter-crude-parental">
+    <screen>+filter{crude-parental}      # Kill all web pages that contain the words "sex" or "warez"</screen>
    </para>
   </listitem>
  </varlistentry>
-
 </variablelist>
 </sect3>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="hide-referer">
-<title><emphasis>+hide-referer</emphasis></title>
-<anchor id="hide-referrer">
+<sect3 renderas="sect4" id="handle-as-image">
+<title><emphasis>handle-as-image</emphasis></title>
+
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Parameterized.</para>
+   <para>Mark URLs as belonging to images (so they'll be replaced by images <emphasis>if they get blocked</emphasis>)</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-     Don't send the <quote>Referer:</quote> (sic) HTTP header to the web site.
-     Or, alternately send a forged header instead.
+    This action alone doesn't do anything noticeable. It just marks URLs as images.
+    If the <literal><link linkend="block">block</link></literal> action <emphasis>also applies</emphasis>,
+    the presence or absence of this mark decides whether an HTML <quote>blocked</quote>
+    page, or a replacement image (as determined by the <literal><link
+    linkend="set-image-blocker">set-image-blocker</link></literal> action) will be sent to the
+    client as a substitute for the blocked content.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Boolean.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
-     Prevent the header from being sent with the keyword, <quote>block</quote>.
-     Or, <quote>forge</quote> a URL to one from the same server as the request.
-     Or, set to user defined value of your choice.
+    N/A
    </para>
   </listitem>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+hide-referer{forge}}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    The below generic example section is actually part of <filename>default.action</filename>.
+    It marks all URLs with well-known image file name extensions as images and should
+    be left intact. 
+   </para>
+   <para>
+    Users will probably only want to use the handle-as-image action in conjunction with
+    <literal><link linkend="block">block</link></literal>, to block sources of banners, whose URLs don't
+    reflect the file type, like in the second example section.
+   </para>
+   <para>
+    Note that you cannot treat HTML pages as images in most cases. For instance, (inline) ad
+    frames require an HTML page to be sent, or they won't display properly.
+    Forcing <literal>handle-as-image</literal> in this situation will not replace the
+    ad frame with an image, but lead to error messages.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage (sections):</term>
   <listitem>
    <para>
-    <quote>forge</quote> is the preferred option here, since some servers will
-    not send images back otherwise.
+     <screen># Generic image extensions:
+#
+{+handle-as-image}
+/.*\.(gif|jpg|jpeg|png|bmp|ico)$
+
+# These don't look like images, but they're banners and should be
+# blocked as images:
+#
+{+block +handle-as-image}
+some.nasty-banner-server.com/junk.cgi?output=trash
+
+# Banner source! Who cares if they also have non-image content?
+ad.doubleclick.net 
+</screen>
    </para>
-  <para>  
-   <quote>+hide-referrer</quote> is an alternate spelling of
-   <quote>+hide-referer</quote>. It has the exact same parameters, and can be freely
-   mixed with, <quote>+hide-referer</quote>. (<quote>referrer</quote> is the
-   correct English spelling, however the HTTP specification has a bug - it
-   requires it to be spelled as <quote>referer</quote>.) 
-  </para>
   </listitem>
  </varlistentry>
-
 </variablelist>
 </sect3>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="hide-user-agent">
-<title><emphasis>+hide-user-agent</emphasis></title>
+<sect3 renderas="sect4" id="hide-forwarded-for-headers">
+<title><emphasis>hide-forwarded-for-headers</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Parameterized.</para>
+   <para>Improve privacy by hiding the true source of the request</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    To change the <quote>User-Agent:</quote> header so web servers can't tell
-    your browser type. Who's business is it anyway?
+    Deletes any existing <quote>X-Forwarded-for:</quote> HTTP header from client requests,
+    and prevents adding a new one.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Boolean.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
-    Any user defined string.
+    N/A
    </para>
   </listitem>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+hide-user-agent{Netscape 6.1 (X11; I; Linux 2.4.18 i686)}}</emphasis>
-     <emphasis>.msn.com</emphasis>
-    </literallayout>
+   <para>
+    It is fairly safe to leave this on.
+   </para>
+   <para>
+    This action is scheduled for improvement: It should be able to generate forged 
+    <quote>X-Forwarded-for:</quote> headers using random IP addresses from a specified network,
+    to make successive requests from the same client look like requests from a pool of different
+    users sharing the same proxy.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage:</term>
   <listitem>
-   <para>
-     Warning! This breaks many web sites that depend on this in order 
-     to determine how the target browser will respond to various 
-     requests. Use with caution.
+    <para>
+     <screen>+hide-forwarded-for-headers</screen>
    </para>
   </listitem>
  </varlistentry>
-
 </variablelist>
 </sect3>
 
+
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="handle-as-image">
-<title><emphasis>+handle-as-image</emphasis></title>
+<sect3 renderas="sect4" id="hide-from-header">
+<title><emphasis>hide-from-header</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>Keep your (old and ill) browser from telling web servers your email address</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    To define what <application>Privoxy</application> should treat 
-    automatically as an image, and is an important ingredient of how 
-    ads are handled.
+    Deletes any existing <quote>From:</quote> HTTP header, or replaces it with the
+    specified string.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
   <listitem>
-   <para>
-    N/A
-   </para>
+   <para>Parameterized.</para>
   </listitem>
  </varlistentry>
- 
+
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Parameter:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+handle-as-image}</emphasis>
-     <emphasis>/.*\.(gif|jpg|jpeg|png|bmp|ico)</emphasis>
-    </literallayout>
+   <para>
+    Keyword: <quote>block</quote>, or any user defined value.
+   </para>
   </listitem>
  </varlistentry>
-
+ 
  <varlistentry>
   <term>Notes:</term>
   <listitem>
    <para>
-    This only has meaning if the URL (or pattern) also is
-    <quote>+block</quote>ed, in which case a user definable image can
-    be sent rather than a HTML page. This is integral to the whole concept of
-    ad blocking: the URL must match <emphasis>both</emphasis> a <ulink
-    url="actions-file.html#BLOCK"><quote>+block</quote></ulink> rule,
-    <emphasis>and</emphasis> <quote>+handle-as-image</quote>.
-    (See <ulink
-    url="actions-file.html#SET-IMAGE-BLOCKER"><quote>+set-image-blocker</quote></ulink>
-    below for control over what will actually be displayed by the browser.)
+    The keyword <quote>block</quote> will completely remove the header 
+    (not to be confused with the <literal><link linkend="block">block</link></literal>
+    action).
+   </para>
+   <para>
+    Alternately, you can specify any value you prefer to be sent to the web
+    server. If you do, it is a matter of fairness not to use any address that
+    is actually used by a real person.
    </para>
    <para>
-    There is little reason to change the default definition for this action.
+    This action is rarely needed, as modern web browsers don't send
+    <quote>From:</quote> headers anymore.
    </para>
   </listitem>
  </varlistentry>
 
+ <varlistentry>
+  <term>Example usage:</term>
+  <listitem>
+   <para>
+    <screen>+hide-from-header{block}</screen> or
+    <screen>+hide-from-header{spam-me-senseless@sittingduck.example.com}</screen>
+   </para>
+  </listitem>
+ </varlistentry>
 </variablelist>
 </sect3>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="set-image-blocker">
-<title><emphasis>+set-image-blocker</emphasis></title>
-
+<sect3 renderas="sect4" id="hide-referrer">
+<title><emphasis>hide-referrer</emphasis></title>
+<anchor id="hide-referer">
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Parameterized.</para>
+   <para>Conceal which link you followed to get to a particular site</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Decide what to do with URLs that end up tagged with <emphasis>both</emphasis> 
-    <ulink url="actions-file.html#BLOCK"><quote>+block</quote></ulink>
-    and <ulink
-    url="actions-file.html#HANDLE-AS-IMAGE"><quote>+handle-as-image</quote></ulink>,
-    e.g an advertisement.
+    Deletes the <quote>Referer:</quote> (sic) HTTP header from the client request,
+    or replaces it with a forged one.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
   <listitem>
-   <para>
-    There are four available options: <quote>-set-image-blocker</quote> will send a HTML
-    <quote>blocked</quote> page, usually resulting in a <quote>broken
-    image</quote> icon.
-    <quote>+set-image-blocker{<emphasis>blank</emphasis>}</quote> will send a
-    1x1 transparent GIF image.
-    <quote>+set-image-blocker{<emphasis>pattern</emphasis>}</quote> will send a
-    checkerboard type pattern (the default). And finally,
-    <quote>+set-image-blocker{<emphasis>http://xyz.com</emphasis>}</quote> will
-    send a HTTP temporary redirect to the specified image. This has the
-    advantage of the icon being being cached by the browser, which will speed
-    up the display.
-   </para>
+   <para>Parameterized.</para>
   </listitem>
  </varlistentry>
- 
+
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Parameter:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+set-image-blocker{blank}}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <itemizedlist>
+    <listitem>
+     <para><quote>block</quote> to delete the header completely.</para>
+    </listitem>
+    <listitem>
+     <para><quote>forge</quote> to pretend to be coming from the homepage of the server we are talking to.</para>
+    </listitem>
+    <listitem>
+     <para>Any other string to set a user defined referrer.</para>
+    </listitem>
+   </itemizedlist>
   </listitem>
  </varlistentry>
-
+ 
  <varlistentry>
   <term>Notes:</term>
   <listitem>
    <para>
-    If you want <emphasis>invisible</emphasis> ads, they need to meet 
-    criteria as matching both <emphasis>images</emphasis> and <emphasis>blocked</emphasis>
-    actions. And then, <quote>image-blocker</quote> should be set to
-    <quote>blank</quote> for invisibility. Note you cannot treat HTML pages as
-    images in most cases. For instance, frames require an HTML page to
-    display. So a frame that is an ad, typically cannot be treated as an image.
-    Forcing an <quote>image</quote> in this situation just will not work
-    reliably. 
+    <quote>forge</quote> is the preferred option here, since some servers will
+    not send images back otherwise, in an attempt to prevent their valuable
+    content from being embedded elsewhere (and hence, without being surrounded
+    by <emphasis>their</emphasis> banners.
    </para>
+  <para>  
+   <literal>hide-referer</literal> is an alternate spelling of
+   <literal>hide-referrer</literal> and the two can be can be freely
+   substituted with each other. (<quote>referrer</quote> is the
+   correct English spelling, however the HTTP specification has a bug - it
+   requires it to be spelled as <quote>referer</quote>.) 
+  </para>
   </listitem>
  </varlistentry>
 
+ <varlistentry>
+  <term>Example usage:</term>
+  <listitem>
+   <para>
+     <screen>+hide-referrer{forge}</screen> or
+     <screen>+hide-referrer{http://www.yahoo.com/}</screen>
+   </para>
+  </listitem>
+ </varlistentry>
 </variablelist>
 </sect3>
 
+
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="limit-connect">
-<title><emphasis>+limit-connect</emphasis></title>
+<sect3 renderas="sect4" id="hide-user-agent">
+<title><emphasis>hide-user-agent</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Parameterized.</para>
+   <para>Conceal your type of browser and client operating system</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    By default, <application>Privoxy</application> only allows HTTP CONNECT
-    requests to port 443 (the standard, secure HTTPS port). Use 
-    <quote>+limit-connect</quote> to disable this altogether, or to allow 
-    more ports.
+    Replaces the value of the <quote>User-Agent:</quote> HTTP header
+    in client requests with the specified value.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Parameterized.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
-    Any valid port number, or port number range.
+    Any user-defined string.
    </para>
   </listitem>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usages:</term>
+  <term>Notes:</term>
   <listitem>
-   <!-- I had trouble getting the spacing to look right in my browser -->
-   <!-- I probably have the wrong font setup, bollocks. -->
-   <!-- Apparently the emphasis tag uses a proportional font no matter what -->
-    <literallayout>
-     <emphasis>+limit-connect{443}</emphasis>                       # This is the default and need not be specified.
-     <emphasis>+limit-connect{80,443}</emphasis>                  # Ports 80 and 443 are OK.
-     <emphasis>+limit-connect{-3, 7, 20-100, 500-}</emphasis>   # Port less than 3, 7, 20 to 100 and above 500 are OK.
-    </literallayout>
-  </listitem>
+   <para>
+    Warning! This breaks many web sites that in order to customize their
+    content for the different browser types depend on looking
+    at this header (which, btw, is <emphasis>NOT</emphasis> a <ulink
+    url="http://www.javascriptkit.com/javaindex.shtml">smart way to
+    do that</ulink>!).
+   </para>
+   <para>
+    Using this action in multi-user setups or wherever diffrerent types of
+    browsers will access the same <application>Privoxy</application> is
+    <emphasis>not recommended</emphasis>. In single-user, single-browser
+    setups, you might use it to delete your OS version information from
+    the headers, because it is an invitation to exploit known bugs for your
+    OS.
+   </para>
+   <para>
+    This action is scheduled for improvement.
+   </para>
+   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage:</term>
   <listitem>
    <para>
-    The CONNECT methods exists in HTTP to allow access to secure websites
-    (https:// URLs) through proxies. It works very simply: the proxy connects
-    to the server on the specified port, and then short-circuits its
-    connections to the client <emphasis>and</emphasis> to the remote proxy.
-    This can be a big security hole, since CONNECT-enabled proxies can be
-    abused as TCP relays very easily.
-  </para>
-  <para> 
-   If you want to allow CONNECT for more ports than this, or want to forbid
-   CONNECT altogether, you can specify a comma separated list of ports and
-   port ranges (the latter using dashes, with the minimum defaulting to 0 and
-   max to 65K).
-  </para>
-  <para>
-   If you don't know what any of this means, there probably is no reason to 
-   change this one.
-  </para>
+     <screen>+hide-user-agent{Netscape 6.1 (X11; I; Linux 2.4.18 i686)}</screen>
+   </para>
   </listitem>
  </varlistentry>
-
 </variablelist>
 </sect3>
 
+
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="prevent-compression">
-<title><emphasis>+prevent-compression</emphasis></title>
+<sect3 renderas="sect4" id="kill-popups">
+<title><emphasis>kill-popups<anchor id="kill-popup"></emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>Eliminate those annoying pop-up windows</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Prevent the specified websites from compressing HTTP data.
+    While loading the document, replace JavaScript code that opens
+    pop-up windows with (syntactically neutral) dummy code on the fly.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Boolean.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
     N/A
@@ -3964,124 +4187,167 @@ forward-socks4 and forward-socks4a</title>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+prevent-compression}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    This action is easily confused with a built-in harwired <literal><link linkend="filter">filter</link></literal>
+    action, but there are important differences: For <literal>kill-popups</literal>,
+    the document need not be buffered, so it can be incrementally rendered while
+    downloading. But <literal>kill-popups</literal> doesn't catch as many pop-ups as
+    <literal><link linkend="filter">filter</link>{popups}</literal> does.
+   </para>
+   <para>
+    Think of it as a fast and efficient replacement for a filter that you
+    can use if you don't want any filtering at all. Note that it doesn't make
+    sense to combine it with any <literal><link linkend="filter">filter</link></literal> action,
+    since as soon as one <literal><link linkend="filter">filter</link></literal> applies,
+    the whole document needs to be buffered anyway, which destroys the advantage of
+    the <literal>kill-popups</literal> action over it's filter equivalent.
+   </para>
+   <para>
+    Killing all pop-ups is a dangerous business. Many shops and banks rely on
+    pop-ups to display forms, shopping carts etc, and killing only the unwanted pop-ups 
+    would require artificial intelligance in <application>Privoxy</application>.
+    If the only kind of pop-ups that you want to kill are exit consoles (those
+    <emphasis>really nasty</emphasis> windows that appear when you close an other
+    one), you might want to use
+    <literal><link linkend="filter">filter</link>{js-annoyances}</literal> instead.
+   </para>
+
+  <!-- 
+   <para>
+    An alternate spelling is <literal>+kill-popup</literal>, which is 
+    interchangeable.
+   </para>
+ --> 
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage:</term>
   <listitem>
-   <para>
-    Some websites do this, which can be a problem for
-    <application>Privoxy</application>, since 
-    <ulink url="actions-file.html#FILTER"><quote>+filter</quote></ulink>,
-    <ulink url="actions-file.html#KILL-POPUPS"><quote>+kill-popups</quote></ulink>
-    and <ulink
-    url="actions-file.html#GIF-DEANIMATE"><quote>+gif-deanimate</quote></ulink>
-    will not work on compressed data. This will slow down connections to those
-    websites, though. Default typically is to turn
-    <quote>prevent-compression</quote> on.
-   </para>
+   <para><screen>+kill-popups</screen></para>
   </listitem>
  </varlistentry>
-
 </variablelist>
 </sect3>
 
+
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="session-cookies-only">
-<title><emphasis>+session-cookies-only</emphasis></title>
+<sect3 renderas="sect4" id="limit-connect">
+<title><emphasis>limit-connect</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>Prevent abuse of <application>Privoxy</application> as a TCP relay</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Allow cookies for the current browser session <emphasis>only</emphasis>.
+    Specifies to which ports HTTP CONNECT requests are allowable.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
   <listitem>
-   <para>
-    N/A
-   </para>
+   <para>Parameterized.</para>
   </listitem>
  </varlistentry>
- 
+
  <varlistentry>
-  <term>Example usage (disabling):</term>
+  <term>Parameter:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{-session-cookies-only}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    A comma-separated list of ports or port ranges (the latter using dashes, with the minimum
+    defaulting to 0 and the maximum to 65K).
+   </para>
   </listitem>
  </varlistentry>
-
+ 
  <varlistentry>
   <term>Notes:</term>
   <listitem>
    <para>
-    If websites set cookies, <quote>+session-cookies-only</quote> will make sure
-    they are erased when you exit and restart your web browser. This makes
-    profiling cookies useless, but won't break sites which require cookies so
-    that you can log in for transactions. This is generally turned on for all 
-    sites, and is the recommended setting.
+    By default, i.e. if no <literal>limit-connect</literal> action applies,
+    <application>Privoxy</application> only allows HTTP CONNECT
+    requests to port 443 (the standard, secure HTTPS port). Use 
+    <literal>limit-connect</literal> if more fine-grained control is desired
+    for some or all destinations.
    </para>
    <para>
-    <quote>+prevent-*-cookies</quote> actions should be turned off as well (see
-    below), for <quote>+session-cookies-only</quote> to work. Or, else no cookies 
-    will get through at all. For, <quote>persistent</quote> cookies that survive 
-    across browser sessions, see below as well.
-   </para>
+    The CONNECT methods exists in HTTP to allow access to secure websites
+    (<quote>https://</quote> URLs) through proxies. It works very simply:
+    the proxy connects to the server on the specified port, and then
+    short-circuits its connections to the client and to the remote server.
+    This can be a big security hole, since CONNECT-enabled proxies can be
+    abused as TCP relays very easily.
+  </para>
+  <para>
+   If you don't know what any of this means, there probably is no reason to 
+   change this one, since the default is already very restrictive.
+  </para>
   </listitem>
  </varlistentry>
 
+ <varlistentry>
+  <term>Example usages:</term>
+  <listitem>
+   <!-- I had trouble getting the spacing to look right in my browser -->
+   <!-- I probably have the wrong font setup, bollocks. -->
+   <!-- Apparently the emphasis tag uses a proportional font no matter what -->
+    <para>
+     <screen>+limit-connect{443}                   # This is the default and need not be specified.
++limit-connect{80,443}                # Ports 80 and 443 are OK.
++limit-connect{-3, 7, 20-100, 500-}   # Ports less than 3, 7, 20 to 100 and above 500 are OK.
++limit-connect{-}                     # All ports are OK (gaping security hole!)</screen>
+   </para>
+  </listitem>
+ </varlistentry>
 </variablelist>
 </sect3>
 
-
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="prevent-reading-cookies">
-<title><emphasis>+prevent-reading-cookies</emphasis></title>
+<sect3 renderas="sect4" id="prevent-compression">
+<title><emphasis>prevent-compression</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>
+    Ensure that servers send the content uncompressed, so it can be
+    passed through <literal><link linkend="filter">filter</link></literal>s
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Explicitly prevent the web server from reading any cookies on your 
-    system.
+    Adds a header to the request that asks for uncompressed transfer.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Boolean.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
     N/A
@@ -4090,28 +4356,45 @@ forward-socks4 and forward-socks4a</title>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+prevent-reading-cookies}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    More and more websites send their content compressed by default, which
+    is generally a good idea and saves bandwidth. But for the <literal><link
+    linkend="filter">filter</link></literal>, <literal><link linkend="deanimate-gifs">deanimate-gifs</link></literal>
+    and <literal><link linkend="kill-popups">kill-popups</link></literal> actions to work,
+    <application>Privoxy</application> needs access to the  uncompressed data.
+    Unfortunately, <application>Privoxy</application> can't yet(!)  uncompress, filter, and
+    re-compress the content on the fly. So if you want to ensure that all websites, including
+    those that normally compress, can be filtered, you need to use this action.
+   </para>
+   <para>
+    This will slow down transfers from those websites, though. If you use any of the above-mentioned
+    actions, you will typically want to use <literal>prevent-compression</literal> in conjunction
+    with them.
+   </para>
+   <para>
+    Note that some (rare) ill-configured sites don't handle requests for uncompressed
+    documents correctly (they send an empty document body). If you use <literal>prevent-compression</literal>
+    per default, you'll have to add exceptions for those sites. See the example for how to do that.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage (sections):</term>
   <listitem>
    <para>
-    Often used in conjunction with <quote>+prevent-setting-cookies</quote> to 
-    disable cookies completely. Note that 
-    <ulink url="actions-file.html#SESSION-COOKIES-ONLY"><quote>+session-cookies-only</quote></ulink>
-    requires these to both be disabled (or else it never gets any cookies to cache).
-   </para>
-   <para>
-    For <quote>persistent</quote> cookies to work (i.e. they survive across browser 
-    sessions and reboots), all three cookie settings should be <quote>off</quote> 
-    for the specified sites.
+    <screen># Set default:
+#
+{+prevent-compression}
+/ # Match all sites
+
+# Make exceptions for ill sites:
+#
+{-prevent-compression}
+www.debianhelp.org
+www.pclinuxonline.com</screen>
    </para>
   </listitem>
  </varlistentry>
@@ -4121,30 +4404,39 @@ forward-socks4 and forward-socks4a</title>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="prevent-setting-cookies">
-<title><emphasis>+prevent-setting-cookies</emphasis></title>
+<sect3 renderas="sect4" id="send-vanilla-wafer">
+<title><emphasis>send-vanilla-wafer</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>
+    Feed log analysis scripts with useless data.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Explicitly block the web server from storing cookies on your 
-    system.
+    Sends a cookie with each request stating that you do not accept any copyright
+    on cookies sent to you, and asking the site operator not to track you.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Boolean.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
     N/A
@@ -4153,21 +4445,22 @@ forward-socks4 and forward-socks4a</title>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+prevent-setting-cookies}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    The vanilla wafer is a (relatively) unique header and could conceivably be used to track you.
+   </para>
+   <para>
+    This action is rarely used and not enabled in the default configuration.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage:</term>
   <listitem>
    <para>
-    Often used in conjunction with <quote>+prevent-reading-cookies</quote> to 
-    disable cookies completely (see above).
+     <screen>+send-vanilla-wafer</screen>
    </para>
   </listitem>
  </varlistentry>
@@ -4177,93 +4470,105 @@ forward-socks4 and forward-socks4a</title>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="kill-popup">
-<title><emphasis>+kill-popups<anchor id="kill-popups"></emphasis></title>
+<sect3 renderas="sect4" id="send-wafer">
+<title><emphasis>send-wafer</emphasis></title>
+
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>
+    Send custom cookies or feed log analysis scripts with even more useless data.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Stop those annoying JavaScript pop-up windows! 
+    Sends a custom, user-defined cookie with each request.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Multi-value.</para>
+  </listitem>
+ </varlistentry>
+
+ <varlistentry>
+  <term>Parameter:</term>
   <listitem>
    <para>
-    N/A
+    A string of the form <quote><replaceable class="option">name</replaceable>=<replaceable
+    class="parameter">value</replaceable></quote>.
    </para>
   </listitem>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+kill-popups}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    Being multi-valued, multiple instances of this action can apply to the same request,
+    resulting in multiple cookies being sent.
+   </para>
+   <para>
+    This action is rarely used and not enabled in the default configuration.
+   </para>
   </listitem>
  </varlistentry>
-
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage (section):</term>
   <listitem>
    <para>
-    <quote>+kill-popups</quote> uses a built in filter to disable pop-ups
-    that use the <literal>window.open()</literal> function, etc. This is 
-    one of the first actions processed by <application>Privoxy</application>
-    as it contacts the remote web server. This action is not always 100% reliable, 
-    and is supplemented by <quote>+filter{<emphasis>popups</emphasis>}</quote>.
-    </para>
-  <!-- 
-   <para>
-    An alternate spelling is <quote>+kill-popup</quote>, which is 
-    interchangeable.
+    <screen>{+send-wafer{UsingPrivoxy=true}}
+my-internal-testing-server.void</screen>
    </para>
- --> 
   </listitem>
  </varlistentry>
-
 </variablelist>
 </sect3>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="send-vanilla-wafer">
-<title><emphasis>+send-vanilla-wafer</emphasis></title>
+<sect3 renderas="sect4" id="session-cookies-only">
+<title><emphasis>session-cookies-only</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Boolean.</para>
+   <para>
+    Allow only temporary <quote>session</quote> cookies (for the current browser session <emphasis>only</emphasis>).
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    Sends a cookie for every site stating that you do not accept any copyright
-    on cookies sent to you, and asking them not to track you.
+    Deletes the <quote>expires</quote> field from <quote>Set-Cookie:</quote> server headers.
+    Most browsers will not store such cookies permanently and forget them in between sessions.
    </para>
   </listitem>
  </varlistentry>
 
+<varlistentry>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
+  <listitem>
+   <para>Boolean.</para>
+  </listitem>
+ </varlistentry>
+
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Parameter:</term>
   <listitem>
    <para>
     N/A
@@ -4272,68 +4577,112 @@ forward-socks4 and forward-socks4a</title>
  </varlistentry>
  
  <varlistentry>
-  <term>Example usage:</term>
+  <term>Notes:</term>
   <listitem>
-    <literallayout>
-     <emphasis>{+send-vanilla-wafer}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+   <para>
+    This is less strict than <literal><link linkend="crunch-incoming-cookies">crunch-incoming-cookies</link></literal> / 
+    <literal><link linkend="crunch-outgoing-cookies">crunch-outgoing-cookies</link></literal> and allows you to browse
+    websites that insist or rely on setting cookies, without compromising your privacy too badly.
+   </para>
+   <para>
+    Most browsers will not permanently store cookies that have been processed by
+    <literal>session-cookies-only</literal> and will forget about them between sessions.
+    This makes profiling cookies useless, but won't break sites which require cookies so
+    that you can log in for transactions. This is generally turned on for all 
+    sites, and is the recommended setting.
+   </para>
+   <para>
+    It makes <emphasis>no sense at all</emphasis> to use <literal>session-cookies-only</literal>
+    together with <literal><link linkend="crunch-incoming-cookies">crunch-incoming-cookies</link></literal> or
+    <literal><link linkend="crunch-outgoing-cookies">crunch-outgoing-cookies</link></literal>. If you do, cookies
+    will be plainly killed.
+   </para>
+   <para>
+    Note that it is up to the browser how it handles such cookies without an <quote>expires</quote>
+    field. If you use an exotic browser, you might want to try it out to be sure.
+   </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Notes:</term>
+  <term>Example usage:</term>
   <listitem>
    <para>
-    This action only applies if you are using a <filename>jarfile</filename>
-    for saving cookies. Of course, this is a (relatively) unique header and 
-    could conceivably be used to track you.
+     <screen>+session-cookies-only</screen>
    </para>
   </listitem>
  </varlistentry>
-
 </variablelist>
 </sect3>
 
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect4" id="send-wafer">
-<title><emphasis>+send-wafer</emphasis></title>
+<sect3 renderas="sect4" id="set-image-blocker">
+<title><emphasis>set-image-blocker</emphasis></title>
 
 <variablelist>
  <varlistentry>
-  <term>Type:</term>
-  <!-- Boolean, Parameterized, Multi-value -->
+  <term>Typical use:</term>
   <listitem>
-   <para>Multi-value.</para>
+   <para>Choose the replacement for blocked images</para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Typical uses:</term>
+  <term>Effect:</term>
   <listitem>
    <para>
-    This allows you to send an arbitrary, user definable cookie.
+     This action alone doesn't do anything noticeable. If <emphasis>both</emphasis>
+     <literal><link linkend="block">block</link></literal> <emphasis>and</emphasis> <literal><link
+     linkend="handle-as-image">handle-as-image</link></literal> <emphasis>also</emphasis>
+     apply, i.e. if the request is to be blocked as an image,
+     <emphasis>then</emphasis> the parameter of this action decides what will be
+     sent as a replacement.
    </para>
   </listitem>
  </varlistentry>
 
  <varlistentry>
-  <term>Possible values:</term>
+  <term>Type:</term>
+  <!-- Boolean, Parameterized, Multi-value -->
   <listitem>
-   <para>
-    User specified cookie name and corresponding value.
-   </para>
+   <para>Parameterized.</para>
   </listitem>
  </varlistentry>
- 
+
  <varlistentry>
-  <term>Example usage:</term>
-  <listitem>
-    <literallayout>
-     <emphasis>{+send-wafer{name=value}}</emphasis>
-     <emphasis>.example.com</emphasis>
-    </literallayout>
+  <term>Parameter:</term>
+  <listitem>
+   <itemizedlist>
+    <listitem>
+     <para>
+      <quote>pattern</quote> to send a built-in checkerboard pattern image. The image is visually
+      decent, scales very well, and makes it obvious where banners were busted.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <quote>blank</quote> to send a built-in transparent image. This makes banners disappear
+      completely, but makes it hard to detect where <application>Privoxy</application> has blocked
+      images on a given page and complicates troubleshooting if <application>Privoxy</application>
+      has blocked innocent images, like navigation icons.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <quote><replaceable class="parameter">target-url</replaceable></quote> to
+      send a redirect to <replaceable class="parameter">target-url</replaceable>. You can redirect
+      to any image anywhere, even in your local filesystem (via <quote>file:///</quote> URL).
+     </para>
+     <para>
+      A good application of redirects is to use special <application>Privoxy</application>-built-in
+      URLs, which send the built-in images, as <replaceable class="parameter">target-url</replaceable>.
+      This has the same visual effect as specifying <quote>blank</quote> or <quote>pattern</quote> in
+      the first place, but enables your browser to cache the replacement image, instead of requesting
+      it over and over again.
+     </para>
+    </listitem>
+   </itemizedlist>
   </listitem>
  </varlistentry>
 
@@ -4341,12 +4690,41 @@ forward-socks4 and forward-socks4a</title>
   <term>Notes:</term>
   <listitem>
    <para>
-    This can be specified multiple times in order to add as many cookies as you
-    like.
+    The URLs for the built-in images are <quote>http://config.privoxy.org/send-banner?type=<replaceable
+    class="parameter">type</replaceable></quote>, where <replaceable class="parameter">type</replaceable> is
+    either <quote>blank</quote> or <quote>pattern</quote>.
+   </para>
+   <para>
+    There is a third (advanced) type, called <quote>auto</quote>. It is <emphasis>NOT</emphasis> to be
+    used in <literal>set-image-blocker</literal>, but meant for use from <link linkend="filter-file">filters</link>.
+    Auto will select the type of image that would have applied to the referring page, had it been an image.
    </para>
   </listitem>
  </varlistentry>
 
+ <varlistentry>
+  <term>Example usage:</term>
+  <listitem>
+   <para>
+    Built-in pattern:
+   </para>
+   <para>
+    <screen>+set-image-blocker{pattern}</screen>
+   </para>
+   <para>
+    Redirect to the BSD devil:
+   </para>
+   <para>
+    <screen>+set-image-blocker{http://www.freebsd.org/gifs/dae_up3.gif}</screen>
+   </para>
+   <para>
+    Redirect to the built-in pattern for better caching:
+   </para>
+   <para>
+    <screen>+set-image-blocker{http://config.privoxy.org/send-banner?type=pattern}</screen>
+   </para>
+  </listitem>
+ </varlistentry>
 </variablelist>
 </sect3>
 
@@ -4364,13 +4742,124 @@ forward-socks4 and forward-socks4a</title>
  actions.
 </para>
 </sect3>
+</sect2>
+
+<!--   ~~~~~       New section      ~~~~~     -->
+<sect2 id="aliases">
+<title>Aliases</title>
+<para>
+ Custom <quote>actions</quote>, known to <application>Privoxy</application>
+ as <quote>aliases</quote>, can be defined by combining other actions.
+ These can in turn be invoked just like the built-in actions.
+ Currently, an alias name can contain any character except space, tab,
+ <quote>=</quote>,
+ <quote>{</quote> and <quote>}</quote>, but we <emphasis>strongly 
+ recommend</emphasis> that you only use <quote>a</quote> to <quote>z</quote>,
+ <quote>0</quote> to <quote>9</quote>, <quote>+</quote>, and <quote>-</quote>.
+ Alias names are not case sensitive, and are not required to start with a
+ <quote>+</quote> or <quote>-</quote> sign, since they are merely textually
+ expanded.
+</para>
+<para>
+ Aliases can be used throughout the actions file, but they <emphasis>must be
+ defined in a special section at the top of the file!</emphasis>
+ And there can only be one such section per actions file. Each actions file may
+ have its own alias section, and the aliases defined in it are only visible
+ within that file.
+</para>
+<para>
+ There are two main reasons to use aliases: One is to save typing for frequently
+ used combinations of actions, the other one is a gain in flexibility: If you
+ decide once how you want to handle shops by defining an alias called
+ <quote>shop</quote>, you can later change your policy on shops in
+ <emphasis>one</emphasis> place, and your changes will take effect everywhere
+ in the actions file where the <quote>shop</quote> alias is used. Calling aliases
+ by their purpose also makes your actions files more readable.
+</para>
+<para>
+ Currently, there is one big drawback to using aliases, though:
+ <application>Privoxy</application>'s built-in web-based action file
+ editor honors aliases when reading the actions files, but it expands
+ them before writing. So the effects of your aliases are of course preserved,
+ but the aliases themselves are lost when you edit sections that use aliases
+ with it.
+ This is likely to change in future versions of <application>Privoxy</application>.
+</para>
+
+<para>
+ Now let's define some aliases...
+</para>
+
+<para>
+ <screen>
+ # Useful custom aliases we can use later.
+ #
+ # Note the (required!) section header line and that this section
+ # must be at the top of the actions file!
+ #
+ {{alias}}
+
+ # These aliases just save typing later:
+ #
+ +crunch-all-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
+ -crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
+ +imageblock = +block +handle-as-image
+
+ # 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
+ shop        = -crunch-all-cookies -fast-redirects
+
+ # Aliases defined from other aliases, for really lazy people ;-)
+ #
+ c0 = +crunch-all-cookies
+ c1 = -crunch-all-cookies</screen>
+</para>
+
+<para>
+ ...and put them to use. These sections would appear in the lower part of an 
+ actions file and define exceptions to the default actions (as specified further
+ up for the <quote>/</quote> pattern):
+</para>
 
+<para>
+ <screen>
+ # These sites are either very complex or very keen on
+ # user data and require minimal interference to work:
+ #
+ {fragile}
+ .office.microsoft.com
+ .windowsupdate.microsoft.com
+ .nytimes.com
+
+ # Shopping sites:
+ # Allow cookies (for setting and retrieving your customer data)
+ #           
+ {shop}
+ .quietpc.com
+ .worldpay.com   # for quietpc.com
+ .scan.co.uk
+
+ # These shops require pop-ups:
+ #
+ {shop -kill-popups -filter{popups}}
+  .dabs.com
+  .overclockers.co.uk</screen>
+</para>
+
+<para>
+ Aliases like <quote>shop</quote> and <quote>fragile</quote> are often used for 
+ <quote>problem</quote> sites that require some actions to be disabled 
+ in order to function properly.
+</para>
+</sect2>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 renderas="sect2" id="act-examples">
+<sect2 id="act-examples">
 <title>Sample Actions Files</title>
 <para>
- Remember that the meaning of any of the above references is reversed by preceding
+ Remember that the meaning of each action is reversed by preceding
  the action with a <quote>-</quote>, in place of the <quote>+</quote>. Also, 
  that some actions are turned on in the default section of the actions file, 
  and require little to no additional configuration. These are just <quote>on</quote>.
@@ -4411,29 +4900,39 @@ for-privoxy-version=3.0
 # defined they can be used just like any built-in action -- but within 
 # this file only! Aliases do not require a + or - sign.
 ##########################################################################
+{{alias}}
 
 # Some useful aliases.
 # Alias to turn off cookie handling, ie allow all cookies unmolested.
- -prevent-cookies = -prevent-setting-cookies -prevent-reading-cookies \
+#
+mercy-for-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies \
                     -session-cookies-only
 
 # Alias to both block and treat as if an image for ad blocking
 # purposes.
- +imageblock      = +block +handle-as-image
-
-# Fragile sites should have the minimum changes:
- fragile     = -block -deanimate-gifs -fast-redirects -filter -hide-referer \
-               -prevent-cookies -kill-popups
+#
++block-as-image   = +block +handle-as-image
 
 # Shops should be allowed to set persistent cookies
- shop        = -filter -prevent-cookies -session-cookies-only
+#
+shop        = -filter mercy-for-cookies
 
+# Fragile sites should receive minimum interference:
+#
+fragile     = -block -deanimate-gifs -fast-redirects -filter -hide-referer \
+              mercy-for-cookies -kill-popups
 
 ##########################################################################
-# Begin default action settings. Anything in this section will match 
-# all URLs -- UNLESS we have exceptions that also match, defined below this 
-# section. We will show all potential actions here whether they are on 
-# or off. We could omit any disabled action if we wanted, since all 
+# Matching starts here. Remember that at this time, all actions are
+# disabled, so we need to explicitly enable the ones we want. 
+#
+# We begin with "default" action settings, i.e. we define a set of actions
+# for a pattern ("/") <link linkend="af-patterns">that matches all URLs</link>. This default set will be
+# applied to all requests as a start, and can be partly or wholly overridden
+# by later matches further down this file, or in user.action.
+#
+# We will show all potential actions here whether they are enabled
+# or not. We could omit any disabled action if we wanted, since all 
 # actions are 'off' by default anyway. Shown for completeness only.
 # Actions are enabled if preceded by a '+', otherwise they are disabled 
 # (unless an alias has been defined without this).
@@ -4464,8 +4963,8 @@ for-privoxy-version=3.0
  <ulink url="actions-file.html#LIMIT-CONNECT">-limit-connect</ulink> \
  <ulink url="actions-file.html#PREVENT-COMPRESSION">+prevent-compression</ulink> \
  <ulink url="actions-file.html#SESSION-COOKIES-ONLY">-session-cookies-only</ulink> \
- <ulink url="actions-file.html#PREVENT-READING-COOKIES">-prevent-reading-cookies</ulink> \
- <ulink url="actions-file.html#PREVENT-SETTING-COOKIES">-prevent-setting-cookies</ulink> \
+ <ulink url="actions-file.html#CRUNCH-OUTGOING-COOKIES">-crunch-outgoing-cookies</ulink> \
+ <ulink url="actions-file.html#CRUNCH-INCOMING-COOKIES">-crunch-incoming-cookies</ulink> \
  <ulink url="actions-file.html#KILL-POPUPS">-kill-popups</ulink> \
  <ulink url="actions-file.html#SEND-VANILLA-WAFER">-send-vanilla-wafer</ulink> \
  <ulink url="actions-file.html#SEND-WAFER">-send-wafer</ulink> \
@@ -4603,20 +5102,20 @@ for-privoxy-version=3.0
 
 # Any aliases you want to use need to be re-defined here.
 # Alias to turn off cookie handling, ie allow all cookies unmolested.
- -prevent-cookies = -prevent-setting-cookies -prevent-reading-cookies \
-                    -session-cookies-only
+ -crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies \
+                       -session-cookies-only
 
 # Fragile sites should have the minimum changes:
  fragile     = -block -deanimate-gifs -fast-redirects -filter -hide-referer \
-               -prevent-cookies -kill-popups
+               -crunch-all-cookies -kill-popups
 
 # Allow persistent cookies for a few regular sites that we 
 # trust via our above alias. These will be saved from one browser session 
 # to the next. We are explicity turning off any and all cookie handling, 
-# even though the prevent-*-cookie settings were disabled in our above 
+# even though the crunch-*-cookies settings were disabled in our above 
 # default.action anyway. So cookies from these domains will come through 
 # unmolested.
- { -prevent-cookies }
+ { -crunch-all-cookies }
  .sun.com
  .yahoo.com
  .msdn.microsoft.com
@@ -4647,98 +5146,12 @@ for-privoxy-version=3.0
   </msgtext> 
  </literal>
 </para>
-
-</sect3>
 </sect2>
 
 <!--  ~  End section  ~  -->
 
 
-<!--   ~~~~~       New section      ~~~~~     -->
-<sect2 id="aliases">
-<title>Aliases</title>
-<para>
- Custom <quote>actions</quote>, known to <application>Privoxy</application>
- as <quote>aliases</quote>, can be defined by combining other <quote>actions</quote>.
- These can in turn be invoked just like the built-in <quote>actions</quote>.
- Currently, an alias can contain any character except space, tab, <quote>=</quote>,
- <quote>{</quote> or <quote>}</quote>. But please use only <quote>a</quote>-
- <quote>z</quote>, <quote>0</quote>-<quote>9</quote>, <quote>+</quote>, and
- <quote>-</quote>. Alias names are not case sensitive, and 
- <emphasis>must be defined before other actions</emphasis> in the
- actions file! And there can only be one set of <quote>aliases</quote>
- defined per file. Each actions file may have its own aliases, but they are 
- only visible within that file. Aliases do not requir a <quote>+</quote> or 
- <quote>-</quote> sign in front, since they are merely expanded.
-</para>
-
-<para>
- Now let's define a few aliases:
-</para>
-
-<para>
- <literal>
-  <msgtext> 
-   <literallayout>
- # Useful custom aliases we can use later. These must come first!
- {{alias}}
- +prevent-cookies = +prevent-setting-cookies +prevent-reading-cookies
- -prevent-cookies = -prevent-setting-cookies -prevent-reading-cookies
- fragile     = -block -prevent-cookies -filter -fast-redirects -hide-referer -kill-popups
- shop        = -prevent-cookies -filter -fast-redirects
- +imageblock = +block +handle-as-image
-
- # Aliases defined from other aliases, for people who don't like to type 
- # too much:  ;-)
- c0 = +prevent-cookies
- c1 = -prevent-cookies
- #... etc.  Customize to your heart's content.
-   </literallayout>
-  </msgtext> 
- </literal>
-</para>
-
-<para>
- Some examples using our <quote>shop</quote> and <quote>fragile</quote>
- aliases from above. These would appear in the lower sections of an 
- actions file as exceptions to the default actions (as defined in the 
- upper section):
-</para>
-
-<para>
- <literal>
-  <msgtext> 
-   <literallayout>
- # These sites are very complex and require
- # minimal interference.
- {fragile}
-  .office.microsoft.com
-  .windowsupdate.microsoft.com
-  .nytimes.com
-
- # Shopping sites - but we still want to block ads.
- {shop}
-  .quietpc.com
-  .worldpay.com   # for quietpc.com
-  .scan.co.uk
 
- # These shops require pop-ups also 
- {shop -kill-popups}
-  .dabs.com
-  .overclockers.co.uk
-   </literallayout>
-  </msgtext> 
- </literal>
-</para>
-
-<para>
- The <quote>shop</quote> and <quote>fragile</quote> aliases are often used for 
- <quote>problem</quote> sites that require most actions to be disabled 
- in order to function properly.
-
-</para>
-
-</sect2>
 </sect1>
 
 <!--  ~  End section  ~  -->
@@ -4916,16 +5329,22 @@ Requests</title>
 
 </sect1>
 
+<!--  ~  End section  ~  -->
+
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect1 id="copyright"><title>Copyright and History</title>
+<sect1 id="copyright"><title><application>Privoxy</application> Copyright, License and History</title>
 
-<sect2><title>Copyright</title>
 <!-- Include copyright.sgml: -->
  &copyright;
 <!-- end copyright -->
-</sect2>
 
+<!--   ~~~~~       New section      ~~~~~     -->
+<sect2><title>License</title>
+<!-- Include copyright.sgml: -->
+ &license;
+<!-- end copyright -->
+</sect2>
 <!--  ~  End section  ~  -->
 
 
@@ -4938,6 +5357,9 @@ Requests</title>
 </sect2>
 </sect1>
 
+<!--  ~  End section  ~  -->
+
+
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 id="seealso"><title>See Also</title>
 <!-- Include seealso.sgml: -->
@@ -5456,7 +5878,7 @@ Requests</title>
    First, the server headers are read and processed to determine, among other
    things, the MIME type (document type) and encoding. The headers are then
    filtered as deterimed by the 
-   <ulink url="actions-file.html#PREVENT-SETTING-COOKIES"><quote>+prevent-setting-cookies</quote></ulink>,
+   <ulink url="actions-file.html#CRUNCH-INCOMING-COOKIES"><quote>+crunch-incoming-cookies</quote></ulink>,
    <ulink url="actions-file.html#SESSION-COOKIES-ONLY"><quote>+session-cookies-only</quote></ulink>,
    and <ulink url="actions-file.html#DOWNGRADE-HTTP-VERSION"><quote>+downgrade-http-version</quote></ulink>
    actions.
@@ -5577,8 +5999,8 @@ Requests</title>
  +filter{webbugs} +filter{refresh-tags} +filter{nimda} +filter{banners-by-size} 
  +hide-forwarded-for-headers +hide-from-header{block} +hide-referer{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 }
+ +prevent-compression +session-cookies-only -crunch-outgoing-cookies 
+ -crunch-incoming-cookies -kill-popups -send-vanilla-wafer -send-wafer }
 /
 
  { -session-cookies-only }
@@ -5647,8 +6069,8 @@ Requests</title>
  +filter{webbugs} +filter{refresh-tags} +filter{nimda} +filter{banners-by-size} 
  +hide-forwarded-for-headers +hide-from-header{block} +hide-referer{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
+ +prevent-compression -session-cookies-only -crunch-outgoing-cookies 
+ -crunch-incoming-cookies -kill-popups -send-vanilla-wafer -send-wafer
 </screen>
 </para>
 
@@ -5715,8 +6137,8 @@ Requests</title>
    +filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal} 
    +filter{fun} +hide-forwarded-for-headers +hide-from-header{block} 
    +hide-referer{forge} -hide-user-agent -handle-as-image +set-image-blocker{blank} 
-   +prevent-compression +session-cookies-only -prevent-setting-cookies 
-   -prevent-reading-cookies +kill-popups -send-vanilla-wafer -send-wafer }
+   +prevent-compression +session-cookies-only -crunch-incoming-cookies 
+   -crunch-outgoing-cookies +kill-popups -send-vanilla-wafer -send-wafer }
    /
 
  { +block +handle-as-image }
@@ -5831,6 +6253,41 @@ Requests</title>
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: user-manual.sgml,v $
+ Revision 1.110  2002/05/14 19:10:45  oes
+ Restored alphabetical order of actions
+
+ Revision 1.109  2002/05/14 17:23:11  oes
+ Renamed the prevent-*-cookies actions, extended aliases section and moved it before the example AFs
+
+ Revision 1.108  2002/05/14 15:29:12  oes
+ Completed proofreading the actions chapter
+
+ Revision 1.107  2002/05/12 03:20:41  hal9
+ Small clarifications for 127.0.0.1 vs localhost for listen-address since this
+ apparently an important distinction for some OS's.
+
+ Revision 1.106  2002/05/10 01:48:20  hal9
+ This is mostly proposed copyright/licensing additions and changes. Docs
+ are still GPL, but licensing and copyright are more visible. Also, copyright
+ changed in doc header comments (eliminate references to JB except FAQ).
+
+ Revision 1.105  2002/05/05 20:26:02  hal9
+ Sorting out license vs copyright in these docs.
+
+ Revision 1.104  2002/05/04 08:44:45  swa
+ bumped version
+
+ Revision 1.103  2002/05/04 00:40:53  hal9
+ -Remove the TOC first page kludge. It's fixed proper now in ldp.dsl.in.
+ -Some minor additions to Quickstart.
+
+ Revision 1.102  2002/05/03 17:46:00  oes
+ Further proofread & reactivated short build instructions
+
+ Revision 1.101  2002/05/03 03:58:30  hal9
+ Move the user-manual config directive to top of section. Add note about
+ Privoxy needing read permissions for configs, and write for logs.
+
  Revision 1.100  2002/04/29 03:05:55  hal9
  Add clarification on differences of new actions files.