From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 18 Mar 2012 15:44:20 +0000 (+0000)
Subject: Rebuilt HTML for 3.0.20 UNRELEASED with Ian's recent changes
X-Git-Tag: v_3_0_20~375
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/faq/@default-cgi@/diff?a=commitdiff_plain;h=5fd77903894c0798908743d90ce72b9bdf2cce7d;p=privoxy.git
Rebuilt HTML for 3.0.20 UNRELEASED with Ian's recent changes
---
diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html
index 590801e3..39aea1ad 100644
--- a/doc/webserver/developer-manual/coding.html
+++ b/doc/webserver/developer-manual/coding.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Coding Guidelines</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html
index 7594f9ab..f5d8a0ae 100644
--- a/doc/webserver/developer-manual/contact.html
+++ b/doc/webserver/developer-manual/contact.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Contacting the developers, Bug Reporting and Feature
Requests</title>
<meta name="GENERATOR" content=
diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index f6d39e60..1087509a 100644
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Privoxy Copyright, License and History</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
@@ -63,7 +60,7 @@ body {
"CITETITLE">GNU General Public License</i>.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN1231" id="AEN1231">9.1. License</a></h2>
+ <h2 class="SECT2"><a name="AEN1248" id="AEN1248">9.1. License</a></h2>
<p><span class="APPLICATION">Privoxy</span> is free software; you can
redistribute it and/or modify it under the terms of the <i class=
@@ -89,7 +86,7 @@ body {
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN1247" id="AEN1247">9.2. History</a></h2>
+ <h2 class="SECT2"><a name="AEN1264" id="AEN1264">9.2. History</a></h2>
<p>A long time ago, there was the <a href=
"http://www.junkbusters.com/ijb.html" target="_top"><span class=
diff --git a/doc/webserver/developer-manual/cvs.html b/doc/webserver/developer-manual/cvs.html
index 5a0f571e..5302a34f 100644
--- a/doc/webserver/developer-manual/cvs.html
+++ b/doc/webserver/developer-manual/cvs.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>The CVS Repository</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/developer-manual/documentation.html b/doc/webserver/developer-manual/documentation.html
index bcd57d15..a2a6ba2e 100644
--- a/doc/webserver/developer-manual/documentation.html
+++ b/doc/webserver/developer-manual/documentation.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Documentation Guidelines</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
@@ -399,7 +396,7 @@ body {
<tr>
<td><span class="emphasis EMPHASIS c3">p-version</span>: the
<span class="APPLICATION">Privoxy</span> version string, e.g.
- <span class="QUOTE">"3.0.19"</span>.</td>
+ <span class="QUOTE">"3.0.20"</span>.</td>
</tr>
<tr>
diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index 07858e39..29fdc718 100644
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Privoxy Developer Manual</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
@@ -35,8 +32,8 @@ body {
2001-2009 by <a href="http://www.privoxy.org/" target="_top">Privoxy
Developers</a></sub><br></p>
- <p class="PUBDATE">$Id: developer-manual.sgml,v 2.37 2011/11/13
- 17:03:54 fabiankeil Exp $<br></p>
+ <p class="PUBDATE">$Id: developer-manual.sgml,v 2.39 2012/03/18
+ 01:16:35 diem Exp $<br></p>
<div class="ABSTRACT">
<a name="AEN9" id="AEN9"></a>
@@ -49,7 +46,7 @@ body {
entirely correct. As always, patches are welcome.</p>
<p>Please note that this document is constantly evolving. This copy
- represents the state at the release of version 3.0.19. You can find
+ represents the state at the release of version 3.0.20. You can find
the latest version of the this manual at <a href=
"http://www.privoxy.org/developer-manual/" target=
"_top">http://www.privoxy.org/developer-manual/</a>. Please see
@@ -368,9 +365,9 @@ body {
<dd>
<dl>
- <dt>9.1. <a href="copyright.html#AEN1231">License</a></dt>
+ <dt>9.1. <a href="copyright.html#AEN1248">License</a></dt>
- <dt>9.2. <a href="copyright.html#AEN1247">History</a></dt>
+ <dt>9.2. <a href="copyright.html#AEN1264">History</a></dt>
</dl>
</dd>
diff --git a/doc/webserver/developer-manual/introduction.html b/doc/webserver/developer-manual/introduction.html
index 468f2fa6..1dd4bda1 100644
--- a/doc/webserver/developer-manual/introduction.html
+++ b/doc/webserver/developer-manual/introduction.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Introduction</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index e4655fea..ea1df347 100644
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Releasing a New Version</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
@@ -749,7 +746,7 @@ body {
<tr>
<td>
<pre class="PROGRAMLISTING">
- debchange -v 3.0.19-stable-1 "New upstream version"
+ debchange -v 3.0.20-UNRELEASED-1 "New upstream version"
</pre>
</td>
</tr>
@@ -768,7 +765,7 @@ body {
</table>
<p>This will create <tt class=
- "FILENAME">../privoxy_3.0.19-stable-1_i386.deb</tt> which can be
+ "FILENAME">../privoxy_3.0.20-UNRELEASED-1_i386.deb</tt> which can be
uploaded. To upload the package to Sourceforge, simply issue</p>
<table class="c3" border="0" width="100%">
@@ -788,59 +785,133 @@ body {
<p>First, <span class="emphasis EMPHASIS c2">make sure that you have
freshly exported the right version into an empty directory</span>.
- (See "Building and releasing packages" above). Then get the Mac OS X
- setup module:</p>
+ (See "Building and releasing packages" above).</p>
- <table class="c3" border="0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
+ <p>There are three modules available in the CVS repository for use on
+ Mac OS X, though technically only two of them generate a release (the
+ other can be used to install from source).</p>
+
+ <div class="SECT4">
+ <h4 class="SECT4"><a name="OS-X-OSXPACKAGEBUILDER-MODULE" id=
+ "OS-X-OSXPACKAGEBUILDER-MODULE">6.3.8.1. OSXPackageBuilder
+ module</a></h4>
+
+ <p>The OSXPackageBuilder module generates OS X installer packages
+ supporting all Macs running OS X 10.4 and above. Obtain it from CVS
+ as follows into a folder parallel to the exported privoxy
+ source:</p>
+
+ <table class="c3" border="0" width="100%">
+ <tr>
+ <td>
+ <pre class="PROGRAMLISTING">
+ cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder
+</pre>
+ </td>
+ </tr>
+ </table>
+
+ <p>The module contains complete instructions on its usage in the
+ file <tt class="FILENAME">OS X Package Builder HOWTO.txt</tt>.</p>
+
+ <p>Once the package(s) have been generated, you can then upload
+ them directly to the Files section of the Sourceforge project in
+ the Macintosh (OS X) folder. Each new version release of Privoxy
+ should have a new subfolder created in which to store its files.
+ Please ensure that the folder contains a readme file that makes it
+ clear which package is for whichversion of OS X.</p>
+ </div>
+
+ <div class="SECT4">
+ <h4 class="SECT4"><a name="OS-X-OSXSETUP-MODULE" id=
+ "OS-X-OSXSETUP-MODULE">6.3.8.2. osxsetup module
+ (DEPRECATED)</a></h4>
+
+ <p><span class="emphasis EMPHASIS c2">This module is deprecated
+ since the installer it generates places all Privoxy files in one
+ folder in a non-standard location, and supports only Intel Macs
+ running OS X 10.6 or higher.</span></p>
+
+ <p>Check out the module from CVS as follows into a folder parallel
+ to the exported privoxy source:</p>
+
+ <table class="c3" border="0" width="100%">
+ <tr>
+ <td>
+ <pre class="PROGRAMLISTING">
cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup
</pre>
- </td>
- </tr>
- </table>
+ </td>
+ </tr>
+ </table>
- <p>Then run:</p>
+ <p>Then run:</p>
- <table class="c3" border="0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
+ <table class="c3" border="0" width="100%">
+ <tr>
+ <td>
+ <pre class="PROGRAMLISTING">
cd osxsetup
build
</pre>
- </td>
- </tr>
- </table>
+ </td>
+ </tr>
+ </table>
- <p>This will run <tt class="FILENAME">autoheader</tt>, <tt class=
- "FILENAME">autoconf</tt> and <tt class="FILENAME">configure</tt> as
- well as <tt class="FILENAME">make</tt>. Finally, it will copy over
- the necessary files to the ./osxsetup/files directory for further
- processing by <tt class="FILENAME">PackageMaker</tt>.</p>
+ <p>This will run <tt class="FILENAME">autoheader</tt>, <tt class=
+ "FILENAME">autoconf</tt> and <tt class="FILENAME">configure</tt> as
+ well as <tt class="FILENAME">make</tt>. Finally, it will copy over
+ the necessary files to the ./osxsetup/files directory for further
+ processing by <tt class="FILENAME">PackageMaker</tt>.</p>
- <p>Bring up PackageMaker with the PrivoxyPackage.pmsp definition
- file, modify the package name to match the release, and hit the
- "Create package" button. If you specify ./Privoxy.pkg as the output
- package name, you can then create the distributable zip file with the
- command:</p>
+ <p>Bring up PackageMaker with the PrivoxyPackage.pmsp definition
+ file, modify the package name to match the release, and hit the
+ "Create package" button. If you specify ./Privoxy.pkg as the output
+ package name, you can then create the distributable zip file with
+ the command:</p>
- <table class="c3" border="0" width="100%">
- <tr>
- <td>
- <pre class="PROGRAMLISTING">
+ <table class="c3" border="0" width="100%">
+ <tr>
+ <td>
+ <pre class="PROGRAMLISTING">
zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
</pre>
- </td>
- </tr>
- </table>
+ </td>
+ </tr>
+ </table>
+
+ <p>You can then upload this file directly to the Files section of
+ the Sourceforge project in the Macintosh (OS X) folder. Each new
+ version release of Privoxy should have a new subfolder created in
+ which to store its files. Please ensure that the folder contains a
+ readme file that makes it clear which version(s) of OS X the
+ package supports.</p>
+ </div>
+
+ <div class="SECT4">
+ <h4 class="SECT4"><a name="OS-X-MACSETUP-MODULE" id=
+ "OS-X-MACSETUP-MODULE">6.3.8.3. macsetup module</a></h4>
+
+ <p>The macsetup module is ideal if you wish to build and install
+ Privoxy from source on a single machine.</p>
+
+ <p>Check out the module from CVS as follows into a folder parallel
+ to the exported privoxy source:</p>
+
+ <table class="c3" border="0" width="100%">
+ <tr>
+ <td>
+ <pre class="PROGRAMLISTING">
+ cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup
+</pre>
+ </td>
+ </tr>
+ </table>
- <p>You can then upload <tt class=
- "FILENAME">privoxyosx_setup_x.y.z.zip</tt> anonymously to <tt class=
- "FILENAME">uploads.sourceforge.net/incoming</tt>, create a release
- for it, and you're done. Use the release notes and Change Log from
- the source tarball package.</p>
+ <p>The module contains complete instructions on its usage in its
+ <tt class="FILENAME">README</tt> file. The end result will be the
+ the exported version of Privoxy installed on the build machine.</p>
+ </div>
</div>
<div class="SECT3">
@@ -1024,7 +1095,7 @@ body {
column, and click <tt class="LITERAL">Add Release</tt>. You will then
need to create a new release for your package, using the format of
<tt class="LITERAL">$VERSION ($CODE_STATUS)</tt>, e.g. <span class=
- "emphasis EMPHASIS c2">3.0.19 (beta)</span>.</p>
+ "emphasis EMPHASIS c2">3.0.20 (beta)</span>.</p>
<p>Now just follow the prompts. Be sure to add any appropriate Release
notes. You should see your freshly uploaded packages in <span class=
diff --git a/doc/webserver/developer-manual/seealso.html b/doc/webserver/developer-manual/seealso.html
index ee706f56..961a86a8 100644
--- a/doc/webserver/developer-manual/seealso.html
+++ b/doc/webserver/developer-manual/seealso.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>See also</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/developer-manual/testing.html b/doc/webserver/developer-manual/testing.html
index 9f8abf6c..20ebe03a 100644
--- a/doc/webserver/developer-manual/testing.html
+++ b/doc/webserver/developer-manual/testing.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Testing Guidelines</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/developer-manual/webserver-update.html b/doc/webserver/developer-manual/webserver-update.html
index 76b66908..4f97360d 100644
--- a/doc/webserver/developer-manual/webserver-update.html
+++ b/doc/webserver/developer-manual/webserver-update.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Update the Webserver</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index 892e46b1..90dfaa9d 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Configuration</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index 8f97f567..d3543bba 100644
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Contacting the developers, Bug Reporting and Feature
Requests</title>
<meta name="GENERATOR" content=
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 69a87cc8..78bd0a23 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Privoxy Copyright, License and History</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index 3fb3b53a..3f8647fc 100644
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>General Information</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 38813775..185c235b 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Privoxy Frequently Asked Questions</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
@@ -37,7 +34,7 @@ body {
2001-2011 by <a href="http://www.privoxy.org/" target="_top">Privoxy
Developers</a></sub><br></p>
- <p class="PUBDATE">$Id: faq.sgml,v 2.84 2011/11/13 17:03:54 fabiankeil
+ <p class="PUBDATE">$Id: faq.sgml,v 2.85 2011/12/26 17:05:40 fabiankeil
Exp $<br></p>
<div class="ABSTRACT">
@@ -80,7 +77,7 @@ body {
</ul>
<p>Please note that this document is a work in progress. This copy
- represents the state at the release of version 3.0.19. You can find
+ represents the state at the release of version 3.0.20. You can find
the latest version of the document at <a href=
"http://www.privoxy.org/faq/" target=
"_top">http://www.privoxy.org/faq/</a>. Please see the <a href=
diff --git a/doc/webserver/faq/installation.html b/doc/webserver/faq/installation.html
index 47ecf734..5b52212b 100644
--- a/doc/webserver/faq/installation.html
+++ b/doc/webserver/faq/installation.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Installation</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index b028cf6d..07d767b2 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Miscellaneous</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index 12fc01d7..b08bc2bd 100644
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Troubleshooting</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index 1b3806ee..384baa17 100644
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Privoxy - Home Page</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
@@ -86,7 +83,7 @@ body {
</ul>
<p>The most recent release is <a href="announce.txt" target=
- "_top">3.0.19 (stable)</a>.</p>
+ "_top">3.0.20 (UNRELEASED)</a>.</p>
</div>
<hr>
</div>
@@ -200,7 +197,7 @@ body {
</table>
</div>
- <p><sub>Copyright © 2001-2011 by Privoxy Developers</sub></p>
+ <p><sub>Copyright © 2001-2010 by Privoxy Developers</sub></p>
</div>
</div>
</body>
diff --git a/doc/webserver/man-page/privoxy-man-page.html b/doc/webserver/man-page/privoxy-man-page.html
index 58e137d3..97b4dcd5 100644
--- a/doc/webserver/man-page/privoxy-man-page.html
+++ b/doc/webserver/man-page/privoxy-man-page.html
@@ -3,7 +3,7 @@
<html>
<head>
<meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
+ "HTML Tidy for Linux/x86 (vers 25 March 2009), see www.w3.org">
<title>Privoxy Man page</title>
<link rel="stylesheet" type="text/css" href="../p_web.css">
diff --git a/doc/webserver/privoxy-index.html b/doc/webserver/privoxy-index.html
index 4bde44a2..90698812 100644
--- a/doc/webserver/privoxy-index.html
+++ b/doc/webserver/privoxy-index.html
@@ -3,9 +3,6 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Privoxy - The Privacy Enhancing Proxy</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
@@ -54,7 +51,7 @@ body {
<h1 class="TITLE"><a name="AEN2" id="AEN2">Privoxy - The Privacy
Enhancing Proxy</a></h1>
- <h2 class="SUBTITLE">Project Index Page v3.0.19</h2>
+ <h2 class="SUBTITLE">Project Index Page v3.0.20</h2>
<div class="ABSTRACT">
<a name="AEN29" id="AEN29"></a>
diff --git a/doc/webserver/team/index.html b/doc/webserver/team/index.html
index 168c9637..e2bb1a86 100644
--- a/doc/webserver/team/index.html
+++ b/doc/webserver/team/index.html
@@ -3,7 +3,7 @@
<html>
<head>
<meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
+ "HTML Tidy for Linux/x86 (vers 25 March 2009), see www.w3.org">
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<title>Privoxy - Team Photos</title>
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 45461131..38deb3e8 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Actions Files</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="The Main Configuration File" href=
"config.html">
<link rel="NEXT" title="Filter Files" href="filter-file.html">
@@ -38,7 +35,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
@@ -134,7 +131,7 @@ body {
in <tt class="FILENAME">default.action</tt> are:</p>
<div class="TABLE">
- <a name="AEN2780" id="AEN2780"></a>
+ <a name="AEN2799" id="AEN2799"></a>
<p class="c3">Table 1. Default Configurations</p>
@@ -330,7 +327,7 @@ body {
actions</a>.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN2879" id="AEN2879">8.1. Finding the Right
+ <h2 class="SECT2"><a name="AEN2898" id="AEN2898">8.1. Finding the Right
Mix</a></h2>
<p>Note that some <a href="actions-file.html#ACTIONS">actions</a>, like
@@ -355,7 +352,7 @@ body {
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN2886" id="AEN2886">8.2. How to
+ <h2 class="SECT2"><a name="AEN2905" id="AEN2905">8.2. How to
Edit</a></h2>
<p>The easiest way to edit the actions files is with a browser by using
@@ -544,7 +541,7 @@ body {
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN2998" id="AEN2998">8.4.1. The Domain
+ <h3 class="SECT3"><a name="AEN3017" id="AEN3017">8.4.1. The Domain
Pattern</a></h3>
<p>The matching of the domain part offers some flexible options: if
@@ -650,7 +647,7 @@ body {
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN3074" id="AEN3074">8.4.2. The Path
+ <h3 class="SECT3"><a name="AEN3093" id="AEN3093">8.4.2. The Path
Pattern</a></h3>
<p><span class="APPLICATION">Privoxy</span> uses <span class=
@@ -4227,7 +4224,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4706" id="AEN4706">8.5.34.
+ <h3 class="SECT3"><a name="AEN4725" id="AEN4725">8.5.34.
Summary</a></h3>
<p>Note that many of these actions have the potential to cause a page
@@ -4384,7 +4381,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
together:</p>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4770" id="AEN4770">8.7.1.
+ <h3 class="SECT3"><a name="AEN4789" id="AEN4789">8.7.1.
match-all.action</a></h3>
<p>Remember <span class="emphasis EMPHASIS c2">all actions are
@@ -4432,7 +4429,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4792" id="AEN4792">8.7.2.
+ <h3 class="SECT3"><a name="AEN4811" id="AEN4811">8.7.2.
default.action</a></h3>
<p>If you aren't a developer, there's no need for you to edit the
@@ -4775,7 +4772,7 @@ wiki.
</div>
<div class="SECT3">
- <h3 class="SECT3"><a name="AEN4905" id="AEN4905">8.7.3.
+ <h3 class="SECT3"><a name="AEN4924" id="AEN4924">8.7.3.
user.action</a></h3>
<p>So far we are painting with a broad brush by setting general
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 1091844d..dfbf7014 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Appendix</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="See Also" href="seealso.html">
<link rel="STYLESHEET" type="text/css" href="../p_doc.css">
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
@@ -33,7 +30,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
@@ -305,7 +302,7 @@ body {
</div>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN5795" id="AEN5795">14.2. Privoxy's
+ <h2 class="SECT2"><a name="AEN5814" id="AEN5814">14.2. Privoxy's
Internal Pages</a></h2>
<p>Since <span class="APPLICATION">Privoxy</span> proxies each
@@ -325,7 +322,7 @@ body {
<ul>
<li>
- <p>Privoxy main page:</p><a name="AEN5809" id="AEN5809"></a>
+ <p>Privoxy main page:</p><a name="AEN5828" id="AEN5828"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/" target=
@@ -340,8 +337,8 @@ body {
<li>
<p>Show information about the current configuration, including
- viewing and editing of actions files:</p><a name="AEN5817" id=
- "AEN5817"></a>
+ viewing and editing of actions files:</p><a name="AEN5836" id=
+ "AEN5836"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/show-status" target=
@@ -350,8 +347,8 @@ body {
</li>
<li>
- <p>Show the source code version numbers:</p><a name="AEN5822" id=
- "AEN5822"></a>
+ <p>Show the source code version numbers:</p><a name="AEN5841" id=
+ "AEN5841"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/show-version" target=
@@ -360,8 +357,8 @@ body {
</li>
<li>
- <p>Show the browser's request headers:</p><a name="AEN5827" id=
- "AEN5827"></a>
+ <p>Show the browser's request headers:</p><a name="AEN5846" id=
+ "AEN5846"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/show-request" target=
@@ -370,8 +367,8 @@ body {
</li>
<li>
- <p>Show which actions apply to a URL and why:</p><a name="AEN5832"
- id="AEN5832"></a>
+ <p>Show which actions apply to a URL and why:</p><a name="AEN5851"
+ id="AEN5851"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/show-url-info" target=
@@ -385,20 +382,20 @@ body {
<span class="QUOTE">"off"</span>, <span class=
"QUOTE">"Privoxy"</span> continues to run, but only as a
pass-through proxy, with no actions taking place:</p><a name=
- "AEN5840" id="AEN5840"></a>
+ "AEN5859" id="AEN5859"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/toggle" target=
"_top">http://config.privoxy.org/toggle</a></p>
</blockquote>
- <p>Short cuts. Turn off, then on:</p><a name="AEN5844" id=
- "AEN5844"></a>
+ <p>Short cuts. Turn off, then on:</p><a name="AEN5863" id=
+ "AEN5863"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/toggle?set=disable" target=
"_top">http://config.privoxy.org/toggle?set=disable</a></p>
- </blockquote><a name="AEN5847" id="AEN5847"></a>
+ </blockquote><a name="AEN5866" id="AEN5866"></a>
<blockquote class="BLOCKQUOTE">
<p><a href="http://config.privoxy.org/toggle?set=enable" target=
diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index 6626e003..d6b513de 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>The Main Configuration File</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="Privoxy Configuration" href=
"configuration.html">
<link rel="NEXT" title="Actions Files" href="actions-file.html">
@@ -37,7 +34,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 923fb87f..fe28f3d6 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Privoxy Configuration</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="Starting Privoxy" href="startup.html">
<link rel="NEXT" title="The Main Configuration File" href="config.html">
<link rel="STYLESHEET" type="text/css" href="../p_doc.css">
@@ -34,7 +31,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
@@ -60,7 +57,7 @@ body {
controlled easily with a web browser.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN1090" id="AEN1090">6.1. Controlling
+ <h2 class="SECT2"><a name="AEN1107" id="AEN1107">6.1. Controlling
Privoxy with Your Web Browser</a></h2>
<p><span class="APPLICATION">Privoxy</span>'s user interface can be
@@ -77,8 +74,8 @@ body {
</pre>
- <h2 class="BRIDGEHEAD"><a name="AEN1098" id=
- "AEN1098"></a> Privoxy Menu</h2>
+ <h2 class="BRIDGEHEAD"><a name="AEN1115" id=
+ "AEN1115"></a> Privoxy Menu</h2>
<pre>
</pre>
@@ -118,7 +115,7 @@ body {
<tr>
<td>
- ▪ <a href="http://www.privoxy.org/3.0.19/user-manual/"
+ ▪ <a href="http://www.privoxy.org/3.0.20/user-manual/"
target="_top">Documentation</a></td>
</tr>
</tbody>
@@ -161,7 +158,9 @@ body {
<p>For Unix, *BSD and Linux, all configuration files are located in
<tt class="FILENAME">/etc/privoxy/</tt> by default. For MS Windows,
OS/2, and AmigaOS these are all in the same directory as the
- <span class="APPLICATION">Privoxy</span> executable.</p>
+ <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>
<p>The installed defaults provide a reasonable starting point, though
some settings may be aggressive by some standards. For the time being,
@@ -249,6 +248,12 @@ body {
address of <span class="APPLICATION">Privoxy</span>, these <span class=
"QUOTE">"wake up"</span> requests must obviously be sent to the
<span class="emphasis EMPHASIS c3">old</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>
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index 9b3bc0cf..aade7483 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -3,14 +3,11 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Contacting the Developers, Bug Reporting and Feature
Requests</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="Privoxy's Template Files" href=
"templates.html">
<link rel="NEXT" title="Privoxy Copyright, License and History" href=
@@ -36,7 +33,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 59c76919..c3cb9e4a 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Privoxy Copyright, License and History</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title=
"Contacting the Developers, Bug Reporting and Feature Requests" href=
"contact.html">
@@ -35,7 +32,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
@@ -64,7 +61,7 @@ body {
"CITETITLE">GNU General Public License</i>.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN5542" id="AEN5542">12.1. License</a></h2>
+ <h2 class="SECT2"><a name="AEN5561" id="AEN5561">12.1. License</a></h2>
<p><span class="APPLICATION">Privoxy</span> is free software; you can
redistribute it and/or modify it under the terms of the <i class=
@@ -140,8 +137,10 @@ body {
Fabian Keil, lead developer<br>
David Schmidt, developer<br>
Hal Burgiss<br>
+ Ian Silvester<br>
Lee Rian<br>
- Roland Rosenfeld</p>
+ Roland Rosenfeld<br>
+ Ian Silvester</p>
<p>Former Privoxy Team Members:</p>
@@ -193,6 +192,7 @@ body {
Markus Elfring<br>
Dean Gaudet<br>
Stephen Gildea<br>
+ Lizik Grelier<br>
Daniel Griscom<br>
Felix Gröbert<br>
Jeff H.<br>
@@ -204,7 +204,10 @@ body {
Stefan Huehner<br>
Peter Hyman<br>
Derek Jennings<br>
+ Andrew Jones<br>
+ Julien Joubert<br>
Petr Kadlec<br>
+ Steven Kolins<br>
David Laight<br>
Bert van Leeuwen<br>
Don Libes<br>
@@ -224,6 +227,7 @@ body {
Roberto Ragusa<br>
Félix Rauch<br>
Maynard Riley<br>
+ Andreas Rutkauskas<br>
Chung-chieh Shan<br>
Spinor S.<br>
Bart Schelstraete<br>
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 2a3daff0..289d606c 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Filter Files</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="Actions Files" href="actions-file.html">
<link rel="NEXT" title="Privoxy's Template Files" href="templates.html">
<link rel="STYLESHEET" type="text/css" href="../p_doc.css">
@@ -35,7 +32,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
@@ -165,7 +162,7 @@ FILTER: foo Replace all "foo" with "bar"
started.</p>
<div class="SECT2">
- <h2 class="SECT2"><a name="AEN5060" id="AEN5060">9.1. Filter File
+ <h2 class="SECT2"><a name="AEN5079" id="AEN5079">9.1. Filter File
Tutorial</a></h2>
<p>Now, let's complete our <span class="QUOTE">"foo"</span> content
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 1fea85ee..066c4d33 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -3,10 +3,7 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
- <title>Privoxy 3.0.19 User Manual</title>
+ <title>Privoxy 3.0.20 User Manual</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
<link rel="NEXT" title="Introduction" href="introduction.html">
@@ -29,15 +26,15 @@ body {
<body class="ARTICLE">
<div class="ARTICLE">
<div class="TITLEPAGE">
- <h1 class="TITLE"><a name="AEN2" id="AEN2">Privoxy 3.0.19 User
+ <h1 class="TITLE"><a name="AEN2" id="AEN2">Privoxy 3.0.20 User
Manual</a></h1>
<p class="PUBDATE"><sub><a href="copyright.html">Copyright</a> ©
2001-2011 by <a href="http://www.privoxy.org/" target="_top">Privoxy
Developers</a></sub><br></p>
- <p class="PUBDATE">$Id: user-manual.sgml,v 2.143 2011/11/20 17:16:36
- fabiankeil Exp $<br></p>
+ <p class="PUBDATE">$Id: user-manual.sgml,v 2.147 2012/03/11 19:03:42
+ diem Exp $<br></p>
<div class="ABSTRACT">
<a name="AEN9" id="AEN9"></a>
@@ -126,12 +123,20 @@ body {
OS X</a></dt>
<dt>2.1.7. <a href=
- "installation.html#INSTALLATION-AMIGA">AmigaOS</a></dt>
+ "installation.html#OS-X-INSTALL-FROM-PACKAGE">Installation
+ from ready-built package</a></dt>
<dt>2.1.8. <a href=
- "installation.html#INSTALLATION-TBZ">FreeBSD</a></dt>
+ "installation.html#OS-X-INSTALL-FROM-SOURCE">Installation
+ from source</a></dt>
<dt>2.1.9. <a href=
+ "installation.html#INSTALLATION-AMIGA">AmigaOS</a></dt>
+
+ <dt>2.1.10. <a href=
+ "installation.html#INSTALLATION-TBZ">FreeBSD</a></dt>
+
+ <dt>2.1.11. <a href=
"installation.html#INSTALLATTION-GENTOO">Gentoo</a></dt>
</dl>
</dd>
@@ -195,7 +200,7 @@ body {
<dd>
<dl>
- <dt>6.1. <a href="configuration.html#AEN1090">Controlling Privoxy
+ <dt>6.1. <a href="configuration.html#AEN1107">Controlling Privoxy
with Your Web Browser</a></dt>
<dt>6.2. <a href="configuration.html#CONFOVERVIEW">Configuration
@@ -358,10 +363,10 @@ body {
<dd>
<dl>
- <dt>8.1. <a href="actions-file.html#AEN2879">Finding the Right
+ <dt>8.1. <a href="actions-file.html#AEN2898">Finding the Right
Mix</a></dt>
- <dt>8.2. <a href="actions-file.html#AEN2886">How to Edit</a></dt>
+ <dt>8.2. <a href="actions-file.html#AEN2905">How to Edit</a></dt>
<dt>8.3. <a href="actions-file.html#ACTIONS-APPLY">How Actions
are Applied to Requests</a></dt>
@@ -371,10 +376,10 @@ body {
<dd>
<dl>
- <dt>8.4.1. <a href="actions-file.html#AEN2998">The Domain
+ <dt>8.4.1. <a href="actions-file.html#AEN3017">The Domain
Pattern</a></dt>
- <dt>8.4.2. <a href="actions-file.html#AEN3074">The Path
+ <dt>8.4.2. <a href="actions-file.html#AEN3093">The Path
Pattern</a></dt>
<dt>8.4.3. <a href="actions-file.html#TAG-PATTERN">The Tag
@@ -485,7 +490,7 @@ body {
"actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker</a></dt>
<dt>8.5.34. <a href=
- "actions-file.html#AEN4706">Summary</a></dt>
+ "actions-file.html#AEN4725">Summary</a></dt>
</dl>
</dd>
@@ -497,13 +502,13 @@ body {
<dd>
<dl>
<dt>8.7.1. <a href=
- "actions-file.html#AEN4770">match-all.action</a></dt>
+ "actions-file.html#AEN4789">match-all.action</a></dt>
<dt>8.7.2. <a href=
- "actions-file.html#AEN4792">default.action</a></dt>
+ "actions-file.html#AEN4811">default.action</a></dt>
<dt>8.7.3. <a href=
- "actions-file.html#AEN4905">user.action</a></dt>
+ "actions-file.html#AEN4924">user.action</a></dt>
</dl>
</dd>
</dl>
@@ -513,7 +518,7 @@ body {
<dd>
<dl>
- <dt>9.1. <a href="filter-file.html#AEN5060">Filter File
+ <dt>9.1. <a href="filter-file.html#AEN5079">Filter File
Tutorial</a></dt>
<dt>9.2. <a href="filter-file.html#PREDEFINED-FILTERS">The
@@ -557,7 +562,7 @@ body {
<dd>
<dl>
- <dt>12.1. <a href="copyright.html#AEN5542">License</a></dt>
+ <dt>12.1. <a href="copyright.html#AEN5561">License</a></dt>
<dt>12.2. <a href="copyright.html#HISTORY">History</a></dt>
@@ -574,7 +579,7 @@ body {
<dt>14.1. <a href="appendix.html#REGEX">Regular
Expressions</a></dt>
- <dt>14.2. <a href="appendix.html#AEN5795">Privoxy's Internal
+ <dt>14.2. <a href="appendix.html#AEN5814">Privoxy's Internal
Pages</a></dt>
<dd>
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index c8a184b9..80b2712e 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Installation</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="Introduction" href="introduction.html">
<link rel="NEXT" title="What's New in this Release" href="whatsnew.html">
<link rel="STYLESHEET" type="text/css" href="../p_doc.css">
@@ -35,7 +32,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
@@ -80,7 +77,7 @@ body {
"INSTALLATION-PACK-RPM">2.1.1. Red Hat and Fedora RPMs</a></h3>
<p>RPMs can be installed with <tt class="LITERAL">rpm -Uvh
- privoxy-3.0.19-1.rpm</tt>, and will use <tt class=
+ privoxy-3.0.20-1.rpm</tt>, and will use <tt class=
"FILENAME">/etc/privoxy</tt> for the location of configuration
files.</p>
@@ -92,7 +89,7 @@ body {
<p>If you have problems with failed dependencies, try rebuilding the
SRC RPM: <tt class="LITERAL">rpm --rebuild
- privoxy-3.0.19-1.src.rpm</tt>. This will use your locally installed
+ privoxy-3.0.20-1.src.rpm</tt>. This will use your locally installed
libraries and RPM version.</p>
<p>Also note that if you have a <span class=
@@ -190,26 +187,83 @@ body {
<h3 class="SECT3"><a name="INSTALLATION-MAC" id=
"INSTALLATION-MAC">2.1.6. Mac OS X</a></h3>
- <p>Unzip the downloaded file (you can either double-click on the zip
- file icon from the Finder, or from the desktop if you downloaded it
- there). Then, double-click on the package installer icon and follow
- the installation process.</p>
+ <p>Installation instructions for the OS X platform depend upon
+ whether you downloaded a ready-built installation package (.pkg or
+ .mpkg) or have downloaded the source code.</p>
+ </div>
+
+ <div class="SECT3">
+ <h4 class="SECT3"><a name="OS-X-INSTALL-FROM-PACKAGE" id=
+ "OS-X-INSTALL-FROM-PACKAGE">2.1.7. Installation from ready-built
+ package</a></h4>
+
+ <p>The downloaded file will either be a .pkg (for OS X 10.5 upwards)
+ or a bzipped .mpkg file (for OS X 10.4). The former can be
+ double-clicked as is and the installation will start; double-clicking
+ the latter will unzip the .mpkg file which can then be double-clicked
+ to commence the installation.</p>
<p>The privoxy service will automatically start after a successful
- installation (in addition to every time your computer starts up). To
- prevent the privoxy service from automatically starting when your
- computer starts up, remove or rename the folder named <tt class=
- "LITERAL">/Library/StartupItems/Privoxy</tt>.</p>
+ installation (and thereafter every time your computer starts up)
+ however you will need to configure your web browser(s) to use it. To
+ do so, configure them to use a proxy for HTTP and HTTPS at the
+ address 127.0.0.1:8118.</p>
+
+ <p>To prevent the privoxy service from automatically starting when
+ your computer starts up, remove or rename the file <tt class=
+ "LITERAL">/Library/LaunchDaemons/org.ijbswa.privoxy.plist</tt> (on OS
+ X 10.5 and higher) or the folder named <tt class=
+ "LITERAL">/Library/StartupItems/Privoxy</tt> (on OS X 10.4
+ 'Tiger').</p>
+
+ <p>To manually start or stop the privoxy service, use the scripts
+ startPrivoxy.sh and stopPrivoxy.sh supplied in /Applications/Privoxy.
+ They must be run from an administrator account, using sudo.</p>
+
+ <p>To uninstall, run /Applications/Privoxy/uninstall.command as sudo
+ from an administrator account.</p>
+ </div>
+
+ <div class="SECT3">
+ <h4 class="SECT3"><a name="OS-X-INSTALL-FROM-SOURCE" id=
+ "OS-X-INSTALL-FROM-SOURCE">2.1.8. Installation from source</a></h4>
+
+ <p>To build and install the Privoxy source code on OS X you will need
+ to obtain the macsetup module from the Privoxy Sourceforge CVS
+ repository (refer to Sourceforge help for details of how to set up a
+ CVS client to have read-only access to the repository). This module
+ contains scripts that leverage the usual open-source tools (available
+ as part of Apple's free of charge Xcode distribution or via the usual
+ open-source software package managers for OS X (MacPorts, Homebrew,
+ Fink etc.) to build and then install the privoxy binary and
+ associated files. The macsetup module's README file contains complete
+ instructions for its use.</p>
+
+ <p>The privoxy service will automatically start after a successful
+ installation (and thereafter every time your computer starts up)
+ however you will need to configure your web browser(s) to use it. To
+ do so, configure them to use a proxy for HTTP and HTTPS at the
+ address 127.0.0.1:8118.</p>
+
+ <p>To prevent the privoxy service from automatically starting when
+ your computer starts up, remove or rename the file <tt class=
+ "LITERAL">/Library/LaunchDaemons/org.ijbswa.privoxy.plist</tt> (on OS
+ X 10.5 and higher) or the folder named <tt class=
+ "LITERAL">/Library/StartupItems/Privoxy</tt> (on OS X 10.4
+ 'Tiger').</p>
<p>To manually start or stop the privoxy service, use the Privoxy
- Utility for Mac OS X. This application controls the privoxy service
- (e.g. starting and stopping the service as well as uninstalling the
- software).</p>
+ Utility for Mac OS X (also part of the macsetup module). This
+ application can start and stop the privoxy service and display its
+ log and configuration files.</p>
+
+ <p>To uninstall, run the macsetup module's uninstall.sh as sudo from
+ an administrator account.</p>
</div>
<div class="SECT3">
<h3 class="SECT3"><a name="INSTALLATION-AMIGA" id=
- "INSTALLATION-AMIGA">2.1.7. AmigaOS</a></h3>
+ "INSTALLATION-AMIGA">2.1.9. AmigaOS</a></h3>
<p>Copy and then unpack the <tt class="FILENAME">lha</tt> archive to
a suitable location. All necessary files will be installed into
@@ -220,7 +274,7 @@ body {
<div class="SECT3">
<h3 class="SECT3"><a name="INSTALLATION-TBZ" id=
- "INSTALLATION-TBZ">2.1.8. FreeBSD</a></h3>
+ "INSTALLATION-TBZ">2.1.10. FreeBSD</a></h3>
<p>Privoxy is part of FreeBSD's Ports Collection, you can build and
install it with <tt class="LITERAL">cd /usr/ports/www/privoxy; make
@@ -239,7 +293,7 @@ body {
<div class="SECT3">
<h3 class="SECT3"><a name="INSTALLATTION-GENTOO" id=
- "INSTALLATTION-GENTOO">2.1.9. Gentoo</a></h3>
+ "INSTALLATTION-GENTOO">2.1.11. Gentoo</a></h3>
<p>Gentoo source packages (Ebuilds) for <span class=
"APPLICATION">Privoxy</span> are contained in the Gentoo Portage Tree
@@ -254,7 +308,7 @@ body {
<p>Configuration files are in <tt class="FILENAME">/etc/privoxy</tt>,
the documentation is in <tt class=
- "FILENAME">/usr/share/doc/privoxy-3.0.19</tt> and the Log directory
+ "FILENAME">/usr/share/doc/privoxy-3.0.20</tt> and the Log directory
is in <tt class="FILENAME">/var/log/privoxy</tt>.</p>
</div>
</div>
@@ -289,8 +343,8 @@ body {
<tr>
<td>
<pre class="SCREEN">
- tar xzvf privoxy-3.0.19-stable-src.tar.gz
- cd privoxy-3.0.19-stable
+ tar xzvf privoxy-3.0.20-beta-src.tar.gz
+ cd privoxy-3.0.20-beta
</pre>
</td>
</tr>
diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index d7d39065..5378e515 100644
--- a/doc/webserver/user-manual/introduction.html
+++ b/doc/webserver/user-manual/introduction.html
@@ -3,14 +3,11 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Introduction</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
- <link rel="PREVIOUS" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
+ <link rel="PREVIOUS" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="NEXT" title="Installation" href="installation.html">
<link rel="STYLESHEET" type="text/css" href="../p_doc.css">
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
@@ -23,6 +20,7 @@ body {
:link { color: #0000FF }
:visited { color: #840084 }
:active { color: #0000FF }
+ span.c2 {font-style: italic}
hr.c1 {text-align: left}
</style>
</head>
@@ -32,7 +30,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
@@ -52,8 +50,18 @@ body {
<h1 class="SECT1"><a name="INTRODUCTION" id="INTRODUCTION">1.
Introduction</a></h1>
- <p>This documentation is included with the current stable version of
- <span class="APPLICATION">Privoxy</span>, v.3.0.19.</p>
+ <p>This documentation is included with the current UNRELEASED version of
+ <span class="APPLICATION">Privoxy</span>, v.3.0.20, 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 EMPHASIS c2">may be</span> bugs, though hopefully not many!</p>
<div class="SECT2">
<h2 class="SECT2"><a name="FEATURES" id="FEATURES">1.1.
@@ -62,8 +70,8 @@ body {
<p>In addition to the core features of ad blocking and <a href=
"http://en.wikipedia.org/wiki/Browser_cookie" target="_top">cookie</a>
management, <span class="APPLICATION">Privoxy</span> provides many
- supplemental features, that give the end-user more control, more
- privacy and more freedom:</p>
+ supplemental features, some of them currently under development, that
+ give the end-user more control, more privacy and more freedom:</p>
<ul>
<li>
@@ -169,7 +177,7 @@ body {
</tr>
<tr>
- <td width="33%" align="left" valign="top">Privoxy 3.0.19 User
+ <td width="33%" align="left" valign="top">Privoxy 3.0.20 User
Manual</td>
<td width="34%" align="center" valign="top"> </td>
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 3085eb55..f988f165 100644
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Quickstart to Using Privoxy</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="What's New in this Release" href=
"whatsnew.html">
<link rel="NEXT" title="Starting Privoxy" href="startup.html">
@@ -35,7 +32,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
@@ -357,7 +354,7 @@ body {
"GUIBUTTON">Edit</span>"</span>:</p>
<div class="FIGURE">
- <a name="AEN844" id="AEN844"></a>
+ <a name="AEN861" id="AEN861"></a>
<p class="c3">Figure 1. Actions Files in Use</p>
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index 223f1edc..5593114a 100644
--- a/doc/webserver/user-manual/seealso.html
+++ b/doc/webserver/user-manual/seealso.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>See Also</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="Privoxy Copyright, License and History" href=
"copyright.html">
<link rel="NEXT" title="Appendix" href="appendix.html">
@@ -33,7 +30,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 9c9e9440..f2325a2a 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Starting Privoxy</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="Quickstart to Using Privoxy" href=
"quickstart.html">
<link rel="NEXT" title="Privoxy Configuration" href="configuration.html">
@@ -36,7 +33,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
@@ -70,7 +67,7 @@ body {
protocols.</p>
<div class="FIGURE">
- <a name="AEN899" id="AEN899"></a>
+ <a name="AEN916" id="AEN916"></a>
<p class="c3">Figure 2. Proxy Configuration Showing Mozilla/Netscape
HTTP and HTTPS (SSL) Settings</p>
@@ -127,7 +124,7 @@ body {
and HTTPS (SSL)!</p>
<div class="FIGURE">
- <a name="AEN944" id="AEN944"></a>
+ <a name="AEN961" id="AEN961"></a>
<p class="c3">Figure 3. Proxy Configuration Showing Internet Explorer
HTTP and HTTPS (Secure) Settings</p>
diff --git a/doc/webserver/user-manual/templates.html b/doc/webserver/user-manual/templates.html
index 39dac406..8a7b4c9c 100644
--- a/doc/webserver/user-manual/templates.html
+++ b/doc/webserver/user-manual/templates.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>Privoxy's Template Files</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="Filter Files" href="filter-file.html">
<link rel="NEXT" title=
"Contacting the Developers, Bug Reporting and Feature Requests" href=
@@ -36,7 +33,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>
diff --git a/doc/webserver/user-manual/whatsnew.html b/doc/webserver/user-manual/whatsnew.html
index 03730aa4..ef96d8c9 100644
--- a/doc/webserver/user-manual/whatsnew.html
+++ b/doc/webserver/user-manual/whatsnew.html
@@ -3,13 +3,10 @@
<html>
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org">
-
<title>What's New in this Release</title>
<meta name="GENERATOR" content=
"Modular DocBook HTML Stylesheet Version 1.79">
- <link rel="HOME" title="Privoxy 3.0.19 User Manual" href="index.html">
+ <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
<link rel="PREVIOUS" title="Installation" href="installation.html">
<link rel="NEXT" title="Quickstart to Using Privoxy" href=
"quickstart.html">
@@ -33,7 +30,7 @@ body {
<table summary="Header navigation table" width="100%" border="0"
cellpadding="0" cellspacing="0">
<tr>
- <th colspan="3" align="center">Privoxy 3.0.19 User Manual</th>
+ <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
</tr>
<tr>