From ecc029c86cab6da6b915bb80714db895e78034a2 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 21 Mar 2009 12:59:32 +0000
Subject: [PATCH 1/1] Rebuild with recent changes.

---
 doc/webserver/developer-manual/contact.html  | 12 ++--
 doc/webserver/developer-manual/cvs.html      |  2 +-
 doc/webserver/developer-manual/seealso.html  |  2 +-
 doc/webserver/developer-manual/testing.html  |  2 +-
 doc/webserver/faq/configuration.html         | 18 +++---
 doc/webserver/faq/contact.html               | 12 ++--
 doc/webserver/faq/copyright.html             |  4 +-
 doc/webserver/faq/general.html               | 31 +++++-----
 doc/webserver/faq/index.html                 | 59 +++++++++++---------
 doc/webserver/faq/misc.html                  | 20 +++----
 doc/webserver/faq/trouble.html               |  4 +-
 doc/webserver/user-manual/actions-file.html  | 18 +++---
 doc/webserver/user-manual/appendix.html      | 24 ++++----
 doc/webserver/user-manual/configuration.html |  4 +-
 doc/webserver/user-manual/contact.html       | 12 ++--
 doc/webserver/user-manual/copyright.html     |  2 +-
 doc/webserver/user-manual/filter-file.html   |  2 +-
 doc/webserver/user-manual/index.html         | 31 ++++++----
 doc/webserver/user-manual/installation.html  |  4 +-
 doc/webserver/user-manual/quickstart.html    |  2 +-
 doc/webserver/user-manual/seealso.html       |  2 +-
 doc/webserver/user-manual/startup.html       |  4 +-
 22 files changed, 142 insertions(+), 129 deletions(-)

diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html
index ce1c7db5..3d8ddc03 100644
--- a/doc/webserver/developer-manual/contact.html
+++ b/doc/webserver/developer-manual/contact.html
@@ -98,13 +98,13 @@ NAME="CONTACT-SUPPORT"
 ><P
 > For casual users, our 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118"
 TARGET="_top"
 >support forum at SourceForge</A
 >
  is probably best suited:
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118</A
 ></P
@@ -191,7 +191,7 @@ CLASS="FILENAME"
 >default.action</TT
 > file, to 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
 TARGET="_top"
 > http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >,
@@ -228,7 +228,7 @@ NAME="CONTACT-BUGS"
 ><P
 > Please report all bugs through our bug tracker: 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=111118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118</A
 >. </P
@@ -241,7 +241,7 @@ CLASS="EMPHASIS"
 ></SPAN
 >
   and observe the additional hints at the top of the <A
-HREF="http://sourceforge.net/tracker/?func=add&group_id=11118&atid=111118"
+HREF="http://sourceforge.net/tracker/?func=add&#38;group_id=11118&#38;atid=111118"
 TARGET="_top"
 >submit
   form</A
@@ -419,7 +419,7 @@ NAME="CONTACT-FEATURE"
 > You are welcome to submit ideas on new features or other proposals
  for improvement through our feature request tracker at
  <A
-HREF="http://sourceforge.net/tracker/?atid=361118&group_id=11118"
+HREF="http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118</A
 >.</P
diff --git a/doc/webserver/developer-manual/cvs.html b/doc/webserver/developer-manual/cvs.html
index 30f3f694..db1fb9e9 100644
--- a/doc/webserver/developer-manual/cvs.html
+++ b/doc/webserver/developer-manual/cvs.html
@@ -255,7 +255,7 @@ CLASS="EMPHASIS"
 ><P
 >            Note that near a major public release, we get more cautious.
             There is always the possibility to submit a patch to the <A
-HREF="http://sourceforge.net/tracker/?atid=311118&group_id=11118&func=browse"
+HREF="http://sourceforge.net/tracker/?atid=311118&#38;group_id=11118&#38;func=browse"
 TARGET="_top"
 >patch
             tracker</A
diff --git a/doc/webserver/developer-manual/seealso.html b/doc/webserver/developer-manual/seealso.html
index c17f538a..35ee27cb 100644
--- a/doc/webserver/developer-manual/seealso.html
+++ b/doc/webserver/developer-manual/seealso.html
@@ -212,7 +212,7 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="https://sourceforge.net/tracker/?group_id=11118&atid=460288"
+HREF="https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
 TARGET="_top"
 >https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >, to submit <SPAN
diff --git a/doc/webserver/developer-manual/testing.html b/doc/webserver/developer-manual/testing.html
index cf2ba01c..80d3f292 100644
--- a/doc/webserver/developer-manual/testing.html
+++ b/doc/webserver/developer-manual/testing.html
@@ -166,7 +166,7 @@ NAME="TESTING-REPORT"
 ></H2
 ><P
 >Please submit test reports only with the <A
-HREF="http://sourceforge.net/tracker/?func=add&group_id=11118&atid=395005"
+HREF="http://sourceforge.net/tracker/?func=add&#38;group_id=11118&#38;atid=395005"
 TARGET="_top"
 >test form</A
 >
diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index 769e9316..01c001bd 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -84,7 +84,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN352"
+NAME="AEN354"
 >3.1. What exactly is an <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -186,7 +186,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN375"
+NAME="AEN377"
 >3.3. How are actions files configured? What is the easiest
 way to do this?</A
 ></H3
@@ -228,7 +228,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN384"
+NAME="AEN386"
 >3.4. There are several different <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -643,7 +643,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN479"
+NAME="AEN481"
 >3.11. What is the <TT
 CLASS="FILENAME"
 >default.filter</TT
@@ -870,7 +870,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN530"
+NAME="AEN532"
 >3.13. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
 ></H3
 ><P
@@ -937,7 +937,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN547"
+NAME="AEN549"
 >3.14. Why would anybody want to see a checkerboard pattern?</A
 ></H3
 ><P
@@ -967,7 +967,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN553"
+NAME="AEN555"
 >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
@@ -1025,7 +1025,7 @@ CLASS="COMMAND"
 >srvany.exe</B
 >.
  See the discussion at <A
-HREF="http://sourceforge.net/tracker/?func=detail&atid=361118&aid=485617&group_id=11118"
+HREF="http://sourceforge.net/tracker/?func=detail&#38;atid=361118&#38;aid=485617&#38;group_id=11118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?func=detail&#38;atid=361118&#38;aid=485617&#38;group_id=11118</A
 >,
@@ -1229,7 +1229,7 @@ CLASS="APPLICATION"
 > For a good discussion of some of the issues involved (including privacy and 
  security issues), see 
  <A
-HREF="http://sourceforge.net/tracker/?func=detail&atid=211118&aid=629518&group_id=11118"
+HREF="http://sourceforge.net/tracker/?func=detail&#38;atid=211118&#38;aid=629518&#38;group_id=11118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?func=detail&#38;atid=211118&#38;aid=629518&#38;group_id=11118</A
 >.</P
diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index 3141c61d..c9d18c70 100644
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -98,13 +98,13 @@ NAME="CONTACT-SUPPORT"
 ><P
 > For casual users, our 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118"
 TARGET="_top"
 >support forum at SourceForge</A
 >
  is probably best suited:
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118</A
 ></P
@@ -191,7 +191,7 @@ CLASS="FILENAME"
 >default.action</TT
 > file, to 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
 TARGET="_top"
 > http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >,
@@ -228,7 +228,7 @@ NAME="CONTACT-BUGS"
 ><P
 > Please report all bugs through our bug tracker: 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=111118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118</A
 >. </P
@@ -241,7 +241,7 @@ CLASS="EMPHASIS"
 ></SPAN
 >
   and observe the additional hints at the top of the <A
-HREF="http://sourceforge.net/tracker/?func=add&group_id=11118&atid=111118"
+HREF="http://sourceforge.net/tracker/?func=add&#38;group_id=11118&#38;atid=111118"
 TARGET="_top"
 >submit
   form</A
@@ -419,7 +419,7 @@ NAME="CONTACT-FEATURE"
 > You are welcome to submit ideas on new features or other proposals
  for improvement through our feature request tracker at
  <A
-HREF="http://sourceforge.net/tracker/?atid=361118&group_id=11118"
+HREF="http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118</A
 >.</P
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 23bba4e6..39b71a6f 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -106,7 +106,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1449"
+NAME="AEN1451"
 >7.1. License</A
 ></H2
 ><P
@@ -164,7 +164,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1465"
+NAME="AEN1467"
 >7.2. History</A
 ></H2
 ><P
diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index 2ad8c4b8..7043b18b 100644
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -332,7 +332,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN76"
+NAME="AEN78"
 >1.6. Why <SPAN
 CLASS="QUOTE"
 >"Privoxy"</SPAN
@@ -628,7 +628,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN158"
+NAME="AEN160"
 >1.9. Can Privoxy make mistakes? 
 This does not sound very scientific.</A
 ></H3
