Rebuild for the upcoming 3.0.9 beta release.

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 12d3ac3..2c831e2 100644 (file)
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -262,7 +262,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
 >    <DIV
 CLASS="TABLE"
 ><A

-NAME="AEN2207"
+NAME="AEN2199"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B


@@ -420,7 +420,7 @@ TITLE="C4"><THEAD
 ><TD
 >no</TD
 ><TD
 ><TD
 >no</TD
 ><TD

->no</TD
+>yes</TD

 ><TD
 >yes</TD
 ></TR
 ><TD
 >yes</TD
 ></TR


@@ -531,7 +531,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN2306"
+NAME="AEN2298"

 >8.1. Finding the Right Mix</A
 ></H2
 ><P
 >8.1. Finding the Right Mix</A
 ></H2
 ><P


@@ -566,7 +566,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN2313"
+NAME="AEN2305"

 >8.2. How to Edit</A
 ></H2
 ><P
 >8.2. How to Edit</A
 ></H2
 ><P


@@ -896,7 +896,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2404"
+NAME="AEN2396"

 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P


@@ -1136,7 +1136,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2480"
+NAME="AEN2472"

 >8.4.2. The Path Pattern</A
 ></H3
 ><P
 >8.4.2. The Path Pattern</A
 ></H3
 ><P


@@ -5994,6 +5994,13 @@ HREF="actions-file.html#FAST-REDIRECTS"
     and be aware that using your own redirects might make it
     possible to fingerprint your requests.
    </P
     and be aware that using your own redirects might make it
     possible to fingerprint your requests.
    </P

+><P
+>    In case of problems with your redirects, or simply to watch
+    them working, enable <A
+HREF="config.html#DEBUG"
+>debug 128</A
+>.
+   </P

 ></DD
 ><DT
 >Example usages:</DT
 ></DD
 ><DT
 >Example usages:</DT


