From: hal9 <hal9@users.sourceforge.net>
Date: Fri, 22 Sep 2006 01:32:41 +0000 (+0000)
Subject: Freshly built HTML docs for 3.0.5 beta.
X-Git-Tag: v_3_0_5~16
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=ae6beecce49ef10b169c4b843580985430bc698b

Freshly built HTML docs for 3.0.5 beta.
---

diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html
index 7fcad1bf..945acb15 100644
--- a/doc/webserver/developer-manual/coding.html
+++ b/doc/webserver/developer-manual/coding.html
@@ -2334,14 +2334,14 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.7 2006/07/18 14:48:50 david__schmidt Exp $";
+>const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.9 2006/09/14 02:30:07 hal9 Exp $";
 /*********************************************************************
  *
  * File        :  $Source$
  *
  * Purpose     :  (Fill me in with a good description!)
  *
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
+ * Copyright   :  Written by and Copyright (C) 2001-2006 the SourceForge
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -2363,8 +2363,9 @@ CLASS="PROGRAMLISTING"
  *                The GNU General Public License should be included with
  *                this file.  If not, you can view it at
  *                http://www.gnu.org/copyleft/gpl.html
- *                or write to the Free Software Foundation, Inc., 59
- *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *                or write to the Free Software Foundation, Inc., 
+ *                51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ,
+ *                USA
  *
  * Revisions   :
  *    $Log$
@@ -2421,14 +2422,14 @@ WIDTH="100%"
 CLASS="PROGRAMLISTING"
 >#ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.7 2006/07/18 14:48:50 david__schmidt Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.9 2006/09/14 02:30:07 hal9 Exp $"
 /*********************************************************************
  *
  * File        :  $Source$
  *
  * Purpose     :  (Fill me in with a good description!)
  *
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
+ * Copyright   :  Written by and Copyright (C) 2001-2006 the SourceForge
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -2450,8 +2451,9 @@ CLASS="PROGRAMLISTING"
  *                The GNU General Public License should be included with
  *                this file.  If not, you can view it at
  *                http://www.gnu.org/copyleft/gpl.html
- *                or write to the Free Software Foundation, Inc., 59
- *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *                or write to the Free Software Foundation, Inc., 
+ *                51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ,
+ *                USA
  *
  * Revisions   :
  *    $Log$
diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html
index c6d655d0..0dae3493 100644
--- a/doc/webserver/developer-manual/contact.html
+++ b/doc/webserver/developer-manual/contact.html
@@ -118,9 +118,96 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
+NAME="REPORTING"
+></A
+>8.2. Reporting Problems</H2
+><P
+><SPAN
+CLASS="QUOTE"
+>"Problems"</SPAN
+> for our purposes, come in two forms:</P
+><P
+></P
+><UL
+><LI
+><P
+>    Configuration issues, such as ads that slip through, or sites that 
+    don't function properly due to one <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> 
+    <SPAN
+CLASS="QUOTE"
+>"action"</SPAN
+> or another being turned <SPAN
+CLASS="QUOTE"
+>"on"</SPAN
+>.
+   </P
+></LI
+><LI
+><P
+>    <SPAN
+CLASS="QUOTE"
+>"Bugs"</SPAN
+> in the programming code that makes up 
+    <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>, such as that might cause a crash.
+   </P
+></LI
+></UL
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="CONTACT-ADS"
+></A
+>8.2.1. Reporting Ads or Other Configuration Problems</H3
+><P
+> Please send feedback on ads that slipped through, innocent images that were
+ blocked, sites that don't work properly, and other configuration related problem of 
+ <TT
+CLASS="FILENAME"
+>default.action</TT
+> file, to 
+ <A
+HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
+TARGET="_top"
+> http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
+>,
+ the Actions File Tracker.</P
+><P
+> New, improved <TT
+CLASS="FILENAME"
+>default.action</TT
+> files may occasionally be made
+ available based on your feedback. These will be announced on the <A
+HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce"
+TARGET="_top"
+>ijbswa-announce</A
+>
+ list and available from our the <A
+HREF="http://sourceforge.net/project/showfiles.php?group_id=11118"
+TARGET="_top"
+>files section</A
+> of
+ our <A
+HREF="http://sf.net/projects/ijbswa/"
+TARGET="_top"
+>project page</A
+>.</P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
 NAME="CONTACT-BUGS"
 ></A
->8.2. Report Bugs</H2
+>8.2.2. Reporting Bugs</H3
 ><P
 > Please report all bugs <SPAN
 CLASS="emphasis"
@@ -136,13 +223,20 @@ TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118</A
 >. </P
 ><P
->  Before doing so, please make sure that the bug has not already been submitted
+>  Before doing so, please make sure that the bug has <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>not already been submitted</I
+></SPAN
+>
   and observe the additional hints at the top of the <A
 HREF="http://sourceforge.net/tracker/?func=add&group_id=11118&atid=111118"
 TARGET="_top"
 >submit
   form</A
->.</P
+>. If already submitted, please feel free to add any info to the 
+  original report that might help solve the issue.</P
 ><P
 > 
   Please try to verify that it is a <SPAN
@@ -159,16 +253,10 @@ TARGET="_top"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >, and see if the problem persists.
-  The <A
-HREF="http://www.privoxy.org/user-manual/appendix.html#ACTIONSANAT"
-TARGET="_top"
->appendix
-  of the user manual</A
-> also has helpful information 
-  on action debugging. If you are using your own custom configuration, please try
+  If you are using your own custom configuration, please try
   the stock configs to see if the problem is configuration related.</P
 ><P
->  If not using the latest version, chances are that the bug has been found
+>  If not using the latest version, the bug may have been found
   and fixed in the meantime. We would appreciate if you could take the time
   to <A
 HREF="http://www.privoxy.org/user-manual/installation.html"
@@ -176,7 +264,127 @@ TARGET="_top"
 >upgrade
   to the latest version</A
 > (or  even the latest CVS snapshot) and verify
-  your bug, but this is not required for reporting.</P
+  your bug.</P
+><P
+>Please be sure to provide the following information:</P
+><P
+> <P
+></P
+><UL
+><LI
+><P
+>    The exact <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> version of the proxy software
+(if you got the source from CVS, please also give the date).
+   </P
+></LI
+><LI
+><P
+>    The operating system and versions you run
+    <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> on, (e.g. <SPAN
+CLASS="APPLICATION"
+>Windows
+    XP</SPAN
+>).
+   </P
+></LI
+><LI
+><P
+>    The name, platform, and version of the <SPAN
+CLASS="APPLICATION"
+>browser</SPAN
+> 
+    you were using (e.g. <SPAN
+CLASS="APPLICATION"
+>Internet Explorer v5.5</SPAN
+> for Mac).
+   </P
+></LI
+><LI
+><P
+>    The URL where the problem occurred, or some way for us to duplicate the
+    problem (e.g. <TT
+CLASS="LITERAL"
+>http://somesite.example.com?somethingelse=123</TT
+>). 
+   </P
+></LI
+><LI
+><P
+>    Whether your version of <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> is one supplied
+    by the developers of <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> via SourceForge,
+    or somewhere else.
+   </P
+></LI
+><LI
+><P
+>    Whether you are using <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> in tandem with 
+    another proxy such as <SPAN
+CLASS="APPLICATION"
+>TOR</SPAN
+>. If so, please try 
+    disabling the other proxy.
+   </P
+></LI
+><LI
+><P
+>    Whether you are using a personal firewall product. If so, does 
+    <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> work without it?
+   </P
+></LI
+><LI
+><P
+>    Any other pertinent information to help identify the problem such as config
+    or log file excerpts (yes, you should have log file entries for each
+    action taken).
+   </P
+></LI
+><LI
+><P
+>    <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>Please provide your SF login, or email address</I
+></SPAN
+>, in case we 
+    need to contact you.
+   </P
+></LI
+></UL
+></P
+><P
+>  The <A
+HREF="http://www.privoxy.org/user-manual/appendix.html#ACTIONSANAT"
+TARGET="_top"
+>appendix
+  of the Privoxy User Manual</A
+> also has helpful information 
+  on understanding <TT
+CLASS="LITERAL"
+>actions</TT
+>, and <TT
+CLASS="LITERAL"
+>action</TT
+> debugging. </P
+></DIV
 ></DIV
 ><DIV
 CLASS="SECT2"
@@ -200,52 +408,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="CONTACT-ADS"
-></A
->8.4. Report Ads or Other Actions-Related Problems</H2
-><P
-> Please send feedback on ads that slipped through, innocent images that were blocked,
- and any other problems relating to the <TT
-CLASS="FILENAME"
->default.action</TT
-> file through
- our actions feedback mechanism located at
- <A
-HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
-TARGET="_top"
->http://www.privoxy.org/actions/</A
->.
- On this page, you will also find a bookmark which will take you back there from
- any troubled site and even pre-fill the form!</P
-><P
-> New, improved <TT
-CLASS="FILENAME"
->default.action</TT
-> files will occasionally be made
- available based on your feedback. These will be announced on the <A
-HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce"
-TARGET="_top"
->ijbswa-announce</A
->
- list and available from our the <A
-HREF="http://sourceforge.net/project/showfiles.php?group_id=11118"
-TARGET="_top"
->files section</A
-> of
- our <A
-HREF="http://sf.net/projects/ijbswa/"
-TARGET="_top"
->project page</A
->.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
 NAME="CONTACT-OTHER"
 ></A
->8.5. Other</H2
+>8.4. Other</H2
 ><P
 >For any other issues, feel free to use the mailing lists. Technically interested users
 and people who wish to contribute to the project are also welcome on the developers list!
diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index 8fe9f30d..ce1e7a5b 100644
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -77,11 +77,11 @@ NAME="COPYRIGHT"
 ></A
 >9. Privoxy Copyright, License and History</H1
 ><P
-> Copyright © 2001 - 2004 by Privoxy Developers <TT
+> Copyright © 2001 - 2006 by Privoxy Developers <TT
 CLASS="EMAIL"
 >&#60;<A
-HREF="mailto:developers@privoxy.org"
->developers@privoxy.org</A
+HREF="mailto:ijbswa-developers@lists.sourceforge.net"
+>ijbswa-developers@lists.sourceforge.net</A
 >&#62;</TT
 ></P
 ><P
@@ -96,7 +96,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1161"
+NAME="AEN1220"
 ></A
 >9.1. License</H2
 ><P
@@ -119,8 +119,8 @@ CLASS="CITETITLE"
 >GNU General Public License</I
 > for
  
- more details, which is available from the Free Software Foundation, Inc, 59
- Temple Place - Suite 330, Boston, MA  02111-1307, USA.</P
+ more details, which is available from the Free Software Foundation, Inc, 
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</P
 ><P
 > You should have received a copy of the <A
 HREF="http://www.gnu.org/copyleft/gpl.html"
@@ -135,8 +135,8 @@ CLASS="ADDRESS"
 >&nbsp;Free&nbsp;Software<br>
 &nbsp;Foundation,&nbsp;Inc.&nbsp;<SPAN
 CLASS="STREET"
->59 Temple Place</SPAN
->&nbsp;-&nbsp;Suite&nbsp;330<br>
+>51 Franklin Street, Fifth Floor</SPAN
+><br>
 &nbsp;<SPAN
 CLASS="CITY"
 >Boston</SPAN
@@ -145,7 +145,7 @@ CLASS="STATE"
 >MA</SPAN
 >&nbsp;<SPAN
 CLASS="POSTCODE"
->02111-1307</SPAN
+>02110-1301</SPAN
 ><br>
 &nbsp;<SPAN
 CLASS="COUNTRY"
@@ -158,11 +158,11 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1177"
+NAME="AEN1236"
 ></A
 >9.2. History</H2
 ><P
-> In the beginning, there was the
+> Along time ago, there was the
  <A
 HREF="http://www.junkbusters.com/ijb.html"
 TARGET="_top"
@@ -176,12 +176,12 @@ HREF="http://www.junkbusters.com/"
 TARGET="_top"
 >Junkbusters
  Corporation</A
->. It saved many users a lot of pain in the early days of
+>. This saved many users a lot of pain in the early days of
  web advertising and user tracking.</P
 ><P
 > But the web, its protocols and standards, and with it, the techniques for
- forcing  users to consume ads, give up autonomy over their browsing, and
- for spying on them, kept evolving. Unfortunately, the <SPAN
+ forcing  ads on users, give up autonomy over their browsing, and
+ for tracking them, keeps evolving. Unfortunately, the <SPAN
 CLASS="APPLICATION"
 >Internet
  Junkbuster</SPAN
diff --git a/doc/webserver/developer-manual/cvs.html b/doc/webserver/developer-manual/cvs.html
index ad082be4..638ad2e3 100644
--- a/doc/webserver/developer-manual/cvs.html
+++ b/doc/webserver/developer-manual/cvs.html
@@ -176,7 +176,7 @@ HREF="newrelease.html#VERSIONNUMBERS"
 >      At one time there were two distinct branches: stable and unstable. The
       more drastic changes were to be in the unstable branch. These branches 
       have now been merged to minimize time and effort of maintaining two 
-      brances.
+      branches.
      </P
 ></DIV
 ><DIV
diff --git a/doc/webserver/developer-manual/documentation.html b/doc/webserver/developer-manual/documentation.html
index db88e80c..6e67c91d 100644
--- a/doc/webserver/developer-manual/documentation.html
+++ b/doc/webserver/developer-manual/documentation.html
@@ -799,7 +799,7 @@ CLASS="APPLICATION"
 > 
     version string, e.g. <SPAN
 CLASS="QUOTE"
->"3.0.4"</SPAN
+>"3.0.5"</SPAN
 >.
    </TD
 ></TR
diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index fa823bd8..c6150cb2 100644
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -37,7 +37,7 @@ CLASS="PUBDATE"
       <A
 HREF="copyright.html"
 >Copyright</A
-> © 2001, 2002 by 
+> © 2001-2006 by 
       <A
 HREF="http://www.privoxy.org"
 TARGET="_top"
@@ -48,7 +48,7 @@ TARGET="_top"
     <BR></P
 ><P
 CLASS="PUBDATE"
->$Id: developer-manual.sgml,v 2.7 2006/07/18 14:48:50 david__schmidt Exp $<BR></P
+>$Id: developer-manual.sgml,v 2.9 2006/09/14 02:30:07 hal9 Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -67,7 +67,7 @@ CLASS="APPLICATION"
  for anyone who wants to join the team.</P
 ><P
 > Please note that this document is constantly evolving. This copy represents
- the state at the release of version 3.0.4.
+ the state at the release of version 3.0.5.
  You can find the latest version of the this manual at <A
 HREF="http://www.privoxy.org/developer-manual/"
 TARGET="_top"
@@ -573,9 +573,23 @@ HREF="contact.html#CONTACT-SUPPORT"
 ></DT
 ><DT
 >8.2. <A
+HREF="contact.html#REPORTING"
+>Reporting Problems</A
+></DT
+><DD
+><DL
+><DT
+>8.2.1. <A
+HREF="contact.html#CONTACT-ADS"
+>Reporting Ads or Other Configuration Problems</A
+></DT
+><DT
+>8.2.2. <A
 HREF="contact.html#CONTACT-BUGS"
->Report Bugs</A
+>Reporting Bugs</A
 ></DT
+></DL
+></DD
 ><DT
 >8.3. <A
 HREF="contact.html#CONTACT-FEATURE"
@@ -583,11 +597,6 @@ HREF="contact.html#CONTACT-FEATURE"
 ></DT
 ><DT
 >8.4. <A
-HREF="contact.html#CONTACT-ADS"
->Report Ads or Other Actions-Related Problems</A
-></DT
-><DT
->8.5. <A
 HREF="contact.html#CONTACT-OTHER"
 >Other</A
 ></DT
@@ -602,12 +611,12 @@ HREF="copyright.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="copyright.html#AEN1161"
+HREF="copyright.html#AEN1220"
 >License</A
 ></DT
 ><DT
 >9.2. <A
-HREF="copyright.html#AEN1177"
+HREF="copyright.html#AEN1236"
 >History</A
 ></DT
 ></DL
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index 70df23b7..38ec2d50 100644
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -464,8 +464,8 @@ WIDTH="100%"
 CLASS="PROGRAMLISTING"
 >  mkdir dist # delete or choose different name if it already exists
   cd dist
-  cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
-  cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa export -r v_X_Y_Z current</PRE
+  cvs -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa login
+  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa export -r v_X_Y_Z current</PRE
 ></TD
 ></TR
 ></TABLE
@@ -483,6 +483,36 @@ CLASS="EMPHASIS"
      all release packages, and with them, all future bug reports, are based
      on exactly the same code.
     </P
+><DIV
+CLASS="WARNING"
+><P
+></P
+><TABLE
+CLASS="WARNING"
+BORDER="1"
+WIDTH="100%"
+><TR
+><TD
+ALIGN="CENTER"
+><B
+>Warning</B
+></TD
+></TR
+><TR
+><TD
+ALIGN="LEFT"
+><P
+>      Every significant release of Privoxy has included at least one 
+      package that either had incorrect versions of files, missing files, 
+      or incidental leftovers from a previous build process that gave 
+      unknown numbers of users headaches to try to figure out what was 
+      wrong. PLEASE, make sure you are using pristene sources, and are
+      following the prescribed process!
+     </P
+></TD
+></TR
+></TABLE
+></DIV
 ><P
 >     Please find additional instructions for the source tarball and the
      individual platform dependent binary packages below. And details 
@@ -697,15 +727,40 @@ CLASS="FILENAME"
 >        <TT
 CLASS="FILENAME"
 >user.action</TT
-> is designed for local preferences. 
-        Make sure this does not get overwritten!
+> and <TT
+CLASS="FILENAME"
+>user.filter</TT
+>
+        are designed for local preferences. Make sure these do not get overwritten!
+        <TT
+CLASS="FILENAME"
+>config</TT
+> should not be overwritten either. This 
+        has especially important configuration data in it.
+        <TT
+CLASS="FILENAME"
+>trust</TT
+> should be left in tact as well.
        </P
 ></LI
 ><LI
 ><P
->        Other configuration files should be installed as the new defaults, 
-        but all previously installed configuration files should be preserved
-        as backups. This is just good manners :-)
+>        Other configuration files (<TT
+CLASS="FILENAME"
+>default.action</TT
+>,
+        <TT
+CLASS="FILENAME"
+>default.filter</TT
+> and
+        <TT
+CLASS="FILENAME"
+>standard.action</TT
+>) should be installed as the new
+        defaults, but all previously installed configuration files should be
+        preserved as backups. This is just good manners :-) These files are
+        likely to change between releases and contain important new features
+        and bug fixes.
        </P
 ></LI
 ><LI
@@ -1297,7 +1352,7 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->  debchange -v 3.0.4-BETA-1 "New upstream version"</PRE
+>  debchange -v 3.0.5-BETA-1 "New upstream version"</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1325,7 +1380,7 @@ CLASS="PROGRAMLISTING"
 >        This will create
         <TT
 CLASS="FILENAME"
->../privoxy_3.0.4-BETA-1_i386.deb</TT
+>../privoxy_3.0.5-BETA-1_i386.deb</TT
 >
         which can be uploaded.  To upload the package to Sourceforge, simply
 	issue
@@ -1769,7 +1824,7 @@ CLASS="LITERAL"
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
->3.0.4
+>3.0.5
      (beta)</I
 ></SPAN
 >.
@@ -1834,7 +1889,8 @@ TARGET="_top"
       location</A
 >, the release notes and the Changelog. Also, post an
       updated News item on the project page Sourceforge, and update the Home 
-      page and docs linked from the Home page (see below).
+      page and docs linked from the Home page (see below). Other news sites
+      and release oriented sites, such as Freshmeat, should also be notified.
      </P
 ></DIV
 ></DIV
diff --git a/doc/webserver/developer-manual/seealso.html b/doc/webserver/developer-manual/seealso.html
index d1ec6f2f..6ecd6647 100644
--- a/doc/webserver/developer-manual/seealso.html
+++ b/doc/webserver/developer-manual/seealso.html
@@ -186,36 +186,14 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
+HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
 TARGET="_top"
->http://www.privoxy.org/actions/</A
+>http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >, to submit <SPAN
 CLASS="QUOTE"
 >"misses"</SPAN
-> to the developers. 
-  </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
->
- <P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->   <A
-HREF="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/contrib/"
-TARGET="_top"
->http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/contrib/</A
->, cool
-   and fun ideas from <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> users.
+> and other
+   configuration related suggestions to the developers. 
   </TD
 ></TR
 ></TBODY
@@ -223,6 +201,7 @@ CLASS="APPLICATION"
 ><P
 ></P
 >
+ 
  <P
 ></P
 ><TABLE
@@ -263,6 +242,7 @@ TARGET="_top"
 ><P
 ></P
 >
+ 
  <P
 ></P
 ><TABLE
@@ -271,15 +251,11 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="http://www.waldherr.org/junkbuster/"
+HREF="http://privacy.net/"
 TARGET="_top"
->http://www.waldherr.org/junkbuster/</A
->,
-   Stefan Waldherr's version of Junkbuster, from which <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> was
-   derived.
+>http://privacy.net/</A
+>, a useful site
+   to check what information about you is leaked while you browse the web.
   </TD
 ></TR
 ></TBODY
@@ -295,11 +271,14 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="http://privacy.net/analyze/"
+HREF="http://www.squid-cache.org/"
 TARGET="_top"
->http://privacy.net/analyze/</A
->, a useful site
-   to check what information about you is leaked while you browse the web.
+>http://www.squid-cache.org/</A
+>, a very popular
+   caching proxy, which is often used together with <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>.
   </TD
 ></TR
 ></TBODY
@@ -315,14 +294,15 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="http://www.squid-cache.org/"
+HREF="http://tor.eff.org/"
 TARGET="_top"
->http://www.squid-cache.org/</A
->, a very popular
-   caching proxy, which is often used together with <SPAN
+>http://tor.eff.org/</A
+>, 
+   <SPAN
 CLASS="APPLICATION"
->Privoxy</SPAN
->.
+>Tor</SPAN
+> can help anonymize web browsing, 
+   web publishing, instant messaging, IRC, SSH, and other applications.
   </TD
 ></TR
 ></TBODY
diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index c0ef75dc..408e4274 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -130,6 +130,20 @@ CLASS="QUOTE"
 >"improved"</SPAN
 > versions and it is recommended to use the newer
   configuration files.
+  
+   If upgrading from version prior to 3.0.4 the syntax for <TT
+CLASS="LITERAL"
+>fast-redirects</TT
+>
+   has changed. See the <A
+HREF="../user-manual/whatsnew.html"
+TARGET="_top"
+>What's New section</A
+> 
+   of the <I
+CLASS="CITETITLE"
+>User Manual</I
+> for details.
  </P
 ><P
 >   But all configuration files have substantially
@@ -160,7 +174,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN358"
+NAME="AEN361"
 ></A
 >3.3. What exactly is an <SPAN
 CLASS="QUOTE"
@@ -250,7 +264,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN378"
+NAME="AEN381"
 ></A
 >3.5. How are actions files configured? What is the easiest
 way to do this?</H3
@@ -286,7 +300,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN386"
+NAME="AEN389"
 ></A
 >3.6. There are several different <SPAN
 CLASS="QUOTE"
@@ -478,7 +492,7 @@ CLASS="QUOTE"
 >"Medium"</SPAN
 > and <SPAN
 CLASS="QUOTE"
->"Adventuresome"</SPAN
+>"Advanced"</SPAN
 > defaults?</H3
 ><P
 >  Configuring <SPAN
@@ -524,17 +538,17 @@ CLASS="CITETITLE"
 ><P
 > It should be noted that the <SPAN
 CLASS="QUOTE"
->"Adventuresome"</SPAN
+>"Advanced"</SPAN
 > profile (formerly known 
  as the <SPAN
 CLASS="QUOTE"
->"Advanced"</SPAN
-> profile) is not only more
- aggressive, but also includes fun and, extreme usage of most of
+>"Adventuresome"</SPAN
+> profile) is more
+ aggressive, and will make use of some of 
  <SPAN
 CLASS="APPLICATION"
 >Privoxy's</SPAN
-> features. Use at your own risk!</P
+> advanced features. Use at your own risk!</P
 ></DIV
 ><DIV
 CLASS="SECT2"
@@ -622,7 +636,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN464"
+NAME="AEN467"
 ></A
 >3.10. What is the <TT
 CLASS="FILENAME"
@@ -706,7 +720,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN482"
+NAME="AEN485"
 ></A
 >3.11. How can I set up Privoxy to act as a proxy for my 
  LAN?</H3
@@ -815,7 +829,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN507"
+NAME="AEN510"
 ></A
 >3.12. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</H3
 ><P
@@ -882,7 +896,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN524"
+NAME="AEN527"
 ></A
 >3.13. Why would anybody want to see a checkerboard pattern?</H3
 ><P
@@ -908,7 +922,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN529"
+NAME="AEN532"
 ></A
 >3.14. I see some images being replaced by a text
 instead of the checkerboard image. Why and how do I get rid of this?</H3
diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index 3da34f0b..4fdc3596 100644
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -375,7 +375,7 @@ CLASS="EMPHASIS"
 HREF="http://www.privoxy.org/user-manual/appendix.html#ACTIONSANAT"
 TARGET="_top"
 >appendix
-  of the user manual</A
+  of the Privoxy User Manual</A
 > also has helpful information 
   on understanding <TT
 CLASS="LITERAL"
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index acbce574..12b4ef7f 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -103,7 +103,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1244"
+NAME="AEN1248"
 ></A
 >7.1. License</H2
 ><P
@@ -165,7 +165,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1260"
+NAME="AEN1264"
 ></A
 >7.2. History</H2
 ><P
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index e1d9a72a..8e6a1a6c 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -45,7 +45,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: faq.sgml,v 2.16 2006/09/10 15:30:46 hal9 Exp $<BR></P
+>$Id: faq.sgml,v 2.17 2006/09/17 14:56:32 hal9 Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -96,7 +96,7 @@ TARGET="_top"
 > Privoxy is based on Internet Junkbuster (tm).</P
 ><P
 >  Please note that this document is a work in progress. This copy represents
-  the state at the release of version 3.0.4.
+  the state at the release of version 3.0.5.
   You can find the latest version of the document at <A
 HREF="http://www.privoxy.org/faq/"
 TARGET="_top"
@@ -318,7 +318,7 @@ HREF="configuration.html#NEWCONFIG"
 ></DT
 ><DT
 >3.3. <A
-HREF="configuration.html#AEN358"
+HREF="configuration.html#AEN361"
 >What exactly is an <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -338,13 +338,13 @@ CLASS="QUOTE"
 ></DT
 ><DT
 >3.5. <A
-HREF="configuration.html#AEN378"
+HREF="configuration.html#AEN381"
 >How are actions files configured? What is the easiest
 way to do this?</A
 ></DT
 ><DT
 >3.6. <A
-HREF="configuration.html#AEN386"
+HREF="configuration.html#AEN389"
 >There are several different <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -368,7 +368,7 @@ CLASS="QUOTE"
 >"Medium"</SPAN
 > and <SPAN
 CLASS="QUOTE"
->"Adventuresome"</SPAN
+>"Advanced"</SPAN
 > defaults?</A
 ></DT
 ><DT
@@ -379,7 +379,7 @@ with a browser? Does that not raise security issues?</A
 ></DT
 ><DT
 >3.10. <A
-HREF="configuration.html#AEN464"
+HREF="configuration.html#AEN467"
 >What is the <TT
 CLASS="FILENAME"
 >default.filter</TT
@@ -390,23 +390,23 @@ CLASS="QUOTE"
 ></DT
 ><DT
 >3.11. <A
-HREF="configuration.html#AEN482"
+HREF="configuration.html#AEN485"
 >How can I set up Privoxy to act as a proxy for my 
  LAN?</A
 ></DT
 ><DT
 >3.12. <A
-HREF="configuration.html#AEN507"
+HREF="configuration.html#AEN510"
 >Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
 ></DT
 ><DT
 >3.13. <A
-HREF="configuration.html#AEN524"
+HREF="configuration.html#AEN527"
 >Why would anybody want to see a checkerboard pattern?</A
 ></DT
 ><DT
 >3.14. <A
-HREF="configuration.html#AEN529"
+HREF="configuration.html#AEN532"
 >I see some images being replaced by a text
 instead of the checkerboard image. Why and how do I get rid of this?</A
 ></DT
@@ -487,7 +487,7 @@ HREF="misc.html"
 ><DL
 ><DT
 >4.1. <A
-HREF="misc.html#AEN637"
+HREF="misc.html#AEN640"
 >How much does Privoxy slow my browsing down? This 
 has to add extra time to browsing.</A
 ></DT
@@ -522,12 +522,12 @@ HREF="misc.html#IP"
 ></DT
 ><DT
 >4.7. <A
-HREF="misc.html#AEN699"
+HREF="misc.html#AEN702"
 >Can Privoxy guarantee I am anonymous?</A
 ></DT
 ><DT
 >4.8. <A
-HREF="misc.html#AEN717"
+HREF="misc.html#AEN720"
 >A test site says I am not using a Proxy.</A
 ></DT
 ><DT
@@ -538,13 +538,13 @@ HREF="misc.html#TOR"
 ></DT
 ><DT
 >4.10. <A
-HREF="misc.html#AEN770"
+HREF="misc.html#AEN774"
 >Might some things break because header information or
 content is being altered?</A
 ></DT
 ><DT
 >4.11. <A
-HREF="misc.html#AEN781"
+HREF="misc.html#AEN785"
 >Can Privoxy act as a <SPAN
 CLASS="QUOTE"
 >"caching"</SPAN
@@ -553,23 +553,23 @@ speed up web browsing?</A
 ></DT
 ><DT
 >4.12. <A
-HREF="misc.html#AEN790"
+HREF="misc.html#AEN794"
 >What about as a firewall? Can Privoxy protect me?</A
 ></DT
 ><DT
 >4.13. <A
-HREF="misc.html#AEN795"
+HREF="misc.html#AEN799"
 >I have large empty spaces / a checkerboard pattern now where
 ads used to be. Why?</A
 ></DT
 ><DT
 >4.14. <A
-HREF="misc.html#AEN800"
+HREF="misc.html#AEN804"
 >How can Privoxy filter Secure (HTTPS) URLs?</A
 ></DT
 ><DT
 >4.15. <A
-HREF="misc.html#AEN814"
+HREF="misc.html#AEN818"
 >Privoxy runs as a <SPAN
 CLASS="QUOTE"
 >"server"</SPAN
@@ -651,7 +651,7 @@ HREF="trouble.html"
 ><DL
 ><DT
 >5.1. <A
-HREF="trouble.html#AEN963"
+HREF="trouble.html#AEN967"
 >I am getting <SPAN
 CLASS="QUOTE"
 >"connection refused"</SPAN
@@ -660,7 +660,7 @@ with every web page?</A
 ></DT
 ><DT
 >5.2. <A
-HREF="trouble.html#AEN976"
+HREF="trouble.html#AEN980"
 >I just added a new rule, but the steenkin ad is 
 still getting through. How?</A
 ></DT
@@ -844,12 +844,12 @@ HREF="copyright.html"
 ><DL
 ><DT
 >7.1. <A
-HREF="copyright.html#AEN1244"
+HREF="copyright.html#AEN1248"
 >License</A
 ></DT
 ><DT
 >7.2. <A
-HREF="copyright.html#AEN1260"
+HREF="copyright.html#AEN1264"
 >History</A
 ></DT
 ></DL
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index 51b8e494..40b95a32 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -81,7 +81,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN637"
+NAME="AEN640"
 ></A
 >4.1. How much does Privoxy slow my browsing down? This 
 has to add extra time to browsing.</H3
@@ -256,7 +256,7 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 >, http://example.com/show-proxy-args and http://i.j.b/,
  are no longer supported. If you still use such an old version, you should really consider
- upgrading to 3.0.4.</P
+ upgrading to 3.0.5.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
@@ -350,7 +350,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN699"
+NAME="AEN702"
 ></A
 >4.7. Can Privoxy guarantee I am anonymous?</H3
 ><P
@@ -430,7 +430,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN717"
+NAME="AEN720"
 ></A
 >4.8. A test site says I am not using a Proxy.</H3
 ><P
@@ -564,7 +564,10 @@ CLASS="APPLICATION"
 CLASS="APPLICATION"
 >Tor</SPAN
 > configuration and run it on the same
- system as Privoxy, you just have to uncomment the line:</P
+ system as <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>, you just have to uncomment the line:</P
 ><P
 > <TABLE
 BORDER="0"
@@ -662,7 +665,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN770"
+NAME="AEN774"
 ></A
 >4.10. Might some things break because header information or
 content is being altered?</H3
@@ -712,7 +715,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN781"
+NAME="AEN785"
 ></A
 >4.11. Can Privoxy act as a <SPAN
 CLASS="QUOTE"
@@ -751,7 +754,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN790"
+NAME="AEN794"
 ></A
 >4.12. What about as a firewall? Can Privoxy protect me?</H3
 ><P
@@ -774,7 +777,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN795"
+NAME="AEN799"
 ></A
 >4.13. I have large empty spaces / a checkerboard pattern now where
 ads used to be. Why?</H3
@@ -799,7 +802,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN800"
+NAME="AEN804"
 ></A
 >4.14. How can Privoxy filter Secure (HTTPS) URLs?</H3
 ><P
@@ -858,7 +861,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN814"
+NAME="AEN818"
 ></A
 >4.15. Privoxy runs as a <SPAN
 CLASS="QUOTE"
@@ -1548,7 +1551,7 @@ CLASS="QUOTE"
 CLASS="QUOTE"
 >"Adventuresome"</SPAN
 > profile in the
- web-based editor.</P
+ web-based editor. Please upgrade!</P
 ></DIV
 ></DIV
 ><DIV
diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index 1ef83513..9c9adb5b 100644
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -81,7 +81,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN963"
+NAME="AEN967"
 ></A
 >5.1. I am getting <SPAN
 CLASS="QUOTE"
@@ -132,7 +132,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN976"
+NAME="AEN980"
 ></A
 >5.2. I just added a new rule, but the steenkin ad is 
 still getting through. How?</H3
@@ -223,13 +223,15 @@ CLASS="QUOTE"
 > Troubleshooting actions is discussed in more detail in the <A
 HREF="../user-manual/appendix.html#ACTIONSANAT"
 TARGET="_top"
->User Manual appendix</A
+>User Manual appendix,
+ Troubleshooting: the Anatomy of an Action</A
 >.
  There is also an <A
 HREF="../user-manual/actions-file.html#ACT-EXAMPLES"
 TARGET="_top"
 >actions tutorial</A
->.</P
+>
+ with general configuration information and examples.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
@@ -331,7 +333,7 @@ CLASS="APPLICATION"
 CLASS="QUOTE"
 >"proxy"</SPAN
 >
-  setting, which will silently various protocols, including
+  setting, which will silently enable various protocols, including
   <SPAN
 CLASS="emphasis"
 ><I
@@ -345,7 +347,8 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 > will indeed cause problems since
   it does not know FTP. Newer version will give a sane error
-  message if a FTP connection is attempted.
+  message if a FTP connection is attempted. Just disable the FTP setting 
+  and all will be well again.
  </P
 ><P
 >  Will <SPAN
diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index c03b8ad1..4dd8cdf5 100644
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 >Privoxy - Home Page</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><META
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><META
 NAME="KEYWORD"
 CONTENT="privoxy"><META
 NAME="KEYWORD"
@@ -72,47 +72,41 @@ CLASS="TITLEPAGE"
 CLASS="TITLE"
 ><A
 NAME="AEN2"
->Privoxy - Home Page</A
-></H1
+></A
+>Privoxy - Home Page</H1
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
-><P
-></P
 ><A
 NAME="AEN28"
 ></A
 ><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is a web proxy with advanced filtering
- capabilities for protecting privacy, modifying web page content, managing
- cookies, controlling access, and removing ads, banners, pop-ups and other
- obnoxious Internet junk. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> has a very
- flexible configuration and can be customized to suit individual needs and
- tastes. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> has application for both
- stand-alone systems and multi-user networks.</P
+></P
 ><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is based on <SPAN
-CLASS="APPLICATION"
->Internet
- Junkbuster</SPAN
-> (tm).</P
+> Privoxy is a 
+ <A
+HREF="http://en.wikipedia.org/wiki/Proxy_server"
+TARGET="_top"
+>web proxy</A
+>
+ with advanced filtering capabilities for protecting
+ privacy, modifying web page data, managing 
+ <A
+HREF="http://en.wikipedia.org/wiki/Browser_cookie"
+TARGET="_top"
+>cookies</A
+>, 
+ controlling access, and removing ads, banners, pop-ups and other obnoxious
+ Internet junk. Privoxy has a very flexible configuration and can be
+ customized to suit individual needs and tastes. Privoxy has application for
+ both stand-alone systems and multi-user networks.</P
+><P
+> Privoxy is based on Internet Junkbuster (tm).</P
 ><P
 >   The most recent release is <A
 HREF="announce.txt"
 TARGET="_top"
->3.0.3 (stable)</A
+>3.0.5 (BETA)</A
 >. 
   </P
 ><P
@@ -126,8 +120,8 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="DOWNLOAD"
->Download</A
-></H3
+></A
+>Download</H3
 ><P
 > <P
 ></P
@@ -144,15 +138,6 @@ TARGET="_top"
 ><LI
 ><P
 >    <A
-HREF="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.bz2"
-TARGET="_top"
->Download the latest CVS snapshot (source tarball)</A
->
-   </P
-></LI
-><LI
-><P
->    <A
 HREF="user-manual/quickstart.html"
 TARGET="_top"
 >Quickstart after installation</A
@@ -168,8 +153,8 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="DOCS"
->Documentation</A
-></H3
+></A
+>Documentation</H3
 ><P
 > <P
 ></P
@@ -228,8 +213,8 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="MOREINFO"
->More information</A
-></H3
+></A
+>More information</H3
 ><P
 > <P
 ></P
@@ -302,35 +287,34 @@ CLASS="SECT1"
 ><HR><H2
 CLASS="SECT1"
 ><A
-NAME="AEN93"
+NAME="AEN87"
 ></A
 ></H2
 ><P
 ><DIV
 CLASS="INFORMALTABLE"
-><P
-></P
 ><A
-NAME="AEN96"
+NAME="AEN90"
 ></A
+><P
+></P
 ><TABLE
 BORDER="0"
-FRAME="void"
-RULES="all"
 WIDTH="100%"
 CLASS="CALSTABLE"
-><COL
-WIDTH="100%"
-ALIGN="CENTER"
-TITLE="C1"><TBODY
+><TBODY
 ><TR
 ><TD
+WIDTH="100%"
 ALIGN="CENTER"
+VALIGN="TOP"
 >Privoxy is developed on:</TD
 ></TR
 ><TR
 ><TD
+WIDTH="100%"
 ALIGN="CENTER"
+VALIGN="TOP"
 >     <A
 HREF="http://sourceforge.net/"
 TARGET="_top"
@@ -348,7 +332,7 @@ SRC="http://sourceforge.net/sflogo.php?group_id=11118&type=1&dummy=.gif">
 ></P
 ><P
 > <SUB
->  Copyright &copy; 2001 - 2004 by Privoxy Developers
+>  Copyright &copy; 2001 - 2006 by Privoxy Developers
  </SUB
 ></P
 ></DIV
diff --git a/doc/webserver/man-page/privoxy-man-page.html b/doc/webserver/man-page/privoxy-man-page.html
index 71e51801..bed7a128 100644
--- a/doc/webserver/man-page/privoxy-man-page.html
+++ b/doc/webserver/man-page/privoxy-man-page.html
@@ -2,7 +2,7 @@
 <HTML><HEAD><TITLE>Manpage of PRIVOXY</TITLE>
 <LINK REL="STYLESHEET" TYPE="text/css" HREF="../p_doc.css"></HEAD><BODY>
 <H1>PRIVOXY</H1>
-Section:  (1)<BR>Updated: 25 March 2003<BR><A HREF="#index">Index</A>
+Section:  (1)<BR>Updated: 21 September 2006<BR><A HREF="#index">Index</A>
 <HR>
 
 <A NAME="lbAB">&nbsp;</A>
@@ -13,10 +13,7 @@ privoxy - Privacy Enhancing Proxy
 <H2>SYNOPSIS</H2>
 
 <P>
-<B>privoxy</B> [<B>--help</B> ] [<B>--version</B> ] [<B>--no-daemon</B> ] [<B>--pidfile </B><I>pidfile</I><B></B> ] [<B>--user </B><I>user[.group]</I><B></B> ] [<B>--chroot</B> ] [<B></B><I>configfile</I><B></B> ]<B> (UNIX)</B>
-<P>
-<P>
-<B>privoxy.exe</B> [<B></B><I>configfile</I><B></B> ]<B> (Windows)</B>
+<B>privoxy</B> [<B>--help</B> ] [<B>--version</B> ] [<B>--no-daemon</B> ] [<B>--pidfile </B><I>pidfile</I><B></B> ] [<B>--user </B><I>user[.group]</I><B></B> ] [<B>--chroot</B> ] [<B></B><I>configfile</I><B></B> ]
 <P>
 <A NAME="lbAD">&nbsp;</A>
 <H2>OPTIONS</H2>
@@ -57,8 +54,7 @@ that hierarchy.
 
 If the <I>configfile</I> is not specified on  the  command  line,
 <B>Privoxy</B>  will  look for a file named
-<I>config</I> in the current directory (except on Win32 where
-it will try <I>config.txt</I>). If no
+<I>config</I> in the current directory . If no
 <I>configfile</I> is found, <B>Privoxy</B> will 
 fail to start.
 <A NAME="lbAE">&nbsp;</A>
@@ -66,17 +62,18 @@ fail to start.
 
 <P>
 
-<B>Privoxy</B> is a web proxy with advanced filtering
-capabilities for protecting privacy, filtering web page content, managing
-cookies, controlling access, and removing ads, banners, pop-ups and other
-obnoxious Internet junk. <B>Privoxy</B> has a very
-flexible configuration and can be customized to suit individual needs and
-tastes. <B>Privoxy</B> has application for both
-stand-alone systems and multi-user networks.
+Privoxy is a 
+web proxy
+with advanced filtering capabilities for protecting
+privacy, modifying web page data, managing 
+cookies, 
+controlling access, and removing ads, banners, pop-ups and other obnoxious
+Internet junk. Privoxy has a very flexible configuration and can be
+customized to suit individual needs and tastes. Privoxy has application for
+both stand-alone systems and multi-user networks.
 <P>
 
-<B>Privoxy</B> is based on <B>Internet
-Junkbuster</B> (tm).
+Privoxy is based on Internet Junkbuster (tm).
 <A NAME="lbAF">&nbsp;</A>
 <H2>INSTALLATION AND USAGE</H2>
 
@@ -91,6 +88,12 @@ and Mozilla, go through:  <B>Edit</B>;
 <B>View</B>. 
 <P>
 
+For Firefox, go through: <B>Tools</B>; 
+<B>Options</B>; <B>General</B>;
+<B>Connection Settings</B>;
+<B>Manual Proxy Configuration</B>. 
+<P>
+
 For Internet Explorer, go through: <B>Tools</B>; 
 <B>Internet Properties</B>; <B>Connections</B>;
 <B>LAN Settings</B>. 
@@ -99,6 +102,8 @@ For Internet Explorer, go through: <B>Tools</B>;
 The Secure (SSL) Proxy should also be set to the same values, otherwise
 https: URLs will not be proxied. Note: <B>Privoxy</B> can only
 proxy HTTP and HTTPS traffic. Do not try it with FTP or other protocols.
+HTTPS presents some limitations, and not all features will work with HTTPS 
+connections.
 <P>
 
 For other browsers, check the documentation.
@@ -112,19 +117,19 @@ files. The default configuration files are: <I>config</I>,
 <I>default.filter</I>, and
 <I>default.action</I>. <I>user.action</I> should 
 be used for locally defined exceptions to the default rules of
-<I>default.action</I> These are all well commented.  On Unix
+<I>default.action</I>, and <I>user.filter</I> for 
+locally defined filters. These are well commented.  On Unix
 and Unix-like systems, these are located in
-<I>/etc/privoxy/</I> by default. On Windows, OS/2 and AmigaOS,
-these files are in the same directory as the <B>Privoxy</B>
-executable.
+<I>/etc/privoxy/</I> by default. 
 <P>
 
-The name and number of configuration files has changed from previous
-versions. In fact, the configuration itself is changed  and  much more
-sophisticated. See the user-manual for a complete
-explanation of all configuration options and general usage, and notes for 
-upgrading from <B>Junkbuster</B> and earlier <B>Privoxy</B>
-versions.
+<B>Privoxy</B> uses the concept of <B>actions</B> 
+in order to manipulate the data stream between the browser and remote sites.
+There are various actions available with specific functions for such things 
+as blocking web sites, managing cookies, etc. These actions can be invoked
+individually or combined, and used against individual URLs, or groups of URLs 
+that can be defined using wildcards and regular expressions. The result is
+that the user has greatly enhanced control and freedom.
 <P>
 
 The actions list (ad blocks, etc) can also be configured with your
@@ -132,6 +137,11 @@ web browser at <A HREF="http://config.privoxy.org/">http://config.privoxy.org/.<
 <B>Privoxy's</B> configuration parameters  can also  be viewed at
 the same page. In addition, <B>Privoxy</B> can be toggled on/off.
 This is an internal page, and does not require Internet access.
+<P>
+
+See the <I>User Manual</I> for a detailed
+explanation of installation, general usage, all configuration options, new
+features and notes on upgrading.
 <A NAME="lbAH">&nbsp;</A>
 <H2>SAMPLE CONFIGURATION</H2>
 
@@ -144,59 +154,98 @@ configuration might look like:
  # Define a few useful custom aliases for later use
  {{alias}}
 
- # Useful aliases
+ # Useful aliases that combine more than one action
  +crunch-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
  -crunch-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
- +imageblock      = +block +handle-as-image
+ +block-as-image = +block +handle-as-image
 
  # Fragile sites should have the minimum changes
  fragile     = -block -deanimate-gifs -fast-redirects -filter \
                -hide-referer -prevent-cookies -kill-popups
 
  ## Turn some actions on ################################
- { \
- -add-header \
- -block \
- +deanimate-gifs{last} \
- -downgrade-http-version \
- -fast-redirects \
- +filter{html-annoyances} \
- +filter{js-annoyances} \
- +filter{content-cookies} \
- +filter{webbugs} \
- +filter{banners-by-size} \
- +hide-forwarded-for-headers \
- +hide-from-header{block} \
- +hide-referrer{forge} \
- -hide-user-agent \
- -handle-as-image \
- +set-image-blocker{pattern} \
- -limit-connect \
- +prevent-compression \
- +session-cookies-only \
- -crunch-cookies \
- -kill-popups \
- }
- /   # '/' Matches *all* URL patterns
+ ## NOTE: Actions are off by default, unless explictily turned on 
+ ## otherwise with the '+' operator.
+
+{ \
+-add-header \
+-block \
+-content-type-overwrite \
+-crunch-client-header \
+-crunch-if-none-match \
+-crunch-outgoing-cookies \
+-crunch-incoming-cookies \
+-crunch-server-header \
++deanimate-gifs{last} \
+-downgrade-http-version \
+-fast-redirects \
+-filter{js-annoyances} \
+-filter{js-events} \
+-filter{html-annoyances} \
+-filter{content-cookies} \
++filter{refresh-tags} \
+-filter{unsolicited-popups} \
+-filter{all-popups} \
++filter{img-reorder} \
++filter{banners-by-size} \
+-filter{banners-by-link} \
++filter{webbugs} \
+-filter{tiny-textforms} \
++filter{jumping-windows} \
+-filter{frameset-borders} \
+-filter{demoronizer} \
+-filter{shockwave-flash} \
+-filter{quicktime-kioskmode} \
+-filter{fun} \
+-filter{crude-parental} \
++filter{ie-exploits} \
+-filter{site-specifics} \
+-filter-client-headers \
+-filter-server-headers \
+-force-text-mode \
+-handle-as-empty-document
+-handle-as-image \
+-hide-accept-language \
+-hide-content-disposition \
+-hide-if-modified-since \
++hide-forwarded-for-headers \
++hide-from-header{block} \
++hide-referrer{forge} \
+-hide-user-agent \
+-inspect-jpegs \
+-kill-popups \
+-limit-connect \
+-overwrite-last-modified \
+-redirect \
++prevent-compression \
+-send-vanilla-wafer \
+-send-wafer \
++session-cookies-only \
++set-image-blocker{pattern} \
+-treat-forbidden-connects-like-blocks \
+}
+/ # '/' Match *all* URL patterns
+
  
  # Block, and treat these URL patterns as if they were 'images'.
  # We would expect these to be ads.
- {+imageblock}
+ { +block-as-image }
   .ad.doubleclick.net
   .a[0-9].yimg.com/(?:(?!/i/).)*$
   ad.*.doubleclick.net
 
- # Block any URLs that match these patterns
- {+block}
+ # Block all URLs that match these patterns
+ { +block }
   ad*.
   .*ads.
   banner?.
   /.*count(er)?\.(pl|cgi|exe|dll|asp|php[34]?)
   .hitbox.com 
+  media./.*(ads|banner)
 
  # Make exceptions for these harmless ones that would be 
  # caught by our +block patterns just above.
- {-block}
+ { -block }
   adsl.
   advice.
   .*downloads.
@@ -216,22 +265,27 @@ narrowly defined exceptions:
  
  # Set personal exceptions to the policies in default.action #######
 
- # Sites where we want persistant cookies, so allow *all* cookies
- {-crunch-cookies -session-cookies-only}
+ # Sites where we want persistent cookies, so allow *all* cookies
+ { -crunch-cookies -session-cookies-only }
   .redhat.com
   .sun.com
   .msdn.microsoft.com
  
- # This site breaks easily.
- {-block -fast-redirects}
+ # These sites breaks easily. Use our &quot;fragile&quot; alias here.
+ { fragile }
   .forbes.com
+  mybank.example.com
+
+ # Replace example.com's style sheet with one of my choosing
+ { +redirect{<A HREF="http://localhost/css-replacements/example.com.css}">http://localhost/css-replacements/example.com.css}</A> }
+  example.com/stylesheet.css
 </PRE>
 
 <P>
 
 See the comments in the configuration files themselves, or the 
-<I>user-manual</I>
-for explanations of the above syntax, and other <B>Privoxy</B>
+<I>User Manual</I>
+for full explanations of the above syntax, and other <B>Privoxy</B>
 configuration options.
 <A NAME="lbAI">&nbsp;</A>
 <H2>FILES</H2>
@@ -245,6 +299,7 @@ configuration options.
  <I>/etc/privoxy/standard.action</I>
  <I>/etc/privoxy/user.action</I>
  <I>/etc/privoxy/default.filter</I>
+ <I>/etc/privoxy/user.filter</I>
  <I>/etc/privoxy/trust</I>
  <I>/etc/privoxy/templates/*</I>
  <I>/var/log/privoxy/logfile</I>
@@ -253,7 +308,7 @@ configuration options.
 <P>
 
 Various other files should be included, but may vary depending on platform
-and build configuration. More documentation should be included in the local
+and build configuration. Additional documentation should be included in the local
 documentation directory.
 <A NAME="lbAJ">&nbsp;</A>
 <H2>SIGNALS</H2>
@@ -272,8 +327,12 @@ automatically.
 
 <P>
 
+This is a BETA version of <B>Privoxy</B>. Not 
+all features are well tested.
+<P>
+
 Please see the <I>User Manual</I> on how to contact the
-developers for feature requests, reporting problems, and other questions.
+developers, for feature requests, reporting problems, and other questions.
 <A NAME="lbAL">&nbsp;</A>
 <H2>SEE ALSO</H2>
 
@@ -298,10 +357,8 @@ SourceForge.
 the web-based user interface. <B>Privoxy</B> must be
 running for this to work. Shortcut: <A HREF="http://p.p/">http://p.p/</A>
 <P>
-<A HREF="http://www.privoxy.org/actions/">http://www.privoxy.org/actions/,</A> to submit ``misses'' to the developers. 
-<P>
-<A HREF="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/contrib/">http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/contrib/,</A> cool
-and fun ideas from <B>Privoxy</B> users.
+<A HREF="http://sourceforge.net/tracker/?group_id=11118">http://sourceforge.net/tracker/?group_id=11118</A>&amp;atid=460288, to submit ``misses'' and other
+configuration related suggestions to the developers. 
 <P>
 <A HREF="http://www.junkbusters.com/ht/en/cookies.html">http://www.junkbusters.com/ht/en/cookies.html,</A>
 an explanation how cookies are used to track web users.
@@ -309,16 +366,16 @@ an explanation how cookies are used to track web users.
 <A HREF="http://www.junkbusters.com/ijb.html">http://www.junkbusters.com/ijb.html,</A>
 the original Internet Junkbuster.
 <P>
-<A HREF="http://www.waldherr.org/junkbuster/">http://www.waldherr.org/junkbuster/,</A>
-Stefan Waldherr's version of Junkbuster, from which <B>Privoxy</B> was
-derived.
-<P>
-<A HREF="http://privacy.net/analyze/">http://privacy.net/analyze/,</A> a useful site
+<A HREF="http://privacy.net/">http://privacy.net/,</A> a useful site
 to check what information about you is leaked while you browse the web.
 <P>
 <A HREF="http://www.squid-cache.org/">http://www.squid-cache.org/,</A> a very popular
 caching proxy, which is often used together with <B>Privoxy</B>.
 <P>
+<A HREF="http://tor.eff.org/">http://tor.eff.org/,</A> 
+<B>Tor</B> can help anonymize web browsing, 
+web publishing, instant messaging, IRC, SSH, and other applications.
+<P>
 <A HREF="http://www.privoxy.org/developer-manual/">http://www.privoxy.org/developer-manual/,</A> 
 the <B>Privoxy</B> developer manual. 
 <A NAME="lbAM">&nbsp;</A>
@@ -326,30 +383,13 @@ the <B>Privoxy</B> developer manual.
 
 <P>
 <PRE>
- Hal Burgiss (docs)
- Jon Foster
- Andreas Oesterhelt
- David Schmidt (OS/2, Mac OSX ports)
-
- Johny Agotnes 
- Rodrigo Barbosa (RPM specfiles)
- Moritz Barsnick
- Mattes Dolak 
- Karsten Hopp (Red Hat)
- Alexander Lazic
- Daniel Leite
- G&#225;bor Lipt&#225;k
- Adam Lock (Win32)
- Guy Laroche
- Haroon Rafique
- Roland Rosenfeld (Debian)
- Georg Sauthoff (Gentoo)
- Thomas Steudten
- Joerg Strohmayer (Amiga)
- Rodney Stromlund
- Sviatoslav Sviridov
- Sarantis Paskalis
- Stefan Waldherr
+ Fabian Keil, developer
+ David Schmidt, developer
+ 
+ Hal Burgiss
+ Ian Cummings
+ F&#233;lix Rauch
+ Roland Rosenfeld
 </PRE>
 
 <A NAME="lbAN">&nbsp;</A>
@@ -360,7 +400,7 @@ the <B>Privoxy</B> developer manual.
 
 <P>
 
-Copyright (C) 2001 - 2003 by Privoxy Developers &lt;<A HREF="mailto:developers@privoxy.org">developers@privoxy.org</A>&gt;
+Copyright (C) 2001 - 2006 by Privoxy Developers &lt;<A HREF="mailto:ijbswa-developers@lists.sourceforge.net">ijbswa-developers@lists.sourceforge.net</A>&gt;
 <P>
 
 Some source code is based on code Copyright (C) 1997 by Anonymous Coders
@@ -381,14 +421,14 @@ This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the 
 <I>GNU General Public License</I> for
-more details, which is available from the Free Software Foundation, Inc, 59
-Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+more details, which is available from the Free Software Foundation, Inc, 
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 <P>
 
 You should have received a copy of the  <I>GNU General Public License</I>
 along with this program; if not, write to the  Free Software
-Foundation, Inc. 59 Temple Place - Suite 330
-Boston, MA 02111-1307
+Foundation, Inc. 51 Franklin Street, Fifth Floor
+Boston, MA 02110-1301
 USA 
 <P>
 
@@ -417,6 +457,6 @@ USA
 This document was created by
 man2html,
 using the manual pages.<BR>
-Time: 02:05:48 GMT, March 26, 2003
+Time: 01:21:32 GMT, September 22, 2006
 </BODY>
 </HTML>
diff --git a/doc/webserver/privoxy-index.html b/doc/webserver/privoxy-index.html
index 85fe9d32..f85db458 100644
--- a/doc/webserver/privoxy-index.html
+++ b/doc/webserver/privoxy-index.html
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 >Privoxy - The Privacy Enhancing Proxy</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><META
+CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
+"><META
 NAME="KEYWORD"
 CONTENT="privoxy"><META
 NAME="KEYWORD"
@@ -72,45 +72,39 @@ CLASS="TITLEPAGE"
 CLASS="TITLE"
 ><A
 NAME="AEN2"
->Privoxy - The Privacy Enhancing Proxy</A
-></H1
+></A
+>Privoxy - The Privacy Enhancing Proxy</H1
 ><H2
 CLASS="SUBTITLE"
->Project Index Page v3.0.3</H2
+>Project Index Page v3.0.5</H2
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
-><P
-></P
 ><A
 NAME="AEN29"
 ></A
 ><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is a web proxy with advanced filtering
- capabilities for protecting privacy, modifying web page content, managing
- cookies, controlling access, and removing ads, banners, pop-ups and other
- obnoxious Internet junk. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> has a very
- flexible configuration and can be customized to suit individual needs and
- tastes. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> has application for both
- stand-alone systems and multi-user networks.</P
+></P
 ><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is based on <SPAN
-CLASS="APPLICATION"
->Internet
- Junkbuster</SPAN
-> (tm).</P
+> Privoxy is a 
+ <A
+HREF="http://en.wikipedia.org/wiki/Proxy_server"
+TARGET="_top"
+>web proxy</A
+>
+ with advanced filtering capabilities for protecting
+ privacy, modifying web page data, managing 
+ <A
+HREF="http://en.wikipedia.org/wiki/Browser_cookie"
+TARGET="_top"
+>cookies</A
+>, 
+ controlling access, and removing ads, banners, pop-ups and other obnoxious
+ Internet junk. Privoxy has a very flexible configuration and can be
+ customized to suit individual needs and tastes. Privoxy has application for
+ both stand-alone systems and multi-user networks.</P
+><P
+> Privoxy is based on Internet Junkbuster (tm).</P
 ><P
 ></P
 ></DIV
@@ -122,8 +116,8 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="DOWNLOAD"
->Download</A
-></H3
+></A
+>Download</H3
 ><P
 > <P
 ></P
@@ -140,15 +134,6 @@ TARGET="_top"
 ><LI
 ><P
 >    <A
-HREF="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.bz2"
-TARGET="_top"
->Download the latest CVS snapshot (source tarball)</A
->
-   </P
-></LI
-><LI
-><P
->    <A
 HREF="user-manual/quickstart.html"
 TARGET="_top"
 >Quickstart after installation</A
@@ -164,8 +149,8 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="DOCS"
->Documentation</A
-></H3
+></A
+>Documentation</H3
 ><P
 > <P
 ></P
@@ -215,8 +200,8 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="MOREINFO"
->More information</A
-></H3
+></A
+>More information</H3
 ><P
 > <P
 ></P
@@ -289,12 +274,12 @@ CLASS="SECT1"
 ><HR><H2
 CLASS="SECT1"
 ><A
-NAME="AEN89"
+NAME="AEN83"
 ></A
 ></H2
 ><P
 > <SUB
->  Copyright &copy; 2001 - 2004 by Privoxy Developers
+>  Copyright &copy; 2001 - 2006 by Privoxy Developers
  </SUB
 ></P
 ></DIV
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 21b85d43..a70b8104 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.4 User Manual"
+TITLE="Privoxy 3.0.5 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.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -95,7 +95,8 @@ CLASS="APPLICATION"
  There are a number of such actions, with a wide range of functionality.
  Each action does something a little different.
  These actions give us a veritable arsenal of tools with which to exert 
- our control, preferences and independence.</P
+ our control, preferences and independence. Actions can be combined so that 
+ their effects are aggregated when applied against a given set of URLs.</P
 ><P
 > There 
  are three action files included with <SPAN
@@ -120,11 +121,27 @@ CLASS="FILENAME"
 CLASS="APPLICATION"
 >Privoxy's</SPAN
 > array of features. So it is 
-     a set of broad rules that should work reasonably well for users everywhere.
+     a set of broad rules that should work reasonably well as-is for most users.
      This is the file that the developers are keeping updated, and <A
 HREF="installation.html#INSTALLATION-KEEPUPDATED"
 >making available to users</A
 >.
+     The user's preferences as set in <TT
+CLASS="FILENAME"
+>standard.action</TT
+>,
+     e.g. either <TT
+CLASS="LITERAL"
+>Cautious</TT
+> (the default),
+     <TT
+CLASS="LITERAL"
+>Medium</TT
+>, or <TT
+CLASS="LITERAL"
+>Advanced</TT
+> (see
+     below).
     </P
 ></LI
 ><LI
@@ -143,21 +160,90 @@ CLASS="FILENAME"
 >     <TT
 CLASS="FILENAME"
 >standard.action</TT
-> - is used by the web based editor, 
+> - is used by the web based editor
+     at <A
+HREF="http://config.privoxy.org/edit-actions-list?f=default"
+TARGET="_top"
+>     http://config.privoxy.org/edit-actions-list?f=default</A
+>, 
      to set various pre-defined sets of rules for the default actions section
      in <TT
 CLASS="FILENAME"
 >default.action</TT
->. These have increasing levels of
-     aggressiveness <SPAN
+>. 
+     </P
+><P
+>     <SPAN
+CLASS="GUIBUTTON"
+>Edit</SPAN
+>  <SPAN
+CLASS="GUIBUTTON"
+>Set to Cautious</SPAN
+> <SPAN
+CLASS="GUIBUTTON"
+>Set to Medium</SPAN
+>  <SPAN
+CLASS="GUIBUTTON"
+>Set to Advanced</SPAN
+>
+     </P
+><P
+>     These have increasing levels of aggressiveness <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
->and have no influence on your browsing unless
-     you select them explicitly in the editor</I
+>and have no
+     influence on your browsing unless you select them explicitly in the
+     editor</I
 ></SPAN
->. It is not recommend
-     to edit this file.
+>. A default installation should be pre-set to 
+     <TT
+CLASS="LITERAL"
+>Cautious</TT
+> (versions prior to 3.0.5 were set to
+     <TT
+CLASS="LITERAL"
+>Medium</TT
+>). New users should try this for a while before
+     adjusting the settings to more aggressive levels.
+     </P
+><P
+>      The <SPAN
+CLASS="GUIBUTTON"
+>Edit</SPAN
+> button allows you to turn each 
+      action on/off individually for fine-tuning. The <SPAN
+CLASS="GUIBUTTON"
+>Cautious</SPAN
+>
+      button changes the actions list to low/safe settings which will activate 
+      a minimal set of <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>'s features, and subsequently there will be
+      less of a chance for accidental problems. The <SPAN
+CLASS="GUIBUTTON"
+>Medium</SPAN
+>
+      button sets the list to a medium level of ad blocking and a low level set of
+      privacy features. The <SPAN
+CLASS="GUIBUTTON"
+>Advanced</SPAN
+> button 
+      sets the list to a high level of ad blocking and medium level of
+      privacy. See the chart below. The latter three buttons over-ride 
+      any changes via with the <SPAN
+CLASS="GUIBUTTON"
+>Edit</SPAN
+> button. More 
+      fine-tuning can be done in the lower sections of this internal page.
+     </P
+><P
+>     It is not recommend to edit the <TT
+CLASS="FILENAME"
+>standard.action</TT
+> file
+     itself.
     </P
 ><P
 >     The default profiles, and their associated actions, as pre-defined in
@@ -170,7 +256,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN1912"
+NAME="AEN1967"
 ></A
 ><P
 ><B
@@ -200,7 +286,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Adventuresome</TH
+>Advanced</TH
 ></TR
 ></THEAD
 ><TBODY
@@ -209,22 +295,22 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Ad-blocking by URL</TD
+>Ad-blocking Aggressiveness</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>medium</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>high</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>high</TD
 ></TR
 ><TR
 ><TD
@@ -236,28 +322,6 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
-><TD
-WIDTH="25%"
-ALIGN="LEFT"
-VALIGN="TOP"
->yes</TD
-><TD
-WIDTH="25%"
-ALIGN="LEFT"
-VALIGN="TOP"
->yes</TD
-></TR
-><TR
-><TD
-WIDTH="25%"
-ALIGN="LEFT"
-VALIGN="TOP"
->GIF de-animation</TD
-><TD
-WIDTH="25%"
-ALIGN="LEFT"
-VALIGN="TOP"
 >no</TD
 ><TD
 WIDTH="25%"
@@ -275,7 +339,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Referer forging</TD
+>Ad-filtering by link</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -285,7 +349,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>no</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -297,78 +361,78 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Cookie handling</TD
+>Pop-up killing</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->none</TD
+>blocks only</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->session-only</TD
+>blocks only</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->kill</TD
+>all</TD
 ></TR
 ><TR
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Pop-up killing</TD
+>Privacy Features</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->unsolicited</TD
+>low</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->unsolicited</TD
+>medium</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->all</TD
+>medium/high</TD
 ></TR
 ><TR
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Fast redirects</TD
+>Cookie handling</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->no</TD
+>none</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->no</TD
+>session-only</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>kill</TD
 ></TR
 ><TR
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->HTML taming</TD
+>Referer forging</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>no</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -385,12 +449,12 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->JavaScript taming</TD
+>GIF de-animation</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>no</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -407,17 +471,17 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Web-bug killing</TD
+>Fast redirects</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>no</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->yes</TD
+>no</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -429,7 +493,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Fun text replacements</TD
+>HTML taming</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -439,7 +503,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->no</TD
+>yes</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -451,7 +515,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Image tag reordering</TD
+>JavaScript taming</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -461,7 +525,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->no</TD
+>yes</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -473,7 +537,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Ad-filtering by link</TD
+>Web-bug killing</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -483,7 +547,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->no</TD
+>yes</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -495,7 +559,7 @@ VALIGN="TOP"
 WIDTH="25%"
 ALIGN="LEFT"
 VALIGN="TOP"
->Demoronizer</TD
+>Image tag reordering</TD
 ><TD
 WIDTH="25%"
 ALIGN="LEFT"
@@ -536,7 +600,33 @@ CLASS="FILENAME"
 HREF="http://config.privoxy.org/show-status"
 TARGET="_top"
 >http://config.privoxy.org/show-status</A
->.</P
+>.
+ The over-riding principle when applying actions, is that the last action that
+ matches a given URL, wins. The broadest, most general rules go first
+ (defined in <TT
+CLASS="FILENAME"
+>default.action</TT
+>),
+ followed by any exceptions (typically also in
+ <TT
+CLASS="FILENAME"
+>default.action</TT
+>), which are then followed lastly by any
+ local preferences (typically in <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>user</I
+></SPAN
+><TT
+CLASS="FILENAME"
+>.action</TT
+>). 
+ Generally, <TT
+CLASS="FILENAME"
+>user.action</TT
+> has the last word.
+ </P
 ><P
 > An actions file typically has multiple sections. If you want to use
  <SPAN
@@ -593,7 +683,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2011"
+NAME="AEN2066"
 ></A
 >8.1. Finding the Right Mix</H2
 ><P
@@ -603,7 +693,8 @@ HREF="actions-file.html#ACTIONS"
 >, like cookie suppression
  or script disabling, may render some sites unusable that rely on these
  techniques to work properly. Finding the right mix of actions is not always easy and
- certainly a matter of personal taste. In general, it can be said that the more
+ certainly a matter of personal taste. And, things can always change, requiring 
+ refinements in the configuration. In general, it can be said that the more
  <SPAN
 CLASS="QUOTE"
 >"aggressive"</SPAN
@@ -614,7 +705,7 @@ CLASS="QUOTE"
 > sites you
  will have to make later. If, for example, you want to crunch all cookies per
  default, you'll have to make exceptions from that rule for sites that you
- regularly use and that require cookies for actually useful puposes, like maybe
+ regularly use and that require cookies for actually useful purposes, like maybe
  your bank, favorite shop, or newspaper. </P
 ><P
 > We have tried to provide you with reasonable rules to start from in the
@@ -627,7 +718,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2018"
+NAME="AEN2073"
 ></A
 >8.2. How to Edit</H2
 ><P
@@ -647,21 +738,21 @@ CLASS="QUOTE"
 >"Medium"</SPAN
 > or <SPAN
 CLASS="QUOTE"
->"Adventuresome"</SPAN
+>"Advanced"</SPAN
 >.
  Warning: the <SPAN
 CLASS="QUOTE"
->"Adventuresome"</SPAN
-> setting is not only more aggressive, 
- but includes settings that are fun and subversive, and which some may find of 
- dubious merit!</P
+>"Advanced"</SPAN
+> setting is more aggressive, and 
+ will be more likely to cause problems for some sites. Experienced users only!</P
 ><P
 > If you prefer plain text editing to GUIs, you can of course also directly edit the
- the actions files. Look at <TT
+ the actions files with your favorite text editor. Look at
+ <TT
 CLASS="FILENAME"
 >default.action</TT
-> which is richly
- commented.</P
+> which is richly commented with many 
+ good examples.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
@@ -716,7 +807,34 @@ CLASS="emphasis"
 CLASS="EMPHASIS"
 >both</I
 ></SPAN
-> actions to apply.</P
+> actions to apply. And there may well be 
+ cases where you will want to combine actions together. Such a section then 
+ might look like:</P
+><P
+> <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>  { +<TT
+CLASS="LITERAL"
+>handle-as-image</TT
+>  +<TT
+CLASS="LITERAL"
+>block</TT
+> }
+  # Block these as if they were images. Send no block page.
+   banners.example.com
+   media.example.com/.*banners
+   .example.com/images/ads/</PRE
+></TD
+></TR
+></TABLE
+>
+ </P
 ><P
 > You can trace this process for any given URL by visiting <A
 HREF="http://config.privoxy.org/show-url-info"
@@ -724,10 +842,10 @@ TARGET="_top"
 >http://config.privoxy.org/show-url-info</A
 >.</P
 ><P
-> More detail on this is provided in the Appendix, <A
+> Examples and more detail on this is provided in the Appendix, <A
 HREF="appendix.html#ACTIONSANAT"
-> Anatomy of an Action</A
->.</P
+> Troubleshooting: Anatomy of an Action</A
+> section.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
@@ -746,18 +864,24 @@ CLASS="APPLICATION"
 CLASS="QUOTE"
 >"patterns"</SPAN
 >
- to determine what actions might apply to which sites and pages your browser 
- attempts to access. These <SPAN
+ to determine what <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>actions</I
+></SPAN
+> might apply to which sites and
+ pages your browser attempts to access. These <SPAN
 CLASS="QUOTE"
 >"patterns"</SPAN
-> use wild card type 
- <SPAN
+> use wild
+ card type <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
 >pattern</I
 ></SPAN
-> matching to achieve a high degree of 
+> matching to achieve a high degree of
  flexibility. This allows one expression to be expanded and potentially match
  against many similar patterns.</P
 ><P
@@ -793,6 +917,19 @@ CLASS="EMPHASIS"
 > be included in
  the pattern. This is assumed already!</P
 ><P
+> The pattern matching syntax is different for the domain and path parts of
+ the URL. The domain part uses a simple globbing type matching technique, 
+ while the path part uses a more flexible 
+ <A
+HREF="http://en.wikipedia.org/wiki/Regular_expressions"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"Regular
+  Expressions (PCRE)"</SPAN
+></A
+> based syntax.</P
+><P
 ></P
 ><DIV
 CLASS="VARIABLELIST"
@@ -808,7 +945,12 @@ CLASS="LITERAL"
 CLASS="LITERAL"
 >www.example.com</TT
 >,
-    regardless of which document on that server is requested.
+    regardless of which document on that server is requested. So ALL pages in
+    this domain would be covered by the scope of this action. Note that a 
+    simple <TT
+CLASS="LITERAL"
+>example.com</TT
+> is different and would NOT match.
    </P
 ></DD
 ><DT
@@ -859,7 +1001,7 @@ CLASS="emphasis"
 CLASS="EMPHASIS"
 >any</I
 ></SPAN
-> web server.
+> web server anywhere.
    </P
 ></DD
 ><DT
@@ -873,7 +1015,8 @@ CLASS="LITERAL"
     there is no top-level domain called <TT
 CLASS="LITERAL"
 >.html</TT
->.
+>. So its 
+    a mistake.
    </P
 ></DD
 ></DL
@@ -883,7 +1026,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2092"
+NAME="AEN2156"
 ></A
 >8.4.1. The Domain Pattern</H3
 ><P
@@ -951,27 +1094,63 @@ CLASS="EMPHASIS"
 > <TT
 CLASS="LITERAL"
 >.example.</TT
->
-    (Correctly speaking: It matches any FQDN that contains <TT
+>.
+    And, by the way, also included would be any files or documents that exist
+    within that domain since no path limitations are specified. (Correctly
+    speaking: It matches any FQDN that contains <TT
 CLASS="LITERAL"
 >example</TT
-> as a domain.)
+> as
+    a domain.) This might be <TT
+CLASS="LITERAL"
+>www.example.com</TT
+>,
+    <TT
+CLASS="LITERAL"
+>news.example.de</TT
+>, or
+    <TT
+CLASS="LITERAL"
+>www.example.net/cgi/testing.pl</TT
+> for instance. All these
+    cases are matched. 
    </P
 ></DD
 ></DL
 ></DIV
 ><P
 > Additionally, there are wild-cards that you can use in the domain names
- themselves. They work pretty similar to shell wild-cards: <SPAN
+ themselves. These work similarly to shell globbing type wild-cards:
+ <SPAN
 CLASS="QUOTE"
 >"*"</SPAN
->
- stands for zero or more arbitrary characters, <SPAN
+> represents zero or more arbitrary characters (this is
+ equivalent to the 
+ <A
+HREF="http://en.wikipedia.org/wiki/Regular_expressions"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"Regular
+ Expression"</SPAN
+></A
+> based syntax of <SPAN
+CLASS="QUOTE"
+>".*"</SPAN
+>),
+ <SPAN
 CLASS="QUOTE"
 >"?"</SPAN
-> stands for
- any single character, you can define character classes in square
- brackets and all of that can be freely mixed:</P
+>  represents any single character (this is equivalent to the
+ regular expression syntax of a simple <SPAN
+CLASS="QUOTE"
+>"."</SPAN
+>), and you can define
+ <SPAN
+CLASS="QUOTE"
+>"character classes"</SPAN
+> in square brackets which is similar to 
+ the same regular expression technique. All of this can be freely mixed:</P
 ><P
 ></P
 ><DIV
@@ -1063,26 +1242,37 @@ CLASS="LITERAL"
 ></DD
 ></DL
 ></DIV
+><P
+> While flexibile, this is not the sophistication of full regular expression based syntax.</P
 ></DIV
 ><DIV
 CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2154"
+NAME="AEN2227"
 ></A
 >8.4.2. The Path Pattern</H3
 ><P
 > <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> uses Perl compatible regular expressions
+> uses Perl compatible (PCRE)
+  <A
+HREF="http://en.wikipedia.org/wiki/Regular_expressions"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"Regular
+  Expression"</SPAN
+></A
+> based syntax 
  (through the <A
 HREF="http://www.pcre.org/"
 TARGET="_top"
 >PCRE</A
 > library) for
- matching the path.</P
+ matching the path portion (after the slash), and is thus more flexible.</P
 ><P
 > There is an <A
 HREF="appendix.html#REGEX"
@@ -1140,6 +1330,155 @@ CLASS="EMPHASIS"
 >exactly</I
 ></SPAN
 > this capitalization.</P
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+><TT
+CLASS="LITERAL"
+>.example.com/.*</TT
+></DT
+><DD
+><P
+>     Is equivalent to just <SPAN
+CLASS="QUOTE"
+>".example.com"</SPAN
+>, since any documents 
+     within that domain are matched with or without the <SPAN
+CLASS="QUOTE"
+>".*"</SPAN
+>
+     regular expression. This is redundant
+   </P
+></DD
+><DT
+><TT
+CLASS="LITERAL"
+>.example.com/.*/index.html</TT
+></DT
+><DD
+><P
+>    Will match any page in the domain of <SPAN
+CLASS="QUOTE"
+>"example.com"</SPAN
+> that is
+    named <SPAN
+CLASS="QUOTE"
+>"index.html"</SPAN
+>, and that is part of some path. For
+    example, it matches <SPAN
+CLASS="QUOTE"
+>"www.example.com/testing/index.html"</SPAN
+> but
+    NOT <SPAN
+CLASS="QUOTE"
+>"www.example.com/index.html"</SPAN
+> because the regular
+    expression called for at least two <SPAN
+CLASS="QUOTE"
+>"/'s"</SPAN
+>, thus the path 
+    requirement. It also would match 
+    <SPAN
+CLASS="QUOTE"
+>"www.example.com/testing/index_html"</SPAN
+>, because of the 
+    special meta-character <SPAN
+CLASS="QUOTE"
+>"."</SPAN
+>.
+   </P
+></DD
+><DT
+><TT
+CLASS="LITERAL"
+>.example.com/(.*/)?index\.html</TT
+></DT
+><DD
+><P
+>    This regular expression is conditional so it will match any page 
+    named <SPAN
+CLASS="QUOTE"
+>"index.html"</SPAN
+> regardless of path which in this case can 
+    have one or more <SPAN
+CLASS="QUOTE"
+>"/'s"</SPAN
+>. And this one must contain exactly 
+    <SPAN
+CLASS="QUOTE"
+>".html"</SPAN
+> (but does not have to end with that!).
+   </P
+></DD
+><DT
+><TT
+CLASS="LITERAL"
+>.example.com/(.*/)(ads|banners?|junk)</TT
+></DT
+><DD
+><P
+>    This regular expression will match any path of <SPAN
+CLASS="QUOTE"
+>"example.com"</SPAN
+>
+    that contains any of the words <SPAN
+CLASS="QUOTE"
+>"ads"</SPAN
+>, <SPAN
+CLASS="QUOTE"
+>"banner"</SPAN
+>, 
+    <SPAN
+CLASS="QUOTE"
+>"banners"</SPAN
+> (because of the <SPAN
+CLASS="QUOTE"
+>"?"</SPAN
+>) or <SPAN
+CLASS="QUOTE"
+>"junk"</SPAN
+>.
+    The path does not have to end in these words, just contain them.
+   </P
+></DD
+><DT
+><TT
+CLASS="LITERAL"
+>.example.com/(.*/)(ads|banners?|junk)/.*\.(jpe?g|gif|png)$</TT
+></DT
+><DD
+><P
+>    This is very much the same as above, except now it must end in either 
+    <SPAN
+CLASS="QUOTE"
+>".jpg"</SPAN
+>, <SPAN
+CLASS="QUOTE"
+>".jpeg"</SPAN
+>, <SPAN
+CLASS="QUOTE"
+>".gif"</SPAN
+> or <SPAN
+CLASS="QUOTE"
+>".png"</SPAN
+>. So this 
+    one is limited to common image formats.
+   </P
+></DD
+></DL
+></DIV
+><P
+> There are many, many good examples to be found in <TT
+CLASS="FILENAME"
+>default.action</TT
+>, 
+ and more tutorials below in <A
+HREF="appendix.html#REGEX"
+>Appendix on regular expressions</A
+>.</P
 ></DIV
 ></DIV
 ><DIV