@@ -655,7 +655,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN164"
+NAME="AEN166"
 >1.10. Will I have to configure Privoxy
  before I can use it?</A
 ></H3
@@ -962,8 +962,8 @@ CLASS="SECT3"
 ><H4
 CLASS="SECT3"
 ><A
-NAME="DONATING"
->1.17.2. Donating</A
+NAME="DONATE"
+>1.17.2. Would you like to donate?</A
 ></H4
 ><P
 > <SPAN
@@ -979,18 +979,17 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 > has therefore become an associated
  project of <A
-HREF="http://www.spi-inc.org/"
+HREF="http://www.spi-inc.org/about-spi/about-spi"
 TARGET="_top"
->Software in the Public
- Interest</A
->, which allows us to receive tax-deductible donations
- in most western countries. Before donating you should probably read on,
- though, to learn what we want your money for.</P
+>Software
+ in the Public Interest (SPI)</A
+>, which allows us to receive tax-deductible
+ donations in most western countries.</P
 ><P
-> First of all we intend to transfer our domain to SPI to make sure
- there's no single point of failure and the bill gets paid and the
- site keeps running even if a some of the currently active developers
- were to suddenly disappear for a while.</P
+> We intend to use the donations to pay for our domain after transfering
+ it to SPI. Our goal is to make sure there's no single point of failure
+ and the bill gets paid and the site keeps running even if a some of
+ the currently active developers were to suddenly disappear for a while.</P
 ><P
 > We would also like to spend some money on more reliable hosting,
  on hardware to help make sure <SPAN
@@ -1008,7 +1007,7 @@ HREF="http://www.spi-inc.org/donations"
 TARGET="_top"
 >SPI's donation page</A
 >
- to see what the options are. Small donations help too.</P
+ to see what the options are.</P
 ><P
 ></P
 ></DIV
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 48a6fffa..2bd672b8 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.57 2009/03/19 19:07:49 fabiankeil Exp $<BR></P
+>$Id: faq.sgml,v 2.58 2009/03/21 12:27:44 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -86,6 +86,13 @@ CLASS="CITETITLE"
 ><P
 > Privoxy is Free Software and licensed under the GPL2.</P
 ><P
+> Privoxy is an associated project of Software in the Public Interest (SPI).
+ <A
+HREF="http://www.privoxy.org/faq/general.html#DONATE"
+TARGET="_top"
+>Donations are welcome</A
+>.</P
+><P
 >  Please note that this document is a work in progress. This copy represents
   the state at the release of version 3.0.12.
   You can find the latest version of the document at <A
@@ -157,7 +164,7 @@ CLASS="QUOTE"
 ></DT
 ><DT
 >1.6. <A
-HREF="general.html#AEN76"
+HREF="general.html#AEN78"
 >Why <SPAN
 CLASS="QUOTE"
 >"Privoxy"</SPAN
@@ -178,13 +185,13 @@ an ad, and what is not?</A
 ></DT
 ><DT
 >1.9. <A
-HREF="general.html#AEN158"
+HREF="general.html#AEN160"
 >Can Privoxy make mistakes? 
 This does not sound very scientific.</A
 ></DT
 ><DT
 >1.10. <A
-HREF="general.html#AEN164"
+HREF="general.html#AEN166"
 >Will I have to configure Privoxy
  before I can use it?</A
 ></DT
@@ -234,8 +241,8 @@ HREF="general.html#JOINTEAM-WORK"
 ></DT
 ><DT
 >1.17.2. <A
-HREF="general.html#DONATING"
->Donating</A
+HREF="general.html#DONATE"
+>Would you like to donate?</A
 ></DT
 ></DL
 ></DD
@@ -300,7 +307,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >3.1. <A
-HREF="configuration.html#AEN352"
+HREF="configuration.html#AEN354"
 >What exactly is an <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -320,13 +327,13 @@ CLASS="QUOTE"
 ></DT
 ><DT
 >3.3. <A
-HREF="configuration.html#AEN375"
+HREF="configuration.html#AEN377"
 >How are actions files configured? What is the easiest
 way to do this?</A
 ></DT
 ><DT
 >3.4. <A
-HREF="configuration.html#AEN384"
+HREF="configuration.html#AEN386"
 >There are several different <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -376,7 +383,7 @@ with a browser? Does that not raise security issues?</A
 ></DT
 ><DT
 >3.11. <A
-HREF="configuration.html#AEN479"
+HREF="configuration.html#AEN481"
 >What is the <TT
 CLASS="FILENAME"
 >default.filter</TT