@@ -6023,7 +6030,20 @@ CLASS="APPLICATION"
 # (Note the $ at the end of the URL pattern to make sure
 # the request for the rewritten URL isn't redirected as well)
 {+redirect{s@$@&#38;mode=expanded@}}
 # (Note the $ at the end of the URL pattern to make sure
 # the request for the rewritten URL isn't redirected as well)
 {+redirect{s@$@&#38;mode=expanded@}}

-undeadly.org/cgi\?action=article&#38;sid=\d*$</PRE
+undeadly.org/cgi\?action=article&#38;sid=\d*$
+
+# Redirect Google search requests to MSN
+{+redirect{s@^http://[^/]*/search\?q=([^&#38;]*).*@http://search.msn.com/results.aspx?q=$1@}}
+.google.com/search
+
+# Redirect MSN search requests to Yahoo
+{+redirect{s@^http://[^/]*/results\.aspx\?q=([^&#38;]*).*@http://search.yahoo.com/search?p=$1@}}
+search.msn.com//results\.aspx\?q=
+
+# Redirect remote requests for this manual
+# to the local version delivered by Privoxy
+{+redirect{s@^http://www@http://config@}}
+www.privoxy.org/user-manual/</PRE

 ></TD
 ></TR
 ></TABLE
 ></TD
 ></TR
 ></TABLE


@@ -6659,7 +6679,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4101"
+NAME="AEN4095"

 >8.5.34. Summary</A
 ></H3
 ><P
 >8.5.34. Summary</A
 ></H3
 ><P


@@ -6958,7 +6978,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4164"
+NAME="AEN4158"

 >8.7.1. default.action</A
 ></H3
 ><P
 >8.7.1. default.action</A
 ></H3
 ><P


@@ -7673,7 +7693,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4298"
+NAME="AEN4292"

 >8.7.2. user.action</A
 ></H3
 ><P
 >8.7.2. user.action</A
 ></H3
 ><P


@@ -8209,4 +8229,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
 ></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 88e6e2c..72fd1bc 100644 (file)
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -748,7 +748,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN5184"
+NAME="AEN5178"

 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P


@@ -794,7 +794,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
    Privoxy main page: 
   </P
 ><A

-NAME="AEN5198"
+NAME="AEN5192"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -827,7 +827,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
     editing of actions files:
   </P
 ><A

-NAME="AEN5206"
+NAME="AEN5200"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -847,7 +847,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
     Show the source code version numbers:
   </P
 ><A

-NAME="AEN5211"
+NAME="AEN5205"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -867,7 +867,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
    Show the browser's request headers:
   </P
 ><A

-NAME="AEN5216"
+NAME="AEN5210"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -887,7 +887,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
    Show which actions apply to a URL and why:
   </P
 ><A

-NAME="AEN5221"
+NAME="AEN5215"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
    place:
   </P
 ><A

-NAME="AEN5229"
+NAME="AEN5223"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -936,7 +936,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
 >   Short cuts. Turn off, then on: 
   </P
 ><A

-NAME="AEN5233"
+NAME="AEN5227"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -950,7 +950,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
    </P
 ></BLOCKQUOTE
 ><A

-NAME="AEN5236"
+NAME="AEN5230"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"

diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index cec7b06..e6a6433 100644 (file)
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -1444,23 +1444,22 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"

->  debug         1 # log each request destination (and the crunch reason if <SPAN
+>  debug     1 # log each request destination (and the crunch reason if <SPAN

 CLASS="APPLICATION"
 >Privoxy</SPAN
 > intercepted the request)
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > intercepted the request)

-  debug         2 # show each connection status
-  debug         4 # show I/O status
-  debug         8 # show header parsing
-  debug        16 # log all data written to the network into the logfile
-  debug        32 # debug force feature
-  debug        64 # debug regular expression filters
-  debug       128 # debug redirects
-  debug       256 # debug GIF de-animation
-  debug       512 # Common Log Format
-  debug      1024 # Unused
-  debug      2048 # CGI user interface
-  debug      4096 # Startup banner and warnings.
-  debug      8192 # Non-fatal errors</PRE
+  debug     2 # show each connection status
+  debug     4 # show I/O status
+  debug     8 # show header parsing
+  debug    16 # log all data written to the network into the logfile
+  debug    32 # debug force feature
+  debug    64 # debug regular expression filters
+  debug   128 # debug redirects
+  debug   256 # debug GIF de-animation
+  debug   512 # Common Log Format
+  debug  2048 # CGI user interface
+  debug  4096 # Startup banner and warnings.
+  debug  8192 # Non-fatal errors</PRE

 ></TD
 ></TR
 ></TABLE
 ></TD
 ></TR
 ></TABLE

diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 618c28a..e2ec1ea 100644 (file)
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -98,7 +98,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN822"
+NAME="AEN814"

 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P


@@ -129,7 +129,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
 > <H2
 CLASS="BRIDGEHEAD"
 ><A

-NAME="AEN830"
+NAME="AEN822"

 ></A
 >    Privoxy Menu</H2
 ><P
 ></A
 >    Privoxy Menu</H2
 ><P

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 2304bb1..b5c5952 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN4927"
+NAME="AEN4921"

 >12.1. License</A
 ></H2
 ><P
 >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 bfe2b8d..cd3fb52 100644 (file)
--- 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
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN4453"
+NAME="AEN4447"

 >9.1. Filter File Tutorial</A
 ></H2
 ><P
 >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 7261cea..267c778 100644 (file)
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
 ><BR></P
 ><P
 CLASS="PUBDATE"

->$Id: user-manual.sgml,v 2.73 2008/05/23 14:43:18 fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.75 2008/06/13 16:06:48 fabiankeil Exp $<BR></P

 ><DIV
 ><DIV
 CLASS="ABSTRACT"
 ><DIV
 ><DIV
 CLASS="ABSTRACT"


@@ -295,7 +295,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
 ><DL
 ><DT
 >6.1. <A

-HREF="configuration.html#AEN822"
+HREF="configuration.html#AEN814"

 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT


@@ -523,12 +523,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
 ><DL
 ><DT
 >8.1. <A

-HREF="actions-file.html#AEN2306"
+HREF="actions-file.html#AEN2298"

 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A

-HREF="actions-file.html#AEN2313"
+HREF="actions-file.html#AEN2305"

 >How to Edit</A
 ></DT
 ><DT
 >How to Edit</A
 ></DT
 ><DT


@@ -545,12 +545,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
 ><DL
 ><DT
 >8.4.1. <A

-HREF="actions-file.html#AEN2404"
+HREF="actions-file.html#AEN2396"

 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A

-HREF="actions-file.html#AEN2480"
+HREF="actions-file.html#AEN2472"

 >The Path Pattern</A
 ></DT
 ><DT
 >The Path Pattern</A
 ></DT
 ><DT


@@ -734,7 +734,7 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 ></DT
 ><DT
 >8.5.34. <A
 ></DT
 ><DT
 >8.5.34. <A

-HREF="actions-file.html#AEN4101"
+HREF="actions-file.html#AEN4095"

 >Summary</A
 ></DT
 ></DL
 >Summary</A
 ></DT
 ></DL


@@ -753,12 +753,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
 ><DL
 ><DT
 >8.7.1. <A

-HREF="actions-file.html#AEN4164"
+HREF="actions-file.html#AEN4158"

 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A

-HREF="actions-file.html#AEN4298"
+HREF="actions-file.html#AEN4292"

 >user.action</A
 ></DT
 ></DL
 >user.action</A
 ></DT
 ></DL


@@ -774,7 +774,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
 ><DL
 ><DT
 >9.1. <A

-HREF="filter-file.html#AEN4453"
+HREF="filter-file.html#AEN4447"

 >Filter File Tutorial</A
 ></DT
 ><DT
 >Filter File Tutorial</A
 ></DT
 ><DT


@@ -842,7 +842,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
 ><DL
 ><DT
 >12.1. <A

-HREF="copyright.html#AEN4927"
+HREF="copyright.html#AEN4921"

 >License</A
 ></DT
 ><DT
 >License</A
 ></DT
 ><DT


@@ -876,7 +876,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
 ></DT
 ><DT
 >14.2. <A

-HREF="appendix.html#AEN5184"
+HREF="appendix.html#AEN5178"

 >Privoxy's Internal Pages</A
 ></DT
 ><DD
 >Privoxy's Internal Pages</A
 ></DT
 ><DD

diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index fe06835..b3206eb 100644 (file)
--- a/doc/webserver/user-manual/introduction.html
+++ b/doc/webserver/user-manual/introduction.html
@@ -82,7 +82,7 @@ NAME="INTRODUCTION"
 >1. Introduction</A
 ></H1
 ><P
 >1. Introduction</A
 ></H1
 ><P

-> This documentation is included with the current UNRELEASED version of
+> This documentation is included with the current beta version of

  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN


@@ -93,7 +93,7 @@ CLASS="APPLICATION"
  completion, and includes significant changes and enhancements over
  earlier versions. .</P
 ><P
  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
+> Since this is a beta version, not all new features are well tested. This

  documentation may be slightly out of sync as a result (especially with 
  CVS sources). And there <SPAN
 CLASS="emphasis"
  documentation may be slightly out of sync as a result (especially with 
  CVS sources). And there <SPAN
 CLASS="emphasis"

diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 365652b..140201b 100644 (file)
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -727,7 +727,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
 >  <DIV
 CLASS="FIGURE"
 ><A

-NAME="AEN568"
+NAME="AEN560"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B

diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 2deb978..53a086c 100644 (file)
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -114,7 +114,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
 >  <DIV
 CLASS="FIGURE"
 ><A

-NAME="AEN623"
+NAME="AEN615"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B


@@ -251,7 +251,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
 >  <DIV
 CLASS="FIGURE"
 ><A

-NAME="AEN668"
+NAME="AEN660"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B