From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 13 Jan 2009 16:57:30 +0000 (+0000)
Subject: Rebuilt after standard.action file removal.
X-Git-Tag: v_3_0_11~107
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/developer-manual/man-page/faq/@default-cgi@/diff?a=commitdiff_plain;h=1284f78d7c4454f212d1283695d76d78e23d6b4f;p=privoxy.git

Rebuilt after standard.action file removal.
---

diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html
index 42a47d10..b5d4bd67 100644
--- a/doc/webserver/developer-manual/coding.html
+++ b/doc/webserver/developer-manual/coding.html
@@ -2336,7 +2336,7 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.21 2008/08/16 08:51:28 fabiankeil Exp $";
+>const char FILENAME_rcs[] = "$Id$";
 /*********************************************************************
  *
  * File        :  $Source$
@@ -2424,19 +2424,15 @@ WIDTH="100%"
 CLASS="PROGRAMLISTING"
 >#ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.21 2008/08/16 08:51:28 fabiankeil Exp $"
+#define FILENAME_H_VERSION "$Id$"
 /*********************************************************************
  *
  * File        :  $Source$
  *
  * Purpose     :  (Fill me in with a good description!)
  *
- * Copyright   :  Written by and Copyright (C) 2001-2007 the SourceForge
- *                Privoxy team. http://www.privoxy.org/
- *
- *                Based on the Internet Junkbuster originally written
- *                by and Copyright (C) 1997 Anonymous Coders and
- *                Junkbusters Corporation.  http://www.junkbusters.com
+ * Copyright   :  Written by and Copyright (C) 2001-2008
+ *                the Privoxy team. http://www.privoxy.org/
  *
  *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index 9b74654b..e7e275b4 100644
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -99,7 +99,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1224"
+NAME="AEN1223"
 >9.1. License</A
 ></H2
 ><P
@@ -157,7 +157,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1240"
+NAME="AEN1239"
 >9.2. History</A
 ></H2
 ><P
diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index a072ac52..511d3d33 100644
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -51,7 +51,7 @@ TARGET="_top"
     <BR></P
 ><P
 CLASS="PUBDATE"
->$Id: developer-manual.sgml,v 2.21 2008/08/16 08:51:28 fabiankeil Exp $<BR></P
+>$Id: developer-manual.sgml,v 2.23 2008/09/26 17:02:01 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -615,12 +615,12 @@ HREF="copyright.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="copyright.html#AEN1224"
+HREF="copyright.html#AEN1223"
 >License</A
 ></DT
 ><DT
 >9.2. <A
-HREF="copyright.html#AEN1240"
+HREF="copyright.html#AEN1239"
 >History</A
 ></DT
 ></DL
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index 6950a935..043bdba6 100644
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -751,14 +751,10 @@ CLASS="FILENAME"
 >        Other configuration files (<TT
 CLASS="FILENAME"
 >default.action</TT
->,
-        <TT
-CLASS="FILENAME"
->default.filter</TT
 > and
         <TT
 CLASS="FILENAME"
->standard.action</TT
+>default.filter</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
diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index ef878304..00967b1b 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -253,15 +253,8 @@ CLASS="APPLICATION"
  developers and typically sets the default policies, <TT
 CLASS="FILENAME"
 >user.action</TT
->, where users are encouraged
- to make their private customizations, and <TT
-CLASS="FILENAME"
->standard.action</TT
->, 
- which is for internal <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> use only.
+>,
+ where users are encouraged to make their private customizations.
  Please see <A
 HREF="../user-manual/actions-file.html"
 TARGET="_top"
@@ -650,7 +643,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN476"
+NAME="AEN474"
 >3.11. What is the <TT
 CLASS="FILENAME"
 >default.filter</TT
@@ -877,7 +870,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN527"
+NAME="AEN525"
 >3.13. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
 ></H3
 ><P
@@ -944,7 +937,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN544"
+NAME="AEN542"
 >3.14. Why would anybody want to see a checkerboard pattern?</A
 ></H3
 ><P
@@ -974,7 +967,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN550"
+NAME="AEN548"
 >3.15. I see some images being replaced with text
 instead of the checkerboard image. Why and how do I get rid of this?</A
 ></H3
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 417ed83f..0c5ddc2b 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -106,7 +106,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1404"
+NAME="AEN1402"
 >7.1. License</A
 ></H2
 ><P
@@ -164,7 +164,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1420"
+NAME="AEN1418"
 >7.2. History</A
 ></H2
 ><P
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 0742338a..066dda38 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -48,7 +48,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: faq.sgml,v 2.45 2008/08/16 08:51:28 fabiankeil Exp $<BR></P
+>$Id: faq.sgml,v 2.47 2008/11/24 18:29:39 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -393,7 +393,7 @@ with a browser? Does that not raise security issues?</A
 ></DT
 ><DT
 >3.11. <A
-HREF="configuration.html#AEN476"
+HREF="configuration.html#AEN474"
 >What is the <TT
 CLASS="FILENAME"
 >default.filter</TT
@@ -410,17 +410,17 @@ HREF="configuration.html#LANCONFIG"
 ></DT
 ><DT
 >3.13. <A
-HREF="configuration.html#AEN527"
+HREF="configuration.html#AEN525"
 >Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
 ></DT
 ><DT
 >3.14. <A
-HREF="configuration.html#AEN544"
+HREF="configuration.html#AEN542"
 >Why would anybody want to see a checkerboard pattern?</A
 ></DT
 ><DT
 >3.15. <A
-HREF="configuration.html#AEN550"
+HREF="configuration.html#AEN548"
 >I see some images being replaced with text
 instead of the checkerboard image. Why and how do I get rid of this?</A
 ></DT
@@ -541,7 +541,7 @@ HREF="misc.html"
 ><DL
 ><DT
 >4.1. <A
-HREF="misc.html#AEN723"
+HREF="misc.html#AEN721"
 >How much does Privoxy slow my browsing down? This 
 has to add extra time to browsing.</A
 ></DT
@@ -582,12 +582,12 @@ HREF="misc.html#IP"
 ></DT
 ><DT
 >4.8. <A
-HREF="misc.html#AEN788"
+HREF="misc.html#AEN786"
 >Can Privoxy guarantee I am anonymous?</A
 ></DT
 ><DT
 >4.9. <A
-HREF="misc.html#AEN806"
+HREF="misc.html#AEN804"
 >A test site says I am not using a Proxy.</A
 ></DT
 ><DT
@@ -598,13 +598,13 @@ HREF="misc.html#TOR"
 ></DT
 ><DT
 >4.11. <A
-HREF="misc.html#AEN862"
+HREF="misc.html#AEN860"
 >Might some things break because header information or
 content is being altered?</A
 ></DT
 ><DT
 >4.12. <A
-HREF="misc.html#AEN876"
+HREF="misc.html#AEN874"
 >Can Privoxy act as a <SPAN
 CLASS="QUOTE"
 >"caching"</SPAN
@@ -613,23 +613,23 @@ speed up web browsing?</A
 ></DT
 ><DT
 >4.13. <A
-HREF="misc.html#AEN886"
+HREF="misc.html#AEN884"
 >What about as a firewall? Can Privoxy protect me?</A
 ></DT
 ><DT
 >4.14. <A
-HREF="misc.html#AEN891"
+HREF="misc.html#AEN889"
 >I have large empty spaces / a checkerboard pattern now where
 ads used to be. Why?</A
 ></DT
 ><DT
 >4.15. <A
-HREF="misc.html#AEN899"
+HREF="misc.html#AEN897"
 >How can Privoxy filter Secure (HTTPS) URLs?</A
 ></DT
 ><DT
 >4.16. <A
-HREF="misc.html#AEN913"
+HREF="misc.html#AEN911"
 >Privoxy runs as a <SPAN
 CLASS="QUOTE"
 >"server"</SPAN
@@ -724,7 +724,7 @@ HREF="trouble.html"
 ><DL
 ><DT
 >5.1. <A
-HREF="trouble.html#AEN1081"
+HREF="trouble.html#AEN1079"
 >I cannot connect to any websites. Or, I am getting
 <SPAN
 CLASS="QUOTE"
@@ -738,7 +738,7 @@ HREF="trouble.html#ERROR503"
 ></DT
 ><DT
 >5.3. <A
-HREF="trouble.html#AEN1104"
+HREF="trouble.html#AEN1102"
 >I just added a new rule, but the steenkin ad is 
 still getting through. How?</A
 ></DT
@@ -922,12 +922,12 @@ HREF="copyright.html"
 ><DL
 ><DT
 >7.1. <A
-HREF="copyright.html#AEN1404"
+HREF="copyright.html#AEN1402"
 >License</A
 ></DT
 ><DT
 >7.2. <A
-HREF="copyright.html#AEN1420"
+HREF="copyright.html#AEN1418"
 >History</A
 ></DT
 ></DL
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index 07472787..17f5adfc 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -84,7 +84,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN723"
+NAME="AEN721"
 >4.1. How much does Privoxy slow my browsing down? This 
 has to add extra time to browsing.</A
 ></H3
@@ -350,7 +350,7 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 >
  with <A
-HREF="http://tor.eff.org/"
+HREF="https://www.torproject.org/"
 TARGET="_top"
 >Tor</A
 >.
@@ -374,7 +374,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN788"
+NAME="AEN786"
 >4.8. Can Privoxy guarantee I am anonymous?</A
 ></H3
 ><P
@@ -454,7 +454,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN806"
+NAME="AEN804"
 >4.9. A test site says I am not using a Proxy.</A
 ></H3
 ><P
@@ -675,7 +675,7 @@ CLASS="APPLICATION"
  and that there are no other forward lines, unless you know that you need them. If everything looks good,
  refer to
  <A
-HREF="https://wiki.torproject.org/wiki/TheOnionRouter/TorFAQ#head-0e1cc2ac330ede8c6ad1ac0d0db0ac163b0e6143"
+HREF="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate"
 TARGET="_top"
 >Tor
  Faq 4.2</A
@@ -701,7 +701,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN862"
+NAME="AEN860"
 >4.11. Might some things break because header information or
 content is being altered?</A
 ></H3
@@ -768,7 +768,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN876"
+NAME="AEN874"
 >4.12. Can Privoxy act as a <SPAN
 CLASS="QUOTE"
 >"caching"</SPAN
@@ -812,7 +812,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN886"
+NAME="AEN884"
 >4.13. What about as a firewall? Can Privoxy protect me?</A
 ></H3
 ><P
@@ -835,7 +835,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN891"
+NAME="AEN889"
 >4.14. I have large empty spaces / a checkerboard pattern now where
 ads used to be. Why?</A
 ></H3
@@ -874,7 +874,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN899"
+NAME="AEN897"
 >4.15. How can Privoxy filter Secure (HTTPS) URLs?</A
 ></H3
 ><P
@@ -933,7 +933,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN913"
+NAME="AEN911"
 >4.16. Privoxy runs as a <SPAN
 CLASS="QUOTE"
 >"server"</SPAN
diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index 78ae7759..dcb5e0b7 100644
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -84,7 +84,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN1081"
+NAME="AEN1079"
 >5.1. I cannot connect to any websites. Or, I am getting
 <SPAN
 CLASS="QUOTE"
@@ -163,7 +163,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN1104"
+NAME="AEN1102"
 >5.3. I just added a new rule, but the steenkin ad is 
 still getting through. How?</A
 ></H3
diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index 4018f862..9160265c 100644
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -109,7 +109,7 @@ TARGET="_top"
 >   The most recent release is <A
 HREF="announce.txt"
 TARGET="_top"
->3.0.10 (stable)</A
+>3.0.11 (UNRELEASED)</A
 >. 
   </P
 ><P
diff --git a/doc/webserver/privoxy-index.html b/doc/webserver/privoxy-index.html
index a2ea6d1a..9a28fc97 100644
--- a/doc/webserver/privoxy-index.html
+++ b/doc/webserver/privoxy-index.html
@@ -79,7 +79,7 @@ NAME="AEN2"
 ></H1
 ><H2
 CLASS="SUBTITLE"
->Project Index Page v3.0.10</H2
+>Project Index Page v3.0.11</H2
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index ab76a8e8..4b1bf65d 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -129,11 +129,8 @@ CLASS="APPLICATION"
 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
+     It also contains the pre-defined sets of rules for the default actions,
+     e.g. <TT
 CLASS="LITERAL"
 >Cautious</TT
 > (the default),
@@ -160,22 +157,6 @@ CLASS="FILENAME"
 ></LI
 ><LI
 ><P
->     <TT
-CLASS="FILENAME"
->standard.action</TT
-> - is used only 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
->. 
-     </P
-><P
 >     <SPAN
 CLASS="GUIBUTTON"
 >Edit</SPAN
@@ -245,24 +226,17 @@ CLASS="GUIBUTTON"
       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
      <TT
 CLASS="FILENAME"
->standard.action</TT
+>default.action</TT
 > are:
     </P
 ><P
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN2170"
+NAME="AEN2137"
 ></A
 ><P
 ><B
@@ -531,7 +505,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2269"
+NAME="AEN2236"
 >8.1. Finding the Right Mix</A
 ></H2
 ><P
@@ -566,7 +540,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2276"
+NAME="AEN2243"
 >8.2. How to Edit</A
 ></H2
 ><P
@@ -896,7 +870,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2367"
+NAME="AEN2334"
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
@@ -1136,7 +1110,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2443"
+NAME="AEN2410"
 >8.4.2. The Path Pattern</A
 ></H3
 ><P
@@ -6704,7 +6678,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4074"
+NAME="AEN4041"
 >8.5.34. Summary</A
 ></H3
 ><P
@@ -7003,7 +6977,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4137"
+NAME="AEN4104"
 >8.7.1. default.action</A
 ></H3
 ><P
@@ -7718,7 +7692,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4271"
+NAME="AEN4238"
 >8.7.2. user.action</A
 ></H3
 ><P
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 62aeb893..055fef54 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -748,7 +748,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5157"
+NAME="AEN5124"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -794,7 +794,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5171"
+NAME="AEN5138"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -827,7 +827,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5179"
+NAME="AEN5146"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -847,7 +847,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5184"
+NAME="AEN5151"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -867,7 +867,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5189"
+NAME="AEN5156"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -887,7 +887,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5194"
+NAME="AEN5161"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5202"
+NAME="AEN5169"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -936,7 +936,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5206"
+NAME="AEN5173"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -950,7 +950,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5209"
+NAME="AEN5176"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index d46960a4..2b183183 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -816,14 +816,6 @@ BORDER="0"
 ><TD
 >     <P
 CLASS="LITERALLAYOUT"
->&nbsp;&nbsp;standard.action&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&nbsp;Internal&nbsp;purposes,&nbsp;no&nbsp;editing&nbsp;recommended</P
->
-    </TD
-></TR
-><TR
-><TD
->     <P
-CLASS="LITERALLAYOUT"
 >&nbsp;&nbsp;default.action&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&nbsp;Main&nbsp;actions&nbsp;file</P
 >
     </TD
@@ -859,15 +851,11 @@ CLASS="LITERAL"
    </P
 ><P
 > 
-    The default values include <TT
-CLASS="FILENAME"
->standard.action</TT
->, which is used
-    for internal purposes and should be loaded, <TT
+    The default values are <TT
 CLASS="FILENAME"
 >default.action</TT
->,
-    which is the <SPAN
+>, which is the
+    <SPAN
 CLASS="QUOTE"
 >"main"</SPAN
 > actions file maintained by the developers, and
@@ -1369,10 +1357,10 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->  debug     1 # log each request destination (and the crunch reason if <SPAN
+>  debug     1 # Log the destination for each request <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> intercepted the request)
+> let through. See also debug 1024.
   debug     2 # show each connection status
   debug     4 # show I/O status
   debug     8 # show header parsing
@@ -1382,6 +1370,10 @@ CLASS="APPLICATION"
   debug   128 # debug redirects
   debug   256 # debug GIF de-animation
   debug   512 # Common Log Format
+  debug  1024 # Log the destination for requests <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> didn't let through, and the reason why.
   debug  2048 # CGI user interface
   debug  4096 # Startup banner and warnings.
   debug  8192 # Non-fatal errors</PRE
@@ -3596,6 +3588,72 @@ CLASS="APPLICATION"
 ></DL
 ></DIV
 ></DIV
+><DIV
+CLASS="SECT3"
+><H4
+CLASS="SECT3"
+><A
+NAME="KEEP-ALIVE-TIMEOUT"
+>7.5.8. keep-alive-timeout</A
+></H4
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>Specifies:</DT
+><DD
+><P
+>    Number of seconds after which an open connection will no longer be reused.
+   </P
+></DD
+><DT
+>Type of value:</DT
+><DD
+><P
+>    <TT
+CLASS="REPLACEABLE"
+><I
+>Time in seconds.</I
+></TT
+>
+   </P
+></DD
+><DT
+>Default value:</DT
+><DD
+><P
+>None</P
+></DD
+><DT
+>Effect if unset:</DT
+><DD
+><P
+>    Connections are not reused.
+   </P
+></DD
+><DT
+>Notes:</DT
+><DD
+><P
+>    This option has no effect if <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+    has been compiled without keep-alive support.
+   </P
+></DD
+><DT
+>Examples:</DT
+><DD
+><P
+>    keep-alive-timeout 300
+   </P
+></DD
+></DL
+></DIV
+></DIV
 ></DIV
 ><DIV
 CLASS="SECT2"
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index acd8c128..2e56de7f 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -98,7 +98,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN813"
+NAME="AEN763"
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
@@ -129,7 +129,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN821"
+NAME="AEN771"
 ></A
 >    Privoxy Menu</H2
 ><P
@@ -339,14 +339,7 @@ CLASS="FILENAME"
 CLASS="FILENAME"
 >user.action</TT
 >, where you can preserve them across
-    upgrades. <TT
-CLASS="FILENAME"
->standard.action</TT
-> is only for
-    <SPAN
-CLASS="APPLICATION"
->Privoxy's</SPAN
-> internal use.
+    upgrades.
    </P
 ><P
 >    
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 337c14d4..22ee8d0e 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4900"
+NAME="AEN4867"
 >12.1. License</A
 ></H2
 ><P
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index b4c348e8..c17288d4 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -366,7 +366,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4426"
+NAME="AEN4393"
 >9.1. Filter File Tutorial</A
 ></H2
 ><P
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index b5c3160a..9adcb646 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.87 2008/08/30 15:37:35 fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.90 2008/09/26 16:53:09 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -295,7 +295,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN813"
+HREF="configuration.html#AEN763"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -500,6 +500,11 @@ HREF="config.html#ALLOW-CGI-REQUEST-CRUNCHING"
 HREF="config.html#SPLIT-LARGE-FORMS"
 >split-large-forms</A
 ></DT
+><DT
+>7.5.8. <A
+HREF="config.html#KEEP-ALIVE-TIMEOUT"
+>keep-alive-timeout</A
+></DT
 ></DL
 ></DD
 ><DT
@@ -518,12 +523,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2269"
+HREF="actions-file.html#AEN2236"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2276"
+HREF="actions-file.html#AEN2243"
 >How to Edit</A
 ></DT
 ><DT
@@ -540,12 +545,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2367"
+HREF="actions-file.html#AEN2334"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2443"
+HREF="actions-file.html#AEN2410"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -729,7 +734,7 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 ></DT
 ><DT
 >8.5.34. <A
-HREF="actions-file.html#AEN4074"
+HREF="actions-file.html#AEN4041"
 >Summary</A
 ></DT
 ></DL
@@ -748,12 +753,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4137"
+HREF="actions-file.html#AEN4104"
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4271"
+HREF="actions-file.html#AEN4238"
 >user.action</A
 ></DT
 ></DL
@@ -769,7 +774,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4426"
+HREF="filter-file.html#AEN4393"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -837,7 +842,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN4900"
+HREF="copyright.html#AEN4867"
 >License</A
 ></DT
 ><DT
@@ -871,7 +876,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5157"
+HREF="appendix.html#AEN5124"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 9b9e0864..8a9eefb3 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -464,7 +464,7 @@ CLASS="APPLICATION"
 > under Gentoo just do 
  first <TT
 CLASS="LITERAL"
->emerge rsync</TT
+>emerge --sync</TT
 > to get the latest changes from the 
  Portage tree. With <TT
 CLASS="LITERAL"
@@ -916,8 +916,8 @@ CLASS="APPLICATION"
  <SPAN
 CLASS="QUOTE"
 >"new"</SPAN
-> extension. default.action, default.filter, and 
- standard.action <SPAN
+> extension. default.action and default.filter
+ <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index a5a4d8fd..fb127bb3 100644
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -727,7 +727,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN567"
+NAME="AEN517"
 ></A
 ><P
 ><B
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 6ceac208..bbe8ecd1 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -114,7 +114,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN622"
+NAME="AEN572"
 ></A
 ><P
 ><B
@@ -251,7 +251,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN667"
+NAME="AEN617"
 ></A
 ><P
 ><B
diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index 58c76e24..1808b1e5 100644
--- a/doc/webserver/user-manual/whatsnew.html
+++ b/doc/webserver/user-manual/whatsnew.html
@@ -82,9 +82,10 @@ NAME="WHATSNEW"
 >3. What's New in this Release</A
 ></H1
 ><P
-> There are many improvements and new features since <SPAN
+> There are only a few improvements and new features since
+ <SPAN
 CLASS="APPLICATION"
->Privoxy 3.0.8</SPAN
+>Privoxy 3.0.10</SPAN
 >, the last stable release:</P
 ><P
 > <P
@@ -92,192 +93,28 @@ CLASS="APPLICATION"
 ><UL
 ><LI
 ><P
->    Added SOCKS5 support (with address resolution done by
-    the SOCKS5 server). Patch provided by Eric M. Hopper.
+>    The mingw32 version uses mutex locks now which prevents
+    log message corruption under load. As a side effect,
+    the "no thread-safe PRNG" warning could be removed as well.
    </P
 ></LI
 ><LI
 ><P
->    The "blocked" CGI pages include a block reason that was
-    provided as argument to the last-applying block action.
+>    Support for remote toggling is controlled by the configure
+    option --disable-toggle only. In previous versions it also
+    depended on the action editor and thus configuring with the
+    --disable-editor option would disable remote toggling support
+    as well.
    </P
 ></LI
 ><LI
 ><P
->    If enable-edit-actions is disabled (the default since 3.0.7 beta)
-    the show-status page hides the edit buttons and explains why.
-    Previously the user would get the "this feature has been disabled"
-    message after using the edit button.
-   </P
-></LI
-><LI
-><P
->    Forbidden CONNECT requests are treated like blocks by default.
-    The now-pointless treat-forbidden-connects-like-blocks action
-    has been removed.
-   </P
-></LI
-><LI
-><P
->    Not enabling limit-connect now allows CONNECT requests to all ports.
-    In previous versions it would only allow CONNECT requests to port 443.
-    Use +limit-connect{443} if you think you need the old default behaviour.
-   </P
-></LI
-><LI
-><P
->    The CGI editor gets turned off after three edit requests with invalid
-    file modification timestamps. This makes life harder for attackers
-    who can leverage browser bugs to send fake Referers and intend to
-    brute-force edit URLs.
-   </P
-></LI
-><LI
-><P
->    Action settings for multiple patterns in the same section are
-    shared in memory. As a result these sections take up less space
-    (and are loaded slightly faster). Problem reported by Franz Schwartau.
-   </P
-></LI
-><LI
-><P
->    Linear white space in HTTP headers will be normalized to single
-    spaces before parsing the header's content, headers split across
-    multiple lines get merged first.
-   </P
-></LI
-><LI
-><P
->    Host information is gathered outside the main thread so it's less
-    likely to delay other incoming connections if the host is misconfigured.
-   </P
-></LI
-><LI
-><P
->    New config option "hostname" to use a hostname other than
-    the one returned by the operating system. Useful to speed-up responses
-    for CGI requests on misconfigured systems. Requested by Max Khon.
-   </P
-></LI
-><LI
-><P
->    The CGI editor supports the "disable all filters of this type"
-    directives "-client-header-filter", "-server-header-filter",
-    "-client-header-tagger" and "-server-header-tagger".
-   </P
-></LI
-><LI
-><P
->    Fixed false-positives with the link-by-url filter and URLs that
-    contain the pattern "/jump/".
-   </P
-></LI
-><LI
-><P
->    The less-download-windows filter no longer messes
-    "Content-Type: application/x-shockwave-flash" headers up.
-   </P
-></LI
-><LI
-><P
->    In the show-url-info page's "Final results" section active and
-    inactive actions are listed separately. Patch provided by Lee.
-   </P
-></LI
-><LI
-><P
->    The GNUmakefile supports the DESTDIR variable. Patch for
-    the install target submitted by Radoslaw Zielinski.
-   </P
-></LI
-><LI
-><P
->    Embedding the content of configuration files in the show-status
-    page is significantly faster now. For a largish action file (1 MB)
-    a speedup of about 2450 times has been measured. This is mostly
-    interesting if you are using large action files or regularly use
-    Privoxy-Regression-Test while running Privoxy through Valgrind,
-    for stock configuration files it doesn't really matter.
-   </P
-></LI
-><LI
-><P
->    If zlib support is unavailable and there are content
-    filters active but the prevent-compression action is disabled,
-    the show-url-info page includes a warning that compression
-    might prevent filtering.
-   </P
-></LI
-><LI
-><P
->    The show-url-info page provides an OpenSearch Description that
-    allows to access the page through browser search plugins.
-   </P
-></LI
-><LI
-><P
->    The obsolete kill-popups action has been removed as the
-    PCRS-based popup filters can do the same and are slightly
-    less unreliable.
-   </P
-></LI
-><LI
-><P
->    The inspect-jpegs action has been removed.
-   </P
-></LI
-><LI
-><P
->    The send-wafer and send-vanilla-wafer actions have been removed.
-    They weren't particular useful and their behaviour could be emulated
-    with add-header anyway.
-   </P
-></LI
-><LI
-><P
->    Privoxy-Regression-Test has been significantly improved.
-   </P
-></LI
-><LI
-><P
->    Most sections in the default.action file contain tests for
-    Privoxy-Regression-Test to verify that they are working as intended.
-   </P
-></LI
-><LI
-><P
->    Parts of Privoxy have been refactored to increase maintainability.
-   </P
-></LI
-><LI
-><P
->    Building with zlib (if available) is done by default.
-   </P
-></LI
-><LI
-><P
->    Ordinary configuration file changes no longer cause program
-    termination on OS/2 if the name of the logfile hasn't been
-    changed as well. This regression probably crept in with the
-    logging improvements in 3.0.7. Reported by Maynard.
-   </P
-></LI
-><LI
-><P
->    The img-reorder filter is less likely to mess up JavaScript code in
-    img tags. Problem and solution reported by Glenn Washburn in #2014552.
-   </P
-></LI
-><LI
-><P
->    The source tar ball now includes Privoxy-Log-Parser,
-    a syntax-highlighter for Privoxy logs. Documentation is available
-    through perldoc(1), for fancy screenshots see:
-    <A
-HREF="http://www.fabiankeil.de/sourcecode/privoxy-log-parser/"
-TARGET="_top"
->http://www.fabiankeil.de/sourcecode/privoxy-log-parser/</A
->.
+>    The hide-forwarded-for-headers action has been replaced with
+    the change-x-forwarded-for{} action which can also be used to
+    add X-Forwarded-For headers. The latter functionality already
+    existed in Privoxy versions prior to 3.0.7 but has been removed
+    as it was often used unintentionally (by not using the
+    hide-forwarded-for-headers action).
    </P
 ></LI
 ></UL
@@ -356,8 +193,11 @@ CLASS="APPLICATION"
    <TT
 CLASS="FILENAME"
 >standard.action</TT
-> now only includes the enabled actions.
-   Not all actions as before.
+> has been merged into
+   the <TT
+CLASS="FILENAME"
+>default.action</TT
+> file.
   </P
 ></LI
 ><LI