From b5e73ac8341d223fe496f3496f292973ce5034bb Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 21 Jun 2013 14:47:10 +0000 Subject: [PATCH 1/1] Rebuild with recent changes --- doc/webserver/faq/general.html | 11 +++++------ doc/webserver/user-manual/actions-file.html | 2 +- doc/webserver/user-manual/config.html | 7 +++---- doc/webserver/user-manual/copyright.html | 1 + doc/webserver/user-manual/index.html | 2 +- doc/webserver/user-manual/whatsnew.html | 8 ++++---- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html index be0a9fb3..d7c448d0 100644 --- a/doc/webserver/faq/general.html +++ b/doc/webserver/faq/general.html @@ -505,7 +505,7 @@ problems you noticed.

If you intend to help out with the trackers, you also might want - to get an account on SourceForge.net so we don't confuse you with the other name-less users.

@@ -550,11 +550,10 @@ users.

Privoxy has therefore become an - associated project of Software - in the Public Interest (SPI), which allows us to receive - donations. In the United States they are tax-deductible, in a few - other western countries they might be tax-deductible in the + associated project of Software in the Public Interest (SPI), which allows us to + receive donations. In the United States they are tax-deductible, in a + few other western countries they might be tax-deductible in the future.

If you read this section before you may notice that paying for the diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index 896fc341..3a318b3e 100644 --- a/doc/webserver/user-manual/actions-file.html +++ b/doc/webserver/user-manual/actions-file.html @@ -3920,7 +3920,7 @@ nasty-banner-server.example.com/junk.cgi\?output=trash example.com/stylesheet\.css # Create a short, easy to remember nickname for a favorite site -# (relies on the browser accept and forward invalid URLs to Privoxy) { +redirect{http://www.privoxy.org/user-manual/actions-file.html} } a diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html index 38f75fd1..85c80e22 100644 --- a/doc/webserver/user-manual/config.html +++ b/doc/webserver/user-manual/config.html @@ -901,15 +901,14 @@

Type of value:
-

None

+

1 or + 0

Default value:
-

Unset

+

0

Effect if unset:
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html index c0705137..1c18ffb3 100644 --- a/doc/webserver/user-manual/copyright.html +++ b/doc/webserver/user-manual/copyright.html @@ -503,6 +503,7 @@ Public License instead of this License.  Reiner Buehl
 Andrew J. Caines
 Clifford Caoile
+  Edward Carrel
 Wan-Teh Chang
 Ramkumar Chinchani
 Billy Crook
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html index 28bf43a3..09386f82 100644 --- a/doc/webserver/user-manual/index.html +++ b/doc/webserver/user-manual/index.html @@ -23,7 +23,7 @@ 2001-2013 by Privoxy Developers

-

$Id: user-manual.sgml,v 2.174 2013/03/02 14:39:24 +

$Id: user-manual.sgml,v 2.175 2013/03/20 11:30:28 fabiankeil Exp $

diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html index ef800602..4d385c78 100644 --- a/doc/webserver/user-manual/whatsnew.html +++ b/doc/webserver/user-manual/whatsnew.html @@ -42,8 +42,8 @@ Release

Privoxy 3.0.21 stable is a bug-fix - release for Privoxy 3.0.20 beta. It addresses two security issues - that affect all previous Privoxy versions. The changes since 3.0.20 beta + release for Privoxy 3.0.20 beta. It addresses two security issues that + affect all previous Privoxy versions. The changes since 3.0.20 beta are: