From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 17 Aug 2011 10:37:48 +0000 (+0000)
Subject: Rebuild user-manual, developer-manual and faq.
X-Git-Tag: v_3_0_18~134
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=5700aead3098beb0cc5a02bc0034a0d4194774a6

Rebuild user-manual, developer-manual and faq.

Looks like the code status UNRELEASED isn't properly dealt with everywhere,
but as this build is not going to get released, I think we can live with
it for now.

Also ampersands in URLs weren't properly escaped, but hopefully
none of the broken links slipped into this commit. This needs to
be addressed before the next release anyway.
---

diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html
index 763e6713..e87e6046 100644
--- a/doc/webserver/developer-manual/contact.html
+++ b/doc/webserver/developer-manual/contact.html
@@ -119,6 +119,13 @@ TARGET="_top"
 > Please don't sent private support requests to individual Privoxy
  developers, either use the mailing lists or the support trackers.</P
 ><P
+> If you have to contact a Privoxy developer directly for other reasons,
+ please send a real mail and do not bother with SourceForge's messaging
+ system. Answers to SourceForge messages are usually bounced by SourceForge's
+ mail server in which case the developer wasted time writing a response you
+ don't get. From your point of view it will look like your message has
+ been completely ignored, so this is frustrating for all parties involved.</P
+><P
 > Note that the Privoxy mailing lists are moderated. Posts from unsubscribed
  addresses have to be accepted manually by a moderator. This may cause a
  delay of several days and if you use a subject that doesn't clearly
@@ -553,4 +560,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index c7e36f65..c89bcaed 100644
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -80,7 +80,7 @@ NAME="COPYRIGHT"
 >9. Privoxy Copyright, License and History</A
 ></H1
 ><P
-> Copyright © 2001-2010 by Privoxy Developers <CODE
+> Copyright © 2001-2011 by Privoxy Developers <CODE
 CLASS="EMAIL"
 >&#60;<A
 HREF="mailto:ijbswa-developers@lists.sourceforge.net"
@@ -99,7 +99,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1228"
+NAME="AEN1229"
 >9.1. License</A
 ></H2
 ><P
@@ -157,7 +157,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1244"
+NAME="AEN1245"
 >9.2. History</A
 ></H2
 ><P
@@ -295,4 +295,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/developer-manual/documentation.html b/doc/webserver/developer-manual/documentation.html
index 6346be4e..f1bfe610 100644
--- a/doc/webserver/developer-manual/documentation.html
+++ b/doc/webserver/developer-manual/documentation.html
@@ -802,7 +802,7 @@ CLASS="APPLICATION"
 > 
     version string, e.g. <SPAN
 CLASS="QUOTE"
->"3.0.17"</SPAN
+>"3.0.18"</SPAN
 >.
    </TD
 ></TR
@@ -941,4 +941,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index 0efbd844..44b2d6ba 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.34 2010/11/06 12:55:48 fabiankeil Exp $<BR></P
+>$Id: index.html,v 1.54 2010/11/13 12:50:18 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -71,7 +71,7 @@ CLASS="APPLICATION"
  and may not be entirely correct. As always, patches are welcome.</P
 ><P
 > Please note that this document is constantly evolving. This copy represents
- the state at the release of version 3.0.17.
+ the state at the release of version 3.0.18.
  You can find the latest version of the this manual at <A
 HREF="http://www.privoxy.org/developer-manual/"
 TARGET="_top"
@@ -615,12 +615,12 @@ HREF="copyright.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="copyright.html#AEN1228"
+HREF="copyright.html#AEN1229"
 >License</A
 ></DT
 ><DT
 >9.2. <A
-HREF="copyright.html#AEN1244"
+HREF="copyright.html#AEN1245"
 >History</A
 ></DT
 ></DL
@@ -685,4 +685,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index 4c5db454..fa80e1f4 100644
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -1351,7 +1351,7 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->  debchange -v 3.0.17-stable-1 "New upstream version"</PRE
+>  debchange -v 3.0.18-UNRELEASED-1 "New upstream version"</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1379,7 +1379,7 @@ CLASS="PROGRAMLISTING"
 >        This will create
         <TT
 CLASS="FILENAME"
->../privoxy_3.0.17-stable-1_i386.deb</TT
+>../privoxy_3.0.18-UNRELEASED-1_i386.deb</TT
 >
         which can be uploaded.  To upload the package to Sourceforge, simply
 	issue
