From 03472355cc98c0a5f3e65deb0e4569bd14e0fb54 Mon Sep 17 00:00:00 2001
From: hal9 <hal9@users.sourceforge.net>
Date: Tue, 3 Oct 2006 11:13:56 +0000
Subject: [PATCH] More references to the new filters. Include html this time
 around.

---
 doc/source/user-manual.sgml                  |  22 +-
 doc/webserver/user-manual/actions-file.html  | 267 +++++++++++++++----
 doc/webserver/user-manual/appendix.html      |  99 +++++--
 doc/webserver/user-manual/config.html        |   4 +-
 doc/webserver/user-manual/configuration.html |  10 +-
 doc/webserver/user-manual/contact.html       |   4 +-
 doc/webserver/user-manual/copyright.html     |   8 +-
 doc/webserver/user-manual/filter-file.html   | 143 +++++++++-
 doc/webserver/user-manual/index.html         |  28 +-
 doc/webserver/user-manual/installation.html  |  39 +--
 doc/webserver/user-manual/introduction.html  |  14 +-
 doc/webserver/user-manual/quickstart.html    |   8 +-
 doc/webserver/user-manual/seealso.html       |   4 +-
 doc/webserver/user-manual/startup.html       |   8 +-
 doc/webserver/user-manual/templates.html     |   4 +-
 doc/webserver/user-manual/whatsnew.html      |  22 +-
 16 files changed, 519 insertions(+), 165 deletions(-)

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index be15be01..3e36ed85 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -33,7 +33,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: user-manual.sgml,v 2.22 2006/09/22 01:27:55 hal9 Exp $
+ $Id: user-manual.sgml,v 2.23 2006/10/02 22:43:53 hal9 Exp $
 
  Copyright (C) 2001- 2006 Privoxy Developers http://www.privoxy.org
  See LICENSE.
@@ -59,7 +59,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 2.22 2006/09/22 01:27:55 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.23 2006/10/02 22:43:53 hal9 Exp $</pubdate>
 
 <!--
 
@@ -422,8 +422,7 @@ How to install the binary packages depends on your operating system:
 <sect1 id="whatsnew">
 <title>What's New in this Release</title>
 <para>
- There are many improvements and new features in <application>Privoxy</application> &p-version;
- :
+ There are many improvements and new features since the last <application>Privoxy</application> stable release:
 </para>
 
 <para>
@@ -556,6 +555,12 @@ How to install the binary packages depends on your operating system:
     option, for placing documentation and help files on the local system.
    </para>
   </listitem>
+  
+  <listitem>
+   <para>
+    There are six new <link linkend="FILTER">filters</link>.
+   </para>
+  </listitem>
 
   <listitem>
    <para>
@@ -649,8 +654,9 @@ How to install the binary packages depends on your operating system:
    and you may want to review which actions are <quote>on</quote> by 
    default. This is primarily a matter of emphasis, but some features 
    you may have been used to, may now be <quote>off</quote> by default.
-   There are also a number of new actions you may want to consider, most of
-   which are not incorporated into the default settings as yet (see above).
+   There are also a number of new actions and filters you may want to
+   consider, most of which are not incorporated into the default settings as
+   yet (see above).
   </para>
  </listitem>
  
@@ -8429,6 +8435,10 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
+ Revision 2.23  2006/10/02 22:43:53  hal9
+ Contains new filter definitions from Fabian, and few other miscellaneous
+ touch-ups.
+
  Revision 2.22  2006/09/22 01:27:55  hal9
  Final commit of probably various minor changes here and there. Unless
  something changes this should be ready for pending release.
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index a70b8104..16304658 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="The Main Configuration File"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -205,7 +205,9 @@ CLASS="LITERAL"
 CLASS="LITERAL"
 >Medium</TT
 >). New users should try this for a while before
-     adjusting the settings to more aggressive levels.
+     adjusting the settings to more aggressive levels. The more aggressive 
+     the settings, then the more likelihood there is of problems such as sites 
+     not working as they should.
      </P
 ><P
 >      The <SPAN
@@ -256,7 +258,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN1967"
+NAME="AEN1970"
 ></A
 ><P
 ><B
@@ -376,7 +378,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->all</TD
+>blocks only</TD
 ></TR
 ><TR
 ><TD
@@ -503,7 +505,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>no</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -525,7 +527,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>no</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -683,7 +685,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2066"
+NAME="AEN2069"
 ></A
 >8.1. Finding the Right Mix</H2
 ><P
@@ -718,7 +720,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2073"
+NAME="AEN2076"
 ></A
 >8.2. How to Edit</H2
 ><P
@@ -1026,7 +1028,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2156"
+NAME="AEN2159"
 ></A
 >8.4.1. The Domain Pattern</H3
 ><P
