Rebuild with code declared stable.

diff --git a/README b/README
index aa6fd00..2fc2ee3 100644 (file)
--- a/README
+++ b/README
@@ -32,9 +32,8 @@
  *
  *********************************************************************/
 
  *
  *********************************************************************/
 

-This README is included with the development version of Privoxy 3.0.11. See
-http://www.privoxy.org/ for more information. The current code maturity level
-is "UNRELEASED", but seems stable to us :).
+This README is included with Privoxy 3.0.11. See http://www.privoxy.org/ for
+more information. The current code maturity level is "stable".

 
 -------------------------------------------------------------------------------
 
 
 -------------------------------------------------------------------------------
 


@@ -119,22 +118,16 @@ try it with FTP or other protocols for the simple reason it does not work.
 The actions list can be configured via the web interface accessed via http://
 p.p/, as well other options.
 
 The actions list can be configured via the web interface accessed via http://
 p.p/, as well other options.
 

-All configuration files are subject to unannounced changes during the
-development process.
-

 -------------------------------------------------------------------------------
 
 5. DOCUMENTATION
 
 -------------------------------------------------------------------------------
 
 5. DOCUMENTATION
 

-There should be documentation in the 'doc' subdirectory, but it may not be
-completed at this point. In particular, see the User Manual there, the FAQ, and
-those interested in Privoxy development, should look at developer-manual.
+There should be documentation in the 'doc' subdirectory. In particular, see the
+User Manual there, the FAQ, and those interested in Privoxy development, should
+look at developer-manual.

 
 

-The most up to date source of information on the current development version,
-may still be either comments in the source code, or the included configuration
-files. The source and configuration files are all well commented. The main
-configuration files are: 'config', 'default.action', and 'default.filter' in
-the top-level source directory.
+The source and configuration files are all well commented. The main
+configuration files are: 'config', 'default.action', and 'default.filter'.

 
 Included documentation may vary according to platform and packager. All
 documentation is posted on http://www.privoxy.org, in case you don't have it,
 
 Included documentation may vary according to platform and packager. All
 documentation is posted on http://www.privoxy.org, in case you don't have it,

diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html
index b5d4bd6..fbc9bb6 100644 (file)
--- a/doc/webserver/developer-manual/coding.html
+++ b/doc/webserver/developer-manual/coding.html
@@ -2343,12 +2343,8 @@ CLASS="PROGRAMLISTING"
  *
  * Purpose     :  (Fill me in with a good description!)
  *
  *
  * Purpose     :  (Fill me in with a good description!)
  *

- * Copyright   :  Written by and Copyright (C) 2001-2007 the SourceForge
- *                Privoxy team. http://www.privoxy.org/
- *
- *                Based on the Internet Junkbuster originally written
- *                by and Copyright (C) 1997 Anonymous Coders and
- *                Junkbusters Corporation.  http://www.junkbusters.com
+ * Copyright   :  Written by and Copyright (C) 2001-2009
+ *                the Privoxy team. http://www.privoxy.org/

  *
  *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
  *
  *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General


@@ -2364,7 +2360,7 @@ CLASS="PROGRAMLISTING"
  *
  *                The GNU General Public License should be included with
  *                this file.  If not, you can view it at
  *
  *                The GNU General Public License should be included with
  *                this file.  If not, you can view it at

- *                http://www.gnu.org/copyleft/gpl.html
+ *                http://www.gnu.org/licenses/old-licenses/gpl-2.0.html

  *                or write to the Free Software Foundation, Inc., 
  *                51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ,
  *                USA
  *                or write to the Free Software Foundation, Inc., 
  *                51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ,
  *                USA


@@ -2431,7 +2427,7 @@ CLASS="PROGRAMLISTING"
  *
  * Purpose     :  (Fill me in with a good description!)
  *
  *
  * Purpose     :  (Fill me in with a good description!)
  *

- * Copyright   :  Written by and Copyright (C) 2001-2008
+ * Copyright   :  Written by and Copyright (C) 2001-2009

  *                the Privoxy team. http://www.privoxy.org/
  *
  *                This program is free software; you can redistribute it
  *                the Privoxy team. http://www.privoxy.org/
  *
  *                This program is free software; you can redistribute it


@@ -2448,7 +2444,7 @@ CLASS="PROGRAMLISTING"
  *
  *                The GNU General Public License should be included with
  *                this file.  If not, you can view it at
  *
  *                The GNU General Public License should be included with
  *                this file.  If not, you can view it at