@@ -1823,7 +1823,7 @@ CLASS="LITERAL"
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
->3.0.17
+>3.0.18
      (beta)</I
 ></SPAN
 >.
@@ -1953,4 +1953,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index 9e6f73d6..77c28e0a 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -568,7 +568,7 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 > for multiple untrusted users (e.g. in
   a LAN) or aren't entirely in control of your own browser, you will probably want
-  to make sure that the the web-based editor and remote toggle features are
+  to make sure that the web-based editor and remote toggle features are
   <SPAN
 CLASS="QUOTE"
 >"off"</SPAN
@@ -1767,4 +1767,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index e89defb3..87bf155c 100644
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -119,6 +119,13 @@ TARGET="_top"
 > Please don't sent private support requests to individual Privoxy
  developers, either use the mailing lists or the support trackers.</P
 ><P
+> If you have to contact a Privoxy developer directly for other reasons,
+ please send a real mail and do not bother with SourceForge's messaging
+ system. Answers to SourceForge messages are usually bounced by SourceForge's
+ mail server in which case the developer wasted time writing a response you
+ don't get. From your point of view it will look like your message has
+ been completely ignored, so this is frustrating for all parties involved.</P
+><P
 > Note that the Privoxy mailing lists are moderated. Posts from unsubscribed
  addresses have to be accepted manually by a moderator. This may cause a
  delay of several days and if you use a subject that doesn't clearly
@@ -553,4 +560,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 7ab57e0e..009c3136 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -73,7 +73,7 @@ NAME="COPYRIGHT"
 >7. Privoxy Copyright, License and History</A
 ></H1
 ><P
-> Copyright © 2001-2010 by Privoxy Developers <CODE
+> Copyright © 2001-2011 by Privoxy Developers <CODE
 CLASS="EMAIL"
 >&#60;<A
 HREF="mailto:ijbswa-developers@lists.sourceforge.net"
@@ -106,7 +106,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1463"
+NAME="AEN1464"
 >7.1. License</A
 ></H2
 ><P
@@ -164,7 +164,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1479"
+NAME="AEN1480"
 >7.2. History</A
 ></H2
 ><P
@@ -298,4 +298,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index bd045c98..baaf5d43 100644
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -992,7 +992,7 @@ TARGET="_top"
 >, which allows us to receive tax-deductible
  donations in most western countries.</P
 ><P
-> We intend to use the donations to pay for our domain after transfering
+> We intend to use the donations to pay for our domain after transferring
  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
@@ -1077,4 +1077,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 6fd533f9..365a5a8f 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.75 2010/11/13 10:08:00 fabiankeil Exp $<BR></P
+>$Id: index.html,v 1.65 2010/11/13 12:52:12 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -114,7 +114,7 @@ TARGET="_top"
 ></P
 ><P
 >  Please note that this document is a work in progress. This copy represents
-  the state at the release of version 3.0.17.
+  the state at the release of version 3.0.18.
   You can find the latest version of the document at <A
 HREF="http://www.privoxy.org/faq/"
 TARGET="_top"
@@ -955,12 +955,12 @@ HREF="copyright.html"
 ><DL
 ><DT
 >7.1. <A
-HREF="copyright.html#AEN1463"
+HREF="copyright.html#AEN1464"
 >License</A
 ></DT
 ><DT
 >7.2. <A
-HREF="copyright.html#AEN1479"
+HREF="copyright.html#AEN1480"
 >History</A
 ></DT
 ></DL
@@ -1020,4 +1020,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index 49944285..dad0f27b 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -562,7 +562,7 @@ CLASS="APPLICATION"
 CLASS="APPLICATION"
 >Tor</SPAN
 > is just another proxy that can be reached
- by socks4 or socks4a. Most likely you are interested in <SPAN
+ by socks4, socks4a and socks5. Most likely you are interested in <SPAN
 CLASS="APPLICATION"
 >Tor</SPAN
 >
@@ -1783,4 +1783,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index 339743d9..2f8374e2 100644
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -1273,4 +1273,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index c0eb3013..0bf9e3fa 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="The Main Configuration File"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -233,7 +233,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN2534"
+NAME="AEN2625"
 ></A
 ><P
 ><B
@@ -501,7 +501,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2633"
+NAME="AEN2724"
 >8.1. Finding the Right Mix</A
 ></H2
 ><P
@@ -536,7 +536,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2640"
+NAME="AEN2731"
 >8.2. How to Edit</A
 ></H2
 ><P
