From: hal9 <hal9@users.sourceforge.net>
Date: Sat, 19 Jan 2008 17:52:39 +0000 (+0000)
Subject: Re-commit to fix various minor issues for new release.
X-Git-Tag: v_3_0_8~15
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=fe2dba94b00d45349597603a45cca6456c03fe54

Re-commit to fix various minor issues for new release.
---

diff --git a/doc/pdf/privoxy-developer-manual.pdf b/doc/pdf/privoxy-developer-manual.pdf
index a849f712..5d719a34 100644
Binary files a/doc/pdf/privoxy-developer-manual.pdf and b/doc/pdf/privoxy-developer-manual.pdf differ
diff --git a/doc/pdf/privoxy-faq.pdf b/doc/pdf/privoxy-faq.pdf
index 81e7e4c3..489e4f13 100644
Binary files a/doc/pdf/privoxy-faq.pdf and b/doc/pdf/privoxy-faq.pdf differ
diff --git a/doc/pdf/privoxy-user-manual.pdf b/doc/pdf/privoxy-user-manual.pdf
index f244f683..894068b2 100644
Binary files a/doc/pdf/privoxy-user-manual.pdf and b/doc/pdf/privoxy-user-manual.pdf differ
diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml
index 7086908b..db66aa20 100644
--- a/doc/source/copyright.sgml
+++ b/doc/source/copyright.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: copyright.sgml,v 2.7 2007/11/19 17:36:22 fabiankeil Exp $
+ $Id: copyright.sgml,v 2.8 2008/01/17 01:49:51 hal9 Exp $
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -36,7 +36,7 @@
 -->
 
 <para>
- Copyright &my-copy; 2001-2007 by Privoxy Developers <email>ijbswa-developers@lists.sourceforge.net</email>
+ Copyright &my-copy; 2001-2008 by Privoxy Developers <email>ijbswa-developers@lists.sourceforge.net</email>
 </para>
 
 <para>
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 681cd197..585cddb1 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -23,7 +23,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $
+ $Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -44,13 +44,13 @@
      <subscript>
     <!-- Completely the wrong markup, but very little is allowed  -->
     <!-- in this part of an article. FIXME -->
-      <link linkend="copyright">Copyright</link> &my-copy; 2001-2007 by 
+      <link linkend="copyright">Copyright</link> &my-copy; 2001-2008 by 
       <ulink url="http://www.privoxy.org/">Privoxy Developers</ulink>
      </subscript>
     </pubdate>
 
 
-    <pubdate>$Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $</pubdate>
 
 <!--
 
@@ -1833,7 +1833,7 @@ static void unload_re_filterfile( void *f ) { ... }</programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>
-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $";
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -1894,7 +1894,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION;
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $"
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -3026,6 +3026,9 @@ at sourceforge. Three simple steps:
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
+  Revision 2.15  2008/01/19 15:03:05  hal9
+  Doc sources tagged for 3.0.8 release.
+
   Revision 2.14  2008/01/17 01:49:51  hal9
   Change copyright notice for docs s/2007/2008/. All these will be rebuilt soon
   enough.
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index b073f211..cc76dd86 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -26,7 +26,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 2.36 2008/01/17 01:49:51 hal9 Exp $
+ $Id: faq.sgml,v 2.37 2008/01/19 15:03:05 hal9 Exp $
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -72,12 +72,12 @@
  <subscript>
 <!-- Completely the wrong markup, but very little is allowed  -->
 <!-- in this part of an article. FIXME -->
- <link linkend="copyright">Copyright</link> &my-copy; 2001-2007 by 
+ <link linkend="copyright">Copyright</link> &my-copy; 2001-2008 by 
  <ulink url="http://www.privoxy.org/">Privoxy Developers</ulink>
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.36 2008/01/17 01:49:51 hal9 Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.37 2008/01/19 15:03:05 hal9 Exp $</pubdate>
 
 <!--
 