@@ -393,17 +400,17 @@ HREF="configuration.html#LANCONFIG"
 ></DT
 ><DT
 >3.13. <A
-HREF="configuration.html#AEN530"
+HREF="configuration.html#AEN532"
 >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#AEN547"
+HREF="configuration.html#AEN549"
 >Why would anybody want to see a checkerboard pattern?</A
 ></DT
 ><DT
 >3.15. <A
-HREF="configuration.html#AEN553"
+HREF="configuration.html#AEN555"
 >I see some images being replaced with text
 instead of the checkerboard image. Why and how do I get rid of this?</A
 ></DT
@@ -523,7 +530,7 @@ HREF="misc.html"
 ><DL
 ><DT
 >4.1. <A
-HREF="misc.html#AEN727"
+HREF="misc.html#AEN729"
 >How much does Privoxy slow my browsing down? This 
 has to add extra time to browsing.</A
 ></DT
@@ -564,12 +571,12 @@ HREF="misc.html#IP"
 ></DT
 ><DT
 >4.8. <A
-HREF="misc.html#AEN792"
+HREF="misc.html#AEN794"
 >Can Privoxy guarantee I am anonymous?</A
 ></DT
 ><DT
 >4.9. <A
-HREF="misc.html#AEN810"
+HREF="misc.html#AEN812"
 >A test site says I am not using a Proxy.</A
 ></DT
 ><DT
@@ -580,13 +587,13 @@ HREF="misc.html#TOR"
 ></DT
 ><DT
 >4.11. <A
-HREF="misc.html#AEN866"
+HREF="misc.html#AEN868"
 >Might some things break because header information or
 content is being altered?</A
 ></DT
 ><DT
 >4.12. <A
-HREF="misc.html#AEN880"
+HREF="misc.html#AEN882"
 >Can Privoxy act as a <SPAN
 CLASS="QUOTE"
 >"caching"</SPAN
@@ -595,23 +602,23 @@ speed up web browsing?</A
 ></DT
 ><DT
 >4.13. <A
-HREF="misc.html#AEN890"
+HREF="misc.html#AEN892"
 >What about as a firewall? Can Privoxy protect me?</A
 ></DT
 ><DT
 >4.14. <A
-HREF="misc.html#AEN895"
+HREF="misc.html#AEN897"
 >I have large empty spaces / a checkerboard pattern now where
 ads used to be. Why?</A
 ></DT
 ><DT
 >4.15. <A
-HREF="misc.html#AEN903"
+HREF="misc.html#AEN905"
 >How can Privoxy filter Secure (HTTPS) URLs?</A
 ></DT
 ><DT
 >4.16. <A
-HREF="misc.html#AEN917"
+HREF="misc.html#AEN919"
 >Privoxy runs as a <SPAN
 CLASS="QUOTE"
 >"server"</SPAN
@@ -706,7 +713,7 @@ HREF="trouble.html"
 ><DL
 ><DT
 >5.1. <A
-HREF="trouble.html#AEN1082"
+HREF="trouble.html#AEN1084"
 >I cannot connect to any websites. Or, I am getting
 <SPAN
 CLASS="QUOTE"
@@ -720,7 +727,7 @@ HREF="trouble.html#ERROR503"
 ></DT
 ><DT
 >5.3. <A
-HREF="trouble.html#AEN1105"
+HREF="trouble.html#AEN1107"
 >I just added a new rule, but the steenkin ad is 
 still getting through. How?</A
 ></DT
@@ -924,12 +931,12 @@ HREF="copyright.html"
 ><DL
 ><DT
 >7.1. <A
-HREF="copyright.html#AEN1449"
+HREF="copyright.html#AEN1451"
 >License</A
 ></DT
 ><DT
 >7.2. <A
-HREF="copyright.html#AEN1465"
+HREF="copyright.html#AEN1467"
 >History</A
 ></DT
 ></DL
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index b81f2569..174722e6 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -84,7 +84,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN727"
+NAME="AEN729"
 >4.1. How much does Privoxy slow my browsing down? This 
 has to add extra time to browsing.</A
 ></H3
@@ -374,7 +374,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN792"
+NAME="AEN794"
 >4.8. Can Privoxy guarantee I am anonymous?</A
 ></H3
 ><P
@@ -454,7 +454,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN810"
+NAME="AEN812"
 >4.9. A test site says I am not using a Proxy.</A
 ></H3
 ><P
@@ -701,7 +701,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN866"
+NAME="AEN868"
 >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="AEN880"