@@ -918,7 +918,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2752"
+NAME="AEN2843"
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
@@ -1158,7 +1158,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2828"
+NAME="AEN2919"
 >8.4.2. The Path Pattern</A
 ></H3
 ><P
@@ -6730,7 +6730,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4460"
+NAME="AEN4551"
 >8.5.34. Summary</A
 ></H3
 ><P
@@ -7032,7 +7032,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4524"
+NAME="AEN4615"
 >8.7.1. match-all.action</A
 ></H3
 ><P
@@ -7130,7 +7130,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4546"
+NAME="AEN4637"
 >8.7.2. default.action</A
 ></H3
 ><P
@@ -7731,7 +7731,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4659"
+NAME="AEN4750"
 >8.7.3. user.action</A
 ></H3
 ><P
@@ -8267,4 +8267,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 26ed4ec5..8247023b 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="See Also"
@@ -39,7 +39,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -748,7 +748,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5546"
+NAME="AEN5638"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -794,7 +794,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5560"
+NAME="AEN5652"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -827,7 +827,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5568"
+NAME="AEN5660"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -847,7 +847,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5573"
+NAME="AEN5665"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -867,7 +867,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5578"
+NAME="AEN5670"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -887,7 +887,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5583"
+NAME="AEN5675"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5591"
+NAME="AEN5683"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -936,7 +936,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5595"
+NAME="AEN5687"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -950,7 +950,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5598"
+NAME="AEN5690"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -2184,4 +2184,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index f5cf1990..65d38bef 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Privoxy Configuration"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -82,14 +82,14 @@ NAME="CONFIG"
 >7. The Main Configuration File</A
 ></H1
 ><P
-> Again, the main configuration file is named <TT
+> By default, the main configuration file is named <TT
 CLASS="FILENAME"
 >config</TT
-> on
- Linux/Unix/BSD and OS/2, and <TT
+>,
+ with the exception of Windows, where it is named <TT
 CLASS="FILENAME"
 >config.txt</TT
-> on Windows.
+>.
  Configuration lines consist of an initial keyword followed by a list of
  values, all separated by whitespace (any number of spaces or tabs). For
  example:</P
@@ -1633,7 +1633,7 @@ CLASS="VARIABLELIST"
 >Specifies:</DT
 ><DD
 ><P
->    The IP address and TCP port on which <SPAN
+>    The address and TCP port on which <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > will
@@ -1655,6 +1655,18 @@ CLASS="REPLACEABLE"
 >Port</I
 ></TT
 ></P
+><P
+>[<TT
+CLASS="REPLACEABLE"
+><I
+>Hostname</I
+></TT
+>]:<TT
+CLASS="REPLACEABLE"
+><I
+>Port</I
+></TT
+></P
 ></DD
 ><DT
 >Default value:</DT
@@ -1686,19 +1698,91 @@ CLASS="APPLICATION"
     will need to override the default.
    </P
 ><P