@@ -2808,6 +2808,9 @@ browsing has slowed to a crawl. What gives? </title>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $
+Revision 2.37  2008/01/19 15:03:05  hal9
+Doc sources tagged for 3.0.8 release.
+
 Revision 2.36  2008/01/17 01:49:51  hal9
 Change copyright notice for docs s/2007/2008/. All these will be rebuilt soon
 enough.
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 28165bd8..9ec9a341 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -33,7 +33,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: user-manual.sgml,v 2.52 2008/01/17 01:49:51 hal9 Exp $
+ $Id: user-manual.sgml,v 2.53 2008/01/19 15:03:05 hal9 Exp $
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -54,12 +54,12 @@
  <subscript>
 <!-- Completely the wrong markup, but very little is allowed  -->
 <!-- in this part of an article. FIXME -->
- <link linkend="copyright">Copyright</link> &my-copy; 2001 - 2007 by 
+ <link linkend="copyright">Copyright</link> &my-copy; 2001 - 2008 by 
  <ulink url="http://www.privoxy.org/">Privoxy Developers</ulink>
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 2.52 2008/01/17 01:49:51 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.53 2008/01/19 15:03:05 hal9 Exp $</pubdate>
 
 <!--
 
@@ -1195,7 +1195,7 @@ How to install the binary packages depends on your operating system:
 </para>
  
 <literallayout>
- <guibutton>Tools</guibutton> -> <guibutton>Options</guibutton> -> <guibutton>General</guibutton> -> <guibutton>Connection Settings</guibutton> -> <guibutton>Manual Proxy Configuration</guibutton>
+ <guibutton>Tools</guibutton> -> <guibutton>Options</guibutton> ->  <guibutton>Advanced</guibutton> -> <guibutton>Network</guibutton> -><guibutton>Connection</guibutton> -> <guibutton>Settings</guibutton>
 
 </literallayout>
 
@@ -8920,6 +8920,9 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
+ Revision 2.53  2008/01/19 15:03:05  hal9
+ Doc sources tagged for 3.0.8 release.
+
  Revision 2.52  2008/01/17 01:49:51  hal9
  Change copyright notice for docs s/2007/2008/. All these will be rebuilt soon
  enough.
diff --git a/doc/text/developer-manual.txt b/doc/text/developer-manual.txt
index b6023da4..eeb17e30 100644
--- a/doc/text/developer-manual.txt
+++ b/doc/text/developer-manual.txt
@@ -1,8 +1,8 @@
 Privoxy Developer Manual
 
-[ Copyright   2001-2007 by Privoxy Developers ]
+[ Copyright   2001-2008 by Privoxy Developers ]
 
-$Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $
+$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $
 
 The developer manual provides guidance on coding, testing, packaging,
 documentation and other issues of importance to those involved with Privoxy
@@ -1444,7 +1444,7 @@ from the project).
 
 Example for file comments:
 
