From 5fd77903894c0798908743d90ce72b9bdf2cce7d Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 18 Mar 2012 15:44:20 +0000 Subject: [PATCH] Rebuilt HTML for 3.0.20 UNRELEASED with Ian's recent changes --- doc/webserver/developer-manual/coding.html | 3 - doc/webserver/developer-manual/contact.html | 3 - doc/webserver/developer-manual/copyright.html | 7 +- doc/webserver/developer-manual/cvs.html | 3 - .../developer-manual/documentation.html | 5 +- doc/webserver/developer-manual/index.html | 13 +- .../developer-manual/introduction.html | 3 - .../developer-manual/newrelease.html | 161 +++++++++++++----- doc/webserver/developer-manual/seealso.html | 3 - doc/webserver/developer-manual/testing.html | 3 - .../developer-manual/webserver-update.html | 3 - doc/webserver/faq/configuration.html | 3 - doc/webserver/faq/contact.html | 3 - doc/webserver/faq/copyright.html | 3 - doc/webserver/faq/general.html | 3 - doc/webserver/faq/index.html | 7 +- doc/webserver/faq/installation.html | 3 - doc/webserver/faq/misc.html | 3 - doc/webserver/faq/trouble.html | 3 - doc/webserver/index.html | 7 +- doc/webserver/man-page/privoxy-man-page.html | 2 +- doc/webserver/privoxy-index.html | 5 +- doc/webserver/team/index.html | 2 +- doc/webserver/user-manual/actions-file.html | 25 ++- doc/webserver/user-manual/appendix.html | 35 ++-- doc/webserver/user-manual/config.html | 7 +- doc/webserver/user-manual/configuration.html | 25 +-- doc/webserver/user-manual/contact.html | 7 +- doc/webserver/user-manual/copyright.html | 18 +- doc/webserver/user-manual/filter-file.html | 9 +- doc/webserver/user-manual/index.html | 47 ++--- doc/webserver/user-manual/installation.html | 102 ++++++++--- doc/webserver/user-manual/introduction.html | 30 ++-- doc/webserver/user-manual/quickstart.html | 9 +- doc/webserver/user-manual/seealso.html | 7 +- doc/webserver/user-manual/startup.html | 11 +- doc/webserver/user-manual/templates.html | 7 +- doc/webserver/user-manual/whatsnew.html | 7 +- 38 files changed, 327 insertions(+), 270 deletions(-) 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 @@ - - Coding Guidelines 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 @@ - - Contacting the developers, Bug Reporting and Feature Requests - - Privoxy Copyright, License and History @@ -63,7 +60,7 @@ body { "CITETITLE">GNU General Public License.

-

9.1. License

+

9.1. License

Privoxy is free software; you can redistribute it and/or modify it under the terms of the

-

9.2. History

+

9.2. History