+NAME="AEN882"
 >4.12. Can Privoxy act as a <SPAN
 CLASS="QUOTE"
 >"caching"</SPAN
@@ -812,7 +812,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN890"
+NAME="AEN892"
 >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="AEN895"
+NAME="AEN897"
 >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="AEN903"
+NAME="AEN905"
 >4.15. How can Privoxy filter Secure (HTTPS) URLs?</A
 ></H3
 ><P
@@ -933,7 +933,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN917"
+NAME="AEN919"
 >4.16. Privoxy runs as a <SPAN
 CLASS="QUOTE"
 >"server"</SPAN
@@ -1488,7 +1488,7 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="https://sourceforge.net/tracker/?group_id=11118&atid=460288"
+HREF="https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
 TARGET="_top"
 >https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >, to submit <SPAN
diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index b4ca3021..8bc5b709 100644
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -84,7 +84,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN1082"
+NAME="AEN1084"
 >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="AEN1105"
+NAME="AEN1107"
 >5.3. I just added a new rule, but the steenkin ad is 
 still getting through. How?</A
 ></H3
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index baf68b97..be87aa77 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -233,7 +233,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN2187"
+NAME="AEN2189"
 ></A
 ><P
 ><B
@@ -501,7 +501,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2286"
+NAME="AEN2288"
 >8.1. Finding the Right Mix</A
 ></H2
 ><P
@@ -536,7 +536,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2293"
+NAME="AEN2295"
 >8.2. How to Edit</A
 ></H2
 ><P
@@ -866,7 +866,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2384"
+NAME="AEN2386"
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
@@ -1106,7 +1106,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2460"
+NAME="AEN2462"
 >8.4.2. The Path Pattern</A
 ></H3
 ><P
@@ -6674,7 +6674,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4091"
+NAME="AEN4093"
 >8.5.34. Summary</A
 ></H3
 ><P
@@ -6976,7 +6976,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4155"
+NAME="AEN4157"
 >8.7.1. match-all.action</A
 ></H3
 ><P
@@ -7074,7 +7074,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4177"
+NAME="AEN4179"
 >8.7.2. default.action</A
 ></H3
 ><P
@@ -7675,7 +7675,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4290"
+NAME="AEN4292"
 >8.7.3. user.action</A
 ></H3
 ><P
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 5ba1d652..4df57a49 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="AEN5172"
+NAME="AEN5174"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -794,7 +794,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5186"
+NAME="AEN5188"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -827,7 +827,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5194"
+NAME="AEN5196"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -847,7 +847,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5199"
+NAME="AEN5201"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -867,7 +867,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5204"
+NAME="AEN5206"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -887,7 +887,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5209"
+NAME="AEN5211"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5217"
+NAME="AEN5219"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -936,7 +936,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5221"
+NAME="AEN5223"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -950,7 +950,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5224"
+NAME="AEN5226"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -1021,7 +1021,7 @@ CLASS="QUOTE"
 ><LI
 ><P
 >    <A
-HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
+HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&#38;set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
 TARGET="_top"
 >Privoxy - Enable</A
 >
@@ -1030,7 +1030,7 @@ TARGET="_top"
 ><LI
 ><P
 >    <A
-HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
+HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&#38;set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
 TARGET="_top"
 >Privoxy - Disable</A
 >
@@ -1039,7 +1039,7 @@ TARGET="_top"
 ><LI
 ><P
 >    <A
-HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
+HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&#38;set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
 TARGET="_top"
 >Privoxy - Toggle Privoxy</A
 > (Toggles between enabled and disabled)
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index a45747de..b4f021e4 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="AEN774"
+NAME="AEN776"
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
@@ -129,7 +129,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN782"
+NAME="AEN784"
 ></A
 >    Privoxy Menu</H2
 ><P
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index ae0ef224..3fd43eb3 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -102,13 +102,13 @@ NAME="CONTACT-SUPPORT"
 ><P
 > For casual users, our 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118"
 TARGET="_top"
 >support forum at SourceForge</A
 >
  is probably best suited:
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=211118</A
 ></P
@@ -195,7 +195,7 @@ CLASS="FILENAME"
 >default.action</TT
 > file, to 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=460288"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
 TARGET="_top"
 > http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >,
@@ -232,7 +232,7 @@ NAME="CONTACT-BUGS"
 ><P
 > Please report all bugs through our bug tracker: 
  <A
-HREF="http://sourceforge.net/tracker/?group_id=11118&atid=111118"
+HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?group_id=11118&#38;atid=111118</A
 >. </P