+>    You can use this statement multiple times to make
+    <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> listen on more ports or more
+    <ABBR
+CLASS="ABBREV"
+>IP</ABBR
+> addresses. Suitable if your operating system does not
+    support sharing <ABBR
+CLASS="ABBREV"
+>IPv6</ABBR
+> and <ABBR
+CLASS="ABBREV"
+>IPv4</ABBR
+> protocols
+    on the same socket.
+   </P
+><P
+>    If a hostname is used instead of an IP address, <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+    will try to resolve it to an IP address and if there are multiple, use the first
+    one returned.
+   </P
+><P
+>    If the address for the hostname isn't already known on the system
+    (for example because it's in /etc/hostname), this may result in DNS
+    traffic.
+   </P
+><P
+>    If the specified address isn't available on the system, or if the
+    hostname can't be resolved, <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+    will fail to start.
+   </P
+><P
 >    IPv6 addresses containing colons have to be quoted by brackets.
+    They can only be used if <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> has
+    been compiled with IPv6 support. If you aren't sure if your version
+    supports it, have a look at
+    <TT
+CLASS="LITERAL"
+>http://config.privoxy.org/show-status</TT
+>.
    </P
 ><P
->    If you leave out the IP address, <SPAN
+>    Some operating systems will prefer IPv6 to IPv4 addresses even if the
+    system has no IPv6 connectivity which is usually not expected by the user.
+    Some even rely on DNS to resolve localhost which mean the "localhost" address
+    used may not actually be local.
+   </P
+><P
+>    It is therefore recommended to explicitly configure the intended IP address
+    instead of relying on the operating system, unless there's a strong reason not to.
+   </P
+><P
+>    If you leave out the address, <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> will
-    bind to all IPv4 interfaces (addresses) on your machine and may become reachable
-    from the Internet. In that case, consider using <A
+> will bind to all
+    IPv4 interfaces (addresses) on your machine and may become reachable from the
+    Internet and/or the local network. Be aware that some GNU/Linux distributions
+    modify that behaviour without updating the documentation. Check for non-standard
+    patches if your <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>version behaves differently.
+   </P
+><P
+>    If you configure <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>to be reachable from the
+    network, consider using <A
 HREF="config.html#ACLS"
 >access control lists</A
-> (ACL's, see below), and/or
-    a firewall.
+>
+    (ACL's, see below), and/or a firewall.
    </P
 ><P
 >    If you open <SPAN
@@ -1720,6 +1804,15 @@ HREF="config.html#ENABLE-REMOTE-TOGGLE"
 ></TT
 >
    </P
+><P
+>    With the exception noted above, listening on multiple addresses is currently
+    not supported by <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> directly.
+    It can be done on most operating systems by letting a packet filter
+    redirect request for certain addresses to Privoxy, though.
+   </P
 ></DD
 ><DT
 >Example:</DT
@@ -2985,7 +3078,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->  foward   /                   [2001:DB8::1]:8000</PRE
+>  forward   /                   [2001:DB8::1]:8000</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3568,10 +3661,6 @@ CLASS="QUOTE"
     that go away when you try again manually. Start with a small value and check Privoxy's
     logfile from time to time, to see how many retries are usually needed.
    </P
-><P
->    Due to a bug, this option currently also causes Privoxy to
-    retry in case of certain problems with direct connections.
-   </P
 ></DD
 ><DT
 >Examples:</DT
@@ -4252,9 +4341,9 @@ CLASS="REPLACEABLE"
 >Notes:</DT
 ><DD
 ><P
->    For SOCKS requests the timeout currently doesn't start until
-    the SOCKS server accepted the request. This will be fixed in
-    the next release.
+>    The default is quite high and you probably want to reduce it.
+    If you aren't using an occasionally slow proxy like Tor, reducing
+    it to a few seconds should be fine.
    </P
 ></DD
 ><DT
@@ -4395,7 +4484,56 @@ NAME="HANDLE-AS-EMPTY-DOC-RETURNS-OK"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
->Note:</DT
+>Specifies:</DT
+><DD
+><P
+>    The status code Privoxy returns for pages blocked with
+    
+    <TT
+CLASS="LITERAL"
+><A
+HREF="actions-file.html#HANDLE-AS-EMPTY-DOCUMENT"
+TARGET="_top"
+>+handle-as-empty-document</A
+></TT
+>.
+   </P
+></DD
+><DT
+>Type of value:</DT
+><DD
+><P
+>    <TT
+CLASS="REPLACEABLE"
+><I
+>0 or 1</I
+></TT
+>
+   </P
+></DD
+><DT
+>Default value:</DT
+><DD
+><P
+>0</P
+></DD
+><DT
+>Effect if unset:</DT
+><DD
+><P
+>    Privoxy returns a status 403(forbidden) for all blocked pages.
+   </P
+></DD
+><DT
+>Effect if set:</DT
+><DD
+><P
+>    Privoxy returns a status 200(OK) for pages blocked with +handle-as-empty-document
+    and a status 403(Forbidden) for all other blocked pages.
+   </P
+></DD
+><DT
+>Notes:</DT
 ><DD
 ><P
 >    This is a work-around for Firefox bug 492459:
@@ -4409,22 +4547,32 @@ HREF="https://bugzilla.mozilla.org/show_bug.cgi?id=492459"
 TARGET="_top"
 >https://bugzilla.mozilla.org/show_bug.cgi?id=492459</A
 >)
+    As the bug has been fixed for quite some time this option should no longer
+    be needed and will be removed in a future release. Please speak up if you
+    have a reason why the option should be kept around.
    </P
 ></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="SECT3"
+><H4
+CLASS="SECT3"
+><A
+NAME="ENABLE-COMPRESSION"
+>7.6.10. enable-compression</A
+></H4
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
 ><DT
 >Specifies:</DT
 ><DD
 ><P
->    The status code Privoxy returns for pages blocked with
-    
-    <TT
-CLASS="LITERAL"
-><A
-HREF="actions-file.html#HANDLE-AS-EMPTY-DOCUMENT"
-TARGET="_top"
->+handle-as-empty-document</A
-></TT
->.
+>    Whether or not buffered content is compressed before delivery.
    </P
 ></DD
 ><DT
@@ -4449,15 +4597,117 @@ CLASS="REPLACEABLE"
 >Effect if unset:</DT
 ><DD
 ><P
->    Privoxy returns a status 403(forbidden) for all blocked pages.
+>    Privoxy does not compress buffered content.
    </P
 ></DD
 ><DT
 >Effect if set:</DT
 ><DD
 ><P
->    Privoxy returns a status 200(OK) for pages blocked with +handle-as-empty-document
-    and a status 403(Forbidden) for all other blocked pages.
+>    Privoxy compresses buffered content before delivering it to the client,
+    provided the client supports it.
+   </P
+></DD
+><DT
+>Notes:</DT
+><DD
+><P
+>    This directive is only supported if Privoxy has been compiled with
+    FEATURE_COMPRESSION, which should not to be confused with FEATURE_ZLIB.
+   </P
+><P
+>    Compressing buffered content is mainly useful if Privoxy and the
+    client are running on different systems. If they are running on the
+    same system, enabling compression is likely to slow things down.
+    If you didn't measure otherwise, you should assume that it does
+    and keep this option disabled.
+   </P
+><P
+>    Privoxy will not compress buffered content below a certain length.
+   </P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="SECT3"
+><H4
+CLASS="SECT3"
+><A
+NAME="COMPRESSION-LEVEL"
+>7.6.11. compression-level</A
+></H4
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>Specifies:</DT
+><DD
+><P
+>    The compression level that is passed to the zlib library when compressing buffered content.
+   </P
+></DD
+><DT
+>Type of value:</DT
+><DD
+><P
+>    <TT
+CLASS="REPLACEABLE"
+><I
+>Positive number ranging from 0 to 9.</I
+></TT
+>
+   </P
+></DD
+><DT
+>Default value:</DT
+><DD
+><P
+>1</P
+></DD
+><DT
+>Notes:</DT
+><DD
+><P
+>     Compressing the data more takes usually longer than compressing
+     it less or not compressing it at all. Which level is best depends
+     on the connection between Privoxy and the client. If you can't
+     be bothered to benchmark it for yourself, you should stick with
+     the default and keep compression disabled.
+   </P
+><P
+>     If compression is disabled, the compression level is irrelevant.
+   </P
+></DD
+><DT
+>Examples:</DT
+><DD
+><P
+>    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>    # Best speed (compared to the other levels)
+    compression-level 1
+    # Best compression
+    compression-level 9
+    # No compression. Only useful for testing as the added header
+    # slightly increases the amount of data that has to be sent.
+    # If your benchmark shows that using this compression level
+    # is superior to using no compression at all, the benchmark
+    # is likely to be flawed.
+    compression-level 0
+    </PRE
+></TD
+></TR
+></TABLE
+>
    </P
 ></DD
 ></DL
@@ -4822,4 +5072,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index d6f8e1a6..b9508349 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Starting Privoxy"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -98,7 +98,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN921"
+NAME="AEN933"
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
@@ -129,7 +129,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN929"
+NAME="AEN941"
 ></A
 >    Privoxy Menu</H2
 ><P
@@ -185,7 +185,7 @@ TARGET="_top"
 ><TR
 ><TD
 >          &#9642;  <A
-HREF="http://www.privoxy.org/3.0.17/user-manual/"
+HREF="http://www.privoxy.org/3.0.18/user-manual/"
 TARGET="_top"
 >Documentation</A
 >
@@ -275,7 +275,9 @@ CLASS="FILENAME"
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
-> executable. </P
+> executable.  The name
+ and number of configuration files has changed from previous versions, and is
+ subject to change as development progresses.</P
 ><P
 > The installed defaults provide a reasonable starting point, though 
  some settings may be aggressive by some standards. For the time being, the
@@ -449,6 +451,14 @@ CLASS="EMPHASIS"
 >old</I
 ></SPAN
 > listening address.</P
+><P
+> While under development, the configuration content is subject to change. 
+ The below documentation may not be accurate by the time you read this. 
+ Also, what constitutes a <SPAN
+CLASS="QUOTE"
+>"default"</SPAN
+> setting, may change, so 
+ please check all your configuration files on important issues.</P
 ></DIV
 ></DIV
 ><DIV
@@ -511,4 +521,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index 5938b0a9..5b8d72f7 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -8,7 +8,7 @@ Requests</TITLE
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Privoxy's Template Files"
@@ -43,7 +43,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -123,6 +123,13 @@ TARGET="_top"
 > Please don't sent private support requests to individual Privoxy
  developers, either use the mailing lists or the support trackers.</P
 ><P
+> If you have to contact a Privoxy developer directly for other reasons,
+ please send a real mail and do not bother with SourceForge's messaging
+ system. Answers to SourceForge messages are usually bounced by SourceForge's
+ mail server in which case the developer wasted time writing a response you
+ don't get. From your point of view it will look like your message has
+ been completely ignored, so this is frustrating for all parties involved.</P
+><P
 > Note that the Privoxy mailing lists are moderated. Posts from unsubscribed
  addresses have to be accepted manually by a moderator. This may cause a
  delay of several days and if you use a subject that doesn't clearly
@@ -557,4 +564,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 1061cc15..8dae54ea 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Contacting the Developers, Bug Reporting and Feature
@@ -43,7 +43,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -83,7 +83,7 @@ NAME="COPYRIGHT"
 >12. Privoxy Copyright, License and History</A
 ></H1
 ><P
-> Copyright © 2001-2010 by Privoxy Developers <CODE
+> Copyright © 2001-2011 by Privoxy Developers <CODE
 CLASS="EMAIL"
 >&#60;<A
 HREF="mailto:ijbswa-developers@lists.sourceforge.net"
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5293"
+NAME="AEN5385"
 >12.1. License</A
 ></H2
 ><P
@@ -427,4 +427,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index c1c08a43..bee45c23 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -7,7 +7,7 @@
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Actions Files"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -366,7 +366,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4814"
+NAME="AEN4905"
 >9.1. Filter File Tutorial</A
 ></H2
 ><P
@@ -1649,4 +1649,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 4fd0dd9a..c0d19e7a 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -2,7 +2,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Privoxy 3.0.17 User Manual</TITLE
+>Privoxy 3.0.18 User Manual</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
@@ -32,7 +32,7 @@ CLASS="TITLEPAGE"
 CLASS="TITLE"
 ><A
 NAME="AEN2"
->Privoxy 3.0.17 User Manual</A
+>Privoxy 3.0.18 User Manual</A
 ></H1
 ><P
 CLASS="PUBDATE"
@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.128 2010/11/10 22:00:13 fabiankeil Exp $<BR></P
+>$Id: index.html,v 1.75 2010/11/13 12:51:44 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -310,7 +310,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN921"
+HREF="configuration.html#AEN933"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -554,6 +554,16 @@ HREF="config.html#MAX-CLIENT-CONNECTIONS"
 HREF="config.html#HANDLE-AS-EMPTY-DOC-RETURNS-OK"
 >handle-as-empty-doc-returns-ok</A
 ></DT
+><DT
+>7.6.10. <A
+HREF="config.html#ENABLE-COMPRESSION"
+>enable-compression</A
+></DT
+><DT
+>7.6.11. <A
+HREF="config.html#COMPRESSION-LEVEL"
+>compression-level</A
+></DT
 ></DL
 ></DD
 ><DT
@@ -572,12 +582,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2633"
+HREF="actions-file.html#AEN2724"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2640"
+HREF="actions-file.html#AEN2731"
 >How to Edit</A
 ></DT
 ><DT
@@ -594,12 +604,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2752"
+HREF="actions-file.html#AEN2843"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2828"
+HREF="actions-file.html#AEN2919"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -783,7 +793,7 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 ></DT
 ><DT
 >8.5.34. <A
-HREF="actions-file.html#AEN4460"
+HREF="actions-file.html#AEN4551"
 >Summary</A
 ></DT
 ></DL
@@ -802,17 +812,17 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4524"
+HREF="actions-file.html#AEN4615"
 >match-all.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4546"
+HREF="actions-file.html#AEN4637"
 >default.action</A
 ></DT
 ><DT
 >8.7.3. <A
-HREF="actions-file.html#AEN4659"
+HREF="actions-file.html#AEN4750"
 >user.action</A
 ></DT
 ></DL
@@ -828,7 +838,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4814"
+HREF="filter-file.html#AEN4905"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -896,7 +906,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN5293"
+HREF="copyright.html#AEN5385"
 >License</A
 ></DT
 ><DT
@@ -930,7 +940,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5546"
+HREF="appendix.html#AEN5638"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
@@ -1009,4 +1019,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index f0252117..f37a3e9b 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Introduction"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -129,7 +129,7 @@ NAME="INSTALLATION-PACK-RPM"
 ><P
 > RPMs can be installed with <TT
 CLASS="LITERAL"
->rpm -Uvh privoxy-3.0.17-1.rpm</TT
+>rpm -Uvh privoxy-3.0.18-1.rpm</TT
 >,
  and will use <TT
 CLASS="FILENAME"
@@ -160,7 +160,7 @@ CLASS="COMMAND"
 > If you have problems with failed dependencies, try rebuilding the SRC RPM: 
  <TT
 CLASS="LITERAL"
->rpm --rebuild privoxy-3.0.17-1.src.rpm</TT
+>rpm --rebuild privoxy-3.0.18-1.src.rpm</TT
 >. This 
  will use your locally installed libraries and RPM version. </P
 ><P
@@ -478,7 +478,7 @@ CLASS="FILENAME"
 >, the 
  documentation is in <TT
 CLASS="FILENAME"
->/usr/share/doc/privoxy-3.0.17</TT
+>/usr/share/doc/privoxy-3.0.18</TT
 >
  and the Log directory is in <TT
 CLASS="FILENAME"
@@ -547,8 +547,8 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
-> tar xzvf privoxy-3.0.17-stable-src.tar.gz
- cd privoxy-3.0.17-stable</PRE
+> tar xzvf privoxy-3.0.18-beta-src.tar.gz
+ cd privoxy-3.0.18-beta</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1079,4 +1079,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index 6b968016..0e36051d 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="NEXT"
 TITLE="Installation"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -82,11 +82,27 @@ NAME="INTRODUCTION"
 >1. Introduction</A
 ></H1
 ><P
-> This documentation is included with the current stable version of
+> This documentation is included with the current UNRELEASED version of
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
->, v.3.0.17.</P
+>, v.3.0.18,
+ 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 UNRELEASED version, not all new features are well tested. This
+ documentation may be slightly out of sync as a result (especially with 
+ CVS sources). And there <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>may be</I
+></SPAN
+> bugs, though hopefully
+ not many! </P
 ><DIV
 CLASS="SECT2"
 ><H2
@@ -107,7 +123,7 @@ TARGET="_top"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > provides many supplemental
- features, 
+ features, some of them currently under development, 
  that give the end-user more control, more privacy and more freedom:</P
 ><P
 > <P
@@ -263,7 +279,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Privoxy 3.0.17 User Manual</TD
+>Privoxy 3.0.18 User Manual</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -279,4 +295,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 7b9b747c..8b30a607 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="What's New in this Release"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -727,7 +727,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN675"
+NAME="AEN687"
 ></A
 ><P
 ><B
@@ -940,4 +940,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index 83fc849f..d319d08f 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Privoxy Copyright, License and History"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -415,4 +415,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 98ff752b..bde97a75 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Quickstart to Using Privoxy"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -114,7 +114,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN730"
+NAME="AEN742"
 ></A
 ><P
 ><B
@@ -251,7 +251,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN775"
+NAME="AEN787"
 ></A
 ><P
 ><B
@@ -899,4 +899,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/templates.html b/doc/webserver/user-manual/templates.html
index 413bd178..ad9c5ff3 100644
--- a/doc/webserver/user-manual/templates.html
+++ b/doc/webserver/user-manual/templates.html
@@ -7,7 +7,7 @@
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Filter Files"
@@ -43,7 +43,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -318,4 +318,4 @@ Requests</TD
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index 9ee55551..ac293a02 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.79"><LINK
 REL="HOME"
-TITLE="Privoxy 3.0.17 User Manual"
+TITLE="Privoxy 3.0.18 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Installation"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.17 User Manual</TH
+>Privoxy 3.0.18 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -551,7 +551,7 @@ CLASS="APPLICATION"
 ><LI
 ><P
 >      Remove an incorrect cgi_error_unknown() call in a
-      cannnot-happen-situation in send_crunch_response().
+      cannot-happen-situation in send_crunch_response().
      </P
 ></LI
 ><LI
@@ -794,4 +794,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file