A long time ago, there was the - - The CVS Repository 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 @@ - - Documentation Guidelines @@ -399,7 +396,7 @@ body { p-version: the Privoxy version string, e.g. - "3.0.19". + "3.0.20". 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 @@ - - Privoxy Developer Manual @@ -35,8 +32,8 @@ body { 2001-2009 by Privoxy Developers

-

$Id: developer-manual.sgml,v 2.37 2011/11/13 - 17:03:54 fabiankeil Exp $

+

$Id: developer-manual.sgml,v 2.39 2012/03/18 + 01:16:35 diem Exp $

@@ -49,7 +46,7 @@ body { entirely correct. As always, patches are welcome.

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 http://www.privoxy.org/developer-manual/. Please see @@ -368,9 +365,9 @@ body {

-
9.1. License
+
9.1. License
-
9.2. History
+
9.2. History
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 @@ - - Introduction 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 @@ - - Releasing a New Version @@ -749,7 +746,7 @@ body { 
-  debchange -v 3.0.19-stable-1 "New upstream version"
+  debchange -v 3.0.20-UNRELEASED-1 "New upstream version"
@@ -768,7 +765,7 @@ body {

This will create ../privoxy_3.0.19-stable-1_i386.deb which can be + "FILENAME">../privoxy_3.0.20-UNRELEASED-1_i386.deb which can be uploaded. To upload the package to Sourceforge, simply issue

@@ -788,59 +785,133 @@ body {

First, make sure that you have freshly exported the right version into an empty directory. - (See "Building and releasing packages" above). Then get the Mac OS X - setup module:

+ (See "Building and releasing packages" above).

-
- - + +
- 
+        
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).

+
+        

+          
6.3.8.1. OSXPackageBuilder
+          module

+
+          
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:

+
+          
+            
+              
+            
+          

+                
+  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co OSXPackageBuilder
+

+              

+
+          
The module contains complete instructions on its usage in the
+          file OS X Package Builder HOWTO.txt.

+
+          
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.

+        

+
+        

+          
6.3.8.2. osxsetup module
+          (DEPRECATED)

+
+          
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.

+
+          
Check out the module from CVS as follows into a folder parallel
+          to the exported privoxy source:

+
+          
+            
+              
-          
-        

+                
   cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co osxsetup
 

-            

+
-

Then run:

+

Then run:

- - - + +
- 
+          
+            
+              
-          
-        

+                
   cd osxsetup
   build
 

-            

+
-

This will run autoheader, autoconf and configure as - well as make. Finally, it will copy over - the necessary files to the ./osxsetup/files directory for further - processing by PackageMaker.

+

This will run autoheader, autoconf and configure as + well as make. Finally, it will copy over + the necessary files to the ./osxsetup/files directory for further + processing by PackageMaker.

-

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:

+

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:

- - - + +
- 
+          
+            
+              
-          
-        

+                
   zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
 

-            

+
+ +

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.

+
+ +
+

6.3.8.3. macsetup module

+ +

The macsetup module is ideal if you wish to build and install + Privoxy from source on a single machine.

+ +

Check out the module from CVS as follows into a folder parallel + to the exported privoxy source:

+ + + + + +
+ 
+  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co macsetup
+
+
-

You can then upload privoxyosx_setup_x.y.z.zip anonymously to uploads.sourceforge.net/incoming, create a release - for it, and you're done. Use the release notes and Change Log from - the source tarball package.

+

The module contains complete instructions on its usage in its + README file. The end result will be the + the exported version of Privoxy installed on the build machine.

+
@@ -1024,7 +1095,7 @@ body { column, and click Add Release. You will then need to create a new release for your package, using the format of $VERSION ($CODE_STATUS), e.g. 3.0.19 (beta).

+ "emphasis EMPHASIS c2">3.0.20 (beta).

Now just follow the prompts. Be sure to add any appropriate Release notes. You should see your freshly uploaded packages in - - See also 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 @@ - - Testing Guidelines 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 @@ - - Update the Webserver 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 @@ - - Configuration 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 @@ - - Contacting the developers, Bug Reporting and Feature Requests - - Privoxy Copyright, License and History 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 @@ - - General Information 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 @@ - - Privoxy Frequently Asked Questions @@ -37,7 +34,7 @@ body { 2001-2011 by Privoxy Developers

-

$Id: faq.sgml,v 2.84 2011/11/13 17:03:54 fabiankeil +

$Id: faq.sgml,v 2.85 2011/12/26 17:05:40 fabiankeil Exp $

@@ -80,7 +77,7 @@ body {

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 http://www.privoxy.org/faq/. Please see the - - Installation 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 @@ - - Miscellaneous 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 @@ - - Troubleshooting 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 @@ - - Privoxy - Home Page @@ -86,7 +83,7 @@ body {

The most recent release is 3.0.19 (stable).

+ "_top">3.0.20 (UNRELEASED).

@@ -200,7 +197,7 @@ body {
-

Copyright © 2001-2011 by Privoxy Developers

+

Copyright © 2001-2010 by Privoxy Developers

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 Tidy for Linux/x86 (vers 25 March 2009), see www.w3.org"> Privoxy Man page 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 @@ - - Privoxy - The Privacy Enhancing Proxy @@ -54,7 +51,7 @@ body {

Privoxy - The Privacy Enhancing Proxy

-

Project Index Page v3.0.19

+

Project Index Page v3.0.20

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 Tidy for Linux/x86 (vers 25 March 2009), see www.w3.org"> Privoxy - Team Photos 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 @@ - - Actions Files - + @@ -38,7 +35,7 @@ body { - + @@ -134,7 +131,7 @@ body { in default.action are:

- +

Table 1. Default Configurations

@@ -330,7 +327,7 @@ body { actions.

-

8.1. Finding the Right +

8.1. Finding the Right Mix

Note that some actions, like @@ -355,7 +352,7 @@ body {

-

8.2. How to +

8.2. How to Edit

The easiest way to edit the actions files is with a browser by using @@ -544,7 +541,7 @@ body {

-

8.4.1. The Domain +

8.4.1. The Domain Pattern

The matching of the domain part offers some flexible options: if @@ -650,7 +647,7 @@ body {

-

8.4.2. The Path +

8.4.2. The Path Pattern

Privoxy uses

-

8.5.34. +

8.5.34. Summary

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:

-

8.7.1. +

8.7.1. match-all.action

Remember all actions are @@ -4432,7 +4429,7 @@ example.org/instance-that-is-delivered-as-xml-but-is-not

-

8.7.2. +

8.7.2. default.action

If you aren't a developer, there's no need for you to edit the @@ -4775,7 +4772,7 @@ wiki.

-

8.7.3. +

8.7.3. user.action

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 @@ - - Appendix - + @@ -33,7 +30,7 @@ body {

Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
- + @@ -305,7 +302,7 @@ body {
-

14.2. Privoxy's +

14.2. Privoxy's Internal Pages

Since Privoxy proxies each @@ -325,7 +322,7 @@ body {

Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
- + 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 @@ - - Privoxy Configuration - + @@ -34,7 +31,7 @@ body {
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
- + @@ -60,7 +57,7 @@ body { controlled easily with a web browser.

-

6.1. Controlling +

6.1. Controlling Privoxy with Your Web Browser

Privoxy's user interface can be @@ -77,8 +74,8 @@ body { -

    Privoxy Menu

+

    Privoxy Menu
@@ -118,7 +115,7 @@ body {
@@ -161,7 +158,9 @@ body {

For Unix, *BSD and Linux, all configuration files are located in /etc/privoxy/ by default. For MS Windows, OS/2, and AmigaOS these are all in the same directory as the - Privoxy executable.

+ Privoxy executable. The name and + number of configuration files has changed from previous versions, and + is subject to change as development progresses.

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 Privoxy, these "wake up" requests must obviously be sent to the old listening address.

+ +

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 "default" setting, may change, so please check all your + configuration files on important issues.

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 @@ - - Contacting the Developers, Bug Reporting and Feature Requests - + - + 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 @@ - - Privoxy Copyright, License and History - + @@ -35,7 +32,7 @@ body {
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
-         ▪  Documentation
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
- + @@ -64,7 +61,7 @@ body { "CITETITLE">GNU General Public License.

-

12.1. License

+

12.1. License

Privoxy is free software; you can redistribute it and/or modify it under the terms of the  David Schmidt, developer
 Hal Burgiss
+  Ian Silvester
 Lee Rian
-  Roland Rosenfeld

+  Roland Rosenfeld
+  Ian Silvester

Former Privoxy Team Members:

@@ -193,6 +192,7 @@ body {  Markus Elfring
 Dean Gaudet
 Stephen Gildea
+  Lizik Grelier
 Daniel Griscom
 Felix Gröbert
 Jeff H.
@@ -204,7 +204,10 @@ body {  Stefan Huehner
 Peter Hyman
 Derek Jennings
+  Andrew Jones
+  Julien Joubert
 Petr Kadlec
+  Steven Kolins
 David Laight
 Bert van Leeuwen
 Don Libes
@@ -224,6 +227,7 @@ body {  Roberto Ragusa
 Félix Rauch
 Maynard Riley
+  Andreas Rutkauskas
 Chung-chieh Shan
 Spinor S.
 Bart Schelstraete
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 @@ - - Filter Files - + @@ -35,7 +32,7 @@ body {
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
- + @@ -165,7 +162,7 @@ FILTER: foo Replace all "foo" with "bar" started.

-

9.1. Filter File +

9.1. Filter File Tutorial

Now, let's complete our "foo" 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 @@ - - - Privoxy 3.0.19 User Manual + Privoxy 3.0.20 User Manual @@ -29,15 +26,15 @@ body {

-

Privoxy 3.0.19 User +

Privoxy 3.0.20 User Manual

Copyright © 2001-2011 by Privoxy Developers

-

$Id: user-manual.sgml,v 2.143 2011/11/20 17:16:36 - fabiankeil Exp $

+

$Id: user-manual.sgml,v 2.147 2012/03/11 19:03:42 + diem Exp $

@@ -126,12 +123,20 @@ body { OS X
2.1.7. AmigaOS
+ "installation.html#OS-X-INSTALL-FROM-PACKAGE">Installation + from ready-built package
2.1.8. FreeBSD
+ "installation.html#OS-X-INSTALL-FROM-SOURCE">Installation + from source
2.1.9. AmigaOS
+ +
2.1.10. FreeBSD
+ +
2.1.11. Gentoo
@@ -195,7 +200,7 @@ body {
-
6.1. Controlling Privoxy +
6.1. Controlling Privoxy with Your Web Browser
6.2. Configuration @@ -358,10 +363,10 @@ body {
-
8.1. Finding the Right +
8.1. Finding the Right Mix
-
8.2. How to Edit
+
8.2. How to Edit
8.3. How Actions are Applied to Requests
@@ -371,10 +376,10 @@ body {
-
8.4.1. The Domain +
8.4.1. The Domain Pattern
-
8.4.2. The Path +
8.4.2. The Path Pattern
8.4.3. The Tag @@ -485,7 +490,7 @@ body { "actions-file.html#SET-IMAGE-BLOCKER">set-image-blocker
8.5.34. Summary
+ "actions-file.html#AEN4725">Summary
@@ -497,13 +502,13 @@ body {
8.7.1. match-all.action
+ "actions-file.html#AEN4789">match-all.action
8.7.2. default.action
+ "actions-file.html#AEN4811">default.action
8.7.3. user.action
+ "actions-file.html#AEN4924">user.action
@@ -513,7 +518,7 @@ body {
-
9.1. Filter File +
9.1. Filter File Tutorial
9.2. The @@ -557,7 +562,7 @@ body {
-
12.1. License
+
12.1. License
12.2. History
@@ -574,7 +579,7 @@ body {
14.1. Regular Expressions
-
14.2. Privoxy's Internal +
14.2. Privoxy's Internal Pages
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 @@ - - Installation - + @@ -35,7 +32,7 @@ body {

Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
- + @@ -80,7 +77,7 @@ body { "INSTALLATION-PACK-RPM">2.1.1. Red Hat and Fedora RPMs

RPMs can be installed with rpm -Uvh - privoxy-3.0.19-1.rpm, and will use , and will use /etc/privoxy for the location of configuration files.

@@ -92,7 +89,7 @@ body {

If you have problems with failed dependencies, try rebuilding the SRC RPM: rpm --rebuild - privoxy-3.0.19-1.src.rpm. This will use your locally installed + privoxy-3.0.20-1.src.rpm. This will use your locally installed libraries and RPM version.

Also note that if you have a 2.1.6. Mac OS X -

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.

+

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.

+ + +
+

2.1.7. Installation from ready-built + package

+ +

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.

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 /Library/StartupItems/Privoxy.

+ 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.

+ +

To prevent the privoxy service from automatically starting when + your computer starts up, remove or rename the file /Library/LaunchDaemons/org.ijbswa.privoxy.plist (on OS + X 10.5 and higher) or the folder named /Library/StartupItems/Privoxy (on OS X 10.4 + 'Tiger').

+ +

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.

+ +

To uninstall, run /Applications/Privoxy/uninstall.command as sudo + from an administrator account.

+
+ +
+

2.1.8. Installation from source

+ +

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.

+ +

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.

+ +

To prevent the privoxy service from automatically starting when + your computer starts up, remove or rename the file /Library/LaunchDaemons/org.ijbswa.privoxy.plist (on OS + X 10.5 and higher) or the folder named /Library/StartupItems/Privoxy (on OS X 10.4 + 'Tiger').

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).

+ 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.

+ +

To uninstall, run the macsetup module's uninstall.sh as sudo from + an administrator account.

2.1.7. AmigaOS

+ "INSTALLATION-AMIGA">2.1.9. AmigaOS

Copy and then unpack the lha archive to a suitable location. All necessary files will be installed into @@ -220,7 +274,7 @@ body {

2.1.8. FreeBSD

+ "INSTALLATION-TBZ">2.1.10. FreeBSD

Privoxy is part of FreeBSD's Ports Collection, you can build and install it with cd /usr/ports/www/privoxy; make @@ -239,7 +293,7 @@ body {

2.1.9. Gentoo

+ "INSTALLATTION-GENTOO">2.1.11. Gentoo

Gentoo source packages (Ebuilds) for Privoxy are contained in the Gentoo Portage Tree @@ -254,7 +308,7 @@ body {

Configuration files are in /etc/privoxy, the documentation is in /usr/share/doc/privoxy-3.0.19 and the Log directory + "FILENAME">/usr/share/doc/privoxy-3.0.20 and the Log directory is in /var/log/privoxy.

@@ -289,8 +343,8 @@ body {
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 @@ - - Introduction - - + + @@ -23,6 +20,7 @@ body { :link { color: #0000FF } :visited { color: #840084 } :active { color: #0000FF } + span.c2 {font-style: italic} hr.c1 {text-align: left} @@ -32,7 +30,7 @@ body {
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual 
- 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
- + @@ -52,8 +50,18 @@ body {

1. Introduction

-

This documentation is included with the current stable version of - Privoxy, v.3.0.19.

+

This documentation is included with the current UNRELEASED version of + Privoxy, 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.

+ +

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 may be bugs, though hopefully not many!

1.1. @@ -62,8 +70,8 @@ body {

In addition to the core features of ad blocking and cookie management, Privoxy provides many - supplemental features, that give the end-user more control, more - privacy and more freedom:

+ supplemental features, some of them currently under development, that + give the end-user more control, more privacy and more freedom:

  • @@ -169,7 +177,7 @@ body {

- 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 @@ - - Quickstart to Using Privoxy - + @@ -35,7 +32,7 @@ body {
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
Privoxy 3.0.19 User + Privoxy 3.0.20 User Manual  
- + @@ -357,7 +354,7 @@ body { "GUIBUTTON">Edit":

- +

Figure 1. Actions Files in Use

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 @@ - - See Also - + @@ -33,7 +30,7 @@ body {
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
- + 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 @@ - - Starting Privoxy - + @@ -36,7 +33,7 @@ body {
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
- + @@ -70,7 +67,7 @@ body { protocols.

- +

Figure 2. Proxy Configuration Showing Mozilla/Netscape HTTP and HTTPS (SSL) Settings

@@ -127,7 +124,7 @@ body { and HTTPS (SSL)!

- +

Figure 3. Proxy Configuration Showing Internet Explorer HTTP and HTTPS (Secure) Settings

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 @@ - - Privoxy's Template Files - +
- + 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 @@ - - What's New in this Release - + @@ -33,7 +30,7 @@ body {
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual
- + -- 2.39.2
Privoxy 3.0.19 User ManualPrivoxy 3.0.20 User Manual