- *                http://www.gnu.org/copyleft/gpl.html
+ *                http://www.gnu.org/licenses/old-licenses/gpl-2.0.html

  *                or write to the Free Software Foundation, Inc., 
  *                51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ,
  *                USA
  *                or write to the Free Software Foundation, Inc., 
  *                51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ,
  *                USA

diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index e7e275b..3669ea4 100644 (file)
--- 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
 >9. Privoxy Copyright, License and History</A
 ></H1
 ><P

-> Copyright © 2001-2008 by Privoxy Developers <CODE
+> Copyright © 2001-2009 by Privoxy Developers <CODE

 CLASS="EMAIL"
 >&#60;<A
 HREF="mailto:ijbswa-developers@lists.sourceforge.net"
 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 511d3d3..1e13774 100644 (file)
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -40,7 +40,7 @@ CLASS="PUBDATE"
       <A
 HREF="copyright.html"
 >Copyright</A
       <A
 HREF="copyright.html"
 >Copyright</A

-> © 2001-2008 by 
+> © 2001-2009 by 

       <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"
       <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"


@@ -51,7 +51,7 @@ TARGET="_top"
     <BR></P
 ><P
 CLASS="PUBDATE"
     <BR></P
 ><P
 CLASS="PUBDATE"

->$Id: developer-manual.sgml,v 2.23 2008/09/26 17:02:01 fabiankeil Exp $<BR></P
+>$Id: developer-manual.sgml,v 2.26 2009/02/12 16:08:26 fabiankeil Exp $<BR></P

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

diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index 043bdba..6814b0e 100644 (file)
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -1351,7 +1351,7 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"

->  debchange -v 3.0.11-UNRELEASED-1 "New upstream version"</PRE
+>  debchange -v 3.0.11-stable-1 "New upstream version"</PRE

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


@@ -1379,7 +1379,7 @@ CLASS="PROGRAMLISTING"
 >        This will create
         <TT
 CLASS="FILENAME"
 >        This will create
         <TT
 CLASS="FILENAME"

->../privoxy_3.0.11-UNRELEASED-1_i386.deb</TT
+>../privoxy_3.0.11-stable-1_i386.deb</TT

 >
         which can be uploaded.  To upload the package to Sourceforge, simply
        issue
 >
         which can be uploaded.  To upload the package to Sourceforge, simply
        issue

diff --git a/doc/webserver/developer-manual/seealso.html b/doc/webserver/developer-manual/seealso.html
index 4a627c6..17adf50 100644 (file)
--- a/doc/webserver/developer-manual/seealso.html
+++ b/doc/webserver/developer-manual/seealso.html
@@ -133,9 +133,9 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
 ><TR
 ><TD
 >   <A

-HREF="http://sourceforge.net/projects/ijbswa/"
+HREF="https://sourceforge.net/projects/ijbswa/"

 TARGET="_top"
 TARGET="_top"

->http://sourceforge.net/projects/ijbswa/</A
+>https://sourceforge.net/projects/ijbswa/</A

 >, 
    the Project Page for <SPAN
 CLASS="APPLICATION"
 >, 
    the Project Page for <SPAN
 CLASS="APPLICATION"


@@ -189,9 +189,9 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
 ><TR
 ><TD
 >   <A

-HREF="http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"
+HREF="https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288"

 TARGET="_top"
 TARGET="_top"

->http://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A
+>https://sourceforge.net/tracker/?group_id=11118&#38;atid=460288</A

 >, to submit <SPAN
 CLASS="QUOTE"
 >"misses"</SPAN
 >, to submit <SPAN
 CLASS="QUOTE"
 >"misses"</SPAN


@@ -204,7 +204,6 @@ CLASS="QUOTE"
 ><P
 ></P
 >
 ><P
 ></P
 >

- 

  <P
 ></P
 ><TABLE
  <P
 ></P
 ><TABLE


@@ -253,26 +252,6 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
 ><TR
 ><TD
 >   <A

-HREF="http://privacy.net/"
-TARGET="_top"
->http://privacy.net/</A
->, a useful site
-   to check what information about you is leaked while you browse the web.
-  </TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
->
- <P
-></P
-><TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
->   <A

 HREF="http://www.squid-cache.org/"
 TARGET="_top"
 >http://www.squid-cache.org/</A
 HREF="http://www.squid-cache.org/"
 TARGET="_top"
 >http://www.squid-cache.org/</A