@@ -1250,7 +1252,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2227"
+NAME="AEN2230"
 ></A
 >8.4.2. The Path Pattern</H3
 ><P
@@ -1769,8 +1771,12 @@ CLASS="FILENAME"
 >config</TT
 > (the default
  installation has three actions files). It also quite possible for any given
- URL pattern to match more than one pattern and thus more than one set of
- actions! Last match wins.</P
+ URL to match more than one <SPAN
+CLASS="QUOTE"
+>"pattern"</SPAN
+> (because of wildcards and
+ regular expressions), and thus to trigger more than one set of actions! Last
+ match wins.</P
 ><P
 > The list of valid <SPAN
 CLASS="APPLICATION"
@@ -3197,24 +3203,26 @@ CLASS="VARIABLELIST"
 >Typical use:</DT
 ><DD
 ><P
->Get rid of HTML and JavaScript annoyances, banner advertisements (by size), do fun text replacements, etc.</P
+>Get rid of HTML and JavaScript annoyances, banner advertisements (by size), 
+         do fun text replacements, add personalized effects, etc.</P
 ></DD
 ><DT
 >Effect:</DT
 ><DD
 ><P
->    All files of text-based type, most notably HTML and JavaScript, to which this
-    action applies, are filtered on-the-fly through the specified regular expression
-    based substitutions. (Note: as of version 3.0.3 plain text documents 
-    are exempted from filtering, because web servers often use the
-    <TT
+>    All files of text-based type, most notably HTML and
+    JavaScript, to which this action applies, can be filtered on-the-fly
+    through the specified regular expression based substitutions. (Note: as of
+    version 3.0.3 plain text documents are exempted from filtering, because
+    web servers often use the <TT
 CLASS="LITERAL"
 >text/plain</TT
-> MIME type for all files whose type they
-    don't know.) By default, filtering works only on the raw document content 
-    itself (that which can be seen with <TT
+> MIME type for all
+    files whose type they don't know.) By default, filtering works only on the
+    raw document content itself (that which can be seen with <TT
 CLASS="LITERAL"
->View Source</TT
+>View
+    Source</TT
 >), 
     not the headers.
    </P
@@ -3304,8 +3312,12 @@ CLASS="QUOTE"
 >"HTML"</SPAN
 ></A
 >.
-    This is very powerful feature, and potentially very intrusive. Use 
-    with caution.    
+    This is very powerful feature, and potentially very intrusive. 
+    Filters should be used with caution, and where an equivalent
+    <SPAN
+CLASS="QUOTE"
+>"action"</SPAN
+> is not available.
    </P
 ><P
 >    The amount of data that can be filtered is limited to the 
@@ -3340,7 +3352,7 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 > cannot uncompress compressed
     documents. If you want filtering to work on all documents, even those that
-    would normally be sent compressed, use the
+    would normally be sent compressed, you must use the
     <TT
 CLASS="LITERAL"
 ><A
@@ -3505,7 +3517,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{unsolicited-popups}  # Disable only unsolicited pop-up windows</PRE
+>+filter{unsolicited-popups}  # Disable only unsolicited pop-up windows. Useful if your browser lacks this ability.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3524,7 +3536,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{all-popups}          # Kill all popups in JavaScript and HTML</PRE
+>+filter{all-popups}          # Kill all popups in JavaScript and HTML. Useful if your browser lacks this ability.</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3775,6 +3787,139 @@ CLASS="SCREEN"
 ></TD
 ></TR
 ></TABLE
+>
+   </P
+><P
+>    <A
+NAME="FILTER-SITE-SPECIFICS"
+></A
+>
+    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>+filter{site-specifics}      # Custom filters for specific site related problems</PRE
+></TD
+></TR
+></TABLE
+>
+   </P
+><P
+>    <A
+NAME="FILTER-GOOGLE"
+></A
+>
+    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>+filter{google}              # Removes text ads and other Google specific improvements</PRE
+></TD
+></TR
+></TABLE
+>
+   </P
+><P
+>    <A
+NAME="FILTER-YAHOO"
+></A
+>
+    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>+filter{yahoo}               # Removes text ads and other Yahoo specific improvements</PRE
+></TD
+></TR
+></TABLE
+>
+   </P
+><P
+>    <A
+NAME="FILTER-MSN"
+></A
+>
+    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>+filter{msn}                 # Removes text ads and other MSN specific improvements</PRE
+></TD
+></TR
+></TABLE
+>
+   </P
+><P
+>    <A
+NAME="FILTER-BLOGSPOT"
+></A
+>
+    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>+filter{blogspot}            # Cleans up Blogspot blogs</PRE
+></TD
+></TR
+></TABLE
+>
+   </P
+><P
+>    <A
+NAME="FILTER-HTML-TO-XML"
+></A
+>
+    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>+filter{html-to-xml}         # Header filter to change the Content-Type from html to xml</PRE
+></TD
+></TR
+></TABLE
+>
+   </P
+><P
+>    <A
+NAME="FILTER-XML-TO-HTML"
+></A
+>
+    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>+filter{xml-to-html}         # Header filter to change the Content-Type from xml to html</PRE
+></TD
+></TR
+></TABLE
 >
    </P
 ></DD
@@ -5465,7 +5610,7 @@ CLASS="REPLACEABLE"
 >}</A
 >
     </TT
-> does a fairly good job of catching only the unwanted ones.
+> does a better job of catching only the unwanted ones.
    </P
 ><P
 >    If the only kind of pop-ups that you want to kill are exit consoles (those
@@ -5491,6 +5636,10 @@ CLASS="REPLACEABLE"
 >
     instead. 
    </P
+><P
+>    This action is most appropriate for browsers that don't have any controls 
+    for unwanted pop-ups. Not recommended for general usage.
+   </P
 ></DD
 ><DT
 >Example usage:</DT
@@ -6755,7 +6904,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN3885"
+NAME="AEN3912"
 ></A
 >8.5.36. Summary</H3
 ><P
@@ -7059,7 +7208,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN3950"
+NAME="AEN3977"
 ></A
 >8.7.1. default.action</H3
 ><P
@@ -7285,11 +7434,11 @@ HREF="actions-file.html#DEANIMATE-GIFS"
 HREF="actions-file.html#DOWNGRADE-HTTP-VERSION"
 >downgrade-http-version</A
 > \
- +<A
+ -<A
 HREF="actions-file.html#FAST-REDIRECTS"
 >fast-redirects{check-decoded-url}</A
 > \
- +<A
+ -<A
 HREF="actions-file.html#FILTER-JS-ANNOYANCES"
 >filter{js-annoyances}</A
 > \
@@ -7309,7 +7458,7 @@ HREF="actions-file.html#FILTER-CONTENT-COOKIES"
 HREF="actions-file.html#FILTER-REFRESH-TAGS"
 >filter{refresh-tags}</A
 > \
- +<A
+ -<A
 HREF="actions-file.html#FILTER-UNSOLICITED-POPUPS"
 >filter{unsolicited-popups}</A
 > \
@@ -7317,11 +7466,11 @@ HREF="actions-file.html#FILTER-UNSOLICITED-POPUPS"
 HREF="actions-file.html#FILTER-ALL-POPUPS"
 >filter{all-popups}</A
 > \
- +<A
+ -<A
 HREF="actions-file.html#FILTER-IMG-REORDER"
 >filter{img-reorder}</A
 > \
- +<A
+ -<A
 HREF="actions-file.html#FILTER-BANNERS-BY-SIZE"
 >filter{banners-by-size}</A
 > \
@@ -7337,7 +7486,7 @@ HREF="actions-file.html#FILTER-WEBBUGS"
 HREF="actions-file.html#FILTER-TINY-TEXTFORMS"
 >filter{tiny-textforms}</A
 > \
- +<A
+ -<A
 HREF="actions-file.html#FILTER-JUMPING-WINDOWS"
 >filter{jumping-windows}</A
 > \
@@ -7376,6 +7525,30 @@ HREF="actions-file.html#FILTER-CLIENT-HEADERS"
  -<A
 HREF="actions-file.html#FILTER-SERVER-HEADERS"
 >filter-server-headers</A
+> \
+ -<A
+HREF="actions-file.html#FILTER-GOOGLE"
+>filter-google</A
+> \
+ -<A
+HREF="actions-file.html#FILTER-YAHOO"
+>filter-yahoo</A
+> \
+ -<A
+HREF="actions-file.html#FILTER-MSN"
+>filter-msn</A
+> \
+ -<A
+HREF="actions-file.html#FILTER-BLOGSPOT"
+>filter-blogspot</A
+> \
+ -<A
+HREF="actions-file.html#FILTER-XML-TO-HTML"
+>filter-xml-to-html</A
+> \
+ -<A
+HREF="actions-file.html#FILTER-HTML-TO-XML"
+>filter-html-to-xml</A
 > \
  -<A
 HREF="actions-file.html#FORCE-TEXT-MODE"
@@ -7513,7 +7686,8 @@ CLASS="SCREEN"
 #
 { fragile }
 .office.microsoft.com           # surprise, surprise!
-.windowsupdate.microsoft.com</PRE
+.windowsupdate.microsoft.com
+mail.google.com</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7692,7 +7866,6 @@ ar.atwola.com
 .a.yimg.com/(?:(?!/i/).)*$
 .a[0-9].yimg.com/(?:(?!/i/).)*$
 bs*.gsanet.com
-bs*.einets.com
 .qkimg.net</PRE
 ></TD
 ></TR
@@ -7703,7 +7876,7 @@ bs*.einets.com
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >
- is to block banners. A huge bunch of them can be <SPAN
+ is to block banners. Many of these can be <SPAN
 CLASS="QUOTE"
 >"blocked"</SPAN
 >
@@ -7727,7 +7900,7 @@ HREF="actions-file.html#BLOCK"
 ></TT
 > action to them.</P
 ><P
-> First comes a bunch of generic patterns, which do most of the work, by
+> First comes many generic patterns, which do most of the work, by
  matching typical domain and path name components of banners. Then comes
  a list of individual patterns for specific sites, which is omitted here
  to keep the example short:</P
@@ -7765,7 +7938,7 @@ count*.
 ></TABLE
 ></P
 ><P
-> You wouldn't believe how many advertisers actually call their banner
+> It's quite remarkable how many advertisers actually call their banner
  servers ads.<TT
 CLASS="REPLACEABLE"
 ><I
@@ -7892,6 +8065,7 @@ HREF="actions-file.html#BLOCK"
 > }
 adv[io]*.  # (for advogato.org and advice.*)
 adsl.      # (has nothing to do with ads)
+adobe.     # (has nothing to do with ads either)
 ad[ud]*.   # (adult.* and add.*)
 .edu       # (universities don't host banners (yet!))
 .*loads.   # (downloads, uploads etc)
@@ -7944,7 +8118,10 @@ CLASS="SCREEN"
 HREF="actions-file.html#FILTER"
 >filter</A
 > }
-/.*cvs
+/(.*/)?cvs
+bugzilla.
+developer.
+wiki.
 .sourceforge.net</PRE
 ></TD
 ></TR
@@ -7962,7 +8139,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4131"
+NAME="AEN4164"
 ></A
 >8.7.2. user.action</H3
 ><P
@@ -8271,7 +8448,7 @@ WIDTH="100%"
 CLASS="SCREEN"
 >{ fragile }
  .forbes.com
- mail.example.com
+ webmail.example.com
  .mybank.com</PRE
 ></TD
 ></TR
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 8b4b6982..53b99fe1 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="See Also"
@@ -36,7 +36,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -745,7 +745,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4920"
+NAME="AEN4992"
 ></A
 >14.2. Privoxy's Internal Pages</H2
 ><P
@@ -791,7 +791,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN4934"
+NAME="AEN5006"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -824,7 +824,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN4942"
+NAME="AEN5014"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -844,7 +844,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN4947"
+NAME="AEN5019"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -864,7 +864,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN4952"
+NAME="AEN5024"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -884,7 +884,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN4957"
+NAME="AEN5029"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -908,7 +908,7 @@ CLASS="QUOTE"
    to run, but only as a pass-through proxy, with no actions taking place:
   </P
 ><A
-NAME="AEN4963"
+NAME="AEN5035"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -925,7 +925,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN4967"
+NAME="AEN5039"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -939,7 +939,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN4970"
+NAME="AEN5042"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -1443,15 +1443,21 @@ CLASS="GUIBUTTON"
  -filter {fun}
  -filter {crude-parental}
  -filter {site-specifics}
- +filter {js-annoyances}
- +filter {html-annoyances}
+ -filter {js-annoyances}
+ -filter {html-annoyances}
  +filter {refresh-tags}
- +filter {unsolicited-popups}
+ -filter {unsolicited-popups}
  +filter {img-reorder}
  +filter {banners-by-size}
  +filter {webbugs}
  +filter {jumping-windows}
  +filter {ie-exploits}
+ -filter {google}
+ -filter {yahoo}
+ -filter {msn}
+ -filter {blogspot}
+ -filter {xml-to-html}
+ -filter {html-to-xml}
  -filter-client-headers
  -filter-server-headers
  -force-text-mode
@@ -1657,16 +1663,34 @@ CLASS="SCREEN"
  -crunch-server-header
  +deanimate-gifs {last}
  -downgrade-http-version
- -fast-redirects
- +filter {js-annoyances}
- +filter {html-annoyances}
+ +fast-redirects {check-decoded-url}
+ -filter {js-events}
+ -filter {content-cookies}
+ -filter {all-popups}
+ -filter {banners-by-link}
+ -filter {tiny-textforms}
+ -filter {frameset-borders}
+ -filter {demoronizer}
+ -filter {shockwave-flash}
+ -filter {quicktime-kioskmode}
+ -filter {fun}
+ -filter {crude-parental}
+ -filter {site-specifics}
+ -filter {js-annoyances}
+ -filter {html-annoyances}
  +filter {refresh-tags}
- +filter {unsolicited-popups}
+ -filter {unsolicited-popups}
  +filter {img-reorder}
  +filter {banners-by-size}
  +filter {webbugs}
  +filter {jumping-windows}
  +filter {ie-exploits}
+ -filter {google}
+ -filter {yahoo}
+ -filter {msn}
+ -filter {blogspot}
+ -filter {xml-to-html}
+ -filter {html-to-xml}
  -filter-client-headers
  -filter-server-headers
  -force-text-mode
@@ -1830,15 +1854,34 @@ CLASS="GUIBUTTON"
   -crunch-server-header
   +deanimate-gifs 
   -downgrade-http-version 
-  +fast-redirects{check-decoded-url}
-  +filter{html-annoyances} 
-  +filter{js-annoyances} 
-  +filter{kill-popups} 
-  +filter{webbugs} 
-  +filter{nimda} 
-  +filter{banners-by-size} 
-  +filter{hal} 
-  +filter{fun} 
+  +fast-redirects {check-decoded-url}
+  -filter {js-events}
+  -filter {content-cookies}
+  -filter {all-popups}
+  -filter {banners-by-link}
+  -filter {tiny-textforms}
+  -filter {frameset-borders}
+  -filter {demoronizer}
+  -filter {shockwave-flash}
+  -filter {quicktime-kioskmode}
+  -filter {fun}
+  -filter {crude-parental}
+  -filter {site-specifics}
+  -filter {js-annoyances}
+  -filter {html-annoyances}
+  +filter {refresh-tags}
+  -filter {unsolicited-popups}
+  +filter {img-reorder}
+  +filter {banners-by-size}
+  +filter {webbugs}
+  +filter {jumping-windows}
+  +filter {ie-exploits}
+  -filter {google}
+  -filter {yahoo}
+  -filter {msn}
+  -filter {blogspot}
+  -filter {xml-to-html}
+  -filter {html-to-xml}
   -filter-client-headers
   -filter-server-headers
   -force-text-mode
@@ -1851,7 +1894,7 @@ CLASS="GUIBUTTON"
   +hide-referer{forge} 
   -hide-user-agent 
   -inspect-jpegs
-  +kill-popups 
+  -kill-popups 
   -overwrite-last-modified
   +prevent-compression 
   -redirect
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index be5157a9..7d68900e 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Privoxy Configuration"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 49153a49..5714ad9a 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Starting Privoxy"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -95,7 +95,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN803"
+NAME="AEN806"
 ></A
 >6.1. Controlling Privoxy with Your Web Browser</H2
 ><P
@@ -126,7 +126,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN811"
+NAME="AEN814"
 ></A
 >    Privoxy Menu</H2
 ><P
@@ -182,7 +182,7 @@ TARGET="_top"
 ><TR
 ><TD
 >          &#9642;  <A
-HREF="http://www.privoxy.org/   3.0.5/user-manual/"
+HREF="http://www.privoxy.org/   3.0.6/user-manual/"
 TARGET="_top"
 >Documentation</A
 >
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index c59809e7..c257dd34 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Privoxy's Template Files"
@@ -40,7 +40,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index c4be4353..f1c298a1 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Contacting the Developers, Bug Reporting and Feature
@@ -40,7 +40,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -99,7 +99,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4670"
+NAME="AEN4742"
 ></A
 >12.1. License</H2
 ><P
@@ -165,7 +165,7 @@ NAME="HISTORY"
 ></A
 >12.2. History</H2
 ><P
-> Along time ago, there was the
+> A long time ago, there was the
  <A
 HREF="http://www.junkbusters.com/ijb.html"
 TARGET="_top"
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 5ea91bee..d73b79dc 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Actions Files"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -314,7 +314,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4271"
+NAME="AEN4304"
 ></A
 >9.1. Filter File Tutorial</H2
 ><P
@@ -906,6 +906,10 @@ CLASS="QUOTE"
 ></UL
 >
    </P
+><P
+>    Use with caution. This is an aggressive filter, and can break sites that 
+    rely heavily on JavaScript.
+   </P
 ></DD
 ><DT
 ><SPAN
@@ -919,7 +923,7 @@ CLASS="EMPHASIS"
 ><P
 >    This is a very radical measure. It removes virtually all JavaScript event bindings, which
     means that scripts can not react to user actions such as mouse movements or clicks, window
-    resizing etc, anymore. 
+    resizing etc, anymore. Use with caution!
    </P
 ><P
 >    We <SPAN
@@ -988,8 +992,10 @@ HREF="actions-file.html#CRUNCH-OUTGOING-COOKIES"
     to sneak cookies to the browser on the content level.
    </P
 ><P
->    This filter disables HTML and JavaScript code that reads or sets cookies. Use
-    it wherever you would also use the cookie crunch actions.
+>    This filter disables most HTML and JavaScript code that reads or sets
+    cookies. It cannot detect all clever uses of these types of code, so it 
+    should not be relied on as an absolute fix. Use it wherever you would also
+    use the cookie crunch actions. 
    </P
 ></DD
 ><DT
@@ -1028,8 +1034,17 @@ CLASS="QUOTE"
    </P
 ><P
 >    Technical note: The filter works by redefining the window.open JavaScript
-    function to a dummy function during the loading and rendering phase of each
-    HTML page access, and restoring the function afterward.
+    function to a dummy function, <TT
+CLASS="LITERAL"
+>PrivoxyWindowOpen()</TT
+>,
+    during the loading and rendering phase of each HTML page access, and
+    restoring the function afterward.
+   </P
+><P
+>    This is recommended only for browsers that cannot perform this function
+    reliably themselves. And be aware that some sites require such windows 
+    in order to function normally. Use with caution.
    </P
 ></DD
 ><DT
@@ -1049,9 +1064,9 @@ CLASS="EMPHASIS"
 >all</I
 ></SPAN
 > pop-up windows from opening.
-    Note this should be used with more discretion than the above, since it is
-    more likely to break some sites that require pop-ups for normal usage. Use 
-    with caution.
+    Note this should be used with even more discretion than the above, since
+    it is more likely to break some sites that require pop-ups for normal
+    usage. Use with caution.
    </P
 ></DD
 ><DT
@@ -1093,6 +1108,16 @@ CLASS="EMPHASIS"
 >    Occasionally this filter will cause false positives on images that are not ads,
     but just happen to be of one of the standard banner sizes.
    </P
+><P
+>    Recommended only for those who require extreme ad blocking. The default 
+    block rules should catch 95+% of all ads <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>without</I
+></SPAN
+> this filter enabled.
+   </P
 ></DD
 ><DT
 ><SPAN
@@ -1124,7 +1149,7 @@ CLASS="EMPHASIS"
     As an HTML page is loaded by the browser, an embedded image tag causes the
     browser to contact a third-party site, disclosing the tracking information
     through the requested URL and/or cookies for that third-party domain, without
-    the use ever becoming aware of the interaction with the third-party site.
+    the user ever becoming aware of the interaction with the third-party site.
     HTML-ized spam also uses a similar technique to verify email addresses.
    </P
 ><P
@@ -1165,7 +1190,7 @@ CLASS="EMPHASIS"
 ><P
 >    Many consider windows that move, or resize themselves to be abusive. This filter
     neutralizes the related JavaScript code. Note that some sites might not display
-    or behave as intended when using this filter.
+    or behave as intended when using this filter. Use with caution.
    </P
 ></DD
 ><DT
@@ -1284,7 +1309,7 @@ CLASS="EMPHASIS"
 ></DT
 ><DD
 ><P
->    A collection of text replacements to disable malicious HTML and JavaScript
+>    An experimental collection of text replacements to disable malicious HTML and JavaScript
     code that exploits known security holes in Internet Explorer.
    </P
 ><P
@@ -1315,6 +1340,96 @@ CLASS="FILENAME"
     anything regarding this filter.
    </P
 ></DD
+><DT
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>google</I
+></SPAN
+></DT
+><DD
+><P
+>    A CSS based block for Google text ads. Also removes a width limitation
+    and the toolbar advertisement.
+   </P
+></DD
+><DT
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>yahoo</I
+></SPAN
+></DT
+><DD
+><P
+>    Another CSS based block, this time for Yahoo text ads. And removes 
+    a width limitation as well.
+   </P
+></DD
+><DT
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>msn</I
+></SPAN
+></DT
+><DD
+><P
+>    Another CSS based block, this time for MSN text ads. And removes 
+    tracking URLs, as well as a width limitation.
+   </P
+></DD
+><DT
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>blogspot</I
+></SPAN
+></DT
+><DD
+><P
+>    Cleans up some Blogspot blogs. Read the fine print before using this one!
+   </P
+><P
+>    This filter also intentionally removes some navigation stuff and sets the
+    page width to 100%. As a result, some rounded <SPAN
+CLASS="QUOTE"
+>"corners"</SPAN
+> would
+    appear to early or not at all and as fixing this would require a browser
+    that understands background-size (CSS3), they are removed instead.
+   </P
+></DD
+><DT
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>xml-to-html</I
+></SPAN
+></DT
+><DD
+><P
+>    Header filter to change the Content-Type from xml to html.
+   </P
+></DD
+><DT
+><SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>html-to-xml</I
+></SPAN
+></DT
+><DD
+><P
+>    Header filter to change the Content-Type from html to xml.
+   </P
+></DD
 ></DL
 ></DIV
 ></DIV
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index c7d1a0e1..020a6416 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -1,7 +1,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Privoxy 3.0.5 User Manual</TITLE
+>Privoxy 3.0.6 User Manual</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
@@ -30,7 +30,7 @@ CLASS="TITLE"
 ><A
 NAME="AEN2"
 ></A
->Privoxy 3.0.5 User Manual</H1
+>Privoxy 3.0.6 User Manual</H1
 ><P
 CLASS="PUBDATE"
 > <SUB
@@ -47,7 +47,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.21 2006/09/20 03:21:36 david__schmidt Exp $<BR></P
+>$Id: user-manual.sgml,v 2.23 2006/10/02 22:43:53 hal9 Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -292,7 +292,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN803"
+HREF="configuration.html#AEN806"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -490,12 +490,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2066"
+HREF="actions-file.html#AEN2069"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2073"
+HREF="actions-file.html#AEN2076"
 >How to Edit</A
 ></DT
 ><DT
@@ -512,12 +512,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2156"
+HREF="actions-file.html#AEN2159"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2227"
+HREF="actions-file.html#AEN2230"
 >The Path Pattern</A
 ></DT
 ></DL
@@ -709,7 +709,7 @@ HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
 ></DT
 ><DT
 >8.5.36. <A
-HREF="actions-file.html#AEN3885"
+HREF="actions-file.html#AEN3912"
 >Summary</A
 ></DT
 ></DL
@@ -728,12 +728,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN3950"
+HREF="actions-file.html#AEN3977"
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4131"
+HREF="actions-file.html#AEN4164"
 >user.action</A
 ></DT
 ></DL
@@ -749,7 +749,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4271"
+HREF="filter-file.html#AEN4304"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -817,7 +817,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN4670"
+HREF="copyright.html#AEN4742"
 >License</A
 ></DT
 ><DT
@@ -851,7 +851,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN4920"
+HREF="appendix.html#AEN4992"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 24269858..9ef656e0 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Introduction"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -126,7 +126,7 @@ NAME="INSTALLATION-PACK-RPM"
 ><P
 > RPMs can be installed with <TT
 CLASS="LITERAL"
->rpm -Uvh privoxy-3.0.5-1.rpm</TT
+>rpm -Uvh privoxy-3.0.6-1.rpm</TT
 >,
  and will use <TT
 CLASS="FILENAME"
@@ -157,7 +157,7 @@ CLASS="COMMAND"
 > If you have problems with failed dependencies, try rebuilding the SRC RPM: 
  <TT
 CLASS="LITERAL"
->rpm --rebuild privoxy-3.0.5-1.src.rpm</TT
+>rpm --rebuild privoxy-3.0.6-1.src.rpm</TT
 >. This 
  will use your locally installed libraries and RPM version. </P
 ><P
@@ -478,7 +478,7 @@ CLASS="FILENAME"
 >, the 
  documentation is in <TT
 CLASS="FILENAME"
->/usr/share/doc/privoxy-3.0.5</TT
+>/usr/share/doc/privoxy-3.0.6</TT
 >
  and the Log directory is in <TT
 CLASS="FILENAME"
@@ -546,15 +546,15 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
-> tar xzvf privoxy-3.0.5-beta-src* [.tgz or .tar.gz]
- cd privoxy-3.0.5-beta</PRE
+> tar xzvf privoxy-3.0.6-beta-src* [.tgz or .tar.gz]
+ cd privoxy-3.0.6-beta</PRE
 ></TD
 ></TR
 ></TABLE
 ></P
 ><P
-> For retrieving the current CVS sources, you'll need CVS installed.
- Note that sources from CVS are development quality, and may not be
+> For retrieving the current CVS sources, you'll need a CVS client installed.
+ Note that sources from CVS are typicially development quality, and may not be
  stable, or well tested. To download CVS source, check the Sourceforge
  documentation, which might give commands like:</P
 ><P
@@ -873,21 +873,22 @@ CLASS="APPLICATION"
  script should be checked for correct paths and values, if anything other than
  a default install is done.</P
 ><P
-> If install finds previous versions of any configuration files, these will not
- be overwritten, and the new ones will be installed with a <SPAN
+> If install finds previous versions of any local configuration files, these
+ will not be overwritten, and the new ones will be installed with a
+ <SPAN
 CLASS="QUOTE"
 >"new"</SPAN
->
- extension. You will then need to manually update the installed configuration
- files as needed. All template files will be overwritten. If you have
- customized, local templates, you should save these first. If a previous
- version of <SPAN
+> extension. default.action, default.filter, and 
+ standard.action will be overwritten. You will then need to manually update
+ the other installed configuration files as needed. All template files will be
+ overwritten. If you have customized, local templates, you should save these
+ first. If a previous version of <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> is already running, you will
- have to restart it manually.</P
+> is
+ already running, you will have to restart it manually.</P
 ><P
-> For more detailed instructions on how to build Redhat and SuSE RPMs,
+> For more detailed instructions on how to build Redhat RPMs,
  Windows self-extracting installers, building on platforms with
  special requirements etc, please consult the <A
 HREF="../developer-manual/newrelease.html"
diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index f385fb07..bd6b8b9e 100644
--- a/doc/webserver/user-manual/introduction.html
+++ b/doc/webserver/user-manual/introduction.html
@@ -7,10 +7,10 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="NEXT"
 TITLE="Installation"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -79,18 +79,18 @@ NAME="INTRODUCTION"
 ></A
 >1. Introduction</H1
 ><P
-> This documentation is included with the current BETA version of
+> This documentation is included with the current UNRELEASED version of
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
->, v.3.0.5, 
+>, v.3.0.6, 
  and is mostly complete at this point. The most up to date reference for the
  time being is still the comments in the source files and in the individual
  configuration files. Development of a new version is currently nearing
  completion, and includes significant changes and enhancements over
  earlier versions. .</P
 ><P
-> Since this is a BETA version, not all new features are well tested. This
+> Since this is a UNRELEASED version, not all new features are well tested. This
  documentation may be slightly out of sync as a result (especially with 
  CVS sources). And there <SPAN
 CLASS="emphasis"
@@ -263,7 +263,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Privoxy 3.0.5 User Manual</TD
+>Privoxy 3.0.6 User Manual</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index c4628588..6ec539d9 100644
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="What's New in this Release"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -223,7 +223,7 @@ HREF="appendix.html#ACTIONSANAT"
 >Troubleshooting: Anatomy of an
     Action</A
 >"</SPAN
-> has hints how to understand and debug actions that
+> has hints on how to understand and debug actions that
     <SPAN
 CLASS="QUOTE"
 >"misbehave"</SPAN
@@ -648,7 +648,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN565"
+NAME="AEN568"
 ></A
 ><P
 ><B
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index 0bf00a93..b7da41ad 100644
--- a/doc/webserver/user-manual/seealso.html
+++ b/doc/webserver/user-manual/seealso.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Privoxy Copyright, License and History"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index c0dc0b9e..cbe89c64 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Quickstart to Using Privoxy"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -111,7 +111,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN617"
+NAME="AEN620"
 ></A
 ><P
 ><B
@@ -224,7 +224,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN654"
+NAME="AEN657"
 ></A
 ><P
 ><B
diff --git a/doc/webserver/user-manual/templates.html b/doc/webserver/user-manual/templates.html
index a9c0ed06..59221656 100644
--- a/doc/webserver/user-manual/templates.html
+++ b/doc/webserver/user-manual/templates.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Filter Files"
@@ -40,7 +40,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index 669bfd1b..8830d458 100644
--- a/doc/webserver/user-manual/whatsnew.html
+++ b/doc/webserver/user-manual/whatsnew.html
@@ -7,7 +7,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.5 User Manual"
+TITLE="Privoxy 3.0.6 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Installation"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.5 User Manual</TH
+>Privoxy 3.0.6 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -79,11 +79,10 @@ NAME="WHATSNEW"
 ></A
 >3. What's New in this Release</H1
 ><P
-> There are many improvements and new features in <SPAN
+> There are many improvements and new features since the last <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> 3.0.5
- :</P
+> stable release:</P
 ><P
 > <P
 ></P
@@ -352,6 +351,14 @@ HREF="config.html#USER-MANUAL"
 ></LI
 ><LI
 ><P
+>    There are six new <A
+HREF="actions-file.html#FILTER"
+>filters</A
+>.
+   </P
+></LI
+><LI
+><P
 >    Actions files problems and suggestions are now being directed to: 
     <A
 HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
@@ -494,8 +501,9 @@ CLASS="QUOTE"
 CLASS="QUOTE"
 >"off"</SPAN
 > by default.
-   There are also a number of new actions you may want to consider, most of
-   which are not incorporated into the default settings as yet (see above).
+   There are also a number of new actions and filters you may want to
+   consider, most of which are not incorporated into the default settings as
+   yet (see above).
   </P
 ></LI
 ><LI
-- 
2.39.2