From: hal9 <hal9@users.sourceforge.net>
Date: Mon, 11 Feb 2008 11:54:21 +0000 (+0000)
Subject: Rebuild for reason updates for Mac OS X.
X-Git-Tag: v_3_0_9~236
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@edit-actions-add-url-form?a=commitdiff_plain;h=3eabce711503c99e93ad129326b4183e99dd254d;p=privoxy.git

Rebuild for reason updates for Mac OS X.
---

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 52b7fe1e..56f49678 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -2108,8 +2108,9 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
->{+client-header-filter{hide-tor-exit-notation}}
-.exit/
+># Hide Tor exit notation in Host and Referer Headers
+{+client-header-filter{hide-tor-exit-notation}}
+/
     </PRE
 ></TD
 ></TR
@@ -4267,7 +4268,11 @@ CLASS="QUOTE"
 CLASS="QUOTE"
 >"forward-socks4"</SPAN
 >
-      to use a socks4 connection  (with local DNS resolution) instead.
+      to use a socks4 connection  (with local DNS resolution) instead, use <SPAN
+CLASS="QUOTE"
+>"forward-socks5"</SPAN
+>
+      for socks5 connections (with remote DNS resolution).
      </P
 ></LI
 ><LI
@@ -4284,7 +4289,11 @@ CLASS="QUOTE"
 CLASS="QUOTE"
 >"forward-socks4"</SPAN
 > to use a socks4 connection
-      (with local DNS resolution) instead.
+      (with local DNS resolution) instead, use <SPAN
+CLASS="QUOTE"
+>"forward-socks5"</SPAN
+>
+      for socks5 connections (with remote DNS resolution).
      </P
 ></LI
 ></UL
@@ -4293,7 +4302,7 @@ CLASS="QUOTE"
 >Notes:</DT
 ><DD
 ><P
->    This action takes parameters similar to the 
+>    This action takes parameters similar to the
     <A
 HREF="config.html#FORWARDING"
 >forward</A
@@ -7202,7 +7211,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4261"
+NAME="AEN4263"
 >8.5.39. Summary</A
 ></H3
 ><P
@@ -7507,7 +7516,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4326"
+NAME="AEN4328"
 >8.7.1. default.action</A
 ></H3
 ><P
@@ -8228,7 +8237,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4462"
+NAME="AEN4464"
 >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 0d819ae8..d706d0e9 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -748,7 +748,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5347"
+NAME="AEN5349"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -794,7 +794,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5361"
+NAME="AEN5363"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -827,7 +827,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5369"
+NAME="AEN5371"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -847,7 +847,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5374"
+NAME="AEN5376"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -867,7 +867,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5379"
+NAME="AEN5381"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -887,7 +887,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5384"
+NAME="AEN5386"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5392"
+NAME="AEN5394"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -936,7 +936,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5396"
+NAME="AEN5398"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -950,7 +950,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5399"
+NAME="AEN5401"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index 6e72817e..f0612e83 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -2811,7 +2811,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="SOCKS"
->7.5.2. forward-socks4 and forward-socks4a</A
+>7.5.2. forward-socks4, forward-socks4a and forward-socks5</A
 ></H4
 ><A
 NAME="FORWARD-SOCKS4"
@@ -2870,30 +2870,32 @@ CLASS="REPLACEABLE"
 ><I
 >target_pattern</I
 ></TT
-> is a <A
+> is a
+    <A
 HREF="actions-file.html#AF-PATTERNS"
 >URL pattern</A
-> 
-    that specifies to which requests (i.e. URLs) this forward rule shall apply. Use <TT
+> that specifies to which
+    requests (i.e. URLs) this forward rule shall apply. Use <TT
 CLASS="LITERAL"
 >/</TT
 > to
     denote <SPAN
 CLASS="QUOTE"
 >"all URLs"</SPAN
->.
-    <TT
+>. <TT
 CLASS="REPLACEABLE"
 ><I
 >http_parent</I
 ></TT
-> and <TT
+>
+    and <TT
 CLASS="REPLACEABLE"
 ><I
 >socks_proxy</I
 ></TT
 >
