From 0fe95c6387d3cd7173ad01a09acd06c111b189fe Mon Sep 17 00:00:00 2001
From: swa <swa@users.sourceforge.net>
Date: Wed, 10 Apr 2002 18:45:15 +0000
Subject: [PATCH] generated
---
README | 26 +++++----
doc/source/authors.sgml | 4 +-
doc/source/developer-manual.sgml | 13 +++--
doc/source/faq.sgml | 9 ++-
doc/source/privoxy-man-page.sgml | 4 +-
doc/source/readme.sgml | 6 +-
doc/source/user-manual.sgml | 9 ++-
doc/text/developer-manual.txt | 56 ++++++++++---------
doc/text/faq.txt | 16 +++---
doc/text/user-manual.txt | 40 ++++++-------
.../developer-manual/documentation.html | 12 ++--
doc/webserver/faq/index.html | 2 +-
doc/webserver/faq/misc.html | 2 +-
doc/webserver/index.html | 40 ++++++++-----
doc/webserver/user-manual/index.html | 2 +-
doc/webserver/user-manual/installation.html | 18 +++---
doc/webserver/user-manual/introduction.html | 2 +-
17 files changed, 146 insertions(+), 115 deletions(-)
diff --git a/README b/README
index 1dc2a34b..bb5bb1d8 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@
*********************************************************************/
-This README is included with the development version of Privoxy 2.9.14, which
+This README is included with the development version of Privoxy 2.9.13, which
will eventually become Privoxy v3.0 (and soon we hope!). See http://
www.privoxy.org/ for more information. The current code level is beta, and
seems stable to us :).
@@ -76,8 +76,8 @@ There are several ways to install Privoxy.
To build Privoxy from source, autoconf and GNU make (gmake) are required.
Source is available as gzipped tar archives. For this, first unpack the source:
- tar xzvf privoxy-2.9.14-beta-src* [.tgz or .tar.gz]
- cd privoxy-2.9.14-beta
+ tar xzvf privoxy-2.9.13-beta-src* [.tgz or .tar.gz]
+ cd privoxy-2.9.13-beta
For retrieving the current CVS sources, you'll need the CVS package installed
@@ -176,12 +176,12 @@ note:
* Use the Sourceforge Support Forum to get help:
- http://sourceforge.net/tracker/?group_id=11118&atid=211118
+ http://sourceforge.net/tracker/?group_id=11118&atid=211118
* Submit bugs only through our Sourceforge Bug Forum:
- http://sourceforge.net/tracker/?group_id=11118&atid=111118.
+ http://sourceforge.net/tracker/?group_id=11118&atid=111118.
Make sure that the bug has not already been submitted. Please try to verify
@@ -193,19 +193,21 @@ note:
platform, browser, any pertinent log data, any other relevant details
(please be specific) and, if possible, some way to reproduce the bug.
- * Submit feature requests only through our Sourceforge feature request
- forum:
+ * Submit feature requests only through our Sourceforge feature request forum:
- http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
+ http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
- * We will soon have an automated way to submit advertisements, incorrectly
- blocked images, popups and the like. Check back.
+ * Submit missed ads and banners, and incorrectly blocked images, popups, etc:
+
+ http://p.p/, and select "actions file feedback system"
+ This page can also be reached from many of the internal CGI pages.
+
* For any other issues, feel free to use the mailing lists:
- http://sourceforge.net/mail/?group_id=11118.
+ http://sourceforge.net/mail/?group_id=11118.
Anyone interested in actively participating in development and related
@@ -216,5 +218,5 @@ note:
ijbswa-developers@lists.sourceforge.net
-$Id: readme.sgml,v 1.5 2002/04/08 20:49:38 swa Exp $
+$Id: readme.sgml,v 1.6 2002/04/08 22:59:26 hal9 Exp $
diff --git a/doc/source/authors.sgml b/doc/source/authors.sgml
index 9c6d41ab..dca67337 100644
--- a/doc/source/authors.sgml
+++ b/doc/source/authors.sgml
@@ -3,7 +3,7 @@
Purpose : AUTHORS file for Privoxy
- $Id: authors.sgml,v 1.2 2002/04/08 20:48:37 swa Exp $
+ $Id: authors.sgml,v 1.3 2002/04/08 22:59:26 hal9 Exp $
Written by and Copyright (C) 2001 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -30,7 +30,7 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
<!entity % dummy "INCLUDE">
<!entity authors SYSTEM "p-authors.sgml">
-<!entity p-version "2.9.14">
+<!entity p-version "2.9.13">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
<!entity % p-stable "IGNORE">
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 8a5af0ce..5d062d18 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -7,7 +7,7 @@
<!entity seealso SYSTEM "seealso.sgml">
<!entity contacting SYSTEM "contacting.sgml">
<!entity copyright SYSTEM "copyright.sgml">
-<!entity p-version "2.9.14">
+<!entity p-version "2.9.13">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
<!entity % p-stable "IGNORE">
@@ -21,7 +21,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: developer-manual.sgml,v 1.27 2002/04/08 15:31:18 hal9 Exp $
+ $Id: developer-manual.sgml,v 1.28 2002/04/08 22:59:26 hal9 Exp $
Written by and Copyright (C) 2001 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -44,7 +44,7 @@
<artheader>
<title>Privoxy Developer Manual</title>
- <pubdate>$Id: developer-manual.sgml,v 1.27 2002/04/08 15:31:18 hal9 Exp $</pubdate>
+ <pubdate>$Id: developer-manual.sgml,v 1.28 2002/04/08 22:59:26 hal9 Exp $</pubdate>
<authorgroup>
<author>
@@ -1628,7 +1628,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 1.27 2002/04/08 15:31:18 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.28 2002/04/08 22:59:26 hal9 Exp $";
/*********************************************************************
*
* File : $S<!-- Break CVS Substitution -->ource$
@@ -1688,7 +1688,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 1.27 2002/04/08 15:31:18 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.28 2002/04/08 22:59:26 hal9 Exp $"
/*********************************************************************
*
* File : $S<!-- Break CVS Substitution -->ource$
@@ -2414,6 +2414,9 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$Log: developer-manual.sgml,v $
+ Revision 1.28 2002/04/08 22:59:26 hal9
+ Version update. Spell chkconfig correctly :)
+
Revision 1.27 2002/04/08 15:31:18 hal9
Touch ups to documentation section.
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 0a40591f..e80e5706 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -7,7 +7,7 @@
<!entity contacting SYSTEM "contacting.sgml">
<!entity history SYSTEM "history.sgml">
<!entity copyright SYSTEM "copyright.sgml">
-<!entity p-version "2.9.14">
+<!entity p-version "2.9.13">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
<!entity % p-stable "IGNORE">
@@ -22,7 +22,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: faq.sgml,v 1.45 2002/04/08 22:59:26 hal9 Exp $
+ $Id: faq.sgml,v 1.47 2002/04/10 04:05:32 hal9 Exp $
Written by and Copyright (C) 2001 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -60,7 +60,7 @@
<artheader>
<title>Privoxy Frequently Asked Questions</title>
-<pubdate>$Id: faq.sgml,v 1.45 2002/04/08 22:59:26 hal9 Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 1.47 2002/04/10 04:05:32 hal9 Exp $</pubdate>
<authorgroup>
<author>
@@ -1443,6 +1443,9 @@ FIXME: Commented out until we have something to put here. HB 03/18/02.
Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$Log: faq.sgml,v $
+Revision 1.47 2002/04/10 04:05:32 hal9
+More on BML, etc.
+
Revision 1.45 2002/04/08 22:59:26 hal9
Version update. Spell chkconfig correctly :)
diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index de360e56..8bb1599b 100644
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,7 +5,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: privoxy-man-page.sgml,v 1.2 2002/04/08 20:49:10 swa Exp $
+ $Id: privoxy-man-page.sgml,v 1.3 2002/04/08 22:59:26 hal9 Exp $
Written by and Copyright (C) 2001 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -43,7 +43,7 @@
<!entity seealso SYSTEM "seealso.sgml">
<!entity copyright SYSTEM "copyright.sgml">
<!entity authors SYSTEM "p-authors.sgml">
-<!entity p-version "2.9.14">
+<!entity p-version "2.9.13">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
<!entity % p-stable "IGNORE">
diff --git a/doc/source/readme.sgml b/doc/source/readme.sgml
index 1ebffc4b..112655ca 100644
--- a/doc/source/readme.sgml
+++ b/doc/source/readme.sgml
@@ -4,7 +4,7 @@
<!entity p-intro SYSTEM "privoxy.sgml">
<!entity contacting SYSTEM "contacting.sgml">
<!entity buildsource SYSTEM "buildsource.sgml">
-<!entity p-version "2.9.14">
+<!entity p-version "2.9.13">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
<!entity % p-stable "IGNORE">
@@ -17,7 +17,7 @@
Purpose : README for Privoxy
- $Id: readme.sgml,v 1.5 2002/04/08 20:49:38 swa Exp $
+ $Id: readme.sgml,v 1.6 2002/04/08 22:59:26 hal9 Exp $
Written by and Copyright (C) 2001 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -262,7 +262,7 @@
</LiteralLayout>
</para>
<para>
- $Id: readme.sgml,v 1.5 2002/04/08 20:49:38 swa Exp $
+ $Id: readme.sgml,v 1.6 2002/04/08 22:59:26 hal9 Exp $
</para>
</article>
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 8f106ba3..a8d9e186 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -8,7 +8,7 @@
<!entity contacting SYSTEM "contacting.sgml">
<!entity history SYSTEM "history.sgml">
<!entity copyright SYSTEM "copyright.sgml">
-<!entity p-version "2.9.14">
+<!entity p-version "2.9.13">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
<!entity % p-stable "IGNORE">
@@ -24,7 +24,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: user-manual.sgml,v 1.71 2002/04/08 22:59:26 hal9 Exp $
+ $Id: user-manual.sgml,v 1.72 2002/04/10 04:06:19 hal9 Exp $
Written by and Copyright (C) 2001 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -47,7 +47,7 @@
<artheader>
<title>Privoxy User Manual</title>
-<pubdate>$Id: user-manual.sgml,v 1.71 2002/04/08 22:59:26 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 1.72 2002/04/10 04:06:19 hal9 Exp $</pubdate>
<authorgroup>
<author>
@@ -3957,6 +3957,9 @@ Requests</title>
Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$Log: user-manual.sgml,v $
+ Revision 1.72 2002/04/10 04:06:19 hal9
+ Added actions feedback to Bookmarklets section
+
Revision 1.71 2002/04/08 22:59:26 hal9
Version update. Spell chkconfig correctly :)
diff --git a/doc/text/developer-manual.txt b/doc/text/developer-manual.txt
index 1a807941..fd738596 100644
--- a/doc/text/developer-manual.txt
+++ b/doc/text/developer-manual.txt
@@ -2,7 +2,7 @@ Privoxy Developer Manual
By: Privoxy Developers
-$Id: developer-manual.sgml,v 1.27 2002/04/08 15:31:18 hal9 Exp $
+$Id: developer-manual.sgml,v 1.28 2002/04/08 22:59:26 hal9 Exp $
The developer manual gives the users information on how to help the developer
team. It provides guidance on coding, testing, documentation and other issues.
@@ -231,17 +231,18 @@ sufficient for our purposes.
Some common elements that you likely will use:
-<para></para>, paragraph delimiter. Most text needs to be within paragraph
-elements (there are some exceptions).
-<emphasis></emphasis>, the stylesheets make this italics.
-<filename></filename>, files and directories.
-<command></command>, command examples.
-<literallayout></literllayout>, like <pre>, more or less.
-<itemizedlist></itemizdelist>, list with bullets.
-<listitem></listitem>, member of the above.
-<screen></screen>, screen output, implies <literallayout>.
-<ulink url="example.com"></ulink>, like HTML <a> tag.
-<quote></quote>, for, doh, quoting text.
+, paragraph delimiter. Most text needs to be within paragraph elements (there
+are some exceptions).
+, the stylesheets make this italics.
+, files and directories.
+, command examples.
+, like
+, more or less.
+, list with bullets.
+, member of the above.
+, screen output, implies .
+, like HTML tag.
+, for, doh, quoting text.
Look at any of the existing docs for examples of all these and more.
@@ -1012,13 +1013,13 @@ other header files.
Example:
-#include <iostream.h> /* This is not a local include */
+#include /* This is not a local include */
#include "config.h" /* This IS a local include */
Exception:
/* This is not a local include, but requires a path element. */
-#include <sys/fileName.h>
+#include
Note: Please! do not add "-I." to the Makefile without a _very_ good reason.
This duplicates the #include "file.h" behaviour.
@@ -1301,7 +1302,7 @@ from the project).
Example for file comments:
-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.27 2002/04/08 15:31:18 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.28 2002/04/08 22:59:26 hal9 Exp $";
/*********************************************************************
*
* File : $Source$
@@ -1357,7 +1358,7 @@ Example for file header comments:
#ifndef _FILENAME_H
#define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.27 2002/04/08 15:31:18 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.28 2002/04/08 22:59:26 hal9 Exp $"
/*********************************************************************
*
* File : $Source$
@@ -1877,12 +1878,12 @@ note:
* Use the Sourceforge Support Forum to get help:
- http://sourceforge.net/tracker/?group_id=11118&atid=211118
+ http://sourceforge.net/tracker/?group_id=11118&atid=211118
* Submit bugs only through our Sourceforge Bug Forum:
- http://sourceforge.net/tracker/?group_id=11118&atid=111118.
+ http://sourceforge.net/tracker/?group_id=11118&atid=111118.
Make sure that the bug has not already been submitted. Please try to verify
@@ -1894,19 +1895,21 @@ note:
platform, browser, any pertinent log data, any other relevant details
(please be specific) and, if possible, some way to reproduce the bug.
- * Submit feature requests only through our Sourceforge feature request
- forum:
+ * Submit feature requests only through our Sourceforge feature request forum:
- http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
+ http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
- * We will soon have an automated way to submit advertisements, incorrectly
- blocked images, popups and the like. Check back.
+ * Submit missed ads and banners, and incorrectly blocked images, popups, etc:
+
+ http://p.p/, and select "actions file feedback system"
+ This page can also be reached from many of the internal CGI pages.
+
* For any other issues, feel free to use the mailing lists:
- http://sourceforge.net/mail/?group_id=11118.
+ http://sourceforge.net/mail/?group_id=11118.
Anyone interested in actively participating in development and related
@@ -1941,7 +1944,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA.
Privoxy is evolved, and derived from, the Internet Junkbuster, with many
improvments and enhancements over the original.
-Junkbuster was originally written by Anonymous Coders and Junkbuster's
+Junkbuster was originally written by Anonymous Coders and Junkbusters
Corporation, and was released as free open-source software under the GNU GPL.
Stefan Waldherr made many improvements, and started the SourceForge project
Privoxy to rekindle development. There are now several active developers
@@ -1962,6 +1965,9 @@ Sourceforge.
http://p.p/, access Privoxy from your browser. Alternately, http://
config.privoxy.org may work in some situations where the first does not.
+http://p.p/, and select "actions file feedback system" to submit "misses" to
+the developers.
+
http://www.junkbusters.com/ht/en/cookies.html
http://www.waldherr.org/junkbuster/
diff --git a/doc/text/faq.txt b/doc/text/faq.txt
index 50e9f4c9..75032934 100644
--- a/doc/text/faq.txt
+++ b/doc/text/faq.txt
@@ -2,7 +2,7 @@ Privoxy Frequently Asked Questions
By: Privoxy Developers
-$Id: faq.sgml,v 1.45 2002/04/08 22:59:26 hal9 Exp $
+$Id: faq.sgml,v 1.47 2002/04/10 04:05:32 hal9 Exp $
This FAQ gives users and developers alike answers to frequently asked questions
about Privoxy .
@@ -124,12 +124,12 @@ Table of Contents
1.1. What is this new version of Privoxy?
-The original Internet JunkbusterTM (tm) is a copyrighted product of Junkbusters
-Corporation. Development of this effort stopped some time ago as of version
-2.0.2. Stefan Waldherr started the ijbswa project on Sourceforge to rekindle
-development. Other developers subsequently joined with Stefan, and have since
-added many new features, refinements and enhancements. The result of this
-effort is Privoxy.
+The original Internet Junkbuster™ (tm) is a copyrighted product of
+Junkbusters Corporation. Development of this effort stopped some time ago as of
+version 2.0.2. Stefan Waldherr started the ijbswa project on Sourceforge to
+rekindle development. Other developers subsequently joined with Stefan, and
+have since added many new features, refinements and enhancements. The result of
+this effort is Privoxy.
Privoxy has evolved from the Junkbuster 2.0.2 code base, and has advanced
significantly at this point.
@@ -687,7 +687,7 @@ Privoxy.
If you have version 2.0.2, then the equivalent is http://example.com/
show-proxy-args (but you get far less information, and you should really
-consider upgrading to 2.9.14).
+consider upgrading to 2.9.13).
-------------------------------------------------------------------------------
diff --git a/doc/text/user-manual.txt b/doc/text/user-manual.txt
index e86afeb7..ebc0bba0 100644
--- a/doc/text/user-manual.txt
+++ b/doc/text/user-manual.txt
@@ -2,7 +2,7 @@ Privoxy User Manual
By: Privoxy Developers
-$Id: user-manual.sgml,v 1.71 2002/04/08 22:59:26 hal9 Exp $
+$Id: user-manual.sgml,v 1.72 2002/04/10 04:06:19 hal9 Exp $
The user manual gives users information on how to install, configure and use
Privoxy.
@@ -89,7 +89,7 @@ Table of Contents
1. Introduction
This documentation is included with the current beta version of Privoxy,
-v.2.9.14, and is mostly complete at this point. The most up to date reference
+v.2.9.13, 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 version 3.0 is currently nearing
completion, and includes many significant changes and enhancements over earlier
@@ -166,8 +166,8 @@ There are several ways to install Privoxy.
To build Privoxy from source, autoconf and GNU make (gmake) are required.
Source is available as gzipped tar archives. For this, first unpack the source:
- tar xzvf privoxy-2.9.14-beta-src* [.tgz or .tar.gz]
- cd privoxy-2.9.14-beta
+ tar xzvf privoxy-2.9.13-beta-src* [.tgz or .tar.gz]
+ cd privoxy-2.9.13-beta
For retrieving the current CVS sources, you'll need the CVS package installed
@@ -214,13 +214,13 @@ To build Redhat RPM packages from source, install source as above. Then:
This will create both binary and src RPMs in the usual places. Example:
- /usr/src/redhat/RPMS/i686/privoxy-2.9.14-1.i686.rpm
+ /usr/src/redhat/RPMS/i686/privoxy-2.9.13-1.i686.rpm
- /usr/src/redhat/SRPMS/privoxy-2.9.14-1.src.rpm
+ /usr/src/redhat/SRPMS/privoxy-2.9.13-1.src.rpm
To install, of course:
- rpm -Uvv /usr/src/redhat/RPMS/i686/privoxy-2.9.14-1.i686.rpm
+ rpm -Uvv /usr/src/redhat/RPMS/i686/privoxy-2.9.13-1.i686.rpm
This will place the Privoxy configuration files in /etc/privoxy/, and log files
@@ -241,13 +241,13 @@ To build SuSE RPM packages, install source as above. Then:
This will create both binary and src RPMs in the usual places. Example:
- /usr/src/packages/RPMS/i686/privoxy-2.9.14-1.i686.rpm
+ /usr/src/packages/RPMS/i686/privoxy-2.9.13-1.i686.rpm
- /usr/src/packages/SRPMS/privoxy-2.9.14-1.src.rpm
+ /usr/src/packages/SRPMS/privoxy-2.9.13-1.src.rpm
To install, of course:
- rpm -Uvv /usr/src/packages/RPMS/i686/privoxy-2.9.14-1.i686.rpm
+ rpm -Uvv /usr/src/packages/RPMS/i686/privoxy-2.9.13-1.i686.rpm
This will place the Privoxy configuration files in /etc/privoxy/, and log files
@@ -259,7 +259,7 @@ in /var/log/privoxy/.
Privoxy is packaged in a WarpIN self- installing archive. The self-installing
program will be named depending on the release version, something like:
-privoxyos2_setup_2.9.14.exe. In order to install it, simply run this executable
+privoxyos2_setup_2.9.13.exe. In order to install it, simply run this executable
or double-click on its icon and follow the WarpIN installation panels. A shadow
of the Privoxy executable will be placed in your startup folder so it will
start automatically whenever OS/2 starts.
@@ -449,7 +449,7 @@ Privoxy can be reached by the special URL http://p.p/ (or alternately http://
config.privoxy.org/), which is an internal page. You will see the following
section:
-Please choose from the following options:
+ Please choose from the following options:
* Show information about the current configuration
* Show the source code version numbers
@@ -2100,7 +2100,7 @@ basically what Privoxy would do if there were not any "actions" defined, i.e.
it does nothing. Every action is disabled. This is not particularly informative
for our purposes here. OK, next section:
- Matches for http://google.com:
+ Matches for http://google.com:
{ -add-header -block +deanimate-gifs -downgrade +fast-redirects
+filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}
@@ -2140,7 +2140,7 @@ referenced in these sections.
And now we pull it altogether in the bottom section and summarize how Privoxy
is appying all its "actions" to "google.com":
- Final results:
+ Final results:
-add-header -block -deanimate-gifs -downgrade -fast-redirects
+filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}
@@ -2154,7 +2154,7 @@ is appying all its "actions" to "google.com":
Now another example, "ad.doubleclick.net":
- { +block +image }
+ { +block +image }
.ad.doubleclick.net
{ +block +image }
@@ -2181,7 +2181,7 @@ defined as "ad.doubleclick.net" is done here -- as both a "+block" and an
One last example. Let's try "http://www.rhapsodyk.net/adsl/HOWTO/". This one is
giving us problems. We are getting a blank page. Hmmm...
- Matches for http://www.rhapsodyk.net/adsl/HOWTO/:
+ Matches for http://www.rhapsodyk.net/adsl/HOWTO/:
{ -add-header -block +deanimate-gifs -downgrade +fast-redirects
+filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}
@@ -2202,7 +2202,7 @@ see why we get the blank page. We could now add a new action below this that
explictly does not block (-block) pages with "adsl". There are various ways to
handle such exceptions. Example:
- { -block }
+ { -block }
/adsl
@@ -2213,7 +2213,7 @@ such changes. Or, try using Shift+Reload.
But now what about a situation where we get no explicit matches like we did
with:
- { -block }
+ { -block }
/adsl
@@ -2225,7 +2225,7 @@ and maybe a little trial and error to isolate the offending rule. One likely
cause would be one of the "{+filter}" actions. Try adding the URL for the site
to one of aliases that turn off "+filter":
- {shop}
+ {shop}
.quietpc.com
.worldpay.com # for quietpc.com
.jungle.com
@@ -2237,7 +2237,7 @@ to one of aliases that turn off "+filter":
"{shop}" is an "alias" that expands to "{ -filter -no-cookies -no-cookies-keep
}". Or you could do your own exception to negate filtering:
- {-filter}
+ {-filter}
.forbes.com
diff --git a/doc/webserver/developer-manual/documentation.html b/doc/webserver/developer-manual/documentation.html
index 9eeab323..1112292b 100644
--- a/doc/webserver/developer-manual/documentation.html
+++ b/doc/webserver/developer-manual/documentation.html
@@ -377,7 +377,7 @@ CLASS="LITERAL"
><TD
> <I
CLASS="EMPHASIS"
-><itemizedlist></itemizedlist></I
+><itemizedlist></itemizdelist></I
>, list with bullets.
</TD
></TR
@@ -678,7 +678,7 @@ CLASS="APPLICATION"
>
version string, e.g. <SPAN
CLASS="QUOTE"
->"2.9.14"</SPAN
+>"2.9.13"</SPAN
>.
</TD
></TR
@@ -690,13 +690,13 @@ CLASS="EMPHASIS"
>: the project status, either
<SPAN
CLASS="QUOTE"
->"alpha"</SPAN
+>"ALPHA"</SPAN
>, <SPAN
CLASS="QUOTE"
->"beta"</SPAN
+>"BETA"</SPAN
>, or <SPAN
CLASS="QUOTE"
->"stable"</SPAN
+>"STABLE"</SPAN
>.
</TD
></TR
@@ -711,7 +711,7 @@ CLASS="QUOTE"
>"not stable"</SPAN
> releases (e.g. <SPAN
CLASS="QUOTE"
->"beta"</SPAN
+>"BETA"</SPAN
>).
</TD
></TR
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 24389897..a9d0a018 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -49,7 +49,7 @@ CLASS="ORGNAME"
></DIV
><P
CLASS="PUBDATE"
->$Id: faq.sgml,v 1.45 2002/04/08 22:59:26 hal9 Exp $<BR></P
+>$Id: faq.sgml,v 1.47 2002/04/10 04:05:32 hal9 Exp $<BR></P
><DIV
><DIV
CLASS="ABSTRACT"
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index 78acb671..9b68069b 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -205,7 +205,7 @@ CLASS="APPLICATION"
><P
> If you have version 2.0.2, then the equivalent is
http://example.com/show-proxy-args (but you get far less information, and
- you should really consider upgrading to 2.9.14).</P
+ you should really consider upgrading to 2.9.13).</P
></DIV
><DIV
CLASS="SECT2"
diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index da38539a..0b85fc0b 100644
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -80,12 +80,12 @@ HREF="#SUPPORT"
></DT
><DT
><A
-HREF="#AEN90"
+HREF="#AEN94"
>Copyright</A
></DT
><DT
><A
-HREF="#AEN97"
+HREF="#AEN101"
>History</A
></DT
></DL
@@ -318,7 +318,7 @@ NAME="SUPPORT"
CLASS="LITERALLAYOUT"
> Use the Sourceforge Support Forum to get help:<br>
<br>
- <A
+ <A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=211118</A
@@ -330,7 +330,7 @@ TARGET="_top"
CLASS="LITERALLAYOUT"
> Submit bugs only through our Sourceforge Bug Forum:<br>
<br>
- <A
+ <A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=111118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=111118</A
@@ -361,10 +361,9 @@ CLASS="APPLICATION"
><LI
><P
CLASS="LITERALLAYOUT"
-> Submit feature requests only through our Sourceforge feature request <br>
- forum:<br>
+> Submit feature requests only through our Sourceforge feature request forum:<br>
<br>
- <A
+ <A
HREF="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse"
TARGET="_top"
>http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse</A
@@ -374,16 +373,31 @@ TARGET="_top"
><LI
><P
CLASS="LITERALLAYOUT"
->We will soon have an automated way to submit advertisements, incorrectly<br>
-blocked images, popups and the like. Check back.<br>
+> Submit missed ads and banners, and incorrectly blocked images, popups, etc:<br>
+ <br>
+ <A
+HREF="http://p.p/"
+TARGET="_top"
+>http://p.p/</A
+>, and select <A
+HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"actions file feedback system"</SPAN
+></A
+><br>
</P
+><P
+> This page can also be reached from many of the internal CGI pages.
+ </P
></LI
><LI
><P
CLASS="LITERALLAYOUT"
> For any other issues, feel free to use the mailing lists:<br>
<br>
- <A
+ <A
HREF="http://sourceforge.net/mail/?group_id=11118"
TARGET="_top"
>http://sourceforge.net/mail/?group_id=11118</A
@@ -403,7 +417,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN90"
+NAME="AEN94"
>Copyright</A
></H1
><P
@@ -435,7 +449,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN97"
+NAME="AEN101"
>History</A
></H1
><P
@@ -456,7 +470,7 @@ CLASS="APPLICATION"
Coders and <A
HREF="http://www.junkbusters.com"
TARGET="_top"
->Junkbuster's
+>Junkbusters
Corporation</A
>, and was released as free open-source software under the
GNU GPL. <A
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 64ad4085..c47ed5bc 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -49,7 +49,7 @@ CLASS="ORGNAME"
></DIV
><P
CLASS="PUBDATE"
->$Id: user-manual.sgml,v 1.71 2002/04/08 22:59:26 hal9 Exp $<BR></P
+>$Id: user-manual.sgml,v 1.72 2002/04/10 04:06:19 hal9 Exp $<BR></P
><DIV
><DIV
CLASS="ABSTRACT"
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index d15c76a0..3defd45c 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -136,8 +136,8 @@ WIDTH="100%"
><TD
><PRE
CLASS="SCREEN"
-> tar xzvf privoxy-2.9.14-beta-src* [.tgz or .tar.gz]
- cd privoxy-2.9.14-beta
+> tar xzvf privoxy-2.9.13-beta-src* [.tgz or .tar.gz]
+ cd privoxy-2.9.13-beta
</PRE
></TD
></TR
@@ -256,9 +256,9 @@ CLASS="SCREEN"
><P
> This will create both binary and src RPMs in the usual places. Example:</P
><P
-> /usr/src/redhat/RPMS/i686/privoxy-2.9.14-1.i686.rpm</P
+> /usr/src/redhat/RPMS/i686/privoxy-2.9.13-1.i686.rpm</P
><P
-> /usr/src/redhat/SRPMS/privoxy-2.9.14-1.src.rpm</P
+> /usr/src/redhat/SRPMS/privoxy-2.9.13-1.src.rpm</P
><P
> To install, of course:</P
><P
@@ -270,7 +270,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="SCREEN"
-> rpm -Uvv /usr/src/redhat/RPMS/i686/privoxy-2.9.14-1.i686.rpm
+> rpm -Uvv /usr/src/redhat/RPMS/i686/privoxy-2.9.13-1.i686.rpm
</PRE
></TD
></TR
@@ -332,9 +332,9 @@ CLASS="SCREEN"
><P
> This will create both binary and src RPMs in the usual places. Example:</P
><P
-> /usr/src/packages/RPMS/i686/privoxy-2.9.14-1.i686.rpm</P
+> /usr/src/packages/RPMS/i686/privoxy-2.9.13-1.i686.rpm</P
><P
-> /usr/src/packages/SRPMS/privoxy-2.9.14-1.src.rpm</P
+> /usr/src/packages/SRPMS/privoxy-2.9.13-1.src.rpm</P
><P
> To install, of course:</P
><P
@@ -346,7 +346,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="SCREEN"
-> rpm -Uvv /usr/src/packages/RPMS/i686/privoxy-2.9.14-1.i686.rpm
+> rpm -Uvv /usr/src/packages/RPMS/i686/privoxy-2.9.13-1.i686.rpm
</PRE
></TD
></TR
@@ -383,7 +383,7 @@ CLASS="APPLICATION"
on the release version, something like:
<TT
CLASS="FILENAME"
->privoxyos2_setup_2.9.14.exe</TT
+>privoxyos2_setup_2.9.13.exe</TT
>. In order to install it, simply
run this executable or double-click on its icon and follow the WarpIN
installation panels. A shadow of the <SPAN
diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index 33e8a972..9bdf6d91 100644
--- a/doc/webserver/user-manual/introduction.html
+++ b/doc/webserver/user-manual/introduction.html
@@ -78,7 +78,7 @@ NAME="INTRODUCTION"
<SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
->, v.2.9.14,
+>, v.2.9.13,
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 version 3.0 is currently nearing
--
2.49.0