-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $";
 /*********************************************************************
  *
  * File        :  $Source$
@@ -1503,7 +1503,7 @@ Example for file header comments:
 
 #ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $"
 /*********************************************************************
  *
  * File        :  $Source$
@@ -2396,7 +2396,7 @@ group_id=11118.
 
 9. Privoxy Copyright, License and History
 
-Copyright   2001-2007 by Privoxy Developers <
+Copyright   2001-2008 by Privoxy Developers <
 ijbswa-developers@lists.sourceforge.net>
 
 Some source code is based on code Copyright   1997 by Anonymous Coders and
diff --git a/doc/text/faq.txt b/doc/text/faq.txt
index 6eedb217..e263cc27 100644
--- a/doc/text/faq.txt
+++ b/doc/text/faq.txt
@@ -1,8 +1,8 @@
 Privoxy Frequently Asked Questions
 
-[ Copyright   2001-2007 by Privoxy Developers ]
+[ Copyright   2001-2008 by Privoxy Developers ]
 
-$Id: faq.sgml,v 2.36 2008/01/17 01:49:51 hal9 Exp $
+$Id: faq.sgml,v 2.37 2008/01/19 15:03:05 hal9 Exp $
 
 This FAQ gives quick answers to frequently asked questions about Privoxy. It is
 not a substitute for the Privoxy User Manual.
@@ -2266,7 +2266,7 @@ group_id=11118.
 
 7. Privoxy Copyright, License and History
 
-Copyright   2001-2007 by Privoxy Developers <
+Copyright   2001-2008 by Privoxy Developers <
 ijbswa-developers@lists.sourceforge.net>
 
 Some source code is based on code Copyright   1997 by Anonymous Coders and
diff --git a/doc/text/user-manual.txt b/doc/text/user-manual.txt
index e119faee..a5058e45 100644
--- a/doc/text/user-manual.txt
+++ b/doc/text/user-manual.txt
@@ -1,6 +1,6 @@
 Privoxy 3.0.8 User Manual
 
-[ Copyright   2001 - 2007 by Privoxy Developers ]
+[ Copyright   2001 - 2008 by Privoxy Developers ]
 
 $Id: user-manual.sgml,v 2.53 2008/01/19 15:03:05 hal9 Exp $
 
@@ -901,8 +901,7 @@ Settings
 
 With Firefox, this is typically set under:
 
- Tools -> Options -> General -> Connection Settings -> Manual Proxy
-Configuration
+ Tools -> Options ->  Advanced -> Network ->Connection -> Settings
  
 
 Or optionally on some platforms:
@@ -6226,7 +6225,7 @@ group_id=11118.
 
 12. Privoxy Copyright, License and History
 
-Copyright   2001-2007 by Privoxy Developers <
+Copyright   2001-2008 by Privoxy Developers <
 ijbswa-developers@lists.sourceforge.net>
 
 Some source code is based on code Copyright   1997 by Anonymous Coders and
diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html
index 789a9790..e6c8476c 100644
--- a/doc/webserver/developer-manual/coding.html
+++ b/doc/webserver/developer-manual/coding.html
@@ -2333,7 +2333,7 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $";
+>const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $";
 /*********************************************************************
  *
  * File        :  $Source$
@@ -2421,7 +2421,7 @@ WIDTH="100%"
 CLASS="PROGRAMLISTING"
 >#ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $"
 /*********************************************************************
  *
  * File        :  $Source$
diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index 435292d0..e8a604be 100644
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -77,7 +77,7 @@ NAME="COPYRIGHT"
 >9. Privoxy Copyright, License and History</A
 ></H1
 ><P
-> Copyright © 2001-2007 by Privoxy Developers <CODE
+> Copyright © 2001-2008 by Privoxy Developers <CODE
 CLASS="EMAIL"
 >&#60;<A
 HREF="mailto:ijbswa-developers@lists.sourceforge.net"
diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index e97233f3..dec4622c 100644
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -37,7 +37,7 @@ CLASS="PUBDATE"
       <A
 HREF="copyright.html"
 >Copyright</A
-> © 2001-2007 by 
+> © 2001-2008 by 
       <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"
@@ -48,7 +48,7 @@ TARGET="_top"
     <BR></P
 ><P
 CLASS="PUBDATE"
->$Id: developer-manual.sgml,v 2.14 2008/01/17 01:49:51 hal9 Exp $<BR></P
+>$Id: developer-manual.sgml,v 2.15 2008/01/19 15:03:05 hal9 Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 080f3465..83dc0ad1 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -70,7 +70,7 @@ NAME="COPYRIGHT"
 >7. Privoxy Copyright, License and History</A
 ></H1
 ><P
-> Copyright © 2001-2007 by Privoxy Developers <CODE
+> Copyright © 2001-2008 by Privoxy Developers <CODE
 CLASS="EMAIL"
 >&#60;<A
 HREF="mailto:ijbswa-developers@lists.sourceforge.net"
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 6ff7ec1d..0df847ec 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -35,7 +35,7 @@ CLASS="PUBDATE"
 > <A
 HREF="copyright.html"
 >Copyright</A
-> © 2001-2007 by 
+> © 2001-2008 by 
  <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"
@@ -45,7 +45,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: faq.sgml,v 2.36 2008/01/17 01:49:51 hal9 Exp $<BR></P
+>$Id: faq.sgml,v 2.37 2008/01/19 15:03:05 hal9 Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 5b05d84c..da2f0797 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -259,7 +259,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN2175"
+NAME="AEN2176"
 ></A
 ><P
 ><B
@@ -528,7 +528,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2274"
+NAME="AEN2275"
 >8.1. Finding the Right Mix</A
 ></H2
 ><P
@@ -563,7 +563,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2281"
+NAME="AEN2282"
 >8.2. How to Edit</A
 ></H2
 ><P
@@ -893,7 +893,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2372"
+NAME="AEN2373"
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
@@ -1133,7 +1133,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2448"
+NAME="AEN2449"
 >8.4.2. The Path Pattern</A
 ></H3
 ><P
@@ -7199,7 +7199,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4260"
+NAME="AEN4261"
 >8.5.39. Summary</A
 ></H3
 ><P
@@ -7504,7 +7504,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4325"
+NAME="AEN4326"
 >8.7.1. default.action</A
 ></H3
 ><P
@@ -8225,7 +8225,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4461"
+NAME="AEN4462"
 >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 580b0649..8617400f 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -745,7 +745,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5346"
+NAME="AEN5347"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -791,7 +791,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5360"
+NAME="AEN5361"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -824,7 +824,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5368"
+NAME="AEN5369"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -844,7 +844,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5373"
+NAME="AEN5374"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -864,7 +864,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5378"
+NAME="AEN5379"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -884,7 +884,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5383"
+NAME="AEN5384"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -916,7 +916,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5391"
+NAME="AEN5392"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -933,7 +933,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5395"
+NAME="AEN5396"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -947,7 +947,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5398"
+NAME="AEN5399"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 4a2be717..1fae582e 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -95,7 +95,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN820"
+NAME="AEN821"
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
@@ -126,7 +126,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN828"
+NAME="AEN829"
 ></A
 >    Privoxy Menu</H2
 ><P
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index cc5db80c..eb6ae38a 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -80,7 +80,7 @@ NAME="COPYRIGHT"
 >12. Privoxy Copyright, License and History</A
 ></H1
 ><P
-> Copyright © 2001-2007 by Privoxy Developers <CODE
+> Copyright © 2001-2008 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="AEN5089"
+NAME="AEN5090"
 >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 89d73cdf..315f6a19 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -363,7 +363,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4616"
+NAME="AEN4617"
 >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 80b286a4..79325812 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -37,7 +37,7 @@ CLASS="PUBDATE"
 > <A
 HREF="copyright.html"
 >Copyright</A
-> © 2001 - 2007 by 
+> © 2001 - 2008 by 
  <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"
@@ -292,7 +292,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN820"
+HREF="configuration.html#AEN821"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -515,12 +515,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2274"
+HREF="actions-file.html#AEN2275"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2281"
+HREF="actions-file.html#AEN2282"
 >How to Edit</A
 ></DT
 ><DT
@@ -537,12 +537,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2372"
+HREF="actions-file.html#AEN2373"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2448"
+HREF="actions-file.html#AEN2449"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -754,7 +754,7 @@ HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
 ></DT
 ><DT
 >8.5.39. <A
-HREF="actions-file.html#AEN4260"
+HREF="actions-file.html#AEN4261"
 >Summary</A
 ></DT
 ></DL
@@ -773,12 +773,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4325"
+HREF="actions-file.html#AEN4326"
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4461"
+HREF="actions-file.html#AEN4462"
 >user.action</A
 ></DT
 ></DL
@@ -794,7 +794,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4616"
+HREF="filter-file.html#AEN4617"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -862,7 +862,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN5089"
+HREF="copyright.html#AEN5090"
 >License</A
 ></DT
 ><DT
@@ -896,7 +896,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5346"
+HREF="appendix.html#AEN5347"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 14ce68a6..7e706cd7 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -141,15 +141,18 @@ CLASS="GUIBUTTON"
 >&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
 >Options</SPAN
->&nbsp;-&#62;&nbsp;<SPAN
+>&nbsp;-&#62;&nbsp;&nbsp;<SPAN
 CLASS="GUIBUTTON"
->General</SPAN
+>Advanced</SPAN
 >&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
->Connection Settings</SPAN
+>Network</SPAN
+>&nbsp;-&#62;<SPAN
+CLASS="GUIBUTTON"
+>Connection</SPAN
 >&nbsp;-&#62;&nbsp;<SPAN
 CLASS="GUIBUTTON"
->Manual Proxy Configuration</SPAN
+>Settings</SPAN
 ><br>&#13;</P
 ><P
 > 
@@ -245,7 +248,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN672"
+NAME="AEN673"
 ></A
 ><P
 ><B