-    are IP addresses in dotted decimal notation or valid DNS names (<TT
+    are IP addresses in dotted decimal notation or valid DNS names
+    (<TT
 CLASS="REPLACEABLE"
 ><I
 >http_parent</I
@@ -2911,7 +2913,8 @@ CLASS="REPLACEABLE"
 ><I
 >port</I
 ></TT
-> parameters are TCP ports, i.e. integer values from 1 to 64535
+> parameters are TCP ports,
+    i.e. integer values from 1 to 65535
    </P
 ></DD
 ><DT
@@ -2951,6 +2954,12 @@ CLASS="LITERAL"
     server, while in SOCKS 4 it happens locally.
    </P
 ><P
+>    With <TT
+CLASS="LITERAL"
+>forward-socks5</TT
+> the DNS resolution will happen on the remote server as well.
+   </P
+><P
 >    If <TT
 CLASS="REPLACEABLE"
 ><I
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 725fd169..69516213 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -98,7 +98,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN821"
+NAME="AEN817"
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
@@ -129,7 +129,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN829"
+NAME="AEN825"
 ></A
 >    Privoxy Menu</H2
 ><P
@@ -185,7 +185,7 @@ TARGET="_top"
 ><TR
 ><TD
 >          &#9642;  <A
-HREF="http://www.privoxy.org/   3.0.8/user-manual/"
+HREF="http://www.privoxy.org/   3.0.9/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
@@ -454,6 +456,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
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index da99a598..1ba9ef4c 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 73bfcd79..25427c2a 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5090"
+NAME="AEN5092"
 >12.1. License</A
 ></H2
 ><P
@@ -316,6 +316,7 @@ CLASS="LITERALLAYOUT"
 &nbsp;Aaron&nbsp;Hamid<br>
 &nbsp;Darel&nbsp;Henman<br>
 &nbsp;Magnus&nbsp;Holmgren<br>
+&nbsp;Eric&nbsp;M.&nbsp;Hopper<br>
 &nbsp;Ralf&nbsp;Horstmann<br>
 &nbsp;Stefan&nbsp;Huehner&nbsp;<br>
 &nbsp;Peter&nbsp;Hyman<br>
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 63a0bd2a..e85aab72 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -366,7 +366,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4617"
+NAME="AEN4619"
 >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 ddd73176..664b73a3 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.8 User Manual</TITLE
+>Privoxy 3.0.9 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.8 User Manual</A
+>Privoxy 3.0.9 User Manual</A
 ></H1
 ><P
 CLASS="PUBDATE"
@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.55 2008/01/19 21:26:37 hal9 Exp $<BR></P
+>$Id: user-manual.sgml,v 2.61 2008/02/11 03:41:47 markm68k Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -173,7 +173,7 @@ HREF="installation.html#INSTALLATION-OS2"
 ><DT
 >2.1.6. <A
 HREF="installation.html#INSTALLATION-MAC"
->Mac OSX</A
+>Mac OS X</A
 ></DT
 ><DT
 >2.1.7. <A
@@ -267,7 +267,7 @@ HREF="startup.html#START-OS2"
 ><DT
 >5.6. <A
 HREF="startup.html#START-MACOSX"
->Mac OSX</A
+>Mac OS X</A
 ></DT
 ><DT
 >5.7. <A
@@ -295,7 +295,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN821"
+HREF="configuration.html#AEN817"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -473,7 +473,7 @@ HREF="config.html#FORWARD"
 ><DT
 >7.5.2. <A
 HREF="config.html#SOCKS"
->forward-socks4 and forward-socks4a</A
+>forward-socks4, forward-socks4a and forward-socks5</A
 ></DT
 ><DT
 >7.5.3. <A
@@ -757,7 +757,7 @@ HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
 ></DT
 ><DT
 >8.5.39. <A
-HREF="actions-file.html#AEN4261"
+HREF="actions-file.html#AEN4263"
 >Summary</A
 ></DT
 ></DL
@@ -776,12 +776,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4326"
+HREF="actions-file.html#AEN4328"
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4462"
+HREF="actions-file.html#AEN4464"
 >user.action</A
 ></DT
 ></DL
@@ -797,7 +797,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4617"
+HREF="filter-file.html#AEN4619"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -865,7 +865,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN5090"
+HREF="copyright.html#AEN5092"
 >License</A
 ></DT
 ><DT
@@ -899,7 +899,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5347"
+HREF="appendix.html#AEN5349"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index f1e22972..76c53b03 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.8 User Manual"
+TITLE="Privoxy 3.0.9 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Introduction"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.8 User Manual</TH
+>Privoxy 3.0.9 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.8-1.rpm</TT
+>rpm -Uvh privoxy-3.0.9-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.8-1.src.rpm</TT
+>rpm --rebuild privoxy-3.0.9-1.src.rpm</TT
 >. This 
  will use your locally installed libraries and RPM version. </P
 ><P
@@ -367,59 +367,31 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="INSTALLATION-MAC"
->2.1.6. Mac OSX</A
+>2.1.6. Mac OS X</A
 ></H3
 ><P
-> Unzip the downloaded file (you can either double-click on the file
- from the finder, or from the desktop if you downloaded it there).
- Then, double-click on the package installer icon named
- <TT
-CLASS="LITERAL"
->Privoxy.pkg</TT
->
- and follow the installation process.
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> will be installed in the folder
- <TT
-CLASS="LITERAL"
->/Library/Privoxy</TT
->.
- It will start automatically whenever you start up.  To prevent it from
- starting automatically, remove or rename the folder
+> Unzip the downloaded file (you can either double-click on the zip file
+ icon from the Finder, or from the desktop if you downloaded it there).
+ Then, double-click on the package installer icon and follow the
+ installation process.</P
+><P
+> The privoxy service will automatically start after a successful
+ installation (in addition to every time your computer starts up).  To
+ prevent the privoxy service from automatically starting when your
+ computer starts up, remove or rename the folder named
  <TT
 CLASS="LITERAL"
 >/Library/StartupItems/Privoxy</TT
 >. </P
 ><P
-> To start Privoxy by hand, double-click on 
- <TT
-CLASS="LITERAL"
->StartPrivoxy.command</TT
-> in the
- <TT
-CLASS="LITERAL"
->/Library/Privoxy</TT
-> folder.
- Or, type this command in the Terminal:</P
-><P
->  <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->  /Library/Privoxy/StartPrivoxy.command
-  </PRE
-></TD
-></TR
-></TABLE
-></P
-><P
-> You will be prompted for the administrator password.</P
+> To manually start or stop the privoxy service, download and install the
+ <A
+HREF="https://sourceforge.net/project/showfiles.php?group_id=11118&package_id=29783"
+TARGET="_top"
+>Privoxy Utility</A
+> for Mac OS X.
+ This application controls the privoxy service (e.g. starting and
+ stopping the service as well as uninstalling the software).</P
 ></DIV
 ><DIV
 CLASS="SECT3"
@@ -511,7 +483,7 @@ CLASS="FILENAME"
 >, the 
  documentation is in <TT
 CLASS="FILENAME"
->/usr/share/doc/privoxy-3.0.8</TT
+>/usr/share/doc/privoxy-3.0.9</TT
 >
  and the Log directory is in <TT
 CLASS="FILENAME"
@@ -580,8 +552,8 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
-> tar xzvf privoxy-3.0.8-src* [.tgz or .tar.gz]
- cd privoxy-3.0.8</PRE
+> tar xzvf privoxy-3.0.9-beta-src* [.tgz or .tar.gz]
+ cd privoxy-3.0.9-beta</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index fcdf7b29..fe06835d 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.8 User Manual"
+TITLE="Privoxy 3.0.9 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Privoxy 3.0.8 User Manual"
+TITLE="Privoxy 3.0.9 User Manual"
 HREF="index.html"><LINK
 REL="NEXT"
 TITLE="Installation"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.8 User Manual</TH
+>Privoxy 3.0.9 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.8.</P
+>, v.3.0.9, 
+ 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
@@ -211,7 +227,7 @@ CLASS="QUOTE"
 ></LI
 ><LI
 ><P
->   Many smaller new features added, limitations and bugs removed, and security holes fixed.
+>   Many smaller new features added, limitations and bugs removed.
   </P
 ></LI
 ></UL
@@ -262,7 +278,7 @@ ACCESSKEY="N"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Privoxy 3.0.8 User Manual</TD
+>Privoxy 3.0.9 User Manual</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 27ff4d32..4f756f15 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -727,7 +727,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN573"
+NAME="AEN569"
 ></A
 ><P
 ><B
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index ed2eee21..cde3da41 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 265ffc91..ab268702 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
@@ -114,7 +114,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN628"
+NAME="AEN624"
 ></A
 ><P
 ><B
@@ -251,7 +251,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN673"
+NAME="AEN669"
 ></A
 ><P
 ><B
@@ -487,7 +487,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="START-MACOSX"
->5.6. Mac OSX</A
+>5.6. Mac OS X</A
 ></H2
 ><P
 > During installation, <SPAN
diff --git a/doc/webserver/user-manual/templates.html b/doc/webserver/user-manual/templates.html
index 4e960004..78f05cde 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.8 User Manual"
+TITLE="Privoxy 3.0.9 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.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD
diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index d07ea3f8..c8799f0d 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.8 User Manual"
+TITLE="Privoxy 3.0.9 User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Installation"
@@ -42,7 +42,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->Privoxy 3.0.8 User Manual</TH
+>Privoxy 3.0.9 User Manual</TH
 ></TR
 ><TR
 ><TD