@@ -324,9 +303,9 @@ BORDER="0"
 ><TR
 ><TD
 >   <A
 ><TR
 ><TD
 >   <A

-HREF="http://tor.eff.org/"
+HREF="https://www.torproject.org/"

 TARGET="_top"
 TARGET="_top"

->http://tor.eff.org/</A
+>https://www.torproject.org/</A

 >, 
    <SPAN
 CLASS="APPLICATION"
 >, 
    <SPAN
 CLASS="APPLICATION"

diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 14a19b1..b2ef84a 100644 (file)
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -106,7 +106,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN1408"
+NAME="AEN1428"

 >7.1. License</A
 ></H2
 ><P
 >7.1. License</A
 ></H2
 ><P


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

-NAME="AEN1424"
+NAME="AEN1444"

 >7.2. History</A
 ></H2
 ><P
 >7.2. History</A
 ></H2
 ><P

diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 2c1a392..7c37db2 100644 (file)
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -48,7 +48,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
 ><BR></P
 ><P
 CLASS="PUBDATE"

->$Id: faq.sgml,v 2.49 2009/02/10 16:30:20 fabiankeil Exp $<BR></P
+>$Id: faq.sgml,v 2.51 2009/02/12 16:08:26 fabiankeil Exp $<BR></P

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


@@ -875,6 +875,11 @@ HREF="trouble.html#SSL-WARNINGS"
  the URL bar doesn't get highlighted and the lock symbol appears to be broken.
  What's going on?</A
 ></DT
  the URL bar doesn't get highlighted and the lock symbol appears to be broken.
  What's going on?</A
 ></DT

+><DT
+>5.22. <A
+HREF="trouble.html#SE-LINUX"
+>I get selinux error messages. How can I fix this?</A
+></DT

 ></DL
 ></DD
 ><DT
 ></DL
 ></DD
 ><DT


@@ -929,12 +934,12 @@ HREF="copyright.html"
 ><DL
 ><DT
 >7.1. <A
 ><DL
 ><DT
 >7.1. <A

-HREF="copyright.html#AEN1408"
+HREF="copyright.html#AEN1428"

 >License</A
 ></DT
 ><DT
 >7.2. <A
 >License</A
 ></DT
 ><DT
 >7.2. <A

-HREF="copyright.html#AEN1424"
+HREF="copyright.html#AEN1444"

 >History</A
 ></DT
 ></DL
 >History</A
 ></DT
 ></DL

diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index 72d24fe..7a5277b 100644 (file)
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -1088,6 +1088,75 @@ CLASS="SCREEN"
 ></TR
 ></TABLE
 ></P
 ></TR
 ></TABLE
 ></P

+><P
+> Additionally you have to configure your browser to contact
+ <SPAN
+CLASS="QUOTE"
+>"127.0.0.1:0"</SPAN
+> directly (instead of through <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>).</P
+><P
+> To add a proxy exception in <SPAN
+CLASS="APPLICATION"
+>Mozilla Firefox</SPAN
+>
+ open the <SPAN
+CLASS="QUOTE"
+>"Preferences"</SPAN
+>, click the <SPAN
+CLASS="QUOTE"
+>"Settings"</SPAN
+>
+ button located on the <SPAN
+CLASS="QUOTE"
+>"Network"</SPAN
+> tab in the <SPAN
+CLASS="QUOTE"
+>"Advanced"</SPAN
+>
+ section, and add <SPAN
+CLASS="QUOTE"
+>"127.0.0.1:0"</SPAN
+> in the <SPAN
+CLASS="QUOTE"
+>"No Proxy for:"</SPAN
+>
+ field.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H3
+CLASS="SECT2"
+><A
+NAME="SE-LINUX"
+>5.22. I get selinux error messages. How can I fix this?</A
+></H3
+><P
+> Please report the problem to the creator of your selinux policies.</P
+><P
+> The problem is that some selinux policy writers aren't familiar
+ with the application they are trying to <SPAN
+CLASS="QUOTE"
+>"secure"</SPAN
+> and
+ thus create policies that make no sense.</P
+><P
+> In <SPAN
+CLASS="APPLICATION"
+>Privoxy's</SPAN
+> case the problem usually
+ is that the policy only allows outgoing connections for certain
+ destination ports (e.g. 80 and 443). While the standard ports
+ maybe covered, websites occasionally use other ports as well.
+ This isn't a security problem and therefore <SPAN
+CLASS="APPLICATION"
+>Privoxy's</SPAN
+>
+ default configuration doesn't block these requests.</P
+><P
+></P

 ></DIV
 ></DIV
 ><DIV
 ></DIV
 ></DIV
 ><DIV

diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index 9160265..9eceade 100644 (file)
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -109,7 +109,7 @@ TARGET="_top"
 >   The most recent release is <A
 HREF="announce.txt"
 TARGET="_top"
 >   The most recent release is <A
 HREF="announce.txt"
 TARGET="_top"

->3.0.11 (UNRELEASED)</A
+>3.0.11 (stable)</A

 >. 
   </P
 ><P
 >. 
   </P
 ><P


@@ -327,7 +327,7 @@ SRC="http://sourceforge.net/sflogo.php?group_id=11118&#38;type=1&#38;dummy=.gif"
 ></P
 ><P
 > <SUB
 ></P
 ><P
 > <SUB

->  Copyright &copy; 2001 - 2008 by Privoxy Developers
+>  Copyright &copy; 2001-2009 by Privoxy Developers

  </SUB
 ></P
 ></DIV
  </SUB
 ></P
 ></DIV

diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index f0f54e4..611a3bf 100644 (file)
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -3715,6 +3715,15 @@ CLASS="REPLACEABLE"
    </P
 ></DD
 ><DT
    </P
 ></DD
 ><DT

+>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.
+   </P
+></DD
+><DT

 >Examples:</DT
 ><DD
 ><P
 >Examples:</DT
 ><DD
 ><P

diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 2e56de7..62f6eec 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="AEN763"
+NAME="AEN761"

 >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="AEN771"
+NAME="AEN769"

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


@@ -275,9 +275,7 @@ CLASS="FILENAME"
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
  <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN

-> executable.  The name
- and number of configuration files has changed from previous versions, and is
- subject to change as development progresses.</P
+> executable. </P

 ><P
 > The installed defaults provide a reasonable starting point, though 
  some settings may be aggressive by some standards. For the time being, the
 ><P
 > The installed defaults provide a reasonable starting point, though 
  some settings may be aggressive by some standards. For the time being, the


@@ -449,14 +447,6 @@ CLASS="EMPHASIS"
 >old</I
 ></SPAN
 > listening address.</P
 >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
 ></DIV
 ></DIV
 ><DIV

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 9ed90fc..559ac0a 100644 (file)
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -40,7 +40,7 @@ CLASS="PUBDATE"
 > <A
 HREF="copyright.html"
 >Copyright</A
 > <A
 HREF="copyright.html"
 >Copyright</A

-> © 2001 - 2008 by 
+> © 2001-2009 by 

  <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"
  <A
 HREF="http://www.privoxy.org/"
 TARGET="_top"


@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
 ><BR></P
 ><P
 CLASS="PUBDATE"

->$Id: user-manual.sgml,v 2.91 2009/01/13 16:50:35 fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.92 2009/02/12 16:08:26 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#AEN763"
+HREF="configuration.html#AEN761"

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

diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 8a9eefb..8f992d0 100644 (file)
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -547,8 +547,8 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
 ><TD
 ><PRE
 CLASS="SCREEN"

-> tar xzvf privoxy-3.0.11-beta-src* [.tgz or .tar.gz]
- cd privoxy-3.0.11-beta</PRE
+> tar xzvf privoxy-3.0.11-src* [.tgz or .tar.gz]
+ cd privoxy-3.0.11</PRE

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

diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index 59e170e..745c138 100644 (file)
--- a/doc/webserver/user-manual/introduction.html
+++ b/doc/webserver/user-manual/introduction.html
@@ -82,27 +82,11 @@ 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 stable version of

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

->, v.3.0.11, 
- 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
+>, v.3.0.11.</P

 ><DIV
 CLASS="SECT2"
 ><H2
 ><DIV
 CLASS="SECT2"
 ><H2


@@ -123,7 +107,7 @@ TARGET="_top"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > provides many supplemental
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > provides many supplemental

- features, some of them currently under development, 
+ features, 

  that give the end-user more control, more privacy and more freedom:</P
 ><P
 > <P
  that give the end-user more control, more privacy and more freedom:</P
 ><P
 > <P

diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index fb127bb..145f167 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="AEN517"
+NAME="AEN515"

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

diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index bbe8ecd..060d516 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="AEN572"
+NAME="AEN570"

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


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

-NAME="AEN617"
+NAME="AEN615"

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