@@ -245,7 +245,7 @@ CLASS="EMPHASIS"
 ></SPAN
 >
   and observe the additional hints at the top of the <A
-HREF="http://sourceforge.net/tracker/?func=add&group_id=11118&atid=111118"
+HREF="http://sourceforge.net/tracker/?func=add&#38;group_id=11118&#38;atid=111118"
 TARGET="_top"
 >submit
   form</A
@@ -423,7 +423,7 @@ NAME="CONTACT-FEATURE"
 > You are welcome to submit ideas on new features or other proposals
  for improvement through our feature request tracker at
  <A
-HREF="http://sourceforge.net/tracker/?atid=361118&group_id=11118"
+HREF="http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118"
 TARGET="_top"
 >http://sourceforge.net/tracker/?atid=361118&#38;group_id=11118</A
 >.</P
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 2d498023..b2e1e960 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="AEN4919"
+NAME="AEN4921"
 >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 b54c1825..3a2ec3a3 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="AEN4445"
+NAME="AEN4447"
 >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 e10acd81..ad99a22e 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -79,6 +79,13 @@ TARGET="_top"
 ><P
 > Privoxy is Free Software and licensed under the GPL2.</P
 ><P
+> Privoxy is an associated project of Software in the Public Interest (SPI).
+ <A
+HREF="http://www.privoxy.org/faq/general.html#DONATE"
+TARGET="_top"
+>Donations are welcome</A
+>.</P
+><P
 >  You can find the latest version of the <I
 CLASS="CITETITLE"
 >Privoxy User Manual</I
@@ -283,7 +290,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN774"
+HREF="configuration.html#AEN776"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -516,12 +523,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2286"
+HREF="actions-file.html#AEN2288"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2293"
+HREF="actions-file.html#AEN2295"
 >How to Edit</A
 ></DT
 ><DT
@@ -538,12 +545,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2384"
+HREF="actions-file.html#AEN2386"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2460"
+HREF="actions-file.html#AEN2462"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -727,7 +734,7 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 ></DT
 ><DT
 >8.5.34. <A
-HREF="actions-file.html#AEN4091"
+HREF="actions-file.html#AEN4093"
 >Summary</A
 ></DT
 ></DL
@@ -746,17 +753,17 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4155"
+HREF="actions-file.html#AEN4157"
 >match-all.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4177"
+HREF="actions-file.html#AEN4179"
 >default.action</A
 ></DT
 ><DT
 >8.7.3. <A
-HREF="actions-file.html#AEN4290"
+HREF="actions-file.html#AEN4292"
 >user.action</A
 ></DT
 ></DL
@@ -772,7 +779,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4445"
+HREF="filter-file.html#AEN4447"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -840,7 +847,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN4919"
+HREF="copyright.html#AEN4921"
 >License</A
 ></DT
 ><DT
@@ -874,7 +881,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5172"
+HREF="appendix.html#AEN5174"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 6dad5a92..f5fefc22 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -501,7 +501,7 @@ CLASS="APPLICATION"
 > sources
  is to download the source tarball from our 
  <A
-HREF="http://sourceforge.net/project/showfiles.php?group_id=11118&package_id=10571"
+HREF="http://sourceforge.net/project/showfiles.php?group_id=11118&#38;package_id=10571"
 TARGET="_top"
 >project download
  page</A
@@ -973,7 +973,7 @@ NAME="INSTALLATION-KEEPUPDATED"
 HREF="actions-file.html"
 >actions file</A
 > (as a <A
-HREF="http://sourceforge.net/project/showfiles.php?group_id=11118&release_id=103670"
+HREF="http://sourceforge.net/project/showfiles.php?group_id=11118&#38;release_id=103670"
 TARGET="_top"
 >separate
  package</A
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 0115776a..03936895 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="AEN528"
+NAME="AEN530"
 ></A
 ><P
 ><B
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index 20454ea0..93a8b2d7 100644
--- a/doc/webserver/user-manual/seealso.html
+++ b/doc/webserver/user-manual/seealso.html
@@ -221,7 +221,7 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
-HREF="https://sourceforge.net/tracker/?group_id=11118&atid=460288"
+HREF="https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
 TARGET="_top"
 >https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
 >, to submit <SPAN
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 3b58117b..e4f0c23a 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="AEN583"
+NAME="AEN585"
 ></A
 ><P
 ><B
@@ -251,7 +251,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN628"
+NAME="AEN630"
 ></A
 ><P
 ><B
-- 
2.39.2