@@ -1199,7 +1538,7 @@ CLASS="LITERAL"
  of the actions file. </P
 ><P
 > 
- There are three classes of actions:</P
+ Actions fall into three categories:</P
 ><P
 > <P
 ></P
@@ -1419,15 +1758,19 @@ CLASS="APPLICATION"
 ><P
 > Later defined actions always over-ride earlier ones.  So exceptions 
  to any rules you make, should come in the latter part of the file (or 
- in a file that is processed later when using multiple actions files). For
- multi-valued actions, the actions are applied in the order they are specified.
- Actions files are processed in the order they are defined in
- <TT
+ in a file that is processed later when using multiple actions files such 
+ as <TT
+CLASS="FILENAME"
+>user.action</TT
+>). For multi-valued actions, the actions
+ are applied in the order they are specified. Actions files are processed in
+ the order they are defined in <TT
 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!</P
+> (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
 ><P
 > The list of valid <SPAN
 CLASS="APPLICATION"
@@ -1532,28 +1875,40 @@ CLASS="VARIABLELIST"
 >Typical use:</DT
 ><DD
 ><P
->Block ads or other obnoxious content</P
+>Block ads or other unwanted content</P
 ></DD
 ><DT
 >Effect:</DT
 ><DD
 ><P
->    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 <TT
+>    Requests for URLs to which this action applies are blocked, i.e. the
+    requests are trapped by <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> and the requested URL is never retrieved,
+    but is answered locally with a substitute page or image, as determined by
+    the <TT
 CLASS="LITERAL"
 ><A
 HREF="actions-file.html#HANDLE-AS-IMAGE"
 >handle-as-image</A
 ></TT
->
-    and <TT
+>,
+    <TT
 CLASS="LITERAL"
 ><A
 HREF="actions-file.html#SET-IMAGE-BLOCKER"
 >set-image-blocker</A
 ></TT
+>, and 
+    <TT
+CLASS="LITERAL"
+><A
+HREF="actions-file.html#HANDLE-AS-EMPTY-DOCUMENT"
+>handle-as-empty-document</A
+></TT
 > actions.
+    
    </P
 ></DD
 ><DT
@@ -1637,7 +1992,8 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > deals with 
-    ads and other unwanted content.
+    ads and other unwanted content. Blocking is a core feature, and one 
+    upon which various other features depend.
    </P
 ><P
 >    The <TT
@@ -1668,12 +2024,18 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->{+block}      # Block and replace with "blocked" page
-.nasty-stuff.example.com
+>{+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</PRE
+{+block +handle-as-image} 
+# Block and replace with image
+ .ad.doubleclick.net
+ .ads.r.us/banners/
+
+{+block +handle-as-empty-document} 
+# Block and then ignore
+ adserver.exampleclick.net/.*\.js$</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1756,7 +2118,10 @@ CLASS="QUOTE"
     <SPAN
 CLASS="QUOTE"
 >"Content-Type: text/html"</SPAN
->, you can use Privoxy
+>, you can use <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
     to overwrite it with <SPAN
 CLASS="QUOTE"
 >"application/xml"</SPAN
@@ -1829,6 +2194,7 @@ CLASS="SCREEN"
 ># Check if www.example.net/ really uses valid XHTML
 {+content-type-overwrite {application/xml}}
 www.example.net/
+
 # but leave the content type unmodified if the URL looks like a style sheet
 {-content-type-overwrite}
 www.example.net/*.\.css$
@@ -2081,7 +2447,7 @@ WIDTH="90%"
 ><PRE
 CLASS="SCREEN"
 ># Let the browser revalidate cached documents without being tracked across sessions
-{+hide-if-modified-since {-1} \
+{+hide-if-modified-since {-60} \
 +overwrite-last-modified {randomize} \
 +crunch-if-none-match}
 /   </PRE
@@ -2800,22 +3166,11 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+fast-redirects{simple-check}</PRE
-></TD
-></TR
-></TABLE
->
-    </P
-><P
->     <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->+fast-redirects{check-decoded-url}</PRE
+> { +fast-redirects{simple-check} }
+   .example.com 
+
+ { +fast-redirects{check-decoded-url} }
+   another.example.com/testing</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2856,8 +3211,12 @@ CLASS="VARIABLELIST"
 CLASS="LITERAL"
 >text/plain</TT
 > MIME type for all files whose type they
-    don't know.) By default, filtering works only on the document content 
-    itself, not the headers.
+    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
+>), 
+    not the headers.
    </P
 ></DD
 ><DT
@@ -2898,7 +3257,13 @@ CLASS="FILENAME"
    </P
 ><P
 >     When used in its negative form,
-     and without parameters, filtering is completely disabled.
+     and without parameters, <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>all</I
+></SPAN
+> filtering is completely disabled.
   </P
 ></DD
 ><DT
@@ -2917,11 +3282,30 @@ CLASS="FILENAME"
     noticeable on slower connections.
    </P
 ><P
->    This is very powerful feature, and <SPAN
+>   <SPAN
 CLASS="QUOTE"
->"rolling your own"</SPAN
+>"Rolling your own"</SPAN
 >
-    filters requires a knowledge of regular expressions and HTML.
+    filters requires a knowledge of 
+     <A
+HREF="http://en.wikipedia.org/wiki/Regular_expressions"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"Regular
+     Expressions"</SPAN
+></A
+> and 
+      <A
+HREF="http://en.wikipedia.org/wiki/Html"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"HTML"</SPAN
+></A
+>.
+    This is very powerful feature, and potentially very intrusive. Use 
+    with caution.    
    </P
 ><P
 >    The amount of data that can be filtered is limited to the 
@@ -2940,7 +3324,7 @@ HREF="config.html"
     data, and all pending data, is passed through unfiltered. 
    </P
 ><P
->    Inadequate MIME types, such as zipped files, are not filtered at all.
+>    Inappropriate MIME types, such as zipped files, are not filtered at all.
     (Again, only text-based types except plain text). Encrypted SSL data
     (from HTTPS servers) cannot be filtered either, since this would violate
     the integrity of the secure transaction. In some situations it might
@@ -2948,13 +3332,13 @@ HREF="config.html"
     by defining appropriate <TT
 CLASS="LITERAL"
 >-filter</TT
-> sections.
+> exceptions.
    </P
 ><P
 >    At this time, <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> cannot (yet!) uncompress compressed
+> cannot uncompress compressed
     documents. If you want filtering to work on all documents, even those that
     would normally be sent compressed, use the
     <TT
@@ -3273,7 +3657,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{frameset-borders}    # Give frames a border and make them resizable</PRE
+>+filter{frameset-borders}    # Give frames a border and make them resizeable</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3330,7 +3714,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->+filter{quicktime-kioskmode} # Make Quicktime movies saveable</PRE
+>+filter{quicktime-kioskmode} # Make Quicktime movies savable</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3916,13 +4300,13 @@ CLASS="VARIABLELIST"
 >Typical use:</DT
 ><DD
 ><P
->Mark URLs as belonging to images (so they'll be replaced by imagee <SPAN
+>Mark URLs as belonging to images (so they'll be replaced by images <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
->if they get blocked</I
+>if they do get blocked</I
 ></SPAN
->)</P
+>, rather than HTML pages)</P
 ></DD
 ><DT
 >Effect:</DT
@@ -4330,8 +4714,8 @@ CLASS="QUOTE"
 CLASS="LITERAL"
 >hide-if-modified-since</TT
 > can
-    also add or substract a random amount of time to/from the headers value.
-    You specify a range of hours were the random factor should be chosen from and
+    also add or subtract a random amount of time to/from the header's value.
+    You specify a range of minutes where the random factor should be chosen from and
     <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -4381,7 +4765,7 @@ WIDTH="90%"
 ><PRE
 CLASS="SCREEN"
 ># Let the browser revalidate without being tracked across sessions
-{+hide-if-modified-since {-1}\
+{+hide-if-modified-since {-60}\
 +overwrite-last-modified {randomize}\
 +crunch-if-none-match}
 /</PRE
@@ -5207,7 +5591,10 @@ CLASS="QUOTE"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > relays HTTPS traffic without seeing
-   the decoded content. Websites can leverage this limitation to circumvent Privoxy's
+   the decoded content. Websites can leverage this limitation to circumvent <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>'s
    filters. By specifying an invalid port range you can disable HTTPS entirely.
    If you plan to disable SSL by default, consider enabling 
    <TT
@@ -5236,7 +5623,7 @@ CLASS="SCREEN"
 +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
-+limit-connect{,}                     # No HTTPS traffic is allowed</PRE
++limit-connect{,}                     # No HTTPS/SSL traffic is allowed</PRE
 ></TD
 ></TR
 ></TABLE
@@ -5528,7 +5915,7 @@ WIDTH="90%"
 ><PRE
 CLASS="SCREEN"
 ># Let the browser revalidate without being tracked across sessions
-{+hide-if-modified-since {-1}\
+{+hide-if-modified-since {-60}\
 +overwrite-last-modified {randomize}\
 +crunch-if-none-match}
 /</PRE
@@ -5586,9 +5973,9 @@ CLASS="VARIABLELIST"
 >Notes:</DT
 ><DD
 ><P
->    This action is useful to replace whole documents with your own
-    ones. For that to work, they have to be available on another server, 
-    and both should resolve.
+>    This action is useful to replace whole documents with ones of your 
+    choosing. This can be used to enforce safe surfing, or just as a simple 
+    convenience.
    </P
 ><P
 >    You can do the same by combining the actions
@@ -5628,7 +6015,7 @@ HREF="actions-file.html#BLOCK"
    </P
 ></DD
 ><DT
->Example usage:</DT
+>Example usages:</DT
 ><DD
 ><P
 >    <TABLE
@@ -5640,8 +6027,12 @@ WIDTH="90%"
 ><PRE
 CLASS="SCREEN"
 ># Replace example.com's style sheet with another one
-{+redirect{http://localhost/css-replacements/example.com.css}}
-example.com/stylesheet.css</PRE
+{ +redirect{http://localhost/css-replacements/example.com.css} }
+ example.com/stylesheet.css
+
+# Create a short, easy to remember nickname for a favorite site
+{ +redirect{http://www.privoxy.org/user-manual/actions-file.html} }
+ a</PRE
 ></TD
 ></TR
 ></TABLE
@@ -6334,7 +6725,7 @@ CLASS="APPLICATION"
 > to do the
     request through a SSL tunnel, everything will work. Most likely you haven't
     and the server will respond with an error message because it is expecting
-    HTTPS.
+    HTTPS (SSL).
    </P
 ></DD
 ><DT
@@ -6364,7 +6755,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN3749"
+NAME="AEN3885"
 ></A
 >8.5.36. Summary</H3
 ><P
@@ -6528,7 +6919,7 @@ HREF="actions-file.html#CRUNCH-INCOMING-COOKIES"
 HREF="actions-file.html#CRUNCH-OUTGOING-COOKIES"
 >crunch-outgoing-cookies</A
 >
- block-as-image      = +block +handle-as-image
+ +block-as-image      = +block +handle-as-image
  mercy-for-cookies   = -crunch-all-cookies -<A
 HREF="actions-file.html#SESSION-COOKIES-ONLY"
 >session-cookies-only</A
@@ -6668,7 +7059,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN3814"
+NAME="AEN3950"
 ></A
 >8.7.1. default.action</H3
 ><P
@@ -6751,7 +7142,7 @@ HREF="actions-file.html#CRUNCH-INCOMING-COOKIES"
 HREF="actions-file.html#CRUNCH-OUTGOING-COOKIES"
 >crunch-outgoing-cookies</A
 >
- block-as-image      = +block +handle-as-image
+ +block-as-image      = +block +handle-as-image
  mercy-for-cookies   = -crunch-all-cookies -<A
 HREF="actions-file.html#SESSION-COOKIES-ONLY"
 >session-cookies-only</A
@@ -7253,7 +7644,7 @@ CLASS="EMPHASIS"
  mark them as images in one go, with the help of our
  <TT
 CLASS="LITERAL"
->block-as-image</TT
+>+block-as-image</TT
 > alias defined above. (We could of
  course just as well use <TT
 CLASS="LITERAL"
@@ -7294,7 +7685,7 @@ WIDTH="100%"
 CLASS="SCREEN"
 ># Known ad generators:
 #
-{ block-as-image }
+{ +block-as-image }
 ar.atwola.com 
 .ad.doubleclick.net
 .ad.*.doubleclick.net
@@ -7571,7 +7962,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN3995"
+NAME="AEN4131"
 ></A
 >8.7.2. user.action</H3
 ><P
@@ -7708,12 +8099,10 @@ WIDTH="100%"
 ><PRE
 CLASS="SCREEN"
 >{ allow-all-cookies }
-sourceforge.net
-sunsolve.sun.com
-.slashdot.org
-.yahoo.com
-.msdn.microsoft.com
-.redhat.com</PRE
+ sourceforge.net
+ .yahoo.com
+ .msdn.microsoft.com
+ .redhat.com</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7733,7 +8122,7 @@ CLASS="SCREEN"
 HREF="actions-file.html#FILTER"
 >filter</A
 > }
-.your-home-banking-site.com</PRE
+ .your-home-banking-site.com</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7800,8 +8189,8 @@ CLASS="SCREEN"
 HREF="actions-file.html#BLOCK"
 >block</A
 > }
-www.example.com/nasty-ads/sponsor.gif
-another.popular.site.net/more/junk/here/</PRE
+ www.example.com/nasty-ads/sponsor.gif
+ another.popular.site.net/more/junk/here/</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7835,9 +8224,10 @@ WIDTH="100%"
 ><PRE
 CLASS="SCREEN"
 >{ +block-as-image }
-.doubleclick.net
-/Realmedia/ads/
-ar.atwola.com/</PRE
+ .doubleclick.net
+ .fastclick.net
+ /Realmedia/ads/
+ ar.atwola.com/</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7868,7 +8258,8 @@ CLASS="LITERAL"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >
- that is causing the problem or not.</P
+ that is causing the problem or not. We later find other regular sites 
+ that misbehave, and add those to our personalized list of troublemakers:</P
 ><P
 ><TABLE
 BORDER="0"
@@ -7879,7 +8270,9 @@ WIDTH="100%"
 ><PRE
 CLASS="SCREEN"
 >{ fragile }
-.forbes.com</PRE
+ .forbes.com
+ mail.example.com
+ .mybank.com</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7908,7 +8301,7 @@ CLASS="SCREEN"
 HREF="actions-file.html#FILTER-FUN"
 >filter{fun}</A
 > }
-/ # For ALL sites!</PRE
+ / # For ALL sites!</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7943,9 +8336,9 @@ WIDTH="100%"
 ><PRE
 CLASS="SCREEN"
 >{ allow-ads }
-.sourceforge.net
-.slashdot.org
-.osdn.net</PRE
+ .sourceforge.net
+ .slashdot.org
+ .osdn.net</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7993,7 +8386,7 @@ WIDTH="100%"
 ><PRE
 CLASS="SCREEN"
 >{ handle-as-text }
-/.*\.sh$</PRE
+ /.*\.sh$</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index b02a2549..8b4b6982 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.4 User Manual"
+TITLE="Privoxy 3.0.5 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.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -745,12 +745,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4783"
+NAME="AEN4920"
 ></A
->14.2. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->'s Internal Pages</H2
+>14.2. Privoxy's Internal Pages</H2
 ><P
 > Since <SPAN
 CLASS="APPLICATION"
@@ -794,7 +791,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN4798"
+NAME="AEN4934"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -827,7 +824,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN4806"
+NAME="AEN4942"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -847,7 +844,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN4811"
+NAME="AEN4947"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -867,7 +864,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN4816"
+NAME="AEN4952"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -887,7 +884,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN4821"
+NAME="AEN4957"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -911,7 +908,7 @@ CLASS="QUOTE"
    to run, but only as a pass-through proxy, with no actions taking place:
   </P
 ><A
-NAME="AEN4827"
+NAME="AEN4963"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -928,7 +925,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN4831"
+NAME="AEN4967"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -942,7 +939,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN4834"
+NAME="AEN4970"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -1301,7 +1298,7 @@ CLASS="SECT2"
 ><A
 NAME="ACTIONSANAT"
 ></A
->14.4. Anatomy of an Action</H2
+>14.4. Troubleshooting: Anatomy of an Action</H2
 ><P
 > The way <SPAN
 CLASS="APPLICATION"
@@ -1350,6 +1347,12 @@ HREF="appendix.html#BOOKMARKLETS"
  and easy way to do this (be sure to flush caches afterward!). Looking at the 
  logs is a good idea too.</P
 ><P
+> Another easy troubleshooting step to try is if you have done any
+ customization of your installation, revert back to the installed
+ defaults and see if that helps. There are times the developers get complaints
+ about one thing or another, and the problem is more related to a customized
+ configuration issue.</P
+><P
 > <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -1530,44 +1533,33 @@ CLASS="QUOTE"
  end result, depending on our configuration directives.</P
 ><P
 > The first listing
- is any matches for the <TT
-CLASS="FILENAME"
->standard.action</TT
-> file. No hits at
- all here on <SPAN
-CLASS="QUOTE"
->"standard"</SPAN
->. Then next is <SPAN
-CLASS="QUOTE"
->"default"</SPAN
->, or
- our <TT
+  is for our <TT
 CLASS="FILENAME"
 >default.action</TT
-> file. The large, multi-line listing,
- is how the actions are set to match for all URLs, i.e. our default settings.
- If you look at your <SPAN
+> file. The large, multi-line
+  listing, is how the actions are set to match for all URLs, i.e. our default
+  settings. If you look at your <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
-> file, this would be the section
- just below the <SPAN
+> file, this would be the
+  section just below the <SPAN
 CLASS="QUOTE"
 >"aliases"</SPAN
-> section near the top. This will apply to
- all URLs as signified by the single forward slash at the end of the listing
- -- <SPAN
+> section near the top. This
+  will apply to all URLs as signified by the single forward slash at the end
+  of the listing -- <SPAN
 CLASS="QUOTE"
->"/"</SPAN
+>" / "</SPAN
 >.</P
 ><P
-> But we can define additional actions that would be exceptions to these general
- rules, and then list specific URLs (or patterns) that these exceptions would
- apply to. Last match wins. Just below this then are two explicit matches for
- <SPAN
+> But we have defined additional actions that would be exceptions to these general
+ rules, and then we list specific URLs (or patterns) that these exceptions
+ would apply to. Last match wins. Just below this then are two explicit
+ matches for <SPAN
 CLASS="QUOTE"
 >".google.com"</SPAN
->. The first is negating our previous cookie setting, 
- which was for <A
+>. The first is negating our previous
+ cookie setting, which was for <A
 HREF="actions-file.html#SESSION-COOKIES-ONLY"
 ><SPAN
 CLASS="QUOTE"
@@ -1582,8 +1574,7 @@ CLASS="emphasis"
 CLASS="EMPHASIS"
 >off</I
 ></SPAN
-> any 
- <A
+> any <A
 HREF="actions-file.html#FAST-REDIRECTS"
 ><SPAN
 CLASS="QUOTE"
@@ -1599,23 +1590,39 @@ CLASS="QUOTE"
  <SPAN
 CLASS="QUOTE"
 >"www.google.com"</SPAN
->. So, apparently, we have these two actions
- defined somewhere in the lower part of our <TT
+> or <SPAN
+CLASS="QUOTE"
+>"mail.google.com"</SPAN
+>. But it would not 
+ match <SPAN
+CLASS="QUOTE"
+>"www.google.de"</SPAN
+>! So, apparently, we have these two actions
+ defined as exceptions to the general rules at the top somewhere in the lower
+ part of our <TT
 CLASS="FILENAME"
 >default.action</TT
->
- file, and <SPAN
+> file, and
+ <SPAN
 CLASS="QUOTE"
 >"google.com"</SPAN
-> is referenced somewhere in these latter
- sections.</P
+> is referenced somewhere in these latter sections.</P
 ><P
 > Then, for our <TT
 CLASS="FILENAME"
 >user.action</TT
 > file, we again have no hits.
  So there is nothing google-specific that we might have added to our own, local
- configuration.</P
+ configuration. If there was, those actions would over-rule any actions from 
+ previously processed files, such as <TT
+CLASS="FILENAME"
+>default.action</TT
+>.
+ <TT
+CLASS="FILENAME"
+>user.action</TT
+> typically has the last word. This is the
+ best place to put hard and fast exceptions,</P
 ><P
 > And finally we pull it all together in the bottom section and summarize how
  <SPAN
@@ -1715,28 +1722,32 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->&#13; { +block +handle-as-image }
-  .ad.doubleclick.net
-
- { +block +handle-as-image }
+>&#13; { +block }
   ad*.
 
+ { +block }
+  .ad.
+
  { +block +handle-as-image }
-  .doubleclick.net</PRE
+  .[a-vx-z]*.doubleclick.net</PRE
 ></TD
 ></TR
 ></TABLE
 ></P
 ><P
-> We'll just show the interesting part here, the explicit matches. It is 
- matched three different times. Each as an <SPAN
+> We'll just show the interesting part here - the explicit matches. It is 
+ matched three different times. Two <SPAN
+CLASS="QUOTE"
+>"+block"</SPAN
+> sections, 
+ and a <SPAN
 CLASS="QUOTE"
 >"+block +handle-as-image"</SPAN
 >,
  which is the expanded form of one of our aliases that had been defined as: 
  <SPAN
 CLASS="QUOTE"
->"+imageblock"</SPAN
+>"+block-as-image"</SPAN
 >. (<A
 HREF="actions-file.html#ALIASES"
 ><SPAN
@@ -1778,9 +1789,12 @@ CLASS="QUOTE"
 >.
  The custom alias <SPAN
 CLASS="QUOTE"
->"+imageblock"</SPAN
-> just simplifies the process and make 
- it more readable.</P
+>"<TT
+CLASS="LITERAL"
+>+block-as-image</TT
+>"</SPAN
+> just
+ simplifies the process and make it more readable.</P
 ><P
 > One last example. Let's try <SPAN
 CLASS="QUOTE"
@@ -1863,22 +1877,36 @@ CLASS="QUOTE"
 >"/ads"</SPAN
 > in our 
  configuration! But we did not want this at all! Now we see why we get the
- blank page. We could now add a new action below this that explicitly 
- <SPAN
+ blank page. It is actually triggering two different actions here, and 
+ the effects are aggregated so that the URL is blocked, and <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> is told 
+ to treat the block as if it were an image. But this is, of course, all wrong.
+  We could now add a new action below this (or better in our own
+  <TT
+CLASS="FILENAME"
+>user.action</TT
+> file) that explicitly
+  <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
 >un</I
 ></SPAN
-> blocks (<SPAN
+> blocks (
+  <A
+HREF="actions-file.html#BLOCK"
+><SPAN
 CLASS="QUOTE"
 >"{-block}"</SPAN
+></A
 >) paths with
- <SPAN
+  <SPAN
 CLASS="QUOTE"
 >"adsl"</SPAN
-> in them (remember, last match in the configuration wins).
- There are various ways to handle such exceptions. Example:</P
+> in them (remember, last match in the configuration
+  wins). There are various ways to handle such exceptions. Example:</P
 ><P
 > <TABLE
 BORDER="0"
@@ -1895,8 +1923,10 @@ CLASS="SCREEN"
 ></TABLE
 ></P
 ><P
-> Now the page displays ;-) Be sure to flush your browser's caches when 
- making such changes. Or, try using <TT
+> Now the page displays ;-) 
+ Remember to flush your browser's caches when making these kinds of changes to
+ your configuration to insure that you get a freshly delivered page! Or, try
+ using <TT
 CLASS="LITERAL"
 >Shift+Reload</TT
 >.</P
@@ -1919,18 +1949,29 @@ CLASS="SCREEN"
 ></TABLE
 ></P
 ><P
-> That actually was very telling and pointed us quickly to where the problem
+> That actually was very helpful and pointed us quickly to where the problem
  was. If you don't get this kind of match, then it means one of the default 
- rules in the first section is causing the problem. This would require some 
- guesswork, and maybe a little trial and error to isolate the offending rule.
- One likely cause would be one of the <SPAN
+ rules in the first section of <TT
+CLASS="FILENAME"
+>default.action</TT
+> is causing
+ the problem. This would require some guesswork, and maybe a little trial and
+ error to isolate the offending rule. One likely cause would be one of the
+ <A
+HREF="actions-file.html#FILTER"
+><SPAN
 CLASS="QUOTE"
->"{+filter}"</SPAN
-> actions. These 
- tend to be harder to troubleshoot. Try adding the URL for the site to one of
- aliases that turn off <SPAN
+>"+filter"</SPAN
+></A
+> actions.
+ These tend to be harder to troubleshoot.
+ Try adding the URL for the site to one of aliases that turn off
+ <A
+HREF="actions-file.html#FILTER"
+><SPAN
 CLASS="QUOTE"
 >"+filter"</SPAN
+></A
 >:</P
 ><P
 > <TABLE
@@ -1941,7 +1982,7 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->&#13; {shop}
+>&#13; { shop }
  .quietpc.com
  .worldpay.com   # for quietpc.com
  .jungle.com
@@ -1954,14 +1995,20 @@ CLASS="SCREEN"
 ><P
 > <SPAN
 CLASS="QUOTE"
->"{shop}"</SPAN
+>"<TT
+CLASS="LITERAL"
+>{ shop }</TT
+>"</SPAN
 > is an <SPAN
 CLASS="QUOTE"
 >"alias"</SPAN
 > that expands to 
  <SPAN
 CLASS="QUOTE"
->"{ -filter -session-cookies-only }"</SPAN
+>"<TT
+CLASS="LITERAL"
+>{ -filter -session-cookies-only }</TT
+>"</SPAN
 >.
  Or you could do your own exception to negate filtering:&#13;</P
 ><P
@@ -1973,35 +2020,97 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->&#13; {-filter}
- .forbes.com</PRE
+>&#13; { -filter }
+ # Disable ALL filter actions for sites in this section
+ .forbes.com
+ developer.ibm.com
+ localhost</PRE
 ></TD
 ></TR
 ></TABLE
 ></P
 ><P
-> This would turn off all filtering for that site. This would probably be most
- appropriately put in <TT
+> This would turn off all filtering for these sites. This is best
+ put in <TT
 CLASS="FILENAME"
 >user.action</TT
 >, for local site
- exceptions.</P
+ exceptions. Note that when a simple domain pattern is used by itself (without
+ the subsequent path portion), all sub-pages within that domain are included 
+ automatcially in the scope of the action.</P
 ><P
 > Images that are inexplicably being blocked, may well be hitting the 
- <SPAN
+<A
+HREF="actions-file.html#FILTER-BANNERS-BY-SIZE"
+><SPAN
 CLASS="QUOTE"
 >"+filter{banners-by-size}"</SPAN
-> rule, which assumes 
- that images of certain sizes are ad banners (works well most of the time 
- since these tend to be standardized).</P
+></A
+>
+ rule, which assumes 
+ that images of certain sizes are ad banners (works well 
+ <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>most of the time</I
+></SPAN
+>  since these tend to be standardized).</P
+><P
+> <SPAN
+CLASS="QUOTE"
+>"<TT
+CLASS="LITERAL"
+>{ fragile }</TT
+>"</SPAN
+> is an alias that disables most
+ actions that are the most likely to cause trouble. This can be used as a
+ last resort for problem sites. </P
+><P
+> <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>&#13; { fragile }
+ # Handle with care: easy to break
+ mail.google.
+ mybank.example.com</PRE
+></TD
+></TR
+></TABLE
+></P
 ><P
 > <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>Remember to flush caches!</I
+></SPAN
+> Note that the 
+ <TT
+CLASS="LITERAL"
+>mail.google</TT
+> reference lacks the TLD portion (e.g. 
+ <SPAN
 CLASS="QUOTE"
->"{fragile}"</SPAN
-> is an alias that disables most actions. This can be 
- used as a last resort for problem sites. Remember to flush caches! If this 
- still does not work, you will have to go through the remaining actions one by
- one to find which one(s) is causing the problem.</P
+>".com"</SPAN
+>. This will effectively match any TLD with 
+ <TT
+CLASS="LITERAL"
+>google</TT
+> in it, such as <TT
+CLASS="LITERAL"
+>mail.google.de</TT
+>, 
+ just as an example.</P
+><P
+> 
+ If this still does not work, you will have to go through the remaining
+ actions one by one to find which one(s) is causing the problem.</P
 ></DIV
 ></DIV
 ><DIV
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index a35c607b..be5157a9 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.4 User Manual"
+TITLE="Privoxy 3.0.5 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.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -228,8 +228,7 @@ CLASS="APPLICATION"
 >, and is used for help links from some
     of the internal CGI pages. The manual itself is normally packaged with the
     binary distributions, so you probably 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.
+    installed copy. 
    </P
 ><P
 >    Examples:
@@ -619,22 +618,6 @@ CLASS="LITERAL"
 >"</SPAN
 >, please
    </P
-><P
->    When development goes modular and multi-user, the blocker, filter, and
-    per-user config will be stored in subdirectories of <SPAN
-CLASS="QUOTE"
->"confdir"</SPAN
->.
-    For now, the configuration directory structure is flat, except for 
-    <TT
-CLASS="FILENAME"
->confdir/templates</TT
->, where the HTML templates for CGI 
-    output reside (e.g. <SPAN
-CLASS="APPLICATION"
->Privoxy's</SPAN
-> 404 error page). 
-   </P
 ></DD
 ></DL
 ></DIV
@@ -1161,7 +1144,7 @@ CLASS="VARIABLELIST"
 >Specifies:</DT
 ><DD
 ><P
->    The trust file to use
+>    The name of the trust file to use
    </P
 ></DD
 ><DT
@@ -1195,7 +1178,7 @@ CLASS="EMPHASIS"
 >Effect if unset:</DT
 ><DD
 ><P
->    The entire trust mechanism is turned off.
+>    The entire trust mechanism is disabled.
    </P
 ></DD
 ><DT
@@ -1228,7 +1211,11 @@ CLASS="LITERAL"
     <TT
 CLASS="LITERAL"
 >~www.example.com</TT
->. 
+> allows access to
+    <TT
+CLASS="LITERAL"
+>~www.example.com/features/news.html</TT
+>, etc. 
    </P
 ><P
 >    Or, you can designate sites as <SPAN
@@ -1243,16 +1230,18 @@ CLASS="LITERAL"
 >+</TT
 > character. The effect is that
     access to untrusted sites will be granted -- but only if a link from this
-    trusted referrer was used. The link target will then be added to the
-    <SPAN
+    trusted referrer was used to get there. The link target will then be added
+    to the <SPAN
 CLASS="QUOTE"
 >"trustfile"</SPAN
-> so that future, direct accesses will be granted.
-    Sites added via this mechanism do not become trusted referrers themselves
-    (i.e. they are added with a <TT
+> so that future, direct accesses will be
+    granted. Sites added via this mechanism do not become trusted referrers
+    themselves (i.e. they are added with a <TT
 CLASS="LITERAL"
 >~</TT
 > designation).
+    There is a limit of 512 such entries, after which new entries will not be
+    made.
    </P
 ><P
 >    If you use the <TT
@@ -2379,12 +2368,7 @@ NAME="FORWARDING"
  multiple proxies.
  It can be used to better protect privacy and confidentiality when
  accessing specific domains by routing requests to those domains
- through an anonymous public proxy (see e.g. <A
-HREF="http://www.multiproxy.org/anon_list.htm"
-TARGET="_top"
->http://www.multiproxy.org/anon_list.htm</A
->)
- Or to use a caching proxy to speed up browsing. Or chaining to a parent
+ through an anonymous public proxy. Or to use a caching proxy to speed up browsing. Or chaining to a parent
  proxy may be necessary because the machine that <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -3414,10 +3398,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
-><SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Configuration</TD
+>Privoxy Configuration</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index df623b5f..49153a49 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.4 User Manual"
+TITLE="Privoxy 3.0.5 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.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -77,10 +77,7 @@ CLASS="SECT1"
 ><A
 NAME="CONFIGURATION"
 ></A
->6. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Configuration</H1
+>6. Privoxy Configuration</H1
 ><P
 >  All <SPAN
 CLASS="APPLICATION"
@@ -98,12 +95,9 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN766"
+NAME="AEN803"
 ></A
->6.1. Controlling <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> with Your Web Browser</H2
+>6.1. Controlling Privoxy with Your Web Browser</H2
 ><P
 > <SPAN
 CLASS="APPLICATION"
@@ -132,7 +126,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN775"
+NAME="AEN811"
 ></A
 >    Privoxy Menu</H2
 ><P
@@ -188,7 +182,7 @@ TARGET="_top"
 ><TR
 ><TD
 >          &#9642;  <A
-HREF="http://www.privoxy.org/   3.0.4/user-manual/"
+HREF="http://www.privoxy.org/   3.0.5/user-manual/"
 TARGET="_top"
 >Documentation</A
 >
@@ -389,7 +383,13 @@ CLASS="FILENAME"
 ><P
 > The syntax of all configuration files has remained the same throughout the
  3.x series. There have been enhancements, but no changes that would preclude
- the use of any configuration file from one version to the next.</P
+ the use of any configuration file from one version to the next. (There is 
+ one exception: <A
+HREF="actions-file.html#FAST-REDIRECTS"
+>+fast-redirects</A
+> which 
+ has enhanced syntax and will require updating any local configs from earlier 
+ versions.)</P
 ><P
 > All files use the <SPAN
 CLASS="QUOTE"
@@ -412,7 +412,7 @@ CLASS="LITERAL"
 >#</TT
 > in front of an otherwise
  valid configuration line to prevent it from being interpreted is called "commenting
- out" that line.</P
+ out" that line. Blank lines are ignored.</P
 ><P
 > The actions files and filter files  
  can use Perl style <A
@@ -500,10 +500,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Starting <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></TD
+>Starting Privoxy</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index f523eb8f..8e2c545a 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -8,10 +8,10 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.4 User Manual"
+TITLE="Privoxy 3.0.5 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Templates"
+TITLE="Privoxy's Template Files"
 HREF="templates.html"><LINK
 REL="NEXT"
 TITLE="Privoxy Copyright, License and History"
@@ -40,7 +40,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -286,7 +286,7 @@ CLASS="APPLICATION"
 ></LI
 ><LI
 ><P
->    The operating system and verions you run
+>    The operating system and versions you run
     <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -379,7 +379,7 @@ CLASS="EMPHASIS"
 HREF="http://www.privoxy.org/user-manual/appendix.html#ACTIONSANAT"
 TARGET="_top"
 >appendix
-  of the user manual</A
+  of the Privoxy User Manual</A
 > also has helpful information 
   on understanding <TT
 CLASS="LITERAL"
@@ -474,7 +474,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Templates</TD
+>Privoxy's Template Files</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -484,10 +484,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
-><SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Copyright, License and History</TD
+>Privoxy Copyright, License and History</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index d2adec79..c4be4353 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.4 User Manual"
+TITLE="Privoxy 3.0.5 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.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -78,10 +78,7 @@ CLASS="SECT1"
 ><A
 NAME="COPYRIGHT"
 ></A
->12. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Copyright, License and History</H1
+>12. Privoxy Copyright, License and History</H1
 ><P
 > Copyright © 2001 - 2006 by Privoxy Developers <TT
 CLASS="EMAIL"
@@ -102,7 +99,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4533"
+NAME="AEN4670"
 ></A
 >12.1. License</H2
 ><P
@@ -125,8 +122,8 @@ CLASS="CITETITLE"
 >GNU General Public License</I
 > for
  
- more details, which is available from the Free Software Foundation, Inc, 59
- Temple Place - Suite 330, Boston, MA  02111-1307, USA.</P
+ more details, which is available from the Free Software Foundation, Inc, 
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA</P
 ><P
 > You should have received a copy of the <A
 HREF="http://www.gnu.org/copyleft/gpl.html"
@@ -141,8 +138,8 @@ CLASS="ADDRESS"
 >&nbsp;Free&nbsp;Software<br>
 &nbsp;Foundation,&nbsp;Inc.&nbsp;<SPAN
 CLASS="STREET"
->59 Temple Place</SPAN
->&nbsp;-&nbsp;Suite&nbsp;330<br>
+>51 Franklin Street, Fifth Floor</SPAN
+><br>
 &nbsp;<SPAN
 CLASS="CITY"
 >Boston</SPAN
@@ -151,7 +148,7 @@ CLASS="STATE"
 >MA</SPAN
 >&nbsp;<SPAN
 CLASS="POSTCODE"
->02111-1307</SPAN
+>02110-1301</SPAN
 ><br>
 &nbsp;<SPAN
 CLASS="COUNTRY"
@@ -255,25 +252,23 @@ NAME="AUTHORS"
 ></A
 >12.3. Authors</H2
 ><P
->Current Developement Team:</P
+>Current Privoxy Team:</P
 ><P
 CLASS="LITERALLAYOUT"
->&nbsp;Fabian&nbsp;Keil<br>
-&nbsp;David&nbsp;Schmidt<br>
-<br>
-Current&nbsp;Contributors:<br>
-<br>
-&nbsp;Johny&nbsp;Agotnes&nbsp;<br>
-&nbsp;Moritz&nbsp;Barsnick<br>
+>&nbsp;Fabian&nbsp;Keil,&nbsp;developer<br>
+&nbsp;David&nbsp;Schmidt,&nbsp;developer<br>
+&nbsp;<br>
 &nbsp;Hal&nbsp;Burgiss<br>
-&nbsp;Mattes&nbsp;Dolak&nbsp;<br>
-&nbsp;Roland&nbsp;Rosenfeld<br>&#13;</P
+&nbsp;Ian&nbsp;Cummings<br>
+&nbsp;Félix&nbsp;Rauch<br>
+&nbsp;Roland&nbsp;Rosenfeld</P
 ><P
-> Former Project Developers and Contributors:</P
+> Former Privoxy Team Members:</P
 ><P
 CLASS="LITERALLAYOUT"
->&nbsp;<br>
+>&nbsp;Johny&nbsp;Agotnes&nbsp;<br>
 &nbsp;Rodrigo&nbsp;Barbosa<br>
+&nbsp;Moritz&nbsp;Barsnick<br>
 &nbsp;Brian&nbsp;Dessent<br>
 &nbsp;Jon&nbsp;Foster<br>
 &nbsp;Karsten&nbsp;Hopp<br>
@@ -282,6 +277,7 @@ CLASS="LITERALLAYOUT"
 &nbsp;Gábor&nbsp;Lipták<br>
 &nbsp;Adam&nbsp;Lock<br>
 &nbsp;Guy&nbsp;Laroche<br>
+&nbsp;Mark&nbsp;Martinec&nbsp;<br>
 &nbsp;Andreas&nbsp;Oesterhelt<br>
 &nbsp;Haroon&nbsp;Rafique<br>
 &nbsp;Georg&nbsp;Sauthoff<br>
@@ -292,14 +288,8 @@ CLASS="LITERALLAYOUT"
 &nbsp;Sarantis&nbsp;Paskalis<br>
 &nbsp;Stefan&nbsp;Waldherr</P
 ><P
-> Based in part on code originally developed by:</P
-><P
-CLASS="LITERALLAYOUT"
->&nbsp;Junkbusters&nbsp;Corp.<br>
-&nbsp;Anonymous&nbsp;Coders</P
-><P
-> Thanks to the many people who have tested Privoxy, reported bugs, or made
- suggestions. These include (in alphabetical order):</P
+> Thanks to the many people who have tested Privoxy, reported bugs, made
+ suggestions or contributed in some way. These include (in alphabetical order):</P
 ><P
 CLASS="LITERALLAYOUT"
 >&nbsp;Ken&nbsp;Arromdee<br>
@@ -308,19 +298,30 @@ CLASS="LITERALLAYOUT"
 &nbsp;Andrew&nbsp;J.&nbsp;Caines<br>
 &nbsp;Clifford&nbsp;Caoile<br>
 &nbsp;Michael&nbsp;T.&nbsp;Davis<br>
-&nbsp;Brian&nbsp;Dessent<br>
+&nbsp;Mattes&nbsp;Dolak&nbsp;<br>
+&nbsp;Ulrich&nbsp;Drepper<br>
 &nbsp;Peter&nbsp;E<br>
 &nbsp;Aaron&nbsp;Hamid<br>
 &nbsp;Magnus&nbsp;Holmgren<br>
 &nbsp;Don&nbsp;Libes&nbsp;&nbsp;<br>
 &nbsp;Paul&nbsp;Lieverse<br>
+&nbsp;Jindrich&nbsp;Makovicka&nbsp;<br>
 &nbsp;David&nbsp;Mediavilla&nbsp;<br>
 &nbsp;Oliver&nbsp;Stoeneberg<br>
 &nbsp;Roberto&nbsp;Ragusa<br>
 &nbsp;Maynard&nbsp;Riley<br>
 &nbsp;Bart&nbsp;Schelstraete<br>
+&nbsp;Bobby&nbsp;G.&nbsp;Vinyard<br>
 &nbsp;Darren&nbsp;Wiebe<br>
+&nbsp;Jörg&nbsp;Weinmann&nbsp;<br>
+&nbsp;Oliver&nbsp;Yeoh<br>
 &nbsp;Jamie&nbsp;Zawinski</P
+><P
+> Privoxy is based in part on code originally developed by:</P
+><P
+CLASS="LITERALLAYOUT"
+>&nbsp;Junkbusters&nbsp;Corp.<br>
+&nbsp;Anonymous&nbsp;Coders</P
 ></DIV
 ></DIV
 ><DIV
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 99401da2..5ea91bee 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -7,13 +7,13 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.4 User Manual"
+TITLE="Privoxy 3.0.5 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Actions Files"
 HREF="actions-file.html"><LINK
 REL="NEXT"
-TITLE="Templates"
+TITLE="Privoxy's Template Files"
 HREF="templates.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -94,7 +94,7 @@ CLASS="QUOTE"
  can then be invoked as an <SPAN
 CLASS="QUOTE"
 >"action"</SPAN
->. Mulitple filter files can be
+>. Multiple filter files can be
  defined through the <TT
 CLASS="LITERAL"
 > <A
@@ -142,7 +142,7 @@ CLASS="QUOTE"
  your own"</SPAN
 > filters, you should first be familiar with HTML syntax, 
  and, of course, regular expressions. By default, filters are only applied 
- to the document content, but can be extended to the headers with 
+ to the raw document content, but can be extended to the HTTP headers with 
  the supplemental actions: 
  <A
 HREF="actions-file.html#FILTER-CLIENT-HEADERS"
@@ -274,7 +274,16 @@ CLASS="LITERAL"
 > is supported,
  which turns the default to ungreedy matching.</P
 ><P
-> If you are new to regular expressions, you might want to take a look at
+> If you are new to 
+  <A
+HREF="http://en.wikipedia.org/wiki/Regular_expressions"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"Regular
+  Expressions"</SPAN
+></A
+>, you might want to take a look at
  the <A
 HREF="appendix.html#REGEX"
 >Appendix on regular expressions</A
@@ -305,7 +314,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4133"
+NAME="AEN4271"
 ></A
 >9.1. Filter File Tutorial</H2
 ><P
@@ -668,7 +677,7 @@ CLASS="EMPHASIS"
 CLASS="LITERAL"
 >\1</TT
 > is
- a backreference to the first parenthesis just like <TT
+ a back-reference to the first parenthesis just like <TT
 CLASS="LITERAL"
 >$1</TT
 > above,
@@ -679,7 +688,7 @@ CLASS="EMPHASIS"
 >pattern</I
 ></SPAN
 >, a backslash indicates
- a backreference, whereas in the <SPAN
+ a back-reference, whereas in the <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
@@ -891,7 +900,7 @@ CLASS="QUOTE"
 ><LI
 ><P
 >      removes code that causes new windows to be opened with undesired properties, such as being
-      full-screen, non-resizable, without location, status or menu bar etc.
+      full-screen, non-resizeable, without location, status or menu bar etc.
      </P
 ></LI
 ></UL
@@ -945,7 +954,7 @@ CLASS="LITERAL"
 >MARQUEE</TT
 > tags 
     are neutralized (yeah baby!), and browser windows will be created as
-    resizable (as of course they should be!), and will have location,
+    resizeable (as of course they should be!), and will have location,
     scroll and menu bars -- even if specified otherwise.
    </P
 ></DD
@@ -959,7 +968,7 @@ CLASS="EMPHASIS"
 ></DT
 ><DD
 ><P
->    Most cookies are set in the HTTP dialogue, where they can be intercepted
+>    Most cookies are set in the HTTP dialog, where they can be intercepted
     by the
     <TT
 CLASS="LITERAL"
@@ -1020,7 +1029,7 @@ CLASS="QUOTE"
 ><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 afterwards.
+    HTML page access, and restoring the function afterward.
    </P
 ></DD
 ><DT
@@ -1198,7 +1207,7 @@ CLASS="EMPHASIS"
 >    This filter translates the MS-only characters into Latin-1 equivalents. 
     It is not necessary when using MS products, and will cause corruption of  
     all documents that use 8-bit character sets other than Latin-1. It's mostly
-    worthwhile for Europeans on non-MS platforms, if wierd garbage characters
+    worthwhile for Europeans on non-MS platforms, if weird garbage characters
     sometimes appear on some pages, or user agents that don't correct for this on 
     the fly.
  
@@ -1364,7 +1373,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Templates</TD
+>Privoxy's Template Files</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 159d59b6..c7d1a0e1 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.4 User Manual</TITLE
+>Privoxy 3.0.5 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.4 User Manual</H1
+>Privoxy 3.0.5 User Manual</H1
 ><P
 CLASS="PUBDATE"
 > <SUB
@@ -47,7 +47,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.17 2006/09/05 13:25:12 david__schmidt Exp $<BR></P
+>$Id: user-manual.sgml,v 2.21 2006/09/20 03:21:36 david__schmidt Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -59,47 +59,38 @@ NAME="AEN9"
 ><P
 >  The <I
 CLASS="CITETITLE"
->User Manual</I
+>Privoxy User Manual</I
 > gives users information on how to
   install, configure and use <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"
-><SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></A
+>Privoxy</A
 >.
  </P
 ><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is a web proxy with advanced filtering
- capabilities for protecting privacy, modifying web page data, managing
- cookies, controlling access, and removing ads, banners, pop-ups and other
- obnoxious Internet junk. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> has a very
- flexible configuration and can be customized to suit individual needs and
- tastes. <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> has application for both
- stand-alone systems and multi-user networks.</P
+> Privoxy is a 
+ <A
+HREF="http://en.wikipedia.org/wiki/Proxy_server"
+TARGET="_top"
+>web proxy</A
+>
+ with advanced filtering capabilities for protecting
+ privacy, modifying web page data, managing 
+ <A
+HREF="http://en.wikipedia.org/wiki/Browser_cookie"
+TARGET="_top"
+>cookies</A
+>, 
+ controlling access, and removing ads, banners, pop-ups and other obnoxious
+ Internet junk. Privoxy has a very flexible configuration and can be
+ customized to suit individual needs and tastes. Privoxy has application for
+ both stand-alone systems and multi-user networks.</P
 ><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is based on <SPAN
-CLASS="APPLICATION"
->Internet
- Junkbuster</SPAN
-> (tm).</P
+> Privoxy is based on Internet Junkbuster (tm).</P
 ><P
 >  You can find the latest version of the <I
 CLASS="CITETITLE"
->User Manual</I
+>Privoxy User Manual</I
 > at  <A
 HREF="http://www.privoxy.org/user-manual/"
 TARGET="_top"
@@ -222,10 +213,7 @@ HREF="whatsnew.html#UPGRADERSNOTE"
 ><DT
 >4. <A
 HREF="quickstart.html"
->Quickstart to Using <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></A
+>Quickstart to Using Privoxy</A
 ></DT
 ><DD
 ><DL
@@ -239,17 +227,14 @@ HREF="quickstart.html#QUICKSTART-AD-BLOCKING"
 ><DT
 >5. <A
 HREF="startup.html"
->Starting <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></A
+>Starting Privoxy</A
 ></DT
 ><DD
 ><DL
 ><DT
 >5.1. <A
 HREF="startup.html#START-REDHAT"
->Red Hat and Conectiva</A
+>Red Hat, Fedora and Conectiva</A
 ></DT
 ><DT
 >5.2. <A
@@ -301,20 +286,14 @@ HREF="startup.html#CMDOPTIONS"
 ><DT
 >6. <A
 HREF="configuration.html"
-><SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Configuration</A
+>Privoxy Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN766"
->Controlling <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> with Your Web Browser</A
+HREF="configuration.html#AEN803"
+>Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
 >6.2. <A
@@ -511,12 +490,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2011"
+HREF="actions-file.html#AEN2066"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2018"
+HREF="actions-file.html#AEN2073"
 >How to Edit</A
 ></DT
 ><DT
@@ -533,12 +512,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2092"
+HREF="actions-file.html#AEN2156"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2154"
+HREF="actions-file.html#AEN2227"
 >The Path Pattern</A
 ></DT
 ></DL
@@ -730,7 +709,7 @@ HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
 ></DT
 ><DT
 >8.5.36. <A
-HREF="actions-file.html#AEN3749"
+HREF="actions-file.html#AEN3885"
 >Summary</A
 ></DT
 ></DL
@@ -749,12 +728,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN3814"
+HREF="actions-file.html#AEN3950"
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN3995"
+HREF="actions-file.html#AEN4131"
 >user.action</A
 ></DT
 ></DL
@@ -770,7 +749,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4133"
+HREF="filter-file.html#AEN4271"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -783,7 +762,7 @@ HREF="filter-file.html#PREDEFINED-FILTERS"
 ><DT
 >10. <A
 HREF="templates.html"
->Templates</A
+>Privoxy's Template Files</A
 ></DT
 ><DT
 >11. <A
@@ -832,16 +811,13 @@ HREF="contact.html#CONTACT-OTHER"
 ><DT
 >12. <A
 HREF="copyright.html"
-><SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Copyright, License and History</A
+>Privoxy Copyright, License and History</A
 ></DT
 ><DD
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN4533"
+HREF="copyright.html#AEN4670"
 >License</A
 ></DT
 ><DT
@@ -875,11 +851,8 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN4783"
-><SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->'s Internal Pages</A
+HREF="appendix.html#AEN4920"
+>Privoxy's Internal Pages</A
 ></DT
 ><DD
 ><DL
@@ -898,7 +871,7 @@ HREF="appendix.html#CHAIN"
 ><DT
 >14.4. <A
 HREF="appendix.html#ACTIONSANAT"
->Anatomy of an Action</A
+>Troubleshooting: Anatomy of an Action</A
 ></DT
 ></DL
 ></DD
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 990f4eaa..24269858 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.4 User Manual"
+TITLE="Privoxy 3.0.5 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Introduction"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.4 User Manual</TH
+>Privoxy 3.0.5 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.4-1.rpm</TT
+>rpm -Uvh privoxy-3.0.5-1.rpm</TT
 >,
  and will use <TT
 CLASS="FILENAME"
@@ -152,13 +152,12 @@ CLASS="COMMAND"
  <B
 CLASS="COMMAND"
 >ntsysv</B
->, or similar methods. Note that SuSE will 
-automatically start Privoxy in the boot process.</P
+>, or similar methods. </P
 ><P
 > If you have problems with failed dependencies, try rebuilding the SRC RPM: 
  <TT
 CLASS="LITERAL"
->rpm --rebuild privoxy-3.0.4-1.src.rpm</TT
+>rpm --rebuild privoxy-3.0.5-1.src.rpm</TT
 >. This 
  will use your locally installed libraries and RPM version. </P
 ><P
@@ -211,7 +210,7 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 > in. </P
 ><P
-> Version 3.0.4 introduces full <SPAN
+> Version 3.0.4 introduced full <SPAN
 CLASS="APPLICATION"
 >Windows</SPAN
 > service
@@ -292,7 +291,7 @@ CLASS="APPLICATION"
  command: <B
 CLASS="COMMAND"
 >services.msc</B
->  If you do not take the manual step
+>.  If you do not take the manual step
  of modifying <SPAN
 CLASS="APPLICATION"
 >Privoxy's</SPAN
@@ -479,7 +478,7 @@ CLASS="FILENAME"
 >, the 
  documentation is in <TT
 CLASS="FILENAME"
->/usr/share/doc/privoxy-3.0.4</TT
+>/usr/share/doc/privoxy-3.0.5</TT
 >
  and the Log directory is in <TT
 CLASS="FILENAME"
@@ -547,8 +546,8 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
-> tar xzvf privoxy-3.0.4-beta-src* [.tgz or .tar.gz]
- cd privoxy-3.0.4-beta</PRE
+> tar xzvf privoxy-3.0.5-beta-src* [.tgz or .tar.gz]
+ cd privoxy-3.0.5-beta</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index 7aca2472..f385fb07 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.4 User Manual"
+TITLE="Privoxy 3.0.5 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Privoxy 3.0.4 User Manual"
+TITLE="Privoxy 3.0.5 User Manual"
 HREF="index.html"><LINK
 REL="NEXT"
 TITLE="Installation"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.4 User Manual</TH
+>Privoxy 3.0.5 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 BETA version of
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
->, v.3.0.4, 
+>, v.3.0.5, 
  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 BETA 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"
@@ -110,7 +110,12 @@ NAME="FEATURES"
 >1.1. Features</H2
 ><P
 > In addition to the core 
- features of ad blocking and cookie management,
+ features of ad blocking and 
+ <A
+HREF="http://en.wikipedia.org/wiki/Browser_cookie"
+TARGET="_top"
+>cookie</A
+> management,
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -258,7 +263,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Privoxy 3.0.4 User Manual</TD
+>Privoxy 3.0.5 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 f460ab2a..c4628588 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.4 User Manual"
+TITLE="Privoxy 3.0.5 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.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -77,10 +77,7 @@ CLASS="SECT1"
 ><A
 NAME="QUICKSTART"
 ></A
->4. Quickstart to Using <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></H1
+>4. Quickstart to Using Privoxy</H1
 ><P
 > <P
 ></P
@@ -135,7 +132,12 @@ CLASS="APPLICATION"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > as HTTP and
-   HTTPS (SSL) proxy by setting the proxy configuration for address of
+   HTTPS (SSL)  <A
+HREF="http://en.wikipedia.org/wiki/Proxy_server"
+TARGET="_top"
+>proxy</A
+>
+   by setting the proxy configuration for address of
    <TT
 CLASS="LITERAL"
 >127.0.0.1</TT
@@ -162,8 +164,13 @@ CLASS="LITERAL"
     If using <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> to manage cookies, you should 
-    remove any currently stored cookies too.
+> to manage 
+    <A
+HREF="http://en.wikipedia.org/wiki/Browser_cookie"
+TARGET="_top"
+>cookies</A
+>,
+    you should remove any currently stored cookies too.
   </P
 ></LI
 ><LI
@@ -179,16 +186,24 @@ HREF="configuration.html"
 >Configuration section</A
 > for more
    configuration options, and how to customize your installation.
- </P
+   You might also want to look at the <A
+HREF="quickstart.html#QUICKSTART-AD-BLOCKING"
+>next section</A
+> for a quick
+   introduction to how <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> blocks ads and
+   banners.</P
 ></LI
 ><LI
 ><P
->    If you experience ads that slipped through, innocent images that are
+>    If you experience ads that slip through, innocent images that are
     blocked, or otherwise feel the need to fine-tune
     <SPAN
 CLASS="APPLICATION"
 >Privoxy's</SPAN
-> behaviour, take a look at the <A
+> behavior, take a look at the <A
 HREF="actions-file.html"
 >actions files</A
 >. As a quick start, you might
@@ -205,10 +220,10 @@ TARGET="_top"
 CLASS="QUOTE"
 >"<A
 HREF="appendix.html#ACTIONSANAT"
->Anatomy of an
+>Troubleshooting: Anatomy of an
     Action</A
 >"</SPAN
-> has hints how to debug actions that
+> has hints how to understand and debug actions that
     <SPAN
 CLASS="QUOTE"
 >"misbehave"</SPAN
@@ -217,7 +232,10 @@ CLASS="QUOTE"
 ></LI
 ><LI
 ><P
->   For easy access to Privoxy's most important controls, drag the provided
+>   For easy access to <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>'s most important controls, drag the provided
    <A
 HREF="appendix.html#BOOKMARKLETS"
 >Bookmarklets</A
@@ -630,7 +648,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN553"
+NAME="AEN565"
 ></A
 ><P
 ><B
@@ -640,7 +658,7 @@ NAME="AEN553"
 CLASS="MEDIAOBJECT"
 ><P
 ><IMG
-SRC="../images/files-in-use.jpg"></P
+SRC="files-in-use.jpg"></P
 ></DIV
 ></DIV
 >
@@ -825,10 +843,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Starting <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></TD
+>Starting Privoxy</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index bc227cfb..0bf00a93 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.4 User Manual"
+TITLE="Privoxy 3.0.5 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.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -309,7 +309,7 @@ TARGET="_top"
 >, 
    <SPAN
 CLASS="APPLICATION"
->TOR</SPAN
+>Tor</SPAN
 > can help anonymize web browsing, 
    web publishing, instant messaging, IRC, SSH, and other applications.
   </TD
@@ -387,10 +387,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
-><SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Copyright, License and History</TD
+>Privoxy Copyright, License and History</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 98e93791..c0dc0b9e 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.4 User Manual"
+TITLE="Privoxy 3.0.5 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.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -77,10 +77,7 @@ CLASS="SECT1"
 ><A
 NAME="STARTUP"
 ></A
->5. Starting <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></H1
+>5. Starting Privoxy</H1
 ><P
 > Before launching <SPAN
 CLASS="APPLICATION"
@@ -90,9 +87,20 @@ CLASS="APPLICATION"
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> as a HTTP and HTTPS proxy. The default is
+> as a HTTP and HTTPS (SSL) 
+ <A
+HREF="http://en.wikipedia.org/wiki/Proxy_server"
+TARGET="_top"
+>proxy</A
+>. The default is
  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!</P
+ used port 8000). This is the one configuration step <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>that must be done</I
+></SPAN
+>!</P
 ><P
 > Please note that <SPAN
 CLASS="APPLICATION"
@@ -103,17 +111,18 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN604"
+NAME="AEN617"
 ></A
 ><P
 ><B
->Figure 2. Proxy Configuration (Mozilla)</B
+>Figure 2. Proxy Configuration Showing
+  Mozilla/Netscape HTTP and HTTPS (SSL) Settings</B
 ></P
 ><DIV
 CLASS="MEDIAOBJECT"
 ><P
 ><IMG
-SRC="../images/proxy_setup.jpg"></P
+SRC="proxy_setup.jpg"></P
 ></DIV
 ></DIV
 >
@@ -129,27 +138,19 @@ CLASS="LITERALLAYOUT"
 >&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Tools</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Options</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >General</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Connection Settings</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Manual Proxy Configuration</SPAN
-></P
+><br>&#13;</P
 ><P
 > 
  With <SPAN
@@ -165,50 +166,36 @@ CLASS="LITERALLAYOUT"
 >&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Edit</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Preferences</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Advanced</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Proxies</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >HTTP Proxy</SPAN
-></P
+><br>&#13;</P
 ><P
 > For <SPAN
 CLASS="APPLICATION"
->Internet Explorer</SPAN
+>Internet Explorer v.5-6</SPAN
 >: </P
 ><P
 CLASS="LITERALLAYOUT"
 >&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Tools</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
->Internet Properties</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>Internet Options</SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Connections</SPAN
-><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >LAN Settings</SPAN
 ></P
@@ -218,11 +205,54 @@ CLASS="QUOTE"
 >"Use Proxy"</SPAN
 > and fill in the appropriate info
  (Address: 127.0.0.1, Port: 8118). Include HTTPS (SSL), if you want HTTPS
- proxy support too. </P
+ proxy support too (sometimes labeled <SPAN
+CLASS="QUOTE"
+>"Secure"</SPAN
+>). Make sure any
+ checkboxes like <SPAN
+CLASS="QUOTE"
+>"Use the same proxy server for all protocols"</SPAN
+> is
+ <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>UNCHECKED</I
+></SPAN
+>. You want only HTTP and HTTPS (SSL)!</P
+><P
+>  <DIV
+CLASS="FIGURE"
+><A
+NAME="AEN654"
+></A
+><P
+><B
+>Figure 3. Proxy Configuration Showing
+  Internet Explorer HTTP and HTTPS (Secure) Settings</B
+></P
+><DIV
+CLASS="MEDIAOBJECT"
+><P
+><IMG
+SRC="proxy2.jpg"></P
+></DIV
+></DIV
+>
+ </P
 ><P
 > After doing this, flush your browser's disk and memory caches to force a
- re-reading of all pages and to get rid of any ads that may be cached. You 
- are now ready to start enjoying the benefits of using
+ re-reading of all pages and to get rid of any ads that may be cached. Remove 
+ any <A
+HREF="http://en.wikipedia.org/wiki/Browser_cookie"
+TARGET="_top"
+>cookies</A
+>,
+ if you want <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> to manage that. You are now
+ ready to start enjoying the benefits of using
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -252,14 +282,17 @@ CLASS="SECT2"
 ><A
 NAME="START-REDHAT"
 ></A
->5.1. Red Hat and Conectiva</H2
+>5.1. Red Hat, Fedora and Conectiva</H2
 ><P
-> We use a script. Note that Red Hat does not start Privoxy upon booting per
- default. It will use the file <TT
+> A default Red Hat installation may not start <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> upon boot. It will use
+ the file <TT
 CLASS="FILENAME"
 >/etc/privoxy/config</TT
-> as
- its main configuration file.</P
+> as its main configuration
+ file.</P
 ><P
 > <TABLE
 BORDER="0"
@@ -274,6 +307,22 @@ CLASS="SCREEN"
 ></TR
 ></TABLE
 ></P
+><P
+> Or ...</P
+><P
+> <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+> # service privoxy start</PRE
+></TD
+></TR
+></TABLE
+></P
 ></DIV
 ><DIV
 CLASS="SECT2"
@@ -284,7 +333,10 @@ NAME="START-DEBIAN"
 ></A
 >5.2. Debian</H2
 ><P
-> We use a script. Note that Debian starts Privoxy upon booting per
+> We use a script. Note that Debian typically starts <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> upon booting per
  default.  It will use the file
  <TT
 CLASS="FILENAME"
@@ -345,7 +397,10 @@ NAME="START-WINDOWS"
 ></A
 >5.4. Windows</H2
 ><P
->Click on the Privoxy Icon to start <SPAN
+>Click on the <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> Icon to start <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >. If no configuration file is
@@ -357,15 +412,24 @@ CLASS="APPLICATION"
 CLASS="FILENAME"
 >config.txt</TT
 >. Note that Windows will
- automatically start Privoxy when the system starts if you chose that option
+ automatically start <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> when the system starts if you chose that option
  when installing.</P
 ><P
 > <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > can run with full Windows service functionality.
- On Windows only, the Privoxy program has two new command line arguments
- to install and uninstall Privoxy as a service. See the 
+ On Windows only, the <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> program has two new command line arguments
+ to install and uninstall <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> as a service. See the 
  <A
 HREF="installation.html#INSTALLATION-PACK-WIN"
 >Windows Installation
@@ -433,7 +497,10 @@ NAME="START-MACOSX"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > is configured to
- start automatically when the system restarts.  To start Privoxy by hand,
+ start automatically when the system restarts.  To start <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> manually,
  double-click on the <TT
 CLASS="LITERAL"
 >StartPrivoxy.command</TT
@@ -694,9 +761,15 @@ CLASS="EMPHASIS"
 >--user</I
 ></SPAN
 > option, 
-   chroot to that user's home directory, i.e. make the kernel pretend to the Privoxy
+   chroot to that user's home directory, i.e. make the kernel pretend to the <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
    process that the directory tree starts there. If set up carefully, this can limit 
-   the impact of possible vulnerabilities in Privoxy to the files contained in that hierarchy.
+   the impact of possible vulnerabilities in <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> to the files contained in that hierarchy.
    Unix only.
   </P
 ></LI
@@ -743,8 +816,8 @@ CLASS="APPLICATION"
 > On <SPAN
 CLASS="APPLICATION"
 >MS Windows</SPAN
-> only there are two addition 
- options to allow <SPAN
+> only there are two additional 
+ command-line options to allow <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > to install and 
@@ -806,10 +879,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Quickstart to Using <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></TD
+>Quickstart to Using Privoxy</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -819,10 +889,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
-><SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> Configuration</TD
+>Privoxy Configuration</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/doc/webserver/user-manual/templates.html b/doc/webserver/user-manual/templates.html
index 03b9d0de..a9c0ed06 100644
--- a/doc/webserver/user-manual/templates.html
+++ b/doc/webserver/user-manual/templates.html
@@ -1,13 +1,13 @@
 <HTML
 ><HEAD
 ><TITLE
->Templates</TITLE
+>Privoxy's Template Files</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.76b+
 "><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.4 User Manual"
+TITLE="Privoxy 3.0.5 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.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -78,7 +78,7 @@ CLASS="SECT1"
 ><A
 NAME="TEMPLATES"
 ></A
->10. Templates</H1
+>10. Privoxy's Template Files</H1
 ><P
 > All <SPAN
 CLASS="APPLICATION"
diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index b501f163..669bfd1b 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.4 User Manual"
+TITLE="Privoxy 3.0.5 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Installation"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.4 User Manual</TH
+>Privoxy 3.0.5 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -82,7 +82,7 @@ NAME="WHATSNEW"
 > There are many improvements and new features in <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> 3.0.4
+> 3.0.5
  :</P
 ><P
 > <P
@@ -90,15 +90,18 @@ CLASS="APPLICATION"
 ><UL
 ><LI
 ><P
->    Mulitiple <A
+>    Multiple <A
 HREF="filter-file.html"
 >filter files</A
-> can now be specifed in <TT
+> can now be specified in <TT
 CLASS="FILENAME"
 >config</TT
 >. This allows for 
     locally defined filters that can be maintained separately from the filters as
-    supplied by the developers.
+    supplied by the developers, i.e. <TT
+CLASS="FILENAME"
+>default.filter</TT
+>.
    </P
 ></LI
 ><LI
@@ -349,7 +352,8 @@ HREF="config.html#USER-MANUAL"
 ></LI
 ><LI
 ><P
->    Actions files problems and suggestions are now being directed to: <A
+>    Actions files problems and suggestions are now being directed to: 
+    <A
 HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
@@ -361,9 +365,31 @@ TARGET="_top"
 ></LI
 ><LI
 ><P
->    In addition, there are various bug fixes and significant enhancements, including 
-    error pages should no longer be cached if the problem is fixed, better DNS
-    error handling, and various logging improvements.
+>    In addition, there are numerous bug fixes and significant enhancements,
+    including error pages should no longer be cached if the problem is fixed,
+    much better DNS error handling, and various logging improvements.
+   </P
+></LI
+><LI
+><P
+>    The default actions setting is now <TT
+CLASS="LITERAL"
+>Cautious</TT
+>. Previous
+    releases had a default setting of <TT
+CLASS="LITERAL"
+>Medium</TT
+>. Experienced
+    users may want to adjust this, as it is fairly conservative by <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+    standards and past practices. See <A
+HREF="http://config.privoxy.org/edit-actions-list?f=default"
+TARGET="_top"
+>    http://config.privoxy.org/edit-actions-list?f=default</A
+>. New users
+    should try the default settings for a while before turning up the volume.
    </P
 ></LI
 ></UL
@@ -396,7 +422,7 @@ CLASS="APPLICATION"
 ><LI
 ><P
 >  
-   On the other hand, some installers may not overwrite any existing configuration 
+   On the other hand, other installers may not overwrite any existing configuration 
    files, thinking you will want to do that. You may want to manually check 
    your saved files against the newer versions to see if the improvements have
    merit, or whether there are new options that you may want to consider.
@@ -414,15 +440,42 @@ HREF="actions-file.html#FAST-REDIRECTS"
 >fast-redirects</A
 ></TT
 >
-     which has changed syntax, and may require adjustments to local configs.
+     which has changed syntax, and will require adjustments to local configs, 
+     such as <TT
+CLASS="FILENAME"
+>user.action</TT
+>. You must reference the new 
+     syntax: 
    </P
+><P
+> <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>  { +fast-redirects{check-decoded-url} }
+   .example.com
+   mybank.com
+   .google.</PRE
+></TD
+></TR
+></TABLE
+></P
 ></LI
 ><LI
 ><P
 >     The <TT
 CLASS="FILENAME"
 >jarfile</TT
->, cookie logger, is off by default now.
+>, 
+     <A
+HREF="http://en.wikipedia.org/wiki/Browser_cookie"
+TARGET="_top"
+>cookie</A
+> logger, is off by default now.
     </P
 ></LI
 ><LI
@@ -441,6 +494,8 @@ 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).
   </P
 ></LI
 ><LI
@@ -511,10 +566,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Quickstart to Using <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></TD
+>Quickstart to Using Privoxy</TD
 ></TR
 ></TABLE
 ></DIV