From: swa <swa@users.sourceforge.net>
Date: Fri, 26 Apr 2002 18:18:54 +0000 (+0000)
Subject: generated
X-Git-Tag: v_3_0_branchpoint~198
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/developer-manual/faq/@default-cgi@/static/gitweb.js?a=commitdiff_plain;h=0a3750f6302df8349b5be2e15a9a4fefe3c35889;p=privoxy.git
generated
---
diff --git a/README b/README
index 0b8ac1ec..e48c7336 100644
--- a/README
+++ b/README
@@ -1,4 +1,3 @@
-
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/doc/source/readme.sgml,v $
@@ -31,7 +30,6 @@
* Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*********************************************************************/
-
This README is included with the development version of Privoxy 2.9.14, which
will eventually become Privoxy v3.0 (and soon we hope!). See http://
@@ -73,7 +71,6 @@ tarball), first unpack the source:
tar xzvf privoxy-2.9.14-beta-src* [.tgz or .tar.gz]
cd privoxy-2.9.14-beta
-
For retrieving the current CVS sources, you'll need CVS installed. Note that
sources from CVS are development quality, and may not be stable, or well
@@ -82,7 +79,6 @@ tested. To download CVS source:
cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co current
cd current
-
This will create a directory named current/, which will contain the source
tree.
@@ -96,13 +92,11 @@ Then, in either case, to build from unpacked tarball or CVS source:
su
make -n install # (to see where all the files will go)
make install # (to really install)
-
If you have gnu make, you can have the first four steps automatically done for
-you by just typing
+you by just typing:
make
-
in the freshly downloaded or unpacked source directory.
@@ -133,13 +127,14 @@ Or for SuSE: /etc/rc.d/privoxy start
CONFIGURATION
--------------
-See: 'config', 'default.action', 'standard.action', 'user.action', and
-'default.filter'. 'user.action' is for personal configuration. These are all
-well commented. Most of the magic is in '*.action' files. On Unix-like systems,
-these files are installed in /etc/privoxy. On Windows, then wherever the
-executable itself is installed. There are many significant changes and advances
-since Junkbuster v2.0.x. The user-manual has a run down of configuration
-options, and examples: http://www.privoxy.org/user-manual/.
+See: 'config', 'default.action', 'user.action', and 'default.filter'.
+'user.action' is for personal configuration. These are all well commented. Most
+of the magic is in '*.action' files. 'user.action' should be used for any
+actions customizations. On Unix-like systems, these files are installed in /etc
+/privoxy. On Windows, then wherever the executable itself is installed. There
+are many significant changes and advances since Junkbuster v2.0.x. The
+user-manual has a run down of configuration options, and examples: http://
+www.privoxy.org/user-manual/.
Be sure to set your browser(s) for HTTP/HTTPS Proxy at <IP>:<Port>, or whatever
you specify in the config file under 'listen-address'. DEFAULT is localhost:
@@ -171,51 +166,8 @@ Included documentation may vary according to platform and packager.
CONTACTING THE DEVELOPERS, BUG REPORTING AND FEATURE REQUESTS
--------------------------------------------------------------
-We value your feedback. However, to provide you with the best support, please
-note:
-
- * Use the Sourceforge Support Forum to get help:
-
- http://sourceforge.net/tracker/?group_id=11118&atid=211118
-
-
- * Submit bugs only through our Sourceforge Bug Forum:
-
- http://sourceforge.net/tracker/?group_id=11118&atid=111118.
-
-
- Make sure that the bug has not already been submitted. Please try to verify
- that it is a Privoxy bug, and not a browser or site bug first. If you are
- using your own custom configuration, please try the stock configs to see if
- the problem is a configuration related bug. And if not using the latest
- development snapshot, please try the latest one. Or even better, CVS
- sources. Please be sure to include the Privoxy/Junkbuster version,
- platform, browser, any pertinent log data, any other relevant details
- (please be specific) and, if possible, some way to reproduce the bug.
-
- * Submit feature requests only through our Sourceforge feature request forum:
-
- http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
-
-
- * You can also send feedback on websites that Privoxy has problems with. Please bookmark
- the following link: "Privoxy - Submit Filter Feedback"
- . Once you surf to a page with problems, use the
- bookmark to send us feedback. We will look into the issue as soon as possible.
-
-
- * For any other issues, feel free to use the mailing lists:
-
- http://sourceforge.net/mail/?group_id=11118.
-
-
- Anyone interested in actively participating in development and related
- discussions can also join the appropriate mailing list. Archives are
- available, too.
-
-------------------------------------------------------------------------
ijbswa-developers@lists.sourceforge.net
-
-$Id: readme.sgml,v 1.9 2002/04/24 04:04:12 hal9 Exp $
+$Id: readme.sgml,v 1.12 2002/04/26 17:45:36 swa Exp $
diff --git a/doc/pdf/privoxy-developer-manual.pdf b/doc/pdf/privoxy-developer-manual.pdf
index 12bda8e0..50ce62c9 100644
Binary files a/doc/pdf/privoxy-developer-manual.pdf and b/doc/pdf/privoxy-developer-manual.pdf differ
diff --git a/doc/pdf/privoxy-faq.pdf b/doc/pdf/privoxy-faq.pdf
index e3c221c4..1328b065 100644
Binary files a/doc/pdf/privoxy-faq.pdf and b/doc/pdf/privoxy-faq.pdf differ
diff --git a/doc/pdf/privoxy-user-manual.pdf b/doc/pdf/privoxy-user-manual.pdf
index 8c995172..83b53d6b 100644
Binary files a/doc/pdf/privoxy-user-manual.pdf and b/doc/pdf/privoxy-user-manual.pdf differ
diff --git a/doc/text/developer-manual.txt b/doc/text/developer-manual.txt
index 675805f2..ac5f2e8b 100644
--- a/doc/text/developer-manual.txt
+++ b/doc/text/developer-manual.txt
@@ -2,7 +2,7 @@ Privoxy Developer Manual
By: Privoxy Developers
-$Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $
+$Id: developer-manual.sgml,v 1.37 2002/04/26 17:23:29 swa Exp $
The developer manual gives the users information on how to help the developer
team. It provides guidance on coding, testing, documentation and other issues.
@@ -119,6 +119,13 @@ Table of Contents
9. Update the Webserver
10. Contacting the developers, Bug Reporting and Feature Requests
+
+ 10.1. Get Support
+ 10.2. Report bugs
+ 10.3. Request new features
+ 10.4. Report ads or other filter problems
+ 10.5. Other
+
11. Copyright and History
11.1. Copyright
@@ -1363,7 +1370,7 @@ from the project).
Example for file comments:
-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.37 2002/04/26 17:23:29 swa Exp $";
/*********************************************************************
*
* File : $Source$
@@ -1420,7 +1427,7 @@ Example for file header comments:
#ifndef _FILENAME_H
#define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.37 2002/04/26 17:23:29 swa Exp $"
/*********************************************************************
*
* File : $Source$
@@ -1595,7 +1602,6 @@ The following must be done by one of the developers prior to each new release.
version info in this line:
{+add-header{X-Actions-File-Version: A.B} -filter -no-popups}
-
Then change the version info in doc/webserver/actions/index.php, line:
'$required_actions_file_version = "A.B";'
@@ -1620,11 +1626,10 @@ For all types of packages, including the source tarball, you must make sure
that you build from clean sources by exporting the right version from CVS into
an empty directory:.
- mkdir dist # delete or choose different name if it already exists
- cd dist
- cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
- cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa export -r v_X_Y_Z current
-
+ mkdir dist # delete or choose different name if it already exists
+ cd dist
+ cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
+ cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa export -r v_X_Y_Z current
Do NOT change a single bit, including, but not limited to version information
after export from CVS. This is to make sure that all release packages, and with
@@ -1642,17 +1647,14 @@ directory. (See "Building and releasing packages" above). Then run:
cd current
autoheader && autoconf && ./configure
-
Then do:
make tarball-dist
-
To upload the package to Sourceforge, simply issue
make tarball-upload
-
Go to the displayed URL and release the file publicly on Sourceforge. For the
change log field, use the relevant section of the ChangeLog file.
@@ -1666,17 +1668,14 @@ directory. (See "Building and releasing packages" above). Then run:
cd current
autoheader && autoconf && ./configure
-
Then do
make suse-dist (or make redhat-dist)
-
To upload the package to Sourceforge, simply issue
make suse-upload (or make redhat-upload)
-
Go to the displayed URL and release the file publicly on Sourceforge. Use the
release notes and çhange log from the source tarball package.
@@ -1689,8 +1688,7 @@ First, make sure that you have freshly exported the right version into an empty
directory. (See "Building and releasing packages" above). Then get the OS/2
Setup module:
- cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co os2setup
-
+ cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co os2setup
You will need a mix of development tools. The main compilation takes place with
IBM Visual Age C++. Some ancillary work takes place with GNU tools, available
@@ -1702,18 +1700,15 @@ Change directory to the os2setup directory. Edit the os2build.cmd file to set
the final executable filename. For example,
installExeName='privoxyos2_setup_X.Y.Z.exe'
-
Next, edit the IJB.wis file so the release number matches in the PACKAGEID
section:
PACKAGEID="Privoxy Team\Privoxy\Privoxy Package\X\Y\Z"
-
You're now ready to build. Run:
os2build
-
You will find the WarpIN-installable executable in the ./files directory.
Upload this anonymously to uploads.sourceforge.net/incoming, create a release
@@ -1727,7 +1722,6 @@ tarball package.
Login to Sourceforge's compilefarm via ssh:
ssh cf.sourceforge.net
-
Choose the right operating system (not the Debian one). When logged in, make
sure that you have freshly exported the right version into an empty directory.
@@ -1735,12 +1729,10 @@ sure that you have freshly exported the right version into an empty directory.
cd current
autoheader && autoconf && ./configure
-
Then run
gmake solaris-dist
-
which creates a gzip'ed tar archive. Sadly, you cannot use make solaris-upload
on the Sourceforge machine (no ncftpput). You now have to manually upload the
@@ -1758,15 +1750,13 @@ First, make sure that you have freshly exported the right version into an empty
directory. (See "Building and releasing packages" above). Then get the Windows
setup module:
- cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co winsetup
-
+ cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co winsetup
Then you can build the package. This is fully automated, and is controlled by
winsetup/GNUmakefile. All you need to do is:
cd winsetup
make
-
Now you can manually rename privoxy_setup.exe to privoxy_setup_X_Y_Z.exe, and
upload it to SourceForge. When releasing the package on SourceForge, use the
@@ -1781,7 +1771,6 @@ directory. (See "Building and releasing packages" above). Then, run:
cd current
autoheader && autoconf && ./configure
-
Then do FIXME.
@@ -1793,14 +1782,12 @@ 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 OSX
setup module:
- cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co osxsetup
-
+ cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co osxsetup
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
@@ -1812,7 +1799,6 @@ 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 privoxyosx_setup_x.y.z.zip anonymously to
uploads.sourceforge.net/incoming, create a release for it, and you're done. Use
@@ -1825,7 +1811,6 @@ the release notes and Change Log from the source tarball package.
Login to Sourceforge's compilefarm via ssh:
ssh cf.sourceforge.net
-
Choose the right operating system. When logged in, make sure that you have
freshly exported the right version into an empty directory. (See "Building and
@@ -1833,12 +1818,10 @@ releasing packages" above). Then run:
cd current
autoheader && autoconf && ./configure
-
Then run:
gmake freebsd-dist
-
which creates a gzip'ed tar archive. Sadly, you cannot use make freebsd-upload
on the Sourceforge machine (no ncftpput). You now have to manually upload the
@@ -1854,7 +1837,6 @@ directory. (See "Building and releasing packages" above). Then run:
cd current
autoheader && autoconf && ./configure
-
Then do FIXME.
@@ -1867,7 +1849,6 @@ directory. (See "Building and releasing packages" above). Then run:
cd current
autoheader && autoconf && ./configure
-
Then do FIXME.
@@ -1878,7 +1859,6 @@ Then do FIXME.
Login to Sourceforge's compilefarm via ssh:
ssh cf.sourceforge.net
-
Choose the right operating system. When logged in, make sure that you have
freshly exported the right version into an empty directory. (See "Building and
@@ -1886,12 +1866,10 @@ releasing packages" above). Then run:
cd current
autoheader && autoconf && ./configure
-
Then run:
make aix-dist
-
which creates a gzip'ed tar archive. Sadly, you cannot use make aix-upload on
the Sourceforge machine (no ncftpput). You now have to manually upload the
@@ -1917,7 +1895,6 @@ broken links, incosistent contents or permission problems will occur:
If you have changed anything in the documentation source SGML files, do:
make dok # (or make redkat-dok if make dok doesn't work for you)
-
That will generate doc/webserver/user-manual, doc/webserver/developer-manual,
doc/webserver/faq and doc/webserver/index.html automatically.
@@ -1932,7 +1909,6 @@ webserver/* directory (or create new directories under doc/webserver).
Next, commit any changes from the above steps to CVS. All set? Then do
make webserver
-
This will do the upload to the webserver (www.privoxy.org) and ensure all files
and directories there are group writable.
@@ -1945,47 +1921,69 @@ avoid permission problems.
10. Contacting the developers, Bug Reporting and Feature Requests
We value your feedback. However, to provide you with the best support, please
-note:
+note the following sections.
- * Use the Sourceforge Support Forum to get help:
-
- http://sourceforge.net/tracker/?group_id=11118&atid=211118
-
-
- * Submit bugs only through our Sourceforge Bug Forum:
-
- http://sourceforge.net/tracker/?group_id=11118&atid=111118.
-
-
- Make sure that the bug has not already been submitted. Please try to verify
- that it is a Privoxy bug, and not a browser or site bug first. If you are
- using your own custom configuration, please try the stock configs to see if
- the problem is a configuration related bug. And if not using the latest
- development snapshot, please try the latest one. Or even better, CVS
- sources. Please be sure to include the Privoxy/Junkbuster version,
- platform, browser, any pertinent log data, any other relevant details
- (please be specific) and, if possible, some way to reproduce the bug.
-
- * Submit feature requests only through our Sourceforge feature request forum:
-
- http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
-
-
- * You can also send feedback on websites that Privoxy has problems with. Please bookmark
- the following link: "Privoxy - Submit Filter Feedback"
- . Once you surf to a page with problems, use the
- bookmark to send us feedback. We will look into the issue as soon as possible.
-
-
- * For any other issues, feel free to use the mailing lists:
-
- http://sourceforge.net/mail/?group_id=11118.
-
+-------------------------------------------------------------------------------
+
+10.1. Get Support
+
+To get support, use the Sourceforge Support Forum:
+
+ http://sourceforge.net/tracker/?group_id=11118&atid=211118
- Anyone interested in actively participating in development and related
- discussions can also join the appropriate mailing list. Archives are
- available, too.
+
+-------------------------------------------------------------------------------
+
+10.2. Report bugs
+
+To submit bugs, use the Sourceforge Bug Forum:
+
+ http://sourceforge.net/tracker/?group_id=11118&atid=111118.
+
+
+Make sure that the bug has not already been submitted. Please try to verify
+that it is a Privoxy bug, and not a browser or site bug first. If you are using
+your own custom configuration, please try the stock configs to see if the
+problem is a configuration related bug. And if not using the latest development
+snapshot, please try the latest one. Or even better, CVS sources. Please be
+sure to include the Privoxy version, platform, browser, any pertinent log data,
+any other relevant details (please be specific) and, if possible, some way to
+reproduce the bug.
+
+-------------------------------------------------------------------------------
+
+10.3. Request new features
+
+To submit ideas on new features, use the Sourceforge feature request forum:
+
+ http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
+
+-------------------------------------------------------------------------------
+
+10.4. Report ads or other filter problems
+
+You can also send feedback on websites that Privoxy has problems with. Please
+bookmark the following link: "Privoxy - Submit Filter Feedback". Once you surf
+to a page with problems, use the bookmark to send us feedback. We will look
+into the issue as soon as possible.
+
+New, improved default.action files will occasionally be made available based on
+your feedback. These will be announced on the ijbswa-announce list.
+
+-------------------------------------------------------------------------------
+
+10.5. Other
+
+For any other issues, feel free to use the mailing lists:
+
+ http://sourceforge.net/mail/?group_id=11118.
+
+
+Anyone interested in actively participating in development and related
+discussions can also join the appropriate mailing list. Archives are available,
+too. See the page on Sourceforge.
+
-------------------------------------------------------------------------------
11. Copyright and History
diff --git a/doc/text/faq.txt b/doc/text/faq.txt
index ee005e10..75c5ac10 100644
--- a/doc/text/faq.txt
+++ b/doc/text/faq.txt
@@ -2,7 +2,7 @@ Privoxy Frequently Asked Questions
By: Privoxy Developers
-$Id: faq.sgml,v 1.49 2002/04/12 10:10:18 swa Exp $
+$Id: faq.sgml,v 1.51 2002/04/26 17:24:31 swa Exp $
This FAQ gives users and developers alike answers to frequently asked questions
about Privoxy .
@@ -57,21 +57,19 @@ Table of Contents
3.3. The "actions" concept confuses me. Please list some of these
"actions".
3.4. How are actions files configured? What is the easiest way to do this?
- 3.5. What are the differences between intermediate.action, basic.action,
- etc.?
- 3.6. Why can I change the configuration with a browser? Does that not raise
+ 3.5. Why can I change the configuration with a browser? Does that not raise
security issues?
- 3.7. What is "default.filter"?
- 3.8. How can I set up Privoxy to act as a proxy for my LAN?
- 3.9. Instead of ads, now I get a checkerboard pattern. I don't want to see
+ 3.6. What is "default.filter"?
+ 3.7. How can I set up Privoxy to act as a proxy for my LAN?
+ 3.8. Instead of ads, now I get a checkerboard pattern. I don't want to see
anything.
- 3.10. Why would anybody want to see a checkerboard pattern?
- 3.11. I see large red banners on some pages that say "Blocked". Why and how
+ 3.9. Why would anybody want to see a checkerboard pattern?
+ 3.10. I see large red banners on some pages that say "Blocked". Why and how
do I get rid of this?
- 3.12. I cannot see all of the "Blocked" page banner. All I see is a bright
+ 3.11. I cannot see all of the "Blocked" page banner. All I see is a bright
red square.
- 3.13. Can Privoxy run as a service on Win2K/NT?
- 3.14. How can I make Privoxy work with other proxies like Squid?
+ 3.12. Can Privoxy run as a service on Win2K/NT?
+ 3.13. How can I make Privoxy work with other proxies like Squid?
4. Miscellaneous
@@ -103,10 +101,16 @@ Table of Contents
5.2. I just added a new rule, but the steenkin ad is still getting through.
How?
5.3. One of my favorite sites does not work with Privoxy. What can I do?
- 5.4. Where can I get help? Report bugs? Feature Requests? Etc?
- 5.5. What time is it?
+ 5.4. What time is it?
7. Contacting the developers, Bug Reporting and Feature Requests
+
+ 7.1. Get Support
+ 7.2. Report bugs
+ 7.3. Request new features
+ 7.4. Report ads or other filter problems
+ 7.5. Other
+
8. Copyright and History
8.1. Copyright
@@ -166,6 +170,9 @@ configuration is now.
1.4. What are some of the new features?
+ * FIXME: complete the list of features. change the order: most important
+ features to the top of the list. prefix new features with "NEW".
+
* Integrated browser based configuration and control utility at http://
config.privoxy.org/ (shortcut: http://p.p/). Browser-based tracing of rule
and filter effects. Remote toggling.
@@ -195,10 +202,6 @@ configuration is now.
* Improved signal handling, and a true daemon mode (Unix).
- * Builds from source on most UNIX-like systems. Packages available for: Linux
- (RedHat, SuSE, or Debian), Windows, Sun Solaris, Mac OSX, OS/2, HP-UX 11,
- NetBSD and AmigaOS.
-
* Every feature now controllable on a per-site or per-location basis,
configuration more powerful and versatile over-all.
@@ -321,8 +324,9 @@ just like a web server does.
2.2. Which operating systems are supported?
-At present, Privoxy is known to run on Win32, Mac OSX, OS/2, AmigaOS, Linux
-(RedHat, Suse, Debian), FreeBSD, NetBSD, BeOS, and many flavors of Unix.
+At present, Privoxy is known to run on Windows(95, 98, ME, 2000, XP), Linux
+(RedHat, Suse, Debian), Mac OSX, OS/2, AmigaOS, FreeBSD, NetBSD, BeOS, and many
+more flavors of Unix.
But any operating system that runs TCP/IP, can conceivably take advantage of
Privoxy in a networked situation where Privoxy would run as a server on a LAN
@@ -438,50 +442,7 @@ configuration files, and their various options and syntax.
-------------------------------------------------------------------------------
-3.5. What are the differences between intermediate.action, basic.action, etc.?
-
-Configuring Privoxy is not easy. To help you get started, we provide you with
-three different default configurations. The following table shows you, which
-features are enabled in each configuration.
-
-Table 1. Default Configurations
-
-+--------------------------------------------------------------------------------------+
-|Feature |default.action|basic.action |intermediate.action|advanced.action|
-|--------------------+--------------+--------------+-------------------+---------------|
-|ad-filtering |? |x |x |x |
-|--------------------+--------------+--------------+-------------------+---------------|
-|blank image |? |x |x |x |
-|--------------------+--------------+--------------+-------------------+---------------|
-|de-animate GIFs |? |x |x |x |
-|--------------------+--------------+--------------+-------------------+---------------|
-|referer forging |? |x |x |x |
-|--------------------+--------------+--------------+-------------------+---------------|
-|jon's |? |x |x |x |
-|+no-cookies-keep | | | | |
-|(i.e. session | | | | |
-|cookies only) | | | | |
-|--------------------+--------------+--------------+-------------------+---------------|
-|no-popup windows |? | |x |x |
-|--------------------+--------------+--------------+-------------------+---------------|
-|fast redirects |? | |x |x |
-|--------------------+--------------+--------------+-------------------+---------------|
-|hide-referrer |? | |x |x |
-|--------------------+--------------+--------------+-------------------+---------------|
-|hide-useragent |? | |x |x |
-|--------------------+--------------+--------------+-------------------+---------------|
-|content-modification|? | | |x |
-|--------------------+--------------+--------------+-------------------+---------------|
-|feature-x |? | | | |
-|--------------------+--------------+--------------+-------------------+---------------|
-|feature-y |? | | | |
-|--------------------+--------------+--------------+-------------------+---------------|
-|feature-z |? | | | |
-+--------------------------------------------------------------------------------------+
-
--------------------------------------------------------------------------------
-
-3.6. Why can I change the configuration with a browser? Does that not raise
+3.5. Why can I change the configuration with a browser? Does that not raise
security issues?
What I don't understand, is how I can browser edit the config file as a regular
@@ -502,7 +463,7 @@ Note that normally only local users can connect to Privoxy, so this is not
-------------------------------------------------------------------------------
-3.7. What is "default.filter"?
+3.6. What is "default.filter"?
The "default.filter" file is used to "filter" any web page content. By
"filtering" we mean it can modify, remove, or change anything on the page,
@@ -520,7 +481,7 @@ the "Actions List Editor" from your browser.
-------------------------------------------------------------------------------
-3.8. How can I set up Privoxy to act as a proxy for my LAN?
+3.7. How can I set up Privoxy to act as a proxy for my LAN?
By default, Privoxy only responds to requests from localhost. To have it act as
a server for a network, this needs to be changed in the main config file where
@@ -529,14 +490,13 @@ option. It may be commented out with a "#" symbol. Make sure it is uncommented,
and assign it the address of the LAN gateway interface, and port number to use:
listen-address 192.168.1.1:8118
-
Save the file, and restart Privoxy. Configure all browsers on the network then
to use this address and port number.
-------------------------------------------------------------------------------
-3.9. Instead of ads, now I get a checkerboard pattern. I don't want to see
+3.8. Instead of ads, now I get a checkerboard pattern. I don't want to see
anything.
This is a configuration option for images that Privoxy is stopping. You have
@@ -554,7 +514,7 @@ below).
-------------------------------------------------------------------------------
-3.10. Why would anybody want to see a checkerboard pattern?
+3.9. Why would anybody want to see a checkerboard pattern?
This can be helpful for troubleshooting problems. It might also be good for
anyone new to Privoxy so that they can see if their favorite pages are
@@ -563,7 +523,7 @@ important.
-------------------------------------------------------------------------------
-3.11. I see large red banners on some pages that say "Blocked". Why and how do
+3.10. I see large red banners on some pages that say "Blocked". Why and how do
I get rid of this?
These are URLs that match something in one of Privoxy's block actions (+block).
@@ -601,7 +561,7 @@ is embedded in the frame's HTML page.
-------------------------------------------------------------------------------
-3.12. I cannot see all of the "Blocked" page banner. All I see is a bright red
+3.11. I cannot see all of the "Blocked" page banner. All I see is a bright red
square.
There is not enough space to fit the entire page. Try right clicking on the
@@ -611,7 +571,7 @@ just what is being blocked, and why.
-------------------------------------------------------------------------------
-3.13. Can Privoxy run as a service on Win2K/NT?
+3.12. Can Privoxy run as a service on Win2K/NT?
Yes, it can run as a system service using srvany.exe. The only catch is that
this will effectively disable the Privoxy icon in the taskbar. You can have one
@@ -623,7 +583,7 @@ details, and a sample configuration.
-------------------------------------------------------------------------------
-3.14. How can I make Privoxy work with other proxies like Squid?
+3.13. How can I make Privoxy work with other proxies like Squid?
This can be done. See the user manual, which describes how to do this.
@@ -697,15 +657,10 @@ See next question ...
4.5. How can I submit new ads?
-Beginning with Privoxy v2.9.14, missed ads and banners and other actions file
-problems, can be submitted by accessing "actions file feedback system" from
-http://p.p/
+Please see the Contact section.
This process does not work with earlier versions of Privoxy or Junkbuster.
-There will soon be regularly updated actions files posted. These will be
-announced on the ijbswa-announce list.
-
-------------------------------------------------------------------------------
4.6. How can I hide my IP address?
@@ -937,63 +892,78 @@ same thing by editing the appropriate "actions" file.
-------------------------------------------------------------------------------
-5.4. Where can I get help? Report bugs? Feature Requests? Etc?
+5.4. What time is it?
-Feedback is encouraged, whether good, bad or ugly. Please see the contact page
-in the user-manual for details.
+Time for you to go!
-------------------------------------------------------------------------------
-5.5. What time is it?
+7. Contacting the developers, Bug Reporting and Feature Requests
-Time for you to go!
+We value your feedback. However, to provide you with the best support, please
+note the following sections.
-------------------------------------------------------------------------------
-7. Contacting the developers, Bug Reporting and Feature Requests
+7.1. Get Support
-We value your feedback. However, to provide you with the best support, please
-note:
+To get support, use the Sourceforge Support Forum:
- * Use the Sourceforge Support Forum to get help:
-
- http://sourceforge.net/tracker/?group_id=11118&atid=211118
-
-
- * Submit bugs only through our Sourceforge Bug Forum:
-
- http://sourceforge.net/tracker/?group_id=11118&atid=111118.
-
-
- Make sure that the bug has not already been submitted. Please try to verify
- that it is a Privoxy bug, and not a browser or site bug first. If you are
- using your own custom configuration, please try the stock configs to see if
- the problem is a configuration related bug. And if not using the latest
- development snapshot, please try the latest one. Or even better, CVS
- sources. Please be sure to include the Privoxy/Junkbuster version,
- platform, browser, any pertinent log data, any other relevant details
- (please be specific) and, if possible, some way to reproduce the bug.
+ http://sourceforge.net/tracker/?group_id=11118&atid=211118
- * Submit feature requests only through our Sourceforge feature request forum:
-
- http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
-
-
- * You can also send feedback on websites that Privoxy has problems with. Please bookmark
- the following link: "Privoxy - Submit Filter Feedback"
- . Once you surf to a page with problems, use the
- bookmark to send us feedback. We will look into the issue as soon as possible.
-
-
- * For any other issues, feel free to use the mailing lists:
-
- http://sourceforge.net/mail/?group_id=11118.
-
-
- Anyone interested in actively participating in development and related
- discussions can also join the appropriate mailing list. Archives are
- available, too.
+
+-------------------------------------------------------------------------------
+
+7.2. Report bugs
+
+To submit bugs, use the Sourceforge Bug Forum:
+
+ http://sourceforge.net/tracker/?group_id=11118&atid=111118.
+
+
+Make sure that the bug has not already been submitted. Please try to verify
+that it is a Privoxy bug, and not a browser or site bug first. If you are using
+your own custom configuration, please try the stock configs to see if the
+problem is a configuration related bug. And if not using the latest development
+snapshot, please try the latest one. Or even better, CVS sources. Please be
+sure to include the Privoxy version, platform, browser, any pertinent log data,
+any other relevant details (please be specific) and, if possible, some way to
+reproduce the bug.
+
+-------------------------------------------------------------------------------
+
+7.3. Request new features
+
+To submit ideas on new features, use the Sourceforge feature request forum:
+
+ http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
+
+-------------------------------------------------------------------------------
+
+7.4. Report ads or other filter problems
+
+You can also send feedback on websites that Privoxy has problems with. Please
+bookmark the following link: "Privoxy - Submit Filter Feedback". Once you surf
+to a page with problems, use the bookmark to send us feedback. We will look
+into the issue as soon as possible.
+
+New, improved default.action files will occasionally be made available based on
+your feedback. These will be announced on the ijbswa-announce list.
+
+-------------------------------------------------------------------------------
+
+7.5. Other
+
+For any other issues, feel free to use the mailing lists:
+
+ http://sourceforge.net/mail/?group_id=11118.
+
+
+Anyone interested in actively participating in development and related
+discussions can also join the appropriate mailing list. Archives are available,
+too. See the page on Sourceforge.
+
-------------------------------------------------------------------------------
8. Copyright and History
diff --git a/doc/text/user-manual.txt b/doc/text/user-manual.txt
index 13d088ea..e534db87 100644
--- a/doc/text/user-manual.txt
+++ b/doc/text/user-manual.txt
@@ -2,7 +2,7 @@ Privoxy User Manual
By: Privoxy Developers
-$Id: user-manual.sgml,v 1.92 2002/04/25 18:55:13 hal9 Exp $
+$Id: user-manual.sgml,v 1.95 2002/04/26 17:23:29 swa Exp $
The user manual gives users information on how to install, configure and use
Privoxy.
@@ -25,72 +25,72 @@ Table of Contents
1. Introduction
- 1.1. New Features
+ 1.1. Features
3. Installation
- 3.1. Binary Packages
-
- 3.1.1. Red Hat and SuSE RPMs
- 3.1.2. Debian
- 3.1.3. Windows
- 3.1.4. Solaris, NetBSD, FreeBSD, HP-UX
- 3.1.5. OS/2
- 3.1.6. Max OSX
- 3.1.7. AmigaOS
-
- 3.2. Building from Source
+ 3.1. Red Hat and SuSE RPMs
+ 3.2. Debian
+ 3.3. Windows
+ 3.4. Solaris, NetBSD, FreeBSD, HP-UX
+ 3.5. OS/2
+ 3.6. Max OSX
+ 3.7. AmigaOS
-4. Quickstart to Using Privoxy
+4. Note to Upgraders
+5. Quickstart to Using Privoxy
+6. Starting Privoxy
- 4.1. Note to Upgraders
- 4.2. Starting Privoxy
- 4.3. Command Line Options
+ 6.1. Command Line Options
-5. Privoxy Configuration
+7. Privoxy Configuration
- 5.1. Controlling Privoxy with Your Web Browser
- 5.2. Configuration Files Overview
- 5.3. The Main Configuration File
+ 7.1. Controlling Privoxy with Your Web Browser
+ 7.2. Configuration Files Overview
+ 7.3. The Main Configuration File
- 5.3.1. Configuration and Log File Locations
- 5.3.2. Local Set-up Documentation
- 5.3.3. Debugging
- 5.3.4. Access Control and Security
- 5.3.5. Forwarding
- 5.3.6. Windows GUI Options
+ 7.3.1. Configuration and Log File Locations
+ 7.3.2. Local Set-up Documentation
+ 7.3.3. Debugging
+ 7.3.4. Access Control and Security
+ 7.3.5. Forwarding
+ 7.3.6. Windows GUI Options
- 5.4. Actions Files
+ 7.4. Actions Files
- 5.4.1. Finding the Right Mix
- 5.4.2. How to Edit
- 5.4.3. How Actions are Applied to URLs
- 5.4.4. Patterns
- 5.4.5. Actions
- 5.4.6. Aliases
+ 7.4.1. Finding the Right Mix
+ 7.4.2. How to Edit
+ 7.4.3. How Actions are Applied to URLs
+ 7.4.4. Patterns
+ 7.4.5. Actions
+ 7.4.6. Aliases
- 5.5. The Filter File
- 5.6. Templates
+ 7.5. The Filter File
+ 7.6. Templates
-6. Contacting the Developers, Bug Reporting and Feature Requests
+8. Contacting the Developers, Bug Reporting and Feature Requests
- 6.1. Submitting Ads and "Action" Problems
+ 8.1. Get Support
+ 8.2. Report bugs
+ 8.3. Request new features
+ 8.4. Report ads or other filter problems
+ 8.5. Other
-7. Copyright and History
+9. Copyright and History
- 7.1. Copyright
- 7.2. History
+ 9.1. Copyright
+ 9.2. History
-8. See Also
-9. Appendix
+10. See Also
+11. Appendix
- 9.1. Regular Expressions
- 9.2. Privoxy's Internal Pages
+ 11.1. Regular Expressions
+ 11.2. Privoxy's Internal Pages
- 9.2.1. Bookmarklets
+ 11.2.1. Bookmarklets
- 9.3. Chain of Events
- 9.4. Anatomy of an Action
+ 11.3. Chain of Events
+ 11.4. Anatomy of an Action
-------------------------------------------------------------------------------
@@ -109,12 +109,15 @@ sources). And there may be bugs, though hopefully not many!
-------------------------------------------------------------------------------
-1.1. New Features
+1.1. Features
In addition to Internet Junkbuster's traditional features of ad and banner
blocking and cookie management, Privoxy provides new features, some of them
currently under development:
+ * FIXME: complete the list of features. change the order: most important
+ features to the top of the list. prefix new features with "NEW".
+
* Integrated browser based configuration and control utility at http://
config.privoxy.org/ (shortcut: http://p.p/). Browser-based tracing of rule
and filter effects. Remote toggling.
@@ -144,10 +147,6 @@ currently under development:
* Improved signal handling, and a true daemon mode (Unix).
- * Builds from source on most UNIX-like systems. Packages available for: Linux
- (RedHat, SuSE, or Debian), Windows, Sun Solaris, Mac OSX, OS/2, HP-UX 11,
- NetBSD and AmigaOS.
-
* Every feature now controllable on a per-site or per-location basis,
configuration more powerful and versatile over-all.
@@ -160,37 +159,36 @@ currently under development:
Privoxy is available both in convenient pre-compiled packages for a wide range
of operating systems, and as raw source code. For most users, we recommend
-using the packages, which can be downloaded from our Privoxy Project Page.
+using the packages, which can be downloaded from our Privoxy Project Page. For
+installing and compiling the source code, please look into our Developer
+Manual.
If you like to live on the bleeding edge and are not afraid of using possibly
unstable development versions, you can check out the up-to-the-minute version
directly from the CVS repository or simply download the nightly CVS tarball.
+Again, we refer you to the Developer Manual.
-At present, Privoxy is known to run on Win32, Mac OSX, OS/2, AmigaOS, Linux
-(RedHat, Suse, Debian), FreeBSD, NetBSD, BeOS, and many flavors of Unix.
-
--------------------------------------------------------------------------------
-
-3.1. Binary Packages
+At present, Privoxy is known to run on Windows(95, 98, ME, 2000, XP), Linux
+(RedHat, Suse, Debian), Mac OSX, OS/2, AmigaOS, FreeBSD, NetBSD, BeOS, and many
+more flavors of Unix.
Note: If you have a previous Junkbuster or Privoxy installation on your system,
you will need to remove it. Some platforms do this for you as part of their
installation procedure. (See below for your platform).
In any case be sure to backup your old configuration if it is valuable to you.
-See the note to upgraders.
-
-How to install the binary packages depends on your operating system:
+See the note to upgraders section below.
-------------------------------------------------------------------------------
-3.1.1. Red Hat and SuSE RPMs
+3.1. Red Hat and SuSE RPMs
RPMs can be installed with rpm -Uvh privoxy-2.9.14-1.rpm, and will use /etc/
privoxy for the location of configuration files.
Note that on Red Hat, Privoxy will not be automatically started on system boot.
-You will need to enable that using chkconfig, ntsysv, or similar method.
+You will need to enable that using chkconfig, ntsysv, or similar methods. Note
+that SuSE will automatically start Privoxy in the boot process.
If you have problems with failed dependencies, try rebuilding the SRC RPM: rpm
--rebuild privoxy-2.9.14-1.src.rpm;. This will use your locally installed
@@ -202,27 +200,28 @@ remove Junkbuster automatically, before installing Privoxy.
-------------------------------------------------------------------------------
-3.1.2. Debian
+3.2. Debian
FIXME.
-------------------------------------------------------------------------------
-3.1.3. Windows
+3.3. Windows
Just double-click the installer, which will guide you through the installation
-process.
+process. You will find the configuration files in the same directory as you
+installed Privoxy in. We do not use the registry of Windows.
-------------------------------------------------------------------------------
-3.1.4. Solaris, NetBSD, FreeBSD, HP-UX
+3.4. Solaris, NetBSD, FreeBSD, HP-UX
Create a new directory, cd to it, then unzip and untar the archive. For the
most part, you'll have to figure out where things go. FIXME.
-------------------------------------------------------------------------------
-3.1.5. OS/2
+3.5. OS/2
First, make sure that no previous installations of Junkbuster and / or Privoxy
are left on your system. You can do this by
@@ -237,7 +236,7 @@ configuration files.
-------------------------------------------------------------------------------
-3.1.6. Max OSX
+3.6. Max OSX
Unzip the downloaded package (you can either double-click on the file in the
finder, or on the desktop if you downloaded it there). Then, double-click on
@@ -248,7 +247,7 @@ StartupItems/Privoxy.
-------------------------------------------------------------------------------
-3.1.7. AmigaOS
+3.7. AmigaOS
Copy and then unpack the lha archive to a suitable location. All necessary
files will be installed into Privoxy directory, including all configuration and
@@ -262,58 +261,7 @@ may display that Privoxy is still running).
-------------------------------------------------------------------------------
-3.2. Building from Source
-
-To build Privoxy from source, autoheader, autoconf, GNU make (gmake), and, of
-course, a C compiler are required.
-
-When building from a source tarball (either release version or nightly CVS
-tarball), first unpack the source:
-
- tar xzvf privoxy-2.9.14-beta-src* [.tgz or .tar.gz]
- cd privoxy-2.9.14-beta
-
-
-For retrieving the current CVS sources, you'll need CVS installed. Note that
-sources from CVS are development quality, and may not be stable, or well
-tested. To download CVS source:
-
- cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
- cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co current
- cd current
-
-
-This will create a directory named current/, which will contain the source
-tree.
-
-Then, in either case, to build from unpacked tarball or CVS source:
-
- autoheader
- autoconf
- ./configure # (--help to see options)
- make # (the make from gnu, gmake for *BSD)
- su
- make -n install # (to see where all the files will go)
- make install # (to really install)
-
-
-If you have gnu make, you can have the first four steps automatically done for
-you by just typing:
-
- make
-
-
-in the freshly downloaded or unpacked source directory.
-
-For more detailed instructions on how to build Redhat and SuSE RPMs, Windows
-self-extracting installers, building on platforms with special requirements
-etc, please consult the developer manual.
-
--------------------------------------------------------------------------------
-
-4. Quickstart to Using Privoxy
-
-4.1. Note to Upgraders
+4. Note to Upgraders
There are very significant changes from older versions of Junkbuster to the
current Privoxy. Configuration is substantially changed. Junkbuster 2.0.x and
@@ -355,7 +303,23 @@ A quick list of things to be aware of before upgrading:
-------------------------------------------------------------------------------
-4.2. Starting Privoxy
+5. Quickstart to Using Privoxy
+
+ * Install Privoxy. See the section Installing.
+
+ * Start Privoxy. See the section Starting Privoxy.
+
+ * Change your browser's configuration to use the proxy localhost on port
+ 8118. See the section Starting Privoxy.
+
+ * Enjoy surfing with enhanced comfort and privacy. Please see the section
+ Contacting the Developers on how to report bugs or problems with websites
+ or to get help. You may want to change the file user.action to further
+ tweak your new browsing experience.
+
+-------------------------------------------------------------------------------
+
+6. Starting Privoxy
Before launching Privoxy for the first time, you will want to configure your
browser(s) to use Privoxy as a HTTP and HTTPS proxy. The default is localhost
@@ -377,8 +341,6 @@ used on the command line. Example Unix startup command:
# /usr/sbin/privoxy /etc/privoxy/config
-
-
See below for other command line options.
@@ -449,7 +411,7 @@ Privoxy, want to propose a new feature or smarter rules, please see the section
-------------------------------------------------------------------------------
-4.3. Command Line Options
+6.1. Command Line Options
Privoxy may be invoked with the following command-line options:
@@ -487,7 +449,7 @@ Privoxy may be invoked with the following command-line options:
-------------------------------------------------------------------------------
-5. Privoxy Configuration
+7. Privoxy Configuration
All Privoxy configuration is stored in text files. These files can be edited
with a text editor. Many important aspects of Privoxy can also be controlled
@@ -495,18 +457,18 @@ easily with a web browser.
-------------------------------------------------------------------------------
-5.1. Controlling Privoxy with Your Web Browser
+7.1. Controlling Privoxy with Your Web Browser
Privoxy's user interface can be reached through the special URL http://
config.privoxy.org/ (shortcut: http://p.p/), which is a built-in page and works
without Internet access. You will see the following section:
Privoxy Menu
- ? View & change the current configuration
- ? View the source code version numbers
- ? View the request headers.
- ? Look up which actions apply to a URL and why
- ? Toggle Privoxy on or off
+ ?? View & change the current configuration
+ ?? View the source code version numbers
+ ?? View the request headers.
+ ?? Look up which actions apply to a URL and why
+ ?? Toggle Privoxy on or off
This should be self-explanatory. Note the first item leads to an editor for the
@@ -524,7 +486,7 @@ browser.
-------------------------------------------------------------------------------
-5.2. Configuration Files Overview
+7.2. Configuration Files Overview
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
@@ -560,7 +522,7 @@ configuration files are:
pre-defined here; whether to apply them or not is up to the actions files.
All files use the "#" character to denote a comment (the rest of the line will
-be ignored) and understand line continuation through placing a backslash ("\")
+be ignored) angd understand line continuation through placing a backslash ("\")
as the very last character in a line. If the # is preceded by a backslash, it
looses its special function. Placing a # in front of an otherwise valid
configuration line to prevent it from being interpreted is called "commenting
@@ -582,7 +544,7 @@ configuration files on important issues.
-------------------------------------------------------------------------------
-5.3. The Main Configuration File
+7.3. The Main Configuration File
Again, the main configuration file is named config on Linux/Unix/BSD and OS/2,
and config.txt on Windows. Configuration lines consist of an initial keyword
@@ -604,7 +566,7 @@ surfing).
-------------------------------------------------------------------------------
-5.3.1. Configuration and Log File Locations
+7.3.1. Configuration and Log File Locations
Privoxy can (and normally does) use a number of other files for additional
configuration and logging. This section of the configuration file tells Privoxy
@@ -612,7 +574,7 @@ where to find those other files.
-------------------------------------------------------------------------------
-5.3.1.1. confdir
+7.3.1.1. confdir
Specifies:
@@ -642,7 +604,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.1.2. logdir
+7.3.1.2. logdir
Specifies:
@@ -667,7 +629,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.1.3. actionsfile
+7.3.1.3. actionsfile
Specifies:
@@ -702,7 +664,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.1.4. filterfile
+7.3.1.4. filterfile
Specifies:
@@ -731,7 +693,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.1.5. logfile
+7.3.1.5. logfile
Specifies:
@@ -769,7 +731,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.1.6. jarfile
+7.3.1.6. jarfile
Specifies:
@@ -793,7 +755,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.1.7. trustfile
+7.3.1.7. trustfile
Specifies:
@@ -828,7 +790,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.2. Local Set-up Documentation
+7.3.2. Local Set-up Documentation
If you intend to operate Privoxy for more users that just yourself, it might be
a good idea to let them know how to reach you, what you block and why you do
@@ -836,7 +798,7 @@ that, your policies etc.
-------------------------------------------------------------------------------
-5.3.2.1. trust-info-url
+7.3.2.1. trust-info-url
Specifies:
@@ -870,7 +832,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.2.2. admin-address
+7.3.2.2. admin-address
Specifies:
@@ -895,7 +857,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.2.3. proxy-info-url
+7.3.2.3. proxy-info-url
Specifies:
@@ -924,7 +886,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.3. Debugging
+7.3.3. Debugging
These options are mainly useful when tracing a problem. Note that you might
also want to invoke Privoxy with the --no-daemon command line option when
@@ -932,7 +894,7 @@ debugging.
-------------------------------------------------------------------------------
-5.3.3.1. debug
+7.3.3.1. debug
Specifies:
@@ -967,7 +929,6 @@ Notes:
debug 1024 # debug kill pop-ups
debug 4096 # Startup banner and warnings.
debug 8192 # Non-fatal errors
-
To select multiple debug levels, you can either add them or use multiple
debug lines.
@@ -986,7 +947,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.3.2. single-threaded
+7.3.3.2. single-threaded
Specifies:
@@ -1012,14 +973,14 @@ Notes:
-------------------------------------------------------------------------------
-5.3.4. Access Control and Security
+7.3.4. Access Control and Security
This section of the config file controls the security-relevant aspects of
Privoxy's configuration.
-------------------------------------------------------------------------------
-5.3.4.1. listen-address
+7.3.4.1. listen-address
Specifies:
@@ -1060,11 +1021,10 @@ Example:
from inside only:
listen-address 192.168.0.1:8118
-
-------------------------------------------------------------------------------
-5.3.4.2. toggle
+7.3.4.2. toggle
Specifies:
@@ -1094,7 +1054,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.4.3. enable-remote-toggle
+7.3.4.3. enable-remote-toggle
Specifies:
@@ -1128,7 +1088,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.4.4. enable-edit-actions
+7.3.4.4. enable-edit-actions
Specifies:
@@ -1159,7 +1119,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.4.5. ACLs: permit-access and deny-access
+7.3.4.5. ACLs: permit-access and deny-access
Specifies:
@@ -1222,13 +1182,11 @@ Examples:
destination addresses are OK:
permit-access localhost
-
Allow any host on the same class C subnet as www.privoxy.org access to
nothing but www.example.com:
permit-access www.privoxy.org/24 www.example.com/32
-
Allow access from any host on the 26-bit subnet 192.168.45.64 to anywhere,
with the exception that 192.168.45.73 may not access
@@ -1236,11 +1194,10 @@ Examples:
permit-access 192.168.45.64/26
deny-access 192.168.45.73 www.dirty-stuff.example.com
-
-------------------------------------------------------------------------------
-5.3.4.6. buffer-limit
+7.3.4.6. buffer-limit
Specifies:
@@ -1274,7 +1231,7 @@ Notes:
-------------------------------------------------------------------------------
-5.3.5. Forwarding
+7.3.5. Forwarding
This feature allows routing of HTTP requests through a chain of multiple
proxies. It can be used to better protect privacy and confidentiality when
@@ -1289,7 +1246,7 @@ Also specified here are SOCKS proxies. Privoxy supports the SOCKS 4 and SOCKS
-------------------------------------------------------------------------------
-5.3.5.1. forward
+7.3.5.1. forward
Specifies:
@@ -1328,18 +1285,16 @@ Examples:
forward .* anon-proxy.example.org:8080
forward :443 .
-
Everything goes to our example ISP's caching proxy, except for requests to
that ISP's sites:
forward .*. caching-proxy.example-isp.net:8000
forward .example-isp.net .
-
-------------------------------------------------------------------------------
-5.3.5.2. forward-socks4 and forward-socks4a
+7.3.5.2. forward-socks4 and forward-socks4a
Specifies:
@@ -1385,17 +1340,15 @@ Examples:
forward-socks4a .*. socks-gw.example.com:1080 www-cache.example-isp.net:8080
forward .example.com .
-
A rule that uses a SOCKS 4 gateway for all destinations but no HTTP parent
looks like this:
forward-socks4 .*. socks-gw.example.com:1080 .
-
-------------------------------------------------------------------------------
-5.3.5.3. Advanced Forwarding Examples
+7.3.5.3. Advanced Forwarding Examples
If you have links to multiple ISPs that provide various special content only to
their subscribers, you can configure multiple Privoxies which have connections
@@ -1410,13 +1363,11 @@ host-a:
forward .*. .
forward .isp-b.net host-b:8118
-
host-b:
forward .*. .
forward .isp-a.net host-a:8118
-
Now, your users can set their browser's proxy to use either host-a or host-b
and be able to browse the internal content of both isp-a and isp-b.
@@ -1438,7 +1389,6 @@ could then look like this:
# Forward all the rest to Privoxy
never_direct allow all
-
You would then need to change your browser's proxy settings to squid's address
and port. Squid normally uses port 3128. If unsure consult http_port in
@@ -1446,7 +1396,7 @@ squid.conf.
-------------------------------------------------------------------------------
-5.3.6. Windows GUI Options
+7.3.6. Windows GUI Options
Privoxy has a number of options specific to the Windows GUI interface:
@@ -1514,7 +1464,7 @@ console.
-------------------------------------------------------------------------------
-5.4. Actions Files
+7.4. Actions Files
The actions files are used to define what actions Privoxy takes for which URLs,
and thus determines how ad images, cookies and various other aspects of HTTP
@@ -1539,7 +1489,7 @@ defined universal policies.
-------------------------------------------------------------------------------
-5.4.1. Finding the Right Mix
+7.4.1. Finding the Right Mix
Note that some actions like cookie suppression or script disabling may render
some sites unusable, which rely on these techniques to work properly. Finding
@@ -1559,7 +1509,7 @@ Sooner or later you will want to change the rules (and read this chapter again
-------------------------------------------------------------------------------
-5.4.2. How to Edit
+7.4.2. How to Edit
The easiest way to edit the "actions" files is with a browser by using our
browser-based editor, which can be reached from http://config.privoxy.org/
@@ -1570,7 +1520,7 @@ the the actions files.
-------------------------------------------------------------------------------
-5.4.3. How Actions are Applied to URLs
+7.4.3. How Actions are Applied to URLs
Actions files are divided into sections. There are special sections, like the "
alias" sections which will be discussed later. For now let's concentrate on
@@ -1593,7 +1543,7 @@ More detail on this is provided in the Appendix, Anatomy of an Action.
-------------------------------------------------------------------------------
-5.4.4. Patterns
+7.4.4. Patterns
Generally, a pattern has the form <domain>/<path>, where both the <domain> and
<path> are optional. (This is why the pattern / matches all URLs).
@@ -1624,7 +1574,7 @@ index.html
-------------------------------------------------------------------------------
-5.4.4.1. The Domain Pattern
+7.4.4.1. The Domain Pattern
The matching of the domain part offers some flexible options: if the domain
starts or ends with a dot, it becomes unanchored at that end. For example:
@@ -1668,7 +1618,7 @@ www[1-9a-ez].example.c*
-------------------------------------------------------------------------------
-5.4.4.2. The Path Pattern
+7.4.4.2. The Path Pattern
Privoxy uses Perl compatible regular expressions (through the PCRE library) for
matching the path.
@@ -1690,7 +1640,7 @@ path starts with PaTtErN in exactly this capitalization.
-------------------------------------------------------------------------------
-5.4.5. Actions
+7.4.5. Actions
All actions are disabled by default, until they are explicitly enabled
somewhere in an actions file. Actions are turned on if preceded with a "+", and
@@ -1739,7 +1689,7 @@ The list of valid Privoxy "actions" are:
-------------------------------------------------------------------------------
-5.4.5.1. +add-header{Name: value}
+7.4.5.1. +add-header{Name: value}
Type:
@@ -1767,7 +1717,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.2. +block
+7.4.5.2. +block
Type:
@@ -1810,7 +1760,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.3. +deanimate-gifs
+7.4.5.3. +deanimate-gifs
Type:
@@ -1842,7 +1792,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.4. +downgrade-http-version
+7.4.5.4. +downgrade-http-version
Type:
@@ -1872,7 +1822,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.5. +fast-redirects
+7.4.5.5. +fast-redirects
Type:
@@ -1915,7 +1865,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.6. +filter
+7.4.5.6. +filter
Type:
@@ -1980,7 +1930,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.7. +hide-forwarded-for-headers
+7.4.5.7. +hide-forwarded-for-headers
Type:
@@ -2006,7 +1956,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.8. +hide-from-header
+7.4.5.8. +hide-from-header
Type:
@@ -2034,7 +1984,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.9. +hide-referer
+7.4.5.9. +hide-referer
Type:
@@ -2069,7 +2019,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.10. +hide-user-agent
+7.4.5.10. +hide-user-agent
Type:
@@ -2098,7 +2048,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.11. +handle-as-image
+7.4.5.11. +handle-as-image
Type:
@@ -2131,7 +2081,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.12. +set-image-blocker
+7.4.5.12. +set-image-blocker
Type:
@@ -2170,7 +2120,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.13. +limit-connect
+7.4.5.13. +limit-connect
Type:
@@ -2214,7 +2164,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.14. +prevent-compression
+7.4.5.14. +prevent-compression
Type:
@@ -2243,7 +2193,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.15. +session-cookies-only
+7.4.5.15. +session-cookies-only
Type:
@@ -2278,7 +2228,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.16. +prevent-reading-cookies
+7.4.5.16. +prevent-reading-cookies
Type:
@@ -2310,7 +2260,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.17. +prevent-setting-cookies
+7.4.5.17. +prevent-setting-cookies
Type:
@@ -2337,7 +2287,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.18. +kill-popups
+7.4.5.18. +kill-popups
Type:
@@ -2366,7 +2316,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.19. +send-vanilla-wafer
+7.4.5.19. +send-vanilla-wafer
Type:
@@ -2395,7 +2345,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.20. +send-wafer
+7.4.5.20. +send-wafer
Type:
@@ -2422,7 +2372,7 @@ Notes:
-------------------------------------------------------------------------------
-5.4.5.21. Actions Examples
+7.4.5.21. Actions Examples
Note that the meaning of any of the above examples is reversed by preceding the
action with a "-", in place of the "+". Also, that some actions are turned on
@@ -2521,7 +2471,7 @@ sites. See the Appendix for a brief example on troubleshooting actions.
-------------------------------------------------------------------------------
-5.4.6. Aliases
+7.4.6. Aliases
Custom "actions", known to Privoxy as "aliases", can be defined by combining
other "actions". These can in turn be invoked just like the built-in "actions".
@@ -2577,7 +2527,7 @@ require most actions to be disabled in order to function properly.
-------------------------------------------------------------------------------
-5.5. The Filter File
+7.5. The Filter File
Any web page can be dynamically modified with the filter file. This
modification can be removal, or re-writing, of any web page content, including
@@ -2644,7 +2594,7 @@ Kill those pesky little web-bugs:
-------------------------------------------------------------------------------
-5.6. Templates
+7.6. Templates
When Privoxy displays one of its internal pages, such as a 404 Not Found error
page, it uses the appropriate template. On Linux, BSD, and Unix, these are
@@ -2657,73 +2607,77 @@ desired.
-------------------------------------------------------------------------------
-6. Contacting the Developers, Bug Reporting and Feature Requests
+8. Contacting the Developers, Bug Reporting and Feature Requests
We value your feedback. However, to provide you with the best support, please
-note:
+note the following sections.
- * Use the Sourceforge Support Forum to get help:
-
- http://sourceforge.net/tracker/?group_id=11118&atid=211118
-
-
- * Submit bugs only through our Sourceforge Bug Forum:
-
- http://sourceforge.net/tracker/?group_id=11118&atid=111118.
-
-
- Make sure that the bug has not already been submitted. Please try to verify
- that it is a Privoxy bug, and not a browser or site bug first. If you are
- using your own custom configuration, please try the stock configs to see if
- the problem is a configuration related bug. And if not using the latest
- development snapshot, please try the latest one. Or even better, CVS
- sources. Please be sure to include the Privoxy/Junkbuster version,
- platform, browser, any pertinent log data, any other relevant details
- (please be specific) and, if possible, some way to reproduce the bug.
-
- * Submit feature requests only through our Sourceforge feature request forum:
-
- http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
-
-
- * You can also send feedback on websites that Privoxy has problems with. Please bookmark
- the following link: "Privoxy - Submit Filter Feedback"
- . Once you surf to a page with problems, use the
- bookmark to send us feedback. We will look into the issue as soon as possible.
-
-
- * For any other issues, feel free to use the mailing lists:
-
- http://sourceforge.net/mail/?group_id=11118.
-
-
- Anyone interested in actively participating in development and related
- discussions can also join the appropriate mailing list. Archives are
- available, too.
+-------------------------------------------------------------------------------
+
+8.1. Get Support
+
+To get support, use the Sourceforge Support Forum:
+
+ http://sourceforge.net/tracker/?group_id=11118&atid=211118
+
-------------------------------------------------------------------------------
-6.1. Submitting Ads and "Action" Problems
+8.2. Report bugs
+
+To submit bugs, use the Sourceforge Bug Forum:
+
+ http://sourceforge.net/tracker/?group_id=11118&atid=111118.
+
+
+Make sure that the bug has not already been submitted. Please try to verify
+that it is a Privoxy bug, and not a browser or site bug first. If you are using
+your own custom configuration, please try the stock configs to see if the
+problem is a configuration related bug. And if not using the latest development
+snapshot, please try the latest one. Or even better, CVS sources. Please be
+sure to include the Privoxy version, platform, browser, any pertinent log data,
+any other relevant details (please be specific) and, if possible, some way to
+reproduce the bug.
+
+-------------------------------------------------------------------------------
+
+8.3. Request new features
+
+To submit ideas on new features, use the Sourceforge feature request forum:
+
+ http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse.
+
+
+-------------------------------------------------------------------------------
-Ads and banners that are not stopped by Privoxy can be submitted to the
-developers by accessing a special page and filling out the brief, required
-form. Conversely, you can also report pages, images, etc. that Privoxy is
-blocking, but should not. The form itself does require Internet access.
+8.4. Report ads or other filter problems
-To do this, point your browser to Privoxy at http://config.privoxy.org/
-(shortcut: http://p.p/), and then select Actions file feedback system, near the
-bottom of the page. Paste in the URL that is the cause of the unwanted
-behavior, and follow the prompts. The developers will try to incorporate a fix
-for the problem you reported into future versions.
+You can also send feedback on websites that Privoxy has problems with. Please
+bookmark the following link: "Privoxy - Submit Filter Feedback". Once you surf
+to a page with problems, use the bookmark to send us feedback. We will look
+into the issue as soon as possible.
New, improved default.action files will occasionally be made available based on
your feedback. These will be announced on the ijbswa-announce list.
-------------------------------------------------------------------------------
-7. Copyright and History
+8.5. Other
-7.1. Copyright
+For any other issues, feel free to use the mailing lists:
+
+ http://sourceforge.net/mail/?group_id=11118.
+
+
+Anyone interested in actively participating in development and related
+discussions can also join the appropriate mailing list. Archives are available,
+too. See the page on Sourceforge.
+
+-------------------------------------------------------------------------------
+
+9. Copyright and History
+
+9.1. Copyright
Privoxy is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
@@ -2742,7 +2696,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA.
-------------------------------------------------------------------------------
-7.2. History
+9.2. History
Privoxy is evolved, and derived from, the Internet Junkbuster, with many
improvments and enhancements over the original.
@@ -2756,7 +2710,7 @@ grown whiskers ;-).
-------------------------------------------------------------------------------
-8. See Also
+10. See Also
Other references and sites of interest to Privoxy users:
@@ -2783,9 +2737,9 @@ http://www.squid-cache.org/
-------------------------------------------------------------------------------
-9. Appendix
+11. Appendix
-9.1. Regular Expressions
+11.1. Regular Expressions
Privoxy can use "regular expressions" in various config files. Assuming support
for "pcre" (Perl Compatible Regular Expressions) is compiled in, which is the
@@ -2924,7 +2878,7 @@ perl5.6/pod/perlre.html
-------------------------------------------------------------------------------
-9.2. Privoxy's Internal Pages
+11.2. Privoxy's Internal Pages
Since Privoxy proxies each requested web page, it is easy for Privoxy to trap
certain special URLs. In this way, we can talk directly to Privoxy, and see how
@@ -2975,7 +2929,7 @@ These may be bookmarked for quick reference. See next.
-------------------------------------------------------------------------------
-9.2.1. Bookmarklets
+11.2.1. Bookmarklets
Below are some "bookmarklets" to allow you to easily access a "mini" version of
some of Privoxy's special pages. They are designed for MS Internet Explorer,
@@ -2990,22 +2944,22 @@ favorites/bookmarks. For even faster access, you can put them on the "Links"
bar (IE) or the "Personal Toolbar" (Netscape), and run them with a single
click.
- * Enable Privoxy
+ * Privoxy - Enable
- * Disable Privoxy
+ * Privoxy - Disable
- * Toggle Privoxy (Toggles between enabled and disabled)
+ * Privoxy - Toggle Privoxy (Toggles between enabled and disabled)
- * View Privoxy Status
+ * Privoxy- View Status
- * Actions file feedback system
+ * Privoxy - Submit Filter Feedback
Credit: The site which gave me the general idea for these bookmarklets is
www.bookmarklets.com. They have more information about bookmarklets.
-------------------------------------------------------------------------------
-9.3. Chain of Events
+11.3. Chain of Events
Let's take a quick look at the basic sequence of events when a web page is
requested by your browser and Privoxy is on duty:
@@ -3068,7 +3022,7 @@ requested by your browser and Privoxy is on duty:
-------------------------------------------------------------------------------
-9.4. Anatomy of an Action
+11.4. Anatomy of an Action
The way Privoxy applies "actions" and "filters" to any given URL can be
complex, and not always so easy to understand what is happening. And sometimes
@@ -3153,7 +3107,7 @@ Then, for our user.action file, we again have no hits.
And finally we pull it all together in the bottom section and summarize how
Privoxy is applying all its "actions" to "google.com":
- Final results:
+ Final results:
-add-header -block +deanimate-gifs{last} -downgrade-http-version -fast-redirects
-filter{popups} -filter{fun} -filter{shockwave-flash} -filter{crude-parental}
+filter{html-annoyances} +filter{js-annoyances} +filter{content-cookies}
@@ -3162,15 +3116,13 @@ Privoxy is applying all its "actions" to "google.com":
-hide-user-agent -handle-as-image +set-image-blocker{pattern} -limit-connect
+prevent-compression -session-cookies-only -prevent-reading-cookies
-prevent-setting-cookies -kill-popups -send-vanilla-wafer -send-wafer
-
-
Notice the only difference here to the previous listing, is to "fast-redirects"
and "session-cookies-only".
Now another example, "ad.doubleclick.net":
- { +block +handle-as-image }
+ { +block +handle-as-image }
.ad.doubleclick.net
{ +block +handle-as-image }
@@ -3178,8 +3130,6 @@ Now another example, "ad.doubleclick.net":
{ +block +handle-as-image }
.doubleclick.net
-
-
We'll just show the interesting part here, the explicit matches. It is matched
three different times. Each as an "+block +handle-as-image", which is the
@@ -3198,7 +3148,7 @@ and make it more readable.
One last example. Let's try "http://www.rhapsodyk.net/adsl/HOWTO/". This one is
giving us problems. We are getting a blank page. Hmmm...
- Matches for http://www.rhapsodyk.net/adsl/HOWTO/:
+ Matches for http://www.rhapsodyk.net/adsl/HOWTO/:
{ -add-header -block +deanimate-gifs -downgrade-http-version +fast-redirects
+filter{html-annoyances} +filter{js-annoyances} +filter{kill-popups}
@@ -3211,18 +3161,14 @@ giving us problems. We are getting a blank page. Hmmm...
{ +block +handle-as-image }
/ads
-
-
Ooops, the "/adsl/" is matching "/ads"! But we did not want this at all! Now we
see why we get the blank page. We could now add a new action below this that
explicitly does not block ("{-block}") paths with "adsl". There are various
ways to handle such exceptions. Example:
- { -block }
+ { -block }
/adsl
-
-
Now the page displays ;-) Be sure to flush your browser's caches when making
such changes. Or, try using Shift+Reload.
@@ -3230,10 +3176,8 @@ such changes. Or, try using Shift+Reload.
But now what about a situation where we get no explicit matches like we did
with:
- { +block +handle-as-image }
+ { +block +handle-as-image }
/ads
-
-
That actually was very telling and pointed us quickly to where the problem was.
If you don't get this kind of match, then it means one of the default rules in
@@ -3242,22 +3186,18 @@ and maybe a little trial and error to isolate the offending rule. One likely
cause would be one of the "{+filter}" actions. Try adding the URL for the site
to one of aliases that turn off "+filter":
- {shop}
+ {shop}
.quietpc.com
.worldpay.com # for quietpc.com
.jungle.com
.scan.co.uk
.forbes.com
-
-
"{shop}" is an "alias" that expands to "{ -filter -session-cookies-only }". Or
you could do your own exception to negate filtering:
- {-filter}
+ {-filter}
.forbes.com
-
-
This would probably be most appropriately put in user.action, for local site
exceptions.
diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html
index 8fb12450..fe73473d 100644
--- a/doc/webserver/developer-manual/coding.html
+++ b/doc/webserver/developer-manual/coding.html
@@ -2019,7 +2019,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
->const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $";
+>const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.37 2002/04/26 17:23:29 swa Exp $";
/*********************************************************************
*
* File : $Source$
@@ -2097,7 +2097,7 @@ WIDTH="100%"
CLASS="PROGRAMLISTING"
>#ifndef _FILENAME_H
#define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.37 2002/04/26 17:23:29 swa Exp $"
/*********************************************************************
*
* File : $Source$
diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html
index d48bc934..15c89a23 100644
--- a/doc/webserver/developer-manual/contact.html
+++ b/doc/webserver/developer-manual/contact.html
@@ -75,34 +75,50 @@ NAME="CONTACT"
></H1
><P
> We value your feedback. However, to provide you with the best support, please
- note:
-
- <P
-></P
-><UL
-><LI
+ note the following sections.</P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-SUPPORT"
+>10.1. Get Support</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Use the Sourceforge Support Forum to get help:<br>
- <br>
+>To get support, use the Sourceforge Support Forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=211118</A
><br>
</P
-></LI
-><LI
+>
+ </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-BUGS"
+>10.2. Report bugs</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Submit bugs only through our Sourceforge Bug Forum:<br>
- <br>
+>To submit bugs, use the Sourceforge Bug Forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=111118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=111118</A
>. <br>
</P
+>
+ </P
><P
> Make sure that the bug has not already been submitted. Please try to
verify that it is a <SPAN
@@ -116,44 +132,75 @@ CLASS="APPLICATION"
<SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
->/<SPAN
-CLASS="APPLICATION"
->Junkbuster</SPAN
->
- version, platform, browser, any pertinent log data, any other relevant
- details (please be specific) and, if possible, some way to reproduce the
- bug.
+> version, platform, browser, any
+ pertinent log data, any other relevant details (please be specific) and,
+ if possible, some way to reproduce the bug.
</P
-></LI
-><LI
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-FEATURE"
+>10.3. Request new features</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Submit feature requests only through our Sourceforge feature request forum:<br>
- <br>
+>To submit ideas on new features, use the Sourceforge feature request forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse"
TARGET="_top"
>http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse</A
>.<br>
</P
-></LI
-><LI
+>
+ </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-ADS"
+>10.4. Report ads or other filter problems</A
+></H2
><P
-CLASS="LITERALLAYOUT"
->You can also send feedback on websites that Privoxy has problems with. Please bookmark<br>
-the following link: <A
+>You can also send feedback on websites that Privoxy has problems with. Please bookmark
+the following link: <A
HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
TARGET="_top"
><SPAN
CLASS="QUOTE"
>"Privoxy - Submit Filter Feedback"</SPAN
></A
->. Once you surf to a page with problems, use the<br>
-bookmark to send us feedback. We will look into the issue as soon as possible.<br>
- </P
-></LI
-><LI
+>. Once you surf to a page with problems, use the
+bookmark to send us feedback. We will look into the issue as soon as possible.
+ </P
+><P
+> New, improved <TT
+CLASS="FILENAME"
+>default.action</TT
+> files will occasionally be made
+ available based on your feedback. These will be announced on the <A
+HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce"
+TARGET="_top"
+>ijbswa-announce</A
+>
+ list.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-OTHER"
+>10.5. Other</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
>For any other issues, feel free to use the mailing lists:<br>
<br>
@@ -163,14 +210,14 @@ TARGET="_top"
>http://sourceforge.net/mail/?group_id=11118</A
>.<br>
</P
+>
+ </P
><P
> Anyone interested in actively participating in development and related
discussions can also join the appropriate mailing list. Archives are
- available, too.
+ available, too. See the page on Sourceforge.
</P
-></LI
-></UL
-></P
+></DIV
></DIV
><DIV
CLASS="NAVFOOTER"
diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index 235e03ea..a69c4245 100644
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -78,7 +78,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN987"
+NAME="AEN995"
>11.1. Copyright</A
></H2
><P
@@ -88,12 +88,14 @@ CLASS="APPLICATION"
> is free software; you can
redistribute it and/or modify it under the terms of the GNU General Public
+
License as published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.</P
><P
> This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+
more details, which is available from the Free Software Foundation, Inc, 59
Temple Place - Suite 330, Boston, MA 02111-1307, USA.</P
><P
@@ -110,7 +112,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN994"
+NAME="AEN1002"
>11.2. History</A
></H2
><P
diff --git a/doc/webserver/developer-manual/documentation.html b/doc/webserver/developer-manual/documentation.html
index 343af475..5d60d94e 100644
--- a/doc/webserver/developer-manual/documentation.html
+++ b/doc/webserver/developer-manual/documentation.html
@@ -607,7 +607,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN214"
+NAME="AEN212"
>5.3. Privoxy Custom Entities</A
></H2
><P
diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index 3f821aa2..de88ed2c 100644
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -49,7 +49,7 @@ CLASS="ORGNAME"
></DIV
><P
CLASS="PUBDATE"
->$Id: developer-manual.sgml,v 1.35 2002/04/17 15:16:15 oes Exp $<BR></P
+>$Id: developer-manual.sgml,v 1.37 2002/04/26 17:23:29 swa Exp $<BR></P
><DIV
><DIV
CLASS="ABSTRACT"
@@ -59,9 +59,6 @@ NAME="AEN9"
><P
></P
><P
->
- </P
-><P
> The developer manual gives the users information on how to help the developer
team. It provides guidance on coding, testing, documentation and other
issues.
@@ -151,7 +148,7 @@ CLASS="APPLICATION"
></DT
><DT
>5.3. <A
-HREF="documentation.html#AEN214"
+HREF="documentation.html#AEN212"
>Privoxy Custom Entities</A
></DT
></DL
@@ -550,6 +547,35 @@ HREF="webserver-update.html"
HREF="contact.html"
>Contacting the developers, Bug Reporting and Feature Requests</A
></DT
+><DD
+><DL
+><DT
+>10.1. <A
+HREF="contact.html#CONTACT-SUPPORT"
+>Get Support</A
+></DT
+><DT
+>10.2. <A
+HREF="contact.html#CONTACT-BUGS"
+>Report bugs</A
+></DT
+><DT
+>10.3. <A
+HREF="contact.html#CONTACT-FEATURE"
+>Request new features</A
+></DT
+><DT
+>10.4. <A
+HREF="contact.html#CONTACT-ADS"
+>Report ads or other filter problems</A
+></DT
+><DT
+>10.5. <A
+HREF="contact.html#CONTACT-OTHER"
+>Other</A
+></DT
+></DL
+></DD
><DT
>11. <A
HREF="copyright.html"
@@ -559,12 +585,12 @@ HREF="copyright.html"
><DL
><DT
>11.1. <A
-HREF="copyright.html#AEN987"
+HREF="copyright.html#AEN995"
>Copyright</A
></DT
><DT
>11.2. <A
-HREF="copyright.html#AEN994"
+HREF="copyright.html#AEN1002"
>History</A
></DT
></DL
diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html
index a188843b..813c248b 100644
--- a/doc/webserver/developer-manual/newrelease.html
+++ b/doc/webserver/developer-manual/newrelease.html
@@ -162,8 +162,7 @@ WIDTH="90%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> {+add-header{X-Actions-File-Version: A.B} -filter -no-popups}
- </PRE
+> {+add-header{X-Actions-File-Version: A.B} -filter -no-popups}</PRE
></TD
></TR
></TABLE
@@ -242,8 +241,7 @@ CLASS="PROGRAMLISTING"
> mkdir dist # delete or choose different name if it already exists
cd dist
cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
- cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa export -r v_X_Y_Z current
- </PRE
+ cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa export -r v_X_Y_Z current</PRE
></TD
></TR
></TABLE
@@ -288,8 +286,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd current
- autoheader && autoconf && ./configure
- </PRE
+ autoheader && autoconf && ./configure</PRE
></TD
></TR
></TABLE
@@ -307,8 +304,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> make tarball-dist
- </PRE
+> make tarball-dist</PRE
></TD
></TR
></TABLE
@@ -326,8 +322,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> make tarball-upload
- </PRE
+> make tarball-upload</PRE
></TD
></TR
></TABLE
@@ -368,8 +363,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd current
- autoheader && autoconf && ./configure
- </PRE
+ autoheader && autoconf && ./configure</PRE
></TD
></TR
></TABLE
@@ -387,8 +381,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> make suse-dist (or make redhat-dist)
- </PRE
+> make suse-dist (or make redhat-dist)</PRE
></TD
></TR
></TABLE
@@ -406,8 +399,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> make suse-upload (or make redhat-upload)
- </PRE
+> make suse-upload (or make redhat-upload)</PRE
></TD
></TR
></TABLE
@@ -443,8 +435,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co os2setup
- </PRE
+> cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co os2setup</PRE
></TD
></TR
></TABLE
@@ -490,8 +481,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> installExeName='privoxyos2_setup_X.Y.Z.exe'
- </PRE
+> installExeName='privoxyos2_setup_X.Y.Z.exe'</PRE
></TD
></TR
></TABLE
@@ -516,8 +506,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> PACKAGEID="Privoxy Team\Privoxy\Privoxy Package\X\Y\Z"
- </PRE
+> PACKAGEID="Privoxy Team\Privoxy\Privoxy Package\X\Y\Z"</PRE
></TD
></TR
></TABLE
@@ -535,8 +524,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> os2build
- </PRE
+> os2build</PRE
></TD
></TR
></TABLE
@@ -576,8 +564,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> ssh cf.sourceforge.net
- </PRE
+> ssh cf.sourceforge.net</PRE
></TD
></TR
></TABLE
@@ -602,8 +589,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd current
- autoheader && autoconf && ./configure
- </PRE
+ autoheader && autoconf && ./configure</PRE
></TD
></TR
></TABLE
@@ -621,8 +607,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> gmake solaris-dist
- </PRE
+> gmake solaris-dist</PRE
></TD
></TR
></TABLE
@@ -673,8 +658,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co winsetup
- </PRE
+> cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co winsetup</PRE
></TD
></TR
></TABLE
@@ -698,8 +682,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd winsetup
- make
- </PRE
+ make</PRE
></TD
></TR
></TABLE
@@ -744,8 +727,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd current
- autoheader && autoconf && ./configure
- </PRE
+ autoheader && autoconf && ./configure</PRE
></TD
></TR
></TABLE
@@ -780,8 +762,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co osxsetup
- </PRE
+> cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co osxsetup</PRE
></TD
></TR
></TABLE
@@ -800,8 +781,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd osxsetup
- build
- </PRE
+ build</PRE
></TD
></TR
></TABLE
@@ -843,8 +823,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
->zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
- </PRE
+>zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg</PRE
></TD
></TR
></TABLE
@@ -883,8 +862,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> ssh cf.sourceforge.net
- </PRE
+> ssh cf.sourceforge.net</PRE
></TD
></TR
></TABLE
@@ -909,8 +887,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd current
- autoheader && autoconf && ./configure
- </PRE
+ autoheader && autoconf && ./configure</PRE
></TD
></TR
></TABLE
@@ -928,8 +905,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> gmake freebsd-dist
- </PRE
+> gmake freebsd-dist</PRE
></TD
></TR
></TABLE
@@ -972,8 +948,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd current
- autoheader && autoconf && ./configure
- </PRE
+ autoheader && autoconf && ./configure</PRE
></TD
></TR
></TABLE
@@ -1009,8 +984,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd current
- autoheader && autoconf && ./configure
- </PRE
+ autoheader && autoconf && ./configure</PRE
></TD
></TR
></TABLE
@@ -1040,8 +1014,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> ssh cf.sourceforge.net
- </PRE
+> ssh cf.sourceforge.net</PRE
></TD
></TR
></TABLE
@@ -1066,8 +1039,7 @@ WIDTH="100%"
><PRE
CLASS="PROGRAMLISTING"
> cd current
- autoheader && autoconf && ./configure
- </PRE
+ autoheader && autoconf && ./configure</PRE
></TD
></TR
></TABLE
@@ -1085,8 +1057,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> make aix-dist
- </PRE
+> make aix-dist</PRE
></TD
></TR
></TABLE
diff --git a/doc/webserver/developer-manual/webserver-update.html b/doc/webserver/developer-manual/webserver-update.html
index 281c416a..90976c4d 100644
--- a/doc/webserver/developer-manual/webserver-update.html
+++ b/doc/webserver/developer-manual/webserver-update.html
@@ -91,8 +91,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> make dok # (or make redkat-dok if make dok doesn't work for you)
- </PRE
+> make dok # (or make redkat-dok if make dok doesn't work for you)</PRE
></TD
></TR
></TABLE
@@ -158,8 +157,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> make webserver
- </PRE
+> make webserver</PRE
></TD
></TR
></TABLE
diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index 2f4bd7f5..24a16533 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -105,7 +105,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN239"
+NAME="AEN237"
>3.2. What is an <SPAN
CLASS="QUOTE"
>"actions"</SPAN
@@ -165,7 +165,7 @@ CLASS="QUOTE"
><P
> These are all explained in the
<A
-HREF="../user-manual/configuration.html#ACTIONSFILE"
+HREF="../user-manual/configuration.html#ACTIONS-FILE"
TARGET="_top"
>user-manual</A
>.
@@ -176,7 +176,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN257"
+NAME="AEN255"
>3.4. How are actions files configured? What is the easiest
way to do this?</A
></H3
@@ -201,7 +201,7 @@ TARGET="_top"
><P
> Please see the
<A
-HREF="../user-manual/configuration.html#ACTIONSFILE"
+HREF="../user-manual/configuration.html#ACTIONS-FILE"
TARGET="_top"
>user-manual</A
> for a
@@ -213,424 +213,8 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="CONFIGFILES"
->3.5. What are the differences between
-intermediate.action, basic.action, etc.?</A
-></H3
-><P
->Configuring <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is not easy. To help you get
-started, we provide you with three different default configurations. The
-following table shows you, which features are enabled in each configuration.
- </P
-><P
-><DIV
-CLASS="TABLE"
-><A
-NAME="AEN270"
-></A
-><P
-><B
->Table 1. Default Configurations</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><THEAD
-><TR
-><TH
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->Feature</TH
-><TH
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->default.action</TH
-><TH
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->basic.action</TH
-><TH
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->intermediate.action</TH
-><TH
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->advanced.action</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->ad-filtering</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->blank image</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->de-animate GIFs</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->referer forging</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->jon's +no-cookies-keep (i.e. session cookies only)</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->no-popup windows</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->fast redirects</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->hide-referrer</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->hide-useragent</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->content-modification</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->x</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->feature-x</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->feature-y</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->feature-z</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
->?</TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-><TD
-WIDTH="20%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> </TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
NAME="BROWSECONFIG"
->3.6. Why can I change the configuration with a
+>3.5. Why can I change the configuration with a
browser? Does that not raise security issues?</A
></H3
><P
@@ -688,8 +272,8 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN379"
->3.7. What is <SPAN
+NAME="AEN278"
+>3.6. What is <SPAN
CLASS="QUOTE"
>"default.filter"</SPAN
>?</A
@@ -733,8 +317,8 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN391"
->3.8. How can I set up <SPAN
+NAME="AEN290"
+>3.7. How can I set up <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
> to act as a proxy for my
@@ -769,8 +353,7 @@ WIDTH="100%"
><TD
><PRE
CLASS="SCREEN"
-> listen-address 192.168.1.1:8118
- </PRE
+> listen-address 192.168.1.1:8118</PRE
></TD
></TR
></TABLE
@@ -787,8 +370,8 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN403"
->3.9. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
+NAME="AEN302"
+>3.8. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
></H3
><P
> This is a configuration option for images that
@@ -844,8 +427,8 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN418"
->3.10. Why would anybody want to see a checkerboard pattern?</A
+NAME="AEN317"
+>3.9. Why would anybody want to see a checkerboard pattern?</A
></H3
><P
> This can be helpful for troubleshooting problems. It might also be good
@@ -865,8 +448,8 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN423"
->3.11. I see large red banners on some pages that say
+NAME="AEN322"
+>3.10. I see large red banners on some pages that say
<SPAN
CLASS="QUOTE"
>"Blocked"</SPAN
@@ -979,7 +562,7 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="ALLISEEISRED"
->3.12. I cannot see all of the <SPAN
+>3.11. I cannot see all of the <SPAN
CLASS="QUOTE"
>"Blocked"</SPAN
> page banner. All I
@@ -1003,7 +586,7 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="SRVANY"
->3.13. Can <SPAN
+>3.12. Can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
> run as a service
@@ -1035,7 +618,7 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="OTHERPROXY"
->3.14. How can I make <SPAN
+>3.13. How can I make <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
> work with other
diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index 900afa54..1e7de0ba 100644
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -75,34 +75,50 @@ NAME="CONTACT"
></H1
><P
> We value your feedback. However, to provide you with the best support, please
- note:
-
- <P
-></P
-><UL
-><LI
+ note the following sections.</P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-SUPPORT"
+>7.1. Get Support</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Use the Sourceforge Support Forum to get help:<br>
- <br>
+>To get support, use the Sourceforge Support Forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=211118</A
><br>
</P
-></LI
-><LI
+>
+ </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-BUGS"
+>7.2. Report bugs</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Submit bugs only through our Sourceforge Bug Forum:<br>
- <br>
+>To submit bugs, use the Sourceforge Bug Forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=111118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=111118</A
>. <br>
</P
+>
+ </P
><P
> Make sure that the bug has not already been submitted. Please try to
verify that it is a <SPAN
@@ -116,44 +132,75 @@ CLASS="APPLICATION"
<SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
->/<SPAN
-CLASS="APPLICATION"
->Junkbuster</SPAN
->
- version, platform, browser, any pertinent log data, any other relevant
- details (please be specific) and, if possible, some way to reproduce the
- bug.
+> version, platform, browser, any
+ pertinent log data, any other relevant details (please be specific) and,
+ if possible, some way to reproduce the bug.
</P
-></LI
-><LI
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-FEATURE"
+>7.3. Request new features</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Submit feature requests only through our Sourceforge feature request forum:<br>
- <br>
+>To submit ideas on new features, use the Sourceforge feature request forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse"
TARGET="_top"
>http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse</A
>.<br>
</P
-></LI
-><LI
+>
+ </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-ADS"
+>7.4. Report ads or other filter problems</A
+></H2
><P
-CLASS="LITERALLAYOUT"
->You can also send feedback on websites that Privoxy has problems with. Please bookmark<br>
-the following link: <A
+>You can also send feedback on websites that Privoxy has problems with. Please bookmark
+the following link: <A
HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
TARGET="_top"
><SPAN
CLASS="QUOTE"
>"Privoxy - Submit Filter Feedback"</SPAN
></A
->. Once you surf to a page with problems, use the<br>
-bookmark to send us feedback. We will look into the issue as soon as possible.<br>
- </P
-></LI
-><LI
+>. Once you surf to a page with problems, use the
+bookmark to send us feedback. We will look into the issue as soon as possible.
+ </P
+><P
+> New, improved <TT
+CLASS="FILENAME"
+>default.action</TT
+> files will occasionally be made
+ available based on your feedback. These will be announced on the <A
+HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce"
+TARGET="_top"
+>ijbswa-announce</A
+>
+ list.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-OTHER"
+>7.5. Other</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
>For any other issues, feel free to use the mailing lists:<br>
<br>
@@ -163,14 +210,14 @@ TARGET="_top"
>http://sourceforge.net/mail/?group_id=11118</A
>.<br>
</P
+>
+ </P
><P
> Anyone interested in actively participating in development and related
discussions can also join the appropriate mailing list. Archives are
- available, too.
+ available, too. See the page on Sourceforge.
</P
-></LI
-></UL
-></P
+></DIV
></DIV
><DIV
CLASS="NAVFOOTER"
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 64e0e53a..9d457478 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -72,7 +72,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN718"
+NAME="AEN618"
>8.1. Copyright</A
></H2
><P
@@ -82,12 +82,14 @@ CLASS="APPLICATION"
> is free software; you can
redistribute it and/or modify it under the terms of the GNU General Public
+
License as published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.</P
><P
> This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+
more details, which is available from the Free Software Foundation, Inc, 59
Temple Place - Suite 330, Boston, MA 02111-1307, USA.</P
><P
@@ -104,7 +106,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN725"
+NAME="AEN625"
>8.2. History</A
></H2
><P
diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index 77adfae6..bdc0a558 100644
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -142,7 +142,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN44"
+NAME="AEN42"
>1.2. Why <SPAN
CLASS="QUOTE"
>"Privoxy"</SPAN
@@ -253,6 +253,12 @@ NAME="FEATURES"
><UL
><LI
><P
+> FIXME: complete the list of features. change the order: most important
+ features to the top of the list. prefix new features with "NEW".
+ </P
+></LI
+><LI
+><P
> Integrated browser based configuration and control utility at <A
HREF="http://config.privoxy.org/"
TARGET="_top"
@@ -329,13 +335,6 @@ CLASS="QUOTE"
></LI
><LI
><P
-> Builds from source on most UNIX-like systems. Packages available for: Linux
- (RedHat, SuSE, or Debian), Windows, Sun Solaris, Mac OSX, OS/2, HP-UX 11,
- NetBSD and AmigaOS.
- </P
-></LI
-><LI
-><P
> Every feature now controllable on a per-site or per-location basis, configuration
more powerful and versatile over-all.
</P
@@ -421,7 +420,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN124"
+NAME="AEN122"
>1.6. How does <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -475,7 +474,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN136"
+NAME="AEN134"
>1.7. Can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -496,7 +495,7 @@ CLASS="APPLICATION"
includes tools to help identify these types of situations so they can be
addressed as needed, allowing you to customize your installation.
(<A
-HREF="trouble.html#AEN661"
+HREF="trouble.html#AEN555"
>See the Troubleshooting section below</A
>.)</P
></DIV
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 3f27923b..2684cabb 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -49,7 +49,7 @@ CLASS="ORGNAME"
></DIV
><P
CLASS="PUBDATE"
->$Id: faq.sgml,v 1.49 2002/04/12 10:10:18 swa Exp $<BR></P
+>$Id: faq.sgml,v 1.51 2002/04/26 17:24:31 swa Exp $<BR></P
><DIV
><DIV
CLASS="ABSTRACT"
@@ -59,8 +59,6 @@ NAME="AEN9"
><P
></P
><P
-> </P
-><P
> This FAQ gives users and developers alike answers to frequently asked
questions about <A
HREF="http://www.privoxy.org"
@@ -137,7 +135,7 @@ CLASS="APPLICATION"
></DT
><DT
>1.2. <A
-HREF="general.html#AEN44"
+HREF="general.html#AEN42"
>Why <SPAN
CLASS="QUOTE"
>"Privoxy"</SPAN
@@ -174,7 +172,7 @@ CLASS="APPLICATION"
></DT
><DT
>1.6. <A
-HREF="general.html#AEN124"
+HREF="general.html#AEN122"
>How does <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -183,7 +181,7 @@ an ad, and what is not?</A
></DT
><DT
>1.7. <A
-HREF="general.html#AEN136"
+HREF="general.html#AEN134"
>Can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -264,7 +262,7 @@ CLASS="APPLICATION"
></DT
><DT
>2.4. <A
-HREF="installation.html#AEN196"
+HREF="installation.html#AEN194"
>I just installed <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -281,7 +279,7 @@ CLASS="APPLICATION"
></DT
><DT
>2.6. <A
-HREF="installation.html#AEN221"
+HREF="installation.html#AEN219"
>I just installed <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -304,7 +302,7 @@ HREF="configuration.html#NEWCONFIG"
></DT
><DT
>3.2. <A
-HREF="configuration.html#AEN239"
+HREF="configuration.html#AEN237"
>What is an <SPAN
CLASS="QUOTE"
>"actions"</SPAN
@@ -324,33 +322,27 @@ CLASS="QUOTE"
></DT
><DT
>3.4. <A
-HREF="configuration.html#AEN257"
+HREF="configuration.html#AEN255"
>How are actions files configured? What is the easiest
way to do this?</A
></DT
><DT
>3.5. <A
-HREF="configuration.html#CONFIGFILES"
->What are the differences between
-intermediate.action, basic.action, etc.?</A
-></DT
-><DT
->3.6. <A
HREF="configuration.html#BROWSECONFIG"
>Why can I change the configuration with a
browser? Does that not raise security issues?</A
></DT
><DT
->3.7. <A
-HREF="configuration.html#AEN379"
+>3.6. <A
+HREF="configuration.html#AEN278"
>What is <SPAN
CLASS="QUOTE"
>"default.filter"</SPAN
>?</A
></DT
><DT
->3.8. <A
-HREF="configuration.html#AEN391"
+>3.7. <A
+HREF="configuration.html#AEN290"
>How can I set up <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -358,18 +350,18 @@ CLASS="APPLICATION"
LAN?</A
></DT
><DT
->3.9. <A
-HREF="configuration.html#AEN403"
+>3.8. <A
+HREF="configuration.html#AEN302"
>Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
></DT
><DT
->3.10. <A
-HREF="configuration.html#AEN418"
+>3.9. <A
+HREF="configuration.html#AEN317"
>Why would anybody want to see a checkerboard pattern?</A
></DT
><DT
->3.11. <A
-HREF="configuration.html#AEN423"
+>3.10. <A
+HREF="configuration.html#AEN322"
>I see large red banners on some pages that say
<SPAN
CLASS="QUOTE"
@@ -377,7 +369,7 @@ CLASS="QUOTE"
>. Why and how do I get rid of this?</A
></DT
><DT
->3.12. <A
+>3.11. <A
HREF="configuration.html#ALLISEEISRED"
>I cannot see all of the <SPAN
CLASS="QUOTE"
@@ -386,7 +378,7 @@ CLASS="QUOTE"
see is a bright red square.</A
></DT
><DT
->3.13. <A
+>3.12. <A
HREF="configuration.html#SRVANY"
>Can <SPAN
CLASS="APPLICATION"
@@ -395,7 +387,7 @@ CLASS="APPLICATION"
on Win2K/NT?</A
></DT
><DT
->3.14. <A
+>3.13. <A
HREF="configuration.html#OTHERPROXY"
>How can I make <SPAN
CLASS="APPLICATION"
@@ -417,7 +409,7 @@ HREF="misc.html"
><DL
><DT
>4.1. <A
-HREF="misc.html#AEN473"
+HREF="misc.html#AEN372"
>How much does <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -452,7 +444,7 @@ HREF="misc.html#IP"
></DT
><DT
>4.7. <A
-HREF="misc.html#AEN530"
+HREF="misc.html#AEN424"
>Can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -460,13 +452,13 @@ CLASS="APPLICATION"
></DT
><DT
>4.8. <A
-HREF="misc.html#AEN541"
+HREF="misc.html#AEN435"
>Might some things break because header information is
being altered?</A
></DT
><DT
>4.9. <A
-HREF="misc.html#AEN551"
+HREF="misc.html#AEN445"
>Can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -478,7 +470,7 @@ speed up web browsing?</A
></DT
><DT
>4.10. <A
-HREF="misc.html#AEN559"
+HREF="misc.html#AEN453"
>What about as a firewall? Can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -486,7 +478,7 @@ CLASS="APPLICATION"
></DT
><DT
>4.11. <A
-HREF="misc.html#AEN564"
+HREF="misc.html#AEN458"
>The <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -495,13 +487,13 @@ and ugly looking. Can't a better font be used?</A
></DT
><DT
>4.12. <A
-HREF="misc.html#AEN573"
+HREF="misc.html#AEN467"
>I have large empty spaces now where ads used to be.
Why?</A
></DT
><DT
>4.13. <A
-HREF="misc.html#AEN576"
+HREF="misc.html#AEN470"
>How can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -509,7 +501,7 @@ CLASS="APPLICATION"
></DT
><DT
>4.14. <A
-HREF="misc.html#AEN583"
+HREF="misc.html#AEN477"
><SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -547,7 +539,7 @@ HREF="trouble.html"
><DL
><DT
>5.1. <A
-HREF="trouble.html#AEN642"
+HREF="trouble.html#AEN536"
>I just upgraded and am getting <SPAN
CLASS="QUOTE"
>"connection refused"</SPAN
@@ -556,13 +548,13 @@ with every web page?</A
></DT
><DT
>5.2. <A
-HREF="trouble.html#AEN655"
+HREF="trouble.html#AEN549"
>I just added a new rule, but the steenkin ad is
still getting through. How?</A
></DT
><DT
>5.3. <A
-HREF="trouble.html#AEN661"
+HREF="trouble.html#AEN555"
>One of my favorite sites does not work with <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -571,12 +563,7 @@ What can I do?</A
></DT
><DT
>5.4. <A
-HREF="trouble.html#BUGS"
->Where can I get help? Report bugs? Feature Requests? Etc?</A
-></DT
-><DT
->5.5. <A
-HREF="trouble.html#AEN688"
+HREF="trouble.html#AEN578"
>What time is it?</A
></DT
></DL
@@ -586,6 +573,35 @@ HREF="trouble.html#AEN688"
HREF="contact.html"
>Contacting the developers, Bug Reporting and Feature Requests</A
></DT
+><DD
+><DL
+><DT
+>7.1. <A
+HREF="contact.html#CONTACT-SUPPORT"
+>Get Support</A
+></DT
+><DT
+>7.2. <A
+HREF="contact.html#CONTACT-BUGS"
+>Report bugs</A
+></DT
+><DT
+>7.3. <A
+HREF="contact.html#CONTACT-FEATURE"
+>Request new features</A
+></DT
+><DT
+>7.4. <A
+HREF="contact.html#CONTACT-ADS"
+>Report ads or other filter problems</A
+></DT
+><DT
+>7.5. <A
+HREF="contact.html#CONTACT-OTHER"
+>Other</A
+></DT
+></DL
+></DD
><DT
>8. <A
HREF="copyright.html"
@@ -595,12 +611,12 @@ HREF="copyright.html"
><DL
><DT
>8.1. <A
-HREF="copyright.html#AEN718"
+HREF="copyright.html#AEN618"
>Copyright</A
></DT
><DT
>8.2. <A
-HREF="copyright.html#AEN725"
+HREF="copyright.html#AEN625"
>History</A
></DT
></DL
diff --git a/doc/webserver/faq/installation.html b/doc/webserver/faq/installation.html
index 4f3e632e..6b7a009f 100644
--- a/doc/webserver/faq/installation.html
+++ b/doc/webserver/faq/installation.html
@@ -109,9 +109,9 @@ NAME="WHICHOS"
> At present, <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> is known to run on Win32, Mac
- OSX, OS/2, AmigaOS, Linux (RedHat, Suse, Debian), FreeBSD, NetBSD, BeOS, and
- many flavors of Unix.</P
+> is known to run on
+ Windows(95, 98, ME, 2000, XP), Linux (RedHat, Suse, Debian), Mac OSX,
+ OS/2, AmigaOS, FreeBSD, NetBSD, BeOS, and many more flavors of Unix.</P
><P
> But any operating system that runs TCP/IP, can conceivably take advantage of
<SPAN
@@ -176,7 +176,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN196"
+NAME="AEN194"
>2.4. I just installed <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -277,7 +277,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN221"
+NAME="AEN219"
>2.6. I just installed <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index 3759c421..09ec33ce 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -78,7 +78,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN473"
+NAME="AEN372"
>4.1. How much does <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -232,24 +232,11 @@ NAME="NEWADS"
>4.5. How can I submit new ads?</A
></H3
><P
-> Beginning with <SPAN
-CLASS="APPLICATION"
->Privoxy v2.9.14</SPAN
->, missed ads and
- banners and other actions file problems, can be submitted by accessing
- <A
-HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
-TARGET="_top"
-><SPAN
-CLASS="QUOTE"
->"actions file feedback system"</SPAN
-></A
->
- from <A
-HREF="http://p.p/"
+>Please see the <A
+HREF="contact.html"
TARGET="_top"
->http://p.p/</A
-></P
+>Contact section</A
+>.</P
><P
> This process does not work with earlier versions of <SPAN
CLASS="APPLICATION"
@@ -259,16 +246,6 @@ CLASS="APPLICATION"
CLASS="APPLICATION"
>Junkbuster</SPAN
>.</P
-><P
->
- There will soon be regularly updated actions files posted. These
- will be announced on the
- <A
-HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce"
-TARGET="_top"
->ijbswa-announce</A
->
- list.</P
></DIV
><DIV
CLASS="SECT2"
@@ -307,7 +284,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN530"
+NAME="AEN424"
>4.7. Can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -353,7 +330,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN541"
+NAME="AEN435"
>4.8. Might some things break because header information is
being altered?</A
></H3
@@ -399,7 +376,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN551"
+NAME="AEN445"
>4.9. Can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -430,7 +407,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN559"
+NAME="AEN453"
>4.10. What about as a firewall? Can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -449,7 +426,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN564"
+NAME="AEN458"
>4.11. The <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -485,7 +462,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN573"
+NAME="AEN467"
>4.12. I have large empty spaces now where ads used to be.
Why?</A
></H3
@@ -501,7 +478,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN576"
+NAME="AEN470"
>4.13. How can <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -531,7 +508,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN583"
+NAME="AEN477"
>4.14. <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index 1f20a281..bf7f00f5 100644
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -78,7 +78,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN642"
+NAME="AEN536"
>5.1. I just upgraded and am getting <SPAN
CLASS="QUOTE"
>"connection refused"</SPAN
@@ -128,7 +128,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN655"
+NAME="AEN549"
>5.2. I just added a new rule, but the steenkin ad is
still getting through. How?</A
></H3
@@ -155,7 +155,7 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="AEN661"
+NAME="AEN555"
>5.3. One of my favorite sites does not work with <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -247,25 +247,8 @@ CLASS="SECT2"
><H3
CLASS="SECT2"
><A
-NAME="BUGS"
->5.4. Where can I get help? Report bugs? Feature Requests? Etc?</A
-></H3
-><P
-> Feedback is encouraged, whether good, bad or ugly. Please see the contact
- page in the <A
-HREF="../user-manual/contact.html"
-TARGET="_top"
->user-manual</A
-> for
- details. </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H3
-CLASS="SECT2"
-><A
-NAME="AEN688"
->5.5. What time is it?</A
+NAME="AEN578"
+>5.4. What time is it?</A
></H3
><P
> Time for you to go!</P
diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index 2e2a8424..57464e50 100644
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -78,19 +78,48 @@ HREF="#DOCS"
HREF="#SUPPORT"
>Support and Service via Sourceforge</A
></DT
+><DD
+><DL
+><DT
+>.1. <A
+HREF="#CONTACT-SUPPORT"
+>Get Support</A
+></DT
+><DT
+>.2. <A
+HREF="#CONTACT-BUGS"
+>Report bugs</A
+></DT
+><DT
+>.3. <A
+HREF="#CONTACT-FEATURE"
+>Request new features</A
+></DT
+><DT
+>.4. <A
+HREF="#CONTACT-ADS"
+>Report ads or other filter problems</A
+></DT
+><DT
+>.5. <A
+HREF="#CONTACT-OTHER"
+>Other</A
+></DT
+></DL
+></DD
><DT
><A
-HREF="#AEN91"
+HREF="#AEN101"
>Copyright</A
></DT
><DT
><A
-HREF="#AEN98"
+HREF="#AEN108"
>History</A
></DT
><DT
><A
-HREF="#AEN109"
+HREF="#AEN119"
></A
></DT
></DL
@@ -159,7 +188,7 @@ CLASS="LITERALLAYOUT"
> A list of <A
HREF="user-manual/introduction.html#AEN37"
TARGET="_top"
->new features</A
+>features</A
><br>
</P
></LI
@@ -306,34 +335,50 @@ NAME="SUPPORT"
></H1
><P
> We value your feedback. However, to provide you with the best support, please
- note:
-
- <P
-></P
-><UL
-><LI
+ note the following sections.</P
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-SUPPORT"
+>.1. Get Support</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Use the Sourceforge Support Forum to get help:<br>
- <br>
+>To get support, use the Sourceforge Support Forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=211118</A
><br>
</P
-></LI
-><LI
+>
+ </P
+></DIV
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-BUGS"
+>.2. Report bugs</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Submit bugs only through our Sourceforge Bug Forum:<br>
- <br>
+>To submit bugs, use the Sourceforge Bug Forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=111118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=111118</A
>. <br>
</P
+>
+ </P
><P
> Make sure that the bug has not already been submitted. Please try to
verify that it is a <SPAN
@@ -347,44 +392,75 @@ CLASS="APPLICATION"
<SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
->/<SPAN
-CLASS="APPLICATION"
->Junkbuster</SPAN
->
- version, platform, browser, any pertinent log data, any other relevant
- details (please be specific) and, if possible, some way to reproduce the
- bug.
+> version, platform, browser, any
+ pertinent log data, any other relevant details (please be specific) and,
+ if possible, some way to reproduce the bug.
</P
-></LI
-><LI
+></DIV
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-FEATURE"
+>.3. Request new features</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Submit feature requests only through our Sourceforge feature request forum:<br>
- <br>
+>To submit ideas on new features, use the Sourceforge feature request forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse"
TARGET="_top"
>http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse</A
>.<br>
</P
-></LI
-><LI
+>
+ </P
+></DIV
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-ADS"
+>.4. Report ads or other filter problems</A
+></H2
><P
-CLASS="LITERALLAYOUT"
->You can also send feedback on websites that Privoxy has problems with. Please bookmark<br>
-the following link: <A
+>You can also send feedback on websites that Privoxy has problems with. Please bookmark
+the following link: <A
HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
TARGET="_top"
><SPAN
CLASS="QUOTE"
>"Privoxy - Submit Filter Feedback"</SPAN
></A
->. Once you surf to a page with problems, use the<br>
-bookmark to send us feedback. We will look into the issue as soon as possible.<br>
- </P
-></LI
-><LI
+>. Once you surf to a page with problems, use the
+bookmark to send us feedback. We will look into the issue as soon as possible.
+ </P
+><P
+> New, improved <TT
+CLASS="FILENAME"
+>default.action</TT
+> files will occasionally be made
+ available based on your feedback. These will be announced on the <A
+HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce"
+TARGET="_top"
+>ijbswa-announce</A
+>
+ list.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-OTHER"
+>.5. Other</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
>For any other issues, feel free to use the mailing lists:<br>
<br>
@@ -394,21 +470,21 @@ TARGET="_top"
>http://sourceforge.net/mail/?group_id=11118</A
>.<br>
</P
+>
+ </P
><P
> Anyone interested in actively participating in development and related
discussions can also join the appropriate mailing list. Archives are
- available, too.
+ available, too. See the page on Sourceforge.
</P
-></LI
-></UL
-></P
+></DIV
></DIV
><DIV
CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN91"
+NAME="AEN101"
>Copyright</A
></H1
><P
@@ -418,12 +494,14 @@ CLASS="APPLICATION"
> is free software; you can
redistribute it and/or modify it under the terms of the GNU General Public
+
License as published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.</P
><P
> This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+
more details, which is available from the Free Software Foundation, Inc, 59
Temple Place - Suite 330, Boston, MA 02111-1307, USA.</P
><P
@@ -440,7 +518,7 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN98"
+NAME="AEN108"
>History</A
></H1
><P
@@ -487,14 +565,14 @@ CLASS="SECT1"
><HR><H1
CLASS="SECT1"
><A
-NAME="AEN109"
+NAME="AEN119"
></A
></H1
><P
><DIV
CLASS="INFORMALTABLE"
><A
-NAME="AEN112"
+NAME="AEN122"
></A
><P
></P
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index a7e346fb..5206ae5e 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -65,7 +65,7 @@ CLASS="SECT1"
CLASS="SECT1"
><A
NAME="APPENDIX"
->9. Appendix</A
+>11. Appendix</A
></H1
><DIV
CLASS="SECT2"
@@ -73,7 +73,7 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="REGEX"
->9.1. Regular Expressions</A
+>11.1. Regular Expressions</A
></H2
><P
> <SPAN
@@ -278,7 +278,7 @@ CLASS="QUOTE"
>"example\.com"</SPAN
>, makes
sure the period is recognized only as a period (and not expanded to its
- metacharacter meaning of any single character).
+ meta-character meaning of any single character).
</TD
></TR
></TBODY
@@ -751,8 +751,8 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN2452"
->9.2. <SPAN
+NAME="AEN2545"
+>11.2. <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
>'s Internal Pages</A
@@ -800,7 +800,7 @@ CLASS="APPLICATION"
Privoxy main page:
</P
><A
-NAME="AEN2467"
+NAME="AEN2560"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@ -825,10 +825,11 @@ TARGET="_top"
><LI
><P
>
- Show information about the current configuration:
+ Show information about the current configuration, including viewing and
+ editing of actions files:
</P
><A
-NAME="AEN2474"
+NAME="AEN2567"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@ -848,7 +849,7 @@ TARGET="_top"
Show the source code version numbers:
</P
><A
-NAME="AEN2479"
+NAME="AEN2572"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@ -865,10 +866,10 @@ TARGET="_top"
><LI
><P
>
- Show the client's request headers:
+ Show the browser's request headers:
</P
><A
-NAME="AEN2484"
+NAME="AEN2577"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@ -888,7 +889,7 @@ TARGET="_top"
Show which actions apply to a URL and why:
</P
><A
-NAME="AEN2489"
+NAME="AEN2582"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@ -912,7 +913,7 @@ CLASS="QUOTE"
to run, but only as a pass-through proxy, with no actions taking place:
</P
><A
-NAME="AEN2495"
+NAME="AEN2588"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@ -929,7 +930,7 @@ TARGET="_top"
> Short cuts. Turn off, then on:
</P
><A
-NAME="AEN2499"
+NAME="AEN2592"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@ -943,7 +944,7 @@ TARGET="_top"
</P
></BLOCKQUOTE
><A
-NAME="AEN2502"
+NAME="AEN2595"
></A
><BLOCKQUOTE
CLASS="BLOCKQUOTE"
@@ -957,26 +958,6 @@ TARGET="_top"
</P
></BLOCKQUOTE
></LI
-><LI
-><P
->
- Edit the actions list file:
- </P
-><A
-NAME="AEN2507"
-></A
-><BLOCKQUOTE
-CLASS="BLOCKQUOTE"
-><P
->
- <A
-HREF="http://config.privoxy.org/edit-actions"
-TARGET="_top"
->http://config.privoxy.org/edit-actions</A
->
- </P
-></BLOCKQUOTE
-></LI
></UL
></P
><P
@@ -987,7 +968,7 @@ CLASS="SECT3"
CLASS="SECT3"
><A
NAME="BOOKMARKLETS"
->9.2.1. Bookmarklets</A
+>11.2.1. Bookmarklets</A
></H3
><P
> Below are some <SPAN
@@ -1036,7 +1017,7 @@ CLASS="QUOTE"
> <A
HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
TARGET="_top"
->Enable Privoxy</A
+>Privoxy - Enable</A
>
</P
></LI
@@ -1045,7 +1026,7 @@ TARGET="_top"
> <A
HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
TARGET="_top"
->Disable Privoxy</A
+>Privoxy - Disable</A
>
</P
></LI
@@ -1054,7 +1035,7 @@ TARGET="_top"
> <A
HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y&set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
TARGET="_top"
->Toggle Privoxy</A
+>Privoxy - Toggle Privoxy</A
> (Toggles between enabled and disabled)
</P
></LI
@@ -1063,7 +1044,7 @@ TARGET="_top"
> <A
HREF="javascript:void(window.open('http://config.privoxy.org/toggle?mini=y','ijbstatus','width=250,height=2,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
TARGET="_top"
->View Privoxy Status</A
+>Privoxy- View Status</A
>
</P
></LI
@@ -1072,7 +1053,7 @@ TARGET="_top"
> <A
HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
TARGET="_top"
->Actions file feedback system</A
+>Privoxy - Submit Filter Feedback</A
>
</P
></LI
@@ -1094,7 +1075,7 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="CHAIN"
->9.3. Chain of Events</A
+>11.3. Chain of Events</A
></H2
><P
> Let's take a quick look at the basic sequence of events when a web page is
@@ -1108,11 +1089,13 @@ CLASS="APPLICATION"
><UL
><LI
><P
-> First, the web browser requests a page, and this request is intercepted by
- <SPAN
+> First, your web browser requests a web page. The browser knows to send
+ the request to <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> immediately.
+>, which will in turn,
+ relay the request to the remote web server after passing the following
+ tests:
</P
></LI
><LI
@@ -1120,17 +1103,47 @@ CLASS="APPLICATION"
> <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> traps any request for internal CGI
- pages (e.g http://p.p/) and relays these back to the browser.
+> traps any request for its own internal CGI
+ pages (e.g http://p.p/) and sends the CGI page back to the browser.
</P
></LI
><LI
><P
-> If the URL matches a <SPAN
+> Next, <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> checks to see if the URL
+ matches any <A
+HREF="configuration.html#BLOCK"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"+block"</SPAN
-> pattern, then it is blocked
- and the banner displayed.
+></A
+> patterns. If
+ so, the URL is then blocked, and the remote web server will not be contacted.
+ <A
+HREF="configuration.html#HANDLE-AS-IMAGE"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+handle-as-image"</SPAN
+></A
+>
+ is then checked and if it does not match, an
+ HTML <SPAN
+CLASS="QUOTE"
+>"BLOCKED"</SPAN
+> page is sent back. Otherwise, if it does match,
+ an image is returned. The type of image depends on the setting of <A
+HREF="configuration.html#SET-IMAGE-BLOCKER"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+set-image-blocker"</SPAN
+></A
+>
+ (blank, checkerboard pattern, or an HTTP redirect to an image elsewhere).
</P
></LI
><LI
@@ -1144,61 +1157,152 @@ CLASS="FILENAME"
></LI
><LI
><P
-> <SPAN
+> If the URL pattern matches the <A
+HREF="configuration.html#FAST-REDIRECTS"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
->"+fast-redirect"</SPAN
-> is processed, stripping unwanted parts
- of the request web page URL.
+>"+fast-redirects"</SPAN
+></A
+> action,
+ it is then processed. Unwanted parts of the requested URL are stripped.
</P
></LI
><LI
><P
-> At this point, <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> relays the request to the
- web server, and requests the page (assuming nothing up to this point has
- prevented getting us from this far).
+> Now the rest of the client browser's request headers are processed. If any
+ of these match any of the relevant actions (e.g. <A
+HREF="configuration.html#HIDE-USER-AGENT"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+hide-user-agent"</SPAN
+></A
+>,
+ etc.), headers are suppressed or forged as determined by these actions and
+ their parameters.
</P
></LI
><LI
><P
-> The first few hundred bytes are read from the web server and
- <SPAN
+> Now the web server starts sending its response back (i.e. typically a web page and related
+ data).
+ </P
+></LI
+><LI
+><P
+> First, the server headers are read and processed to determine, among other
+ things, the MIME type (document type) and encoding. The headers are then
+ filtered as deterimed by the
+ <A
+HREF="configuration.html#PREVENT-SETTING-COOKIES"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+prevent-setting-cookies"</SPAN
+></A
+>,
+ <A
+HREF="configuration.html#SESSION-COOKIES-ONLY"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+session-cookies-only"</SPAN
+></A
+>,
+ and <A
+HREF="configuration.html#DOWNGRADE-HTTP-VERSION"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+downgrade-http-version"</SPAN
+></A
+>
+ actions.
+ </P
+></LI
+><LI
+><P
+> If the <A
+HREF="configuration.html#KILL-POPUPS"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"+kill-popups"</SPAN
-> is processed, if enabled.
+></A
+>
+ action applies, and it is an HTML or JavaScript document, the popup-code in the
+ response is filtered on-the-fly as it is received.
</P
></LI
><LI
><P
-> If <SPAN
+> If a <A
+HREF="configuration.html#FILTER"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"+filter"</SPAN
-> applies, the rest of the page is read into
- memory and then the filters are processed. Filters are applied in the order they
- are specified in the <TT
+></A
+>
+ or <A
+HREF="configuration.html#DEANIMATE-GIFS"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+deanimate-gifs"</SPAN
+></A
+>
+ action applies (and the document type fits the action), the rest of the page is
+ read into memory (up to a configurable limit). Then the filter rules (from
+ <TT
+CLASS="FILENAME"
+>default.filter</TT
+>) are processed against the buffered
+ content. Filters are applied in the order they are specified in the
+ <TT
CLASS="FILENAME"
>default.filter</TT
-> file. The entire
- page, which is now filtered, is then sent by
+> file. Animated GIFs, if present, are
+ reduced to either the first or last frame, depending on the action
+ setting.The entire page, which is now filtered, is then sent by
<SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> to your browser.
+> back to your browser.
</P
-></LI
-><LI
><P
-> As the browser receives the filtered page content, it will read and request any
- embedded URLs on the page, e.g. an ad image. As the browser requests these
- secondary URLs from whatever server they may be on,
- <SPAN
+> If neither <A
+HREF="configuration.html#FILTER"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+filter"</SPAN
+></A
+>
+ or <A
+HREF="configuration.html#DEANIMATE-GIFS"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+deanimate-gifs"</SPAN
+></A
+>
+ matches, then <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> handles these same as above, and the process
- is repeated for each such URL. Note that a fancy web page may have many, many
- such URLs for graphics, frames, etc.
+> passes the raw data through
+ to the client browser as it becomes available.
+ </P
+></LI
+><LI
+><P
+> As the browser receives the now (probably filtered) page content, it
+ reads and then requests any URLs that may be embedded within the page
+ source, e.g. ad images, stylesheets, JavaScript, other HTML documents (e.g.
+ frames), sounds, etc. For each of these objects, the browser issues a new
+ request. And each such request is in turn processed as above. Note that a
+ complex web page may have many such embedded URLs.
</P
></LI
></UL
@@ -1210,20 +1314,30 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="ACTIONSANAT"
->9.4. Anatomy of an Action</A
+>11.4. Anatomy of an Action</A
></H2
><P
> The way <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> applies <SPAN
+> applies
+ <A
+HREF="configuration.html#ACTIONS"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"actions"</SPAN
+></A
>
- and <SPAN
+ and <A
+HREF="configuration.html#FILTER"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"filters"</SPAN
-> to any given URL can be complex, and not always so
+></A
+>
+ to any given URL can be complex, and not always so
easy to understand what is happening. And sometimes we need to be able to
<I
CLASS="EMPHASIS"
@@ -1253,7 +1367,7 @@ CLASS="APPLICATION"
HREF="appendix.html#BOOKMARKLETS"
>the Bookmarklets</A
> section on a quick
- and easy way to do this (be sure to flush caches afterwards!).</P
+ and easy way to do this (be sure to flush caches afterward!).</P
><P
> <SPAN
CLASS="APPLICATION"
@@ -1276,32 +1390,36 @@ CLASS="APPLICATION"
>Privoxy</SPAN
> will tell us
how the current configuration will handle it. This will not
- help with filtering effects (i.e. the <SPAN
+ help with filtering effects (i.e. the <A
+HREF="configuration.html#FILTER"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"+filter"</SPAN
-> action) from the
- <TT
+></A
+> action) from
+ the <TT
CLASS="FILENAME"
>default.filter</TT
-> file since this is handled very differently
- and not so easy to trap! It also will not tell you about any other URLs that
- may be embedded within the URL you are testing (i.e. a web page). For
- instance, images such as ads are expressed as URLs within the raw page source
- of HTML pages. So you will only get info for the actual URL that is pasted
- into the prompt area -- not any sub-URLs. If you want to know about embedded
- URLs like ads, you will have to dig those out of the HTML source. Use your
- browser's <SPAN
-CLASS="QUOTE"
->"View Page Source"</SPAN
-> option for this. Or right click on
- the ad, and grab the URL.</P
-><P
-> Let's look at an example, <A
+> file since this is handled very
+ differently and not so easy to trap! It also will not tell you about any other
+ URLs that may be embedded within the URL you are testing. For instance, images
+ such as ads are expressed as URLs within the raw page source of HTML pages. So
+ you will only get info for the actual URL that is pasted into the prompt area
+ -- not any sub-URLs. If you want to know about embedded URLs like ads, you
+ will have to dig those out of the HTML source. Use your browser's <SPAN
+CLASS="QUOTE"
+>"View
+ Page Source"</SPAN
+> option for this. Or right click on the ad, and grab the
+ URL.</P
+><P
+> Let's try an example, <A
HREF="http://google.com"
TARGET="_top"
>google.com</A
>,
- one section at a time:</P
+ and look at it one section at a time:</P
><P
> <TABLE
BORDER="0"
@@ -1311,114 +1429,133 @@ WIDTH="100%"
><TD
><PRE
CLASS="SCREEN"
-> System default actions:
+> Matches for http://google.com:
- { -add-header -block -deanimate-gifs -downgrade -fast-redirects -filter
- -hide-forwarded -hide-from -hide-referer -hide-user-agent -image
- -image-blocker -limit-connect -no-compression -no-cookies-keep
- -no-cookies-read -no-cookies-set -no-popups -vanilla-wafer -wafer }
-
- </PRE
-></TD
-></TR
-></TABLE
-></P
-><P
-> This is the top section, and only tells us of the compiled in defaults. This
- is basically what <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> would do if there
- were not any <SPAN
-CLASS="QUOTE"
->"actions"</SPAN
-> defined, i.e. it does nothing. Every action
- is disabled. This is not particularly informative for our purposes here. OK,
- next section:</P
-><P
-> <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
-> Matches for http://google.com:
+--- File standard ---
+(no matches in this file)
- { -add-header -block +deanimate-gifs -downgrade +fast-redirects
- +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}
- +filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal}
- +filter{fun} +hide-forwarded +hide-from{block} +hide-referer{forge}
- -hide-user-agent -image +image-blocker{blank} +no-compression
- +no-cookies-keep -no-cookies-read -no-cookies-set +no-popups
- -vanilla-wafer -wafer }
- /
+--- File default ---
- { -no-cookies-keep -no-cookies-read -no-cookies-set }
- .google.com
+{ -add-header -block +deanimate-gifs{last} -downgrade-http-version +fast-redirects
+ -filter{popups} -filter{fun} -filter{shockwave-flash} -filter{crude-parental}
+ +filter{html-annoyances} +filter{js-annoyances} +filter{content-cookies}
+ +filter{webbugs} +filter{refresh-tags} +filter{nimda} +filter{banners-by-size}
+ +hide-forwarded-for-headers +hide-from-header{block} +hide-referer{forge}
+ -hide-user-agent -handle-as-image +set-image-blocker{pattern} -limit-connect
+ +prevent-compression +session-cookies-only -prevent-reading-cookies
+ -prevent-setting-cookies -kill-popups -send-vanilla-wafer -send-wafer }
+/
+
+ { -session-cookies-only }
+ .google.com
{ -fast-redirects }
- .google.com
+ .google.com
- </PRE
+--- File user ---
+(no matches in this file) </PRE
></TD
></TR
></TABLE
></P
><P
-> This is much more informative, and tells us how we have defined our
- <SPAN
+> This tells us how we have defined our
+ <A
+HREF="configuration.html#ACTIONS"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"actions"</SPAN
->, and which ones match for our example,
- <SPAN
+></A
+>, and
+ which ones match for our example, <SPAN
CLASS="QUOTE"
>"google.com"</SPAN
->. The first grouping shows our default
- settings, which would apply to all URLs. If you look at your <SPAN
+>. The first listing
+ is any matches for the <TT
+CLASS="FILENAME"
+>standard.action</TT
+> file. No hits at
+ all here on <SPAN
+CLASS="QUOTE"
+>"standard"</SPAN
+>. Then next is <SPAN
+CLASS="QUOTE"
+>"default"</SPAN
+>, or
+ our <TT
+CLASS="FILENAME"
+>default.action</TT
+> file. The large, multi-line listing,
+ is how the actions are set to match for all URLs, i.e. our default settings.
+ If you look at your <SPAN
CLASS="QUOTE"
>"actions"</SPAN
->
- file, this would be the section just below the <SPAN
+> file, this would be the section
+ just below the <SPAN
CLASS="QUOTE"
>"aliases"</SPAN
-> section
- near the top. This applies to all URLs as signified by the single forward
- slash -- <SPAN
+> section near the top. This will apply to
+ all URLs as signified by the single forward slash at the end of the listing
+ -- <SPAN
CLASS="QUOTE"
>"/"</SPAN
->.
- </P
+>.</P
><P
-> These are the default actions we have enabled. But we can define additional
- actions that would be exceptions to these general rules, and then list
- specific URLs that these exceptions would apply to. Last match wins.
- Just below this then are two explicit matches for <SPAN
+> But we can define additional actions that would be exceptions to these general
+ rules, and then list specific URLs (or patterns) that these exceptions would
+ apply to. Last match wins. Just below this then are two explicit matches for
+ <SPAN
CLASS="QUOTE"
>".google.com"</SPAN
->.
- The first is negating our various cookie blocking actions (i.e. we will allow
- cookies here). The second is allowing <SPAN
+>. The first is negating our previous cookie setting,
+ which was for <A
+HREF="configuration.html#SESSION-COOKIES-ONLY"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
->"fast-redirects"</SPAN
->. Note
- that there is a leading dot here -- <SPAN
+>"+session-cookies-only"</SPAN
+></A
+>
+ (i.e. not persistent). So we will allow persistent cookies for google. The
+ second turns <I
+CLASS="EMPHASIS"
+>off</I
+> any
+ <A
+HREF="configuration.html#FAST-REDIRECTS"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+fast-redirects"</SPAN
+></A
+>
+ action, allowing this to take place unmolested. Note that there is a leading
+ dot here -- <SPAN
CLASS="QUOTE"
>".google.com"</SPAN
->. This will
- match any hosts and sub-domains, in the google.com domain also, such as
+>. This will match any hosts and
+ sub-domains, in the google.com domain also, such as
<SPAN
CLASS="QUOTE"
>"www.google.com"</SPAN
->. So, apparently, we have these actions defined
- somewhere in the lower part of our actions file, and
- <SPAN
+>. So, apparently, we have these two actions
+ defined somewhere in the lower part of our <TT
+CLASS="FILENAME"
+>default.action</TT
+>
+ file, and <SPAN
CLASS="QUOTE"
>"google.com"</SPAN
-> is referenced in these sections. </P
+> is referenced somewhere in these latter
+ sections.</P
+><P
+> Then, for our <TT
+CLASS="FILENAME"
+>user.action</TT
+> file, we again have no hits.</P
><P
-> And now we pull it altogether in the bottom section and summarize how
+> And finally we pull it all together in the bottom section and summarize how
<SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -1440,21 +1577,28 @@ WIDTH="100%"
><PRE
CLASS="SCREEN"
> Final results:
-
- -add-header -block -deanimate-gifs -downgrade -fast-redirects
- +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}
- +filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal}
- +filter{fun} +hide-forwarded +hide-from{block} +hide-referer{forge}
- -hide-user-agent -image +image-blocker{blank} -limit-connect +no-compression
- -no-cookies-keep -no-cookies-read -no-cookies-set +no-popups -vanilla-wafer
- -wafer
-
- </PRE
+ -add-header -block +deanimate-gifs{last} -downgrade-http-version -fast-redirects
+ -filter{popups} -filter{fun} -filter{shockwave-flash} -filter{crude-parental}
+ +filter{html-annoyances} +filter{js-annoyances} +filter{content-cookies}
+ +filter{webbugs} +filter{refresh-tags} +filter{nimda} +filter{banners-by-size}
+ +hide-forwarded-for-headers +hide-from-header{block} +hide-referer{forge}
+ -hide-user-agent -handle-as-image +set-image-blocker{pattern} -limit-connect
+ +prevent-compression -session-cookies-only -prevent-reading-cookies
+ -prevent-setting-cookies -kill-popups -send-vanilla-wafer -send-wafer</PRE
></TD
></TR
></TABLE
></P
><P
+> Notice the only difference here to the previous listing, is to
+ <SPAN
+CLASS="QUOTE"
+>"fast-redirects"</SPAN
+> and <SPAN
+CLASS="QUOTE"
+>"session-cookies-only"</SPAN
+>.</P
+><P
> Now another example, <SPAN
CLASS="QUOTE"
>"ad.doubleclick.net"</SPAN
@@ -1468,16 +1612,14 @@ WIDTH="100%"
><TD
><PRE
CLASS="SCREEN"
-> { +block +image }
+> { +block +handle-as-image }
.ad.doubleclick.net
- { +block +image }
+ { +block +handle-as-image }
ad*.
- { +block +image }
- .doubleclick.net
-
- </PRE
+ { +block +handle-as-image }
+ .doubleclick.net</PRE
></TD
></TR
></TABLE
@@ -1486,17 +1628,21 @@ CLASS="SCREEN"
> We'll just show the interesting part here, the explicit matches. It is
matched three different times. Each as an <SPAN
CLASS="QUOTE"
->"+block +image"</SPAN
+>"+block +handle-as-image"</SPAN
>,
which is the expanded form of one of our aliases that had been defined as:
<SPAN
CLASS="QUOTE"
>"+imageblock"</SPAN
->. (<SPAN
+>. (<A
+HREF="configuration.html#ALIASES"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"Aliases"</SPAN
-> are defined in the
- first section of the actions file and typically used to combine more
+></A
+> are defined in
+ the first section of the actions file and typically used to combine more
than one action.)</P
><P
> Any one of these would have done the trick and blocked this as an unwanted
@@ -1507,21 +1653,31 @@ CLASS="QUOTE"
CLASS="QUOTE"
>"ad.doubleclick.net"</SPAN
>
- is done here -- as both a <SPAN
+ is done here -- as both a <A
+HREF="configuration.html#BLOCK"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"+block"</SPAN
-> <I
+></A
+>
+ <I
CLASS="EMPHASIS"
>and</I
-> an
- <SPAN
+> an
+ <A
+HREF="configuration.html#HANDLE-AS-IMAGE"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
->"+image"</SPAN
->. The custom alias <SPAN
+>"+handle-as-image"</SPAN
+></A
+>.
+ The custom alias <SPAN
CLASS="QUOTE"
>"+imageblock"</SPAN
-> does this
- for us.</P
+> just simplifies the process and make
+ it more readable.</P
><P
> One last example. Let's try <SPAN
CLASS="QUOTE"
@@ -1539,19 +1695,17 @@ WIDTH="100%"
CLASS="SCREEN"
> Matches for http://www.rhapsodyk.net/adsl/HOWTO/:
- { -add-header -block +deanimate-gifs -downgrade +fast-redirects
- +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}
+ { -add-header -block +deanimate-gifs -downgrade-http-version +fast-redirects
+ +filter{html-annoyances} +filter{js-annoyances} +filter{kill-popups}
+filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal}
- +filter{fun} +hide-forwarded +hide-from{block} +hide-referer{forge}
- -hide-user-agent -image +image-blocker{blank} +no-compression
- +no-cookies-keep -no-cookies-read -no-cookies-set +no-popups
- -vanilla-wafer -wafer }
+ +filter{fun} +hide-forwarded-for-headers +hide-from-header{block}
+ +hide-referer{forge} -hide-user-agent -handle-as-image +set-image-blocker{blank}
+ +prevent-compression +session-cookies-only -prevent-setting-cookies
+ -prevent-reading-cookies +kill-popups -send-vanilla-wafer -send-wafer }
/
- { +block +image }
- /ads
-
- </PRE
+ { +block +handle-as-image }
+ /ads</PRE
></TD
></TR
></TABLE
@@ -1569,11 +1723,14 @@ CLASS="QUOTE"
CLASS="EMPHASIS"
>not</I
>
- block (-block) pages with <SPAN
+ block (<SPAN
+CLASS="QUOTE"
+>"{-block}"</SPAN
+>) paths with <SPAN
CLASS="QUOTE"
>"adsl"</SPAN
->. There are various ways to
- handle such exceptions. Example:</P
+>. There are
+ various ways to handle such exceptions. Example:</P
><P
> <TABLE
BORDER="0"
@@ -1584,9 +1741,7 @@ WIDTH="100%"
><PRE
CLASS="SCREEN"
> { -block }
- /adsl
-
- </PRE
+ /adsl</PRE
></TD
></TR
></TABLE
@@ -1609,10 +1764,8 @@ WIDTH="100%"
><TD
><PRE
CLASS="SCREEN"
-> { -block }
- /adsl
-
- </PRE
+> { +block +handle-as-image }
+ /ads</PRE
></TD
></TR
></TABLE
@@ -1644,9 +1797,7 @@ CLASS="SCREEN"
.worldpay.com # for quietpc.com
.jungle.com
.scan.co.uk
- .forbes.com
-
- </PRE
+ .forbes.com</PRE
></TD
></TR
></TABLE
@@ -1661,9 +1812,9 @@ CLASS="QUOTE"
> that expands to
<SPAN
CLASS="QUOTE"
->"{ -filter -no-cookies -no-cookies-keep }"</SPAN
->. Or you could do
- your own exception to negate filtering: </P
+>"{ -filter -session-cookies-only }"</SPAN
+>.
+ Or you could do your own exception to negate filtering: </P
><P
> <TABLE
BORDER="0"
@@ -1674,14 +1825,18 @@ WIDTH="100%"
><PRE
CLASS="SCREEN"
> {-filter}
- .forbes.com
-
- </PRE
+ .forbes.com</PRE
></TD
></TR
></TABLE
></P
><P
+> This would probably be most appropriately put in <TT
+CLASS="FILENAME"
+>user.action</TT
+>,
+ for local site exceptions.</P
+><P
> <SPAN
CLASS="QUOTE"
>"{fragile}"</SPAN
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index abfbabb4..9fe64ac3 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -10,8 +10,8 @@ REL="HOME"
TITLE="Privoxy User Manual"
HREF="index.html"><LINK
REL="PREVIOUS"
-TITLE="Quickstart to Using Privoxy"
-HREF="quickstart.html"><LINK
+TITLE="Starting Privoxy"
+HREF="startup.html"><LINK
REL="NEXT"
TITLE="Contacting the Developers, Bug Reporting and Feature
Requests"
@@ -45,7 +45,7 @@ WIDTH="10%"
ALIGN="left"
VALIGN="bottom"
><A
-HREF="quickstart.html"
+HREF="startup.html"
>Prev</A
></TD
><TD
@@ -72,7 +72,7 @@ CLASS="SECT1"
CLASS="SECT1"
><A
NAME="CONFIGURATION"
->5. <SPAN
+>7. <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
> Configuration</A
@@ -88,15 +88,14 @@ CLASS="APPLICATION"
>Privoxy</SPAN
> can
also be controlled easily with a web browser.
-
</P
><DIV
CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN324"
->5.1. Controlling <SPAN
+NAME="AEN320"
+>7.1. Controlling <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
> with Your Web Browser</A
@@ -118,8 +117,7 @@ TARGET="_top"
>),
which is a built-in page and works without Internet access.
You will see the following section: </P
-><P
-> <TABLE
+><TABLE
BORDER="0"
BGCOLOR="#E0E0E0"
WIDTH="100%"
@@ -127,27 +125,73 @@ WIDTH="100%"
><TD
><PRE
CLASS="SCREEN"
-> Please choose from the following options:
-
- * Privoxy main page
- * Show information about the current configuration
- * Show the source code version numbers
- * Show the request headers.
- * Show which actions apply to a URL and why
- * Toggle Privoxy on or off
- * Edit the actions list
-
- </PRE
-></TD
+> <H3
+CLASS="BRIDGEHEAD"
+>Privoxy Menu</H3
+><P
+></P
+><TABLE
+BORDER="0"
+><TBODY
+><TR
+><TD
+> ▪ <A
+HREF="http://config.privoxy.org/show-status"
+TARGET="_top"
+>View & change the current configuration</A
+>
+ </TD
+></TR
+><TR
+><TD
+> ▪ <A
+HREF="http://config.privoxy.org/show-version"
+TARGET="_top"
+>View the source code version numbers</A
+>
+ </TD
></TR
+><TR
+><TD
+> ▪ <A
+HREF="http://config.privoxy.org/show-request"
+TARGET="_top"
+>View the request headers.</A
+>
+ </TD
+></TR
+><TR
+><TD
+> ▪ <A
+HREF="http://config.privoxy.org/show-url-info"
+TARGET="_top"
+>Look up which actions apply to a URL and why</A
+>
+ </TD
+></TR
+><TR
+><TD
+> ▪ <A
+HREF="http://config.privoxy.org/toggle"
+TARGET="_top"
+>Toggle Privoxy on or off</A
+>
+ </TD
+></TR
+></TBODY
></TABLE
+><P
></P
+></PRE
+></TD
+></TR
+></TABLE
><P
-> This should be self-explanatory. Note the last item is an editor for the
+> This should be self-explanatory. Note the first item leads to an editor for the
<SPAN
CLASS="QUOTE"
>"actions list"</SPAN
->, which is where much of the ad, banner, cookie,
+>, which is where the ad, banner, cookie,
and URL blocking magic is configured as well as other advanced features of
<SPAN
CLASS="APPLICATION"
@@ -188,8 +232,8 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN343"
->5.2. Configuration Files Overview</A
+NAME="CONFOVERVIEW"
+>7.2. Configuration Files Overview</A
></H2
><P
> For Unix, *BSD and Linux, all configuration files are located in
@@ -205,24 +249,24 @@ CLASS="APPLICATION"
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 possibly
- aggressive by some standards. For the time being, there are only three
- default configuration files (this may change in time):</P
+> The installed defaults provide a reasonable starting point, though
+ some settings may be aggressive by some standards. For the time being, the
+ principle configuration files are:</P
><P
> <P
></P
><UL
><LI
><P
-> The main configuration file is named <TT
-CLASS="FILENAME"
->config</TT
+> The main configuration file is named <A
+HREF="configuration.html#CONFIG"
+>config</A
>
on Linux, Unix, BSD, OS/2, and AmigaOS and <TT
CLASS="FILENAME"
>config.txt</TT
>
- on Windows.
+ on Windows. This is a required file.
</P
></LI
><LI
@@ -230,27 +274,54 @@ CLASS="FILENAME"
> <TT
CLASS="FILENAME"
>default.action</TT
-> (the actions file) is used to define
- which of a set of various <SPAN
+> (the main <A
+HREF="configuration.html#ACTIONS-FILE"
+>actions file</A
+>) is used to define
+ the default settings for various <SPAN
CLASS="QUOTE"
>"actions"</SPAN
> relating to images, banners,
- pop-ups, access restrictions, banners and cookies are to be applied, and where.
- There is a web based editor for this file that can be accessed at <A
-HREF="http://config.privoxy.org/edit-actions/"
+ pop-ups, access restrictions, banners and cookies.
+ </P
+><P
+> Multiple actions files may be defined in <TT
+CLASS="FILENAME"
+>config</TT
+>. These
+ are processed in the order they are defined. Local customizations and locally
+ preferred exceptions to the default policies as defined in
+ <TT
+CLASS="FILENAME"
+>default.action</TT
+> are probably best applied in
+ <TT
+CLASS="FILENAME"
+>user.action</TT
+>, which should be preserved across
+ upgrades. <TT
+CLASS="FILENAME"
+>standard.action</TT
+> is also included. This is mostly
+ for <SPAN
+CLASS="APPLICATION"
+>Privoxy's</SPAN
+> internal use.
+ </P
+><P
+>
+ There is also a web based editor that can be accessed from
+ <A
+HREF="http://config.privoxy.org/show-status/"
TARGET="_top"
->http://config.privoxy.org/edit-actions/</A
+>http://config.privoxy.org/show-status/</A
>
(Shortcut: <A
-HREF="http://p.p/edit-actions/"
+HREF="http://p.p/show-status/"
TARGET="_top"
->http://p.p/edit-actions/</A
->).
- (Other actions files are included as well with differing levels of filtering
- and blocking, e.g. <TT
-CLASS="FILENAME"
->basic.action</TT
->.)
+>http://p.p/show-status/</A
+>) for the
+ various actions files.
</P
></LI
><LI
@@ -258,10 +329,14 @@ CLASS="FILENAME"
> <TT
CLASS="FILENAME"
>default.filter</TT
-> (the filter file) can be used to re-write the raw
- page content, including viewable text as well as embedded HTML and JavaScript,
- and whatever else lurks on any given web page. The filtering jobs are only
- pre-defined here; whether to apply them or not is up to the actions file.
+> (the <A
+HREF="configuration.html#FILTER-FILE"
+>filter
+ file</A
+>) can be used to re-write the raw page content, including
+ viewable text as well as embedded HTML and JavaScript, and whatever else
+ lurks on any given web page. The filtering jobs are only pre-defined here;
+ whether to apply them or not is up to the actions files.
</P
></LI
></UL
@@ -274,7 +349,7 @@ CLASS="LITERAL"
>#</TT
>"</SPAN
> character to denote a
- comment (the rest of the line will be ignored) and understand line continuation
+ comment (the rest of the line will be ignored) angd understand line continuation
through placing a backslash ("<TT
CLASS="LITERAL"
>\</TT
@@ -290,10 +365,7 @@ CLASS="LITERAL"
valid configuration line to prevent it from being interpreted is called "commenting
out" that line.</P
><P
-> <TT
-CLASS="FILENAME"
->default.action</TT
-> and <TT
+> The actions files and <TT
CLASS="FILENAME"
>default.filter</TT
>
@@ -339,8 +411,8 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN383"
->5.3. The Main Configuration File</A
+NAME="CONFIG"
+>7.3. The Main Configuration File</A
></H2
><P
> Again, the main configuration file is named <TT
@@ -402,8 +474,8 @@ CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN402"
->5.3.1. Configuration and Log File Locations</A
+NAME="CONF-LOG-LOC"
+>7.3.1. Configuration and Log File Locations</A
></H3
><P
> <SPAN
@@ -421,8 +493,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN407"
->5.3.1.1. confdir</A
+NAME="CONFDIR"
+>7.3.1.1. confdir</A
></H4
><P
></P
@@ -499,8 +571,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN439"
->5.3.1.2. logdir</A
+NAME="LOGDIR"
+>7.3.1.2. logdir</A
></H4
><P
></P
@@ -569,8 +641,20 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN469"
->5.3.1.3. actionsfile</A
+NAME="ACTIONSFILE"
+>7.3.1.3. <A
+NAME="DEFAULT.ACTION"
+></A
+>
+<A
+NAME="STANDARD.ACTION"
+></A
+>
+<A
+NAME="USER.ACTION"
+></A
+>
+actionsfile</A
></H4
><P
></P
@@ -581,7 +665,10 @@ CLASS="VARIABLELIST"
>Specifies:</DT
><DD
><P
-> The actions file to use
+> The <A
+HREF="configuration.html#ACTIONS"
+>actions</A
+> file(s) to use
</P
></DD
><DT
@@ -597,39 +684,74 @@ CLASS="LITERAL"
>Default value:</DT
><DD
><P
->default.action (Unix) <I
-CLASS="EMPHASIS"
->or</I
-> default.action.txt (Windows)</P
+></P
+><TABLE
+BORDER="0"
+><TBODY
+><TR
+><TD
+> <P
+CLASS="LITERALLAYOUT"
+> standard # Internal purposes, recommended not editing</P
+>
+ </TD
+></TR
+><TR
+><TD
+> <P
+CLASS="LITERALLAYOUT"
+> default # Main actions file</P
+>
+ </TD
+></TR
+><TR
+><TD
+> <P
+CLASS="LITERALLAYOUT"
+> user # User customizations</P
+>
+ </TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
></DD
><DT
>Effect if unset:</DT
><DD
><P
-> No action is taken at all. Simple neutral proxying.
+> No actions are taken at all. Simple neutral proxying.
</P
></DD
><DT
>Notes:</DT
><DD
><P
-> There is no point in using <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> without
- an actions file. There are three different actions files included in the
- distribution, with varying degrees of aggressiveness:
- <TT
-CLASS="FILENAME"
->default.action</TT
->, <TT
-CLASS="FILENAME"
->intermediate.action</TT
-> and
+> Multiple <TT
+CLASS="LITERAL"
+>actionsfile</TT
+> lines are OK and are in fact recommended!
+ </P
+><P
+>
+ The default values include standard.action, which is used for internal
+ purposes and should be loaded, default.action, which is the
+ <SPAN
+CLASS="QUOTE"
+>"main"</SPAN
+> actions file maintained by the developers, and
<TT
CLASS="FILENAME"
->advanced.action</TT
->.
+>user.action</TT
+>, where you can make your personal additions.
+ </P
+><P
+>
+ There is no point in using <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> without an actions file.
</P
></DD
></DL
@@ -640,8 +762,11 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN498"
->5.3.1.4. filterfile</A
+NAME="FILTERFILE"
+>7.3.1.4. <A
+NAME="DEFAULT.FILTER"
+></A
+>filterfile</A
></H4
><P
></P
@@ -652,7 +777,10 @@ CLASS="VARIABLELIST"
>Specifies:</DT
><DD
><P
-> The filter file to use
+> The <A
+HREF="configuration.html#FILTER"
+>filter</A
+> file to use
</P
></DD
><DT
@@ -687,7 +815,7 @@ CLASS="REPLACEABLE"
></TT
>}</TT
>
- actions in the actions file are turned off
+ actions in the actions files are turned off
</P
></DD
><DT
@@ -722,8 +850,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN529"
->5.3.1.5. logfile</A
+NAME="LOGFILE"
+>7.3.1.5. logfile</A
></H4
><P
></P
@@ -817,8 +945,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN564"
->5.3.1.6. jarfile</A
+NAME="JARFILE"
+>7.3.1.6. jarfile</A
></H4
><P
></P
@@ -872,8 +1000,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN589"
->5.3.1.7. trustfile</A
+NAME="TRUSTFILE"
+>7.3.1.7. trustfile</A
></H4
><P
></P
@@ -959,8 +1087,8 @@ CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN622"
->5.3.2. Local Set-up Documentation</A
+NAME="LOCAL-SET-UP"
+>7.3.2. Local Set-up Documentation</A
></H3
><P
> If you intend to operate <SPAN
@@ -975,8 +1103,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN626"
->5.3.2.1. trust-info-url</A
+NAME="TRUST-INFO-URL"
+>7.3.2.1. trust-info-url</A
></H4
><P
></P
@@ -1037,8 +1165,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN652"
->5.3.2.2. admin-address</A
+NAME="ADMIN-ADDRESS"
+>7.3.2.2. admin-address</A
></H4
><P
></P
@@ -1097,8 +1225,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN678"
->5.3.2.3. proxy-info-url</A
+NAME="PROXY-INFO-URL"
+>7.3.2.3. proxy-info-url</A
></H4
><P
></P
@@ -1165,8 +1293,8 @@ CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN706"
->5.3.3. Debugging</A
+NAME="DEBUGGING"
+>7.3.3. Debugging</A
></H3
><P
> These options are mainly useful when tracing a problem.
@@ -1185,8 +1313,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN711"
->5.3.3.1. debug</A
+NAME="DEBUG"
+>7.3.3.1. debug</A
></H4
><P
></P
@@ -1246,8 +1374,7 @@ CLASS="PROGRAMLISTING"
debug 512 # Common Log Format
debug 1024 # debug kill pop-ups
debug 4096 # Startup banner and warnings.
- debug 8192 # Non-fatal errors
- </PRE
+ debug 8192 # Non-fatal errors</PRE
></TD
></TR
></TABLE
@@ -1300,8 +1427,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN746"
->5.3.3.2. single-threaded</A
+NAME="SINGLE-THREADED"
+>7.3.3.2. single-threaded</A
></H4
><P
></P
@@ -1361,8 +1488,8 @@ CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN772"
->5.3.4. Access Control and Security</A
+NAME="ACCESS-CONTROL"
+>7.3.4. Access Control and Security</A
></H3
><P
> This section of the config file controls the security-relevant aspects
@@ -1376,8 +1503,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN776"
->5.3.4.1. listen-address</A
+NAME="LISTEN-ADDRESS"
+>7.3.4.1. listen-address</A
></H4
><P
></P
@@ -1446,7 +1573,7 @@ CLASS="APPLICATION"
>Privoxy</SPAN
> will
bind to all interfaces (addresses) on your machine and may become reachable
- from the Internet. In that case, consider using access control lists (acl's)
+ from the Internet. In that case, consider using access control lists (ACL's)
(see <SPAN
CLASS="QUOTE"
>"ACLs"</SPAN
@@ -1474,8 +1601,7 @@ WIDTH="90%"
><TD
><PRE
CLASS="PROGRAMLISTING"
-> listen-address 192.168.0.1:8118
- </PRE
+> listen-address 192.168.0.1:8118</PRE
></TD
></TR
></TABLE
@@ -1490,8 +1616,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN814"
->5.3.4.2. toggle</A
+NAME="TOGGLE"
+>7.3.4.2. toggle</A
></H4
><P
></P
@@ -1564,8 +1690,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN843"
->5.3.4.3. enable-remote-toggle</A
+NAME="ENABLE-REMOTE-TOGGLE"
+>7.3.4.3. enable-remote-toggle</A
></H4
><P
></P
@@ -1656,8 +1782,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN877"
->5.3.4.4. enable-edit-actions</A
+NAME="ENABLE-EDIT-ACTIONS"
+>7.3.4.4. enable-edit-actions</A
></H4
><P
></P
@@ -1669,7 +1795,7 @@ CLASS="VARIABLELIST"
><DD
><P
> Whether or not the <A
-HREF="http://config.privoxy.org/edit-actions"
+HREF="http://config.privoxy.org/show-status"
TARGET="_top"
>web-based actions
file editor</A
@@ -1740,8 +1866,16 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN909"
->5.3.4.5. ACLs: permit-access and deny-access</A
+NAME="ACLS"
+>7.3.4.5. <A
+NAME="PERMIT-ACCES"
+></A
+>
+<A
+NAME="DENY-ACCES"
+></A
+>
+ACLs: permit-access and deny-access</A
></H4
><P
></P
@@ -1947,8 +2081,7 @@ WIDTH="90%"
><TD
><PRE
CLASS="SCREEN"
-> permit-access localhost
- </PRE
+> permit-access localhost</PRE
></TD
></TR
></TABLE
@@ -1967,8 +2100,7 @@ WIDTH="90%"
><TD
><PRE
CLASS="SCREEN"
-> permit-access www.privoxy.org/24 www.example.com/32
- </PRE
+> permit-access www.privoxy.org/24 www.example.com/32</PRE
></TD
></TR
></TABLE
@@ -1988,8 +2120,7 @@ WIDTH="90%"
><PRE
CLASS="SCREEN"
> permit-access 192.168.45.64/26
- deny-access 192.168.45.73 www.dirty-stuff.example.com
- </PRE
+ deny-access 192.168.45.73 www.dirty-stuff.example.com</PRE
></TD
></TR
></TABLE
@@ -2004,8 +2135,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN978"
->5.3.4.6. buffer-limit</A
+NAME="BUFFER-LIMIT"
+>7.3.4.6. buffer-limit</A
></H4
><P
></P
@@ -2089,7 +2220,7 @@ CLASS="SECT3"
CLASS="SECT3"
><A
NAME="FORWARDING"
->5.3.5. Forwarding</A
+>7.3.5. Forwarding</A
></H3
><P
> This feature allows routing of HTTP requests through a chain of
@@ -2118,8 +2249,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN1016"
->5.3.5.1. forward</A
+NAME="FORWARD"
+>7.3.5.1. forward</A
></H4
><P
></P
@@ -2167,7 +2298,10 @@ CLASS="REPLACEABLE"
>target_domain</I
></TT
> is a domain name pattern (see the
- chapter on domain matching in the actions file),
+ chapter on domain matching in the <TT
+CLASS="FILENAME"
+>default.action</TT
+> file),
<TT
CLASS="REPLACEABLE"
><I
@@ -2242,8 +2376,7 @@ WIDTH="90%"
><PRE
CLASS="SCREEN"
> forward .* anon-proxy.example.org:8080
- forward :443 .
- </PRE
+ forward :443 .</PRE
></TD
></TR
></TABLE
@@ -2263,8 +2396,7 @@ WIDTH="90%"
><PRE
CLASS="SCREEN"
> forward .*. caching-proxy.example-isp.net:8000
- forward .example-isp.net .
- </PRE
+ forward .example-isp.net .</PRE
></TD
></TR
></TABLE
@@ -2279,8 +2411,16 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN1062"
->5.3.5.2. forward-socks4 and forward-socks4a</A
+NAME="SOCKS"
+>7.3.5.2. <A
+NAME="FORWARD-SOCKS4"
+></A
+>
+<A
+NAME="FORWARD-SOCKS4A"
+></A
+>
+forward-socks4 and forward-socks4a</A
></H4
><P
></P
@@ -2339,7 +2479,10 @@ CLASS="REPLACEABLE"
>target_domain</I
></TT
> is a domain name pattern (see the
- chapter on domain matching in the actions file),
+ chapter on domain matching in the <TT
+CLASS="FILENAME"
+>default.action</TT
+> file),
<TT
CLASS="REPLACEABLE"
><I
@@ -2441,8 +2584,7 @@ WIDTH="90%"
><PRE
CLASS="SCREEN"
> forward-socks4a .*. socks-gw.example.com:1080 www-cache.example-isp.net:8080
- forward .example.com .
- </PRE
+ forward .example.com .</PRE
></TD
></TR
></TABLE
@@ -2460,8 +2602,7 @@ WIDTH="90%"
><TD
><PRE
CLASS="SCREEN"
-> forward-socks4 .*. socks-gw.example.com:1080 .
- </PRE
+> forward-socks4 .*. socks-gw.example.com:1080 .</PRE
></TD
></TR
></TABLE
@@ -2476,8 +2617,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN1116"
->5.3.5.3. Advanced Forwarding Examples</A
+NAME="ADVANCED-FORWARDING-EXAMPLES"
+>7.3.5.3. Advanced Forwarding Examples</A
></H4
><P
> If you have links to multiple ISPs that provide various special content
@@ -2509,8 +2650,7 @@ WIDTH="100%"
><PRE
CLASS="SCREEN"
> forward .*. .
- forward .isp-b.net host-b:8118
- </PRE
+ forward .isp-b.net host-b:8118</PRE
></TD
></TR
></TABLE
@@ -2527,8 +2667,7 @@ WIDTH="100%"
><PRE
CLASS="SCREEN"
> forward .*. .
- forward .isp-a.net host-a:8118
- </PRE
+ forward .isp-a.net host-a:8118</PRE
></TD
></TR
></TABLE
@@ -2578,8 +2717,7 @@ CLASS="SCREEN"
always_direct allow ftp
# Forward all the rest to Privoxy
- never_direct allow all
- </PRE
+ never_direct allow all</PRE
></TD
></TR
></TABLE
@@ -2603,8 +2741,8 @@ CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN1143"
->5.3.6. Windows GUI Options</A
+NAME="WINDOWS-GUI"
+>7.3.6. Windows GUI Options</A
></H3
><P
> <SPAN
@@ -2612,6 +2750,9 @@ CLASS="APPLICATION"
>Privoxy</SPAN
> has a number of options specific to the
Windows GUI interface:</P
+><A
+NAME="ACTIVITY-ANIMATION"
+></A
><P
> If <SPAN
CLASS="QUOTE"
@@ -2638,6 +2779,9 @@ CLASS="EMPHASIS"
>
</TT
></P
+><A
+NAME="LOG-MESSAGES"
+></A
><P
> If <SPAN
CLASS="QUOTE"
@@ -2661,6 +2805,9 @@ CLASS="EMPHASIS"
>
</TT
></P
+><A
+NAME="LOG-BUFFER-SIZE"
+></A
><P
>
If <SPAN
@@ -2688,6 +2835,9 @@ CLASS="EMPHASIS"
>
</TT
></P
+><A
+NAME="LOG-MAX-LINES"
+></A
><P
> <SPAN
CLASS="APPLICATION"
@@ -2707,6 +2857,9 @@ CLASS="EMPHASIS"
>
</TT
></P
+><A
+NAME="LOG-HIGHLIGHT-MESSAGES"
+></A
><P
> If <SPAN
CLASS="QUOTE"
@@ -2730,6 +2883,9 @@ CLASS="EMPHASIS"
>
</TT
></P
+><A
+NAME="LOG-FONT-NAME"
+></A
><P
> The font used in the console window:</P
><P
@@ -2745,6 +2901,9 @@ CLASS="EMPHASIS"
>
</TT
></P
+><A
+NAME="LOG-FONT-SIZE"
+></A
><P
> Font size used in the console window:</P
><P
@@ -2760,6 +2919,9 @@ CLASS="EMPHASIS"
>
</TT
></P
+><A
+NAME="SHOW-ON-TASK-BAR"
+></A
><P
>
<SPAN
@@ -2784,6 +2946,9 @@ CLASS="EMPHASIS"
>
</TT
></P
+><A
+NAME="CLOSE-BUTTON-MINIMIZES"
+></A
><P
> If <SPAN
CLASS="QUOTE"
@@ -2807,6 +2972,9 @@ CLASS="EMPHASIS"
>
</TT
></P
+><A
+NAME="HIDE-CONSOLE"
+></A
><P
> The <SPAN
CLASS="QUOTE"
@@ -2838,112 +3006,135 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="ACTIONSFILE"
->5.4. The Actions File</A
+NAME="ACTIONS-FILE"
+>7.4. Actions Files</A
></H2
><P
-> The actions file (<TT
+> The actions files are used to define what actions
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> takes for which URLs, and thus determines
+ how ad images, cookies and various other aspects of HTTP content and
+ transactions are handled, and on which sites (or even parts thereof). There
+ are three such files included with <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>,
+ with slightly different purposes. <TT
CLASS="FILENAME"
>default.action</TT
->, formerly:
- <TT
-CLASS="FILENAME"
->actionsfile</TT
-> or <TT
+> sets
+ the default policies. <TT
CLASS="FILENAME"
->ijb.action</TT
->) is used
- to define what actions <SPAN
+>standard.action</TT
+> is used by
+ <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> takes for which
- URLs, and thus determines how ad images, cookies and various other aspects
- of HTTP content and transactions are handled on which sites (or even parts
- thereof).</P
+> and the web based editor to set
+ pre-defined values (and normally should not be edited). Local exceptions
+ are best done in <TT
+CLASS="FILENAME"
+>user.action</TT
+>. The content of these
+ can all be viewed and edited from <A
+HREF="http://config.privoxy.org/show-status"
+TARGET="_top"
+>http://config.privoxy.org/show-status</A
+>.
+ </P
><P
>
Anything you want can blocked, including ads, banners, or just some obnoxious
- URL that you would rather not see. Cookies can be accepted or rejected, or
+ URL that you would rather not see is done here. Cookies can be accepted or rejected, or
accepted only during the current browser session (i.e. not written to disk),
content can be modified, JavaScripts tamed, user-tracking fooled, and much more.
See below for a complete list of available actions.</P
><P
-> An actions file typically has sections. At the top, <SPAN
+> An actions file typically has sections. Near the top, <SPAN
CLASS="QUOTE"
>"aliases"</SPAN
> are
- defined (discussed below), then the default set of rules which will apply
- universally to all sites and pages. And then below that is generally a lengthy
- set of exceptions to the defined universal policies.</P
+ optionally defined (discussed <A
+HREF="configuration.html#ALIASES"
+TARGET="_top"
+>below</A
+>), then the default set of rules
+ which will apply universally to all sites and pages. And then below that,
+ exceptions to the defined universal policies. </P
><DIV
CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN1234"
->5.4.1. Finding the Right Mix</A
+NAME="AEN1285"
+>7.4.1. Finding the Right Mix</A
></H3
><P
-> Note that some actions like cookie suppression or script disabling may
- render some sites unusable, which rely on these techniques to work properly.
- Finding the right mix of actions is not easy and certainly a matter of personal
- taste. In general, it can be said that the more <SPAN
+> Note that some <A
+HREF="configuration.html#ACTIONS"
+>actions</A
+> like cookie suppression
+ or script disabling may render some sites unusable, which rely on these
+ techniques to work properly. Finding the right mix of actions is not easy and
+ certainly a matter of personal taste. In general, it can be said that the more
+ <SPAN
CLASS="QUOTE"
>"aggressive"</SPAN
->
- your default settings (in the top section of the actions file) are,
- the more exceptions for <SPAN
+> your default settings (in the top section of the
+ actions file) are, the more exceptions for <SPAN
CLASS="QUOTE"
>"trusted"</SPAN
-> sites you will have to
- make later. If, for example, you want to kill popup windows per default, you'll
- have to make exceptions from that rule for sites that you regularly use
- and that require popups for actually useful content, like maybe your bank,
- favorite shop, or newspaper.</P
+> sites you
+ will have to make later. If, for example, you want to kill popup windows per
+ default, you'll have to make exceptions from that rule for sites that you
+ regularly use and that require popups for actually useful content, like maybe
+ your bank, favorite shop, or newspaper.</P
><P
> We have tried to provide you with reasonable rules to start from in the
- distribution actions file. But there is no general rule of thumb on these
+ distribution actions files. But there is no general rule of thumb on these
things. There just are too many variables, and sites are constantly changing.
- Sooner or later you will want to change the rules (and read this chapter).</P
+ Sooner or later you will want to change the rules (and read this chapter again :).</P
></DIV
><DIV
CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN1240"
->5.4.2. How to Edit</A
+NAME="AEN1292"
+>7.4.2. How to Edit</A
></H3
><P
> The easiest way to edit the <SPAN
CLASS="QUOTE"
>"actions"</SPAN
-> file is with a browser by
- using our browser-based editor, which is available at <A
-HREF="http://config.privoxy.org/edit-actions"
+> files is with a browser by
+ using our browser-based editor, which can be reached from <A
+HREF="http://config.privoxy.org/show-status"
TARGET="_top"
->http://config.privoxy.org/edit-actions</A
+>http://config.privoxy.org/show-status</A
>.</P
><P
> If you prefer plain text editing to GUIs, you can of course also directly edit the
- <TT
-CLASS="FILENAME"
->default.action</TT
-> file.</P
+ the actions files.</P
></DIV
><DIV
CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN1247"
->5.4.3. How Actions are Applied to URLs</A
+NAME="AEN1298"
+>7.4.3. How Actions are Applied to URLs</A
></H3
><P
-> The actions file is divided into sections. There are special sections,
+> Actions files are divided into sections. There are special sections,
like the <SPAN
CLASS="QUOTE"
->"alias"</SPAN
+>"<A
+HREF="configuration.html#ALIASES"
+>alias</A
+>"</SPAN
> sections which will be discussed later. For now
let's concentrate on regular sections: They have a heading line (often split
up to multiple lines for readability) which consist of a list of actions,
@@ -2954,7 +3145,25 @@ CLASS="QUOTE"
compared to all patterns in this file. Every time it matches, the list of
applicable actions for the URL is incrementally updated, using the heading
of the section in which the pattern is located. If multiple matches for
- the same URL set the same action differently, the last match wins.</P
+ the same URL set the same action differently, the last match wins. If not,
+ the effects are aggregated (e.g. a URL might match both the
+ <A
+HREF="configuration.html#HANDLE-AS-IMAGE"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+handle-as-image"</SPAN
+></A
+>
+ and <A
+HREF="configuration.html#BLOCK"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+block"</SPAN
+></A
+> actions).
+ </P
><P
> You can trace this process by visiting <A
HREF="http://config.privoxy.org/show-url-info"
@@ -2972,8 +3181,8 @@ CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN1256"
->5.4.4. Patterns</A
+NAME="AEN1312"
+>7.4.4. Patterns</A
></H3
><P
> Generally, a pattern has the form <TT
@@ -3079,8 +3288,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN1296"
->5.4.4.1. The Domain Pattern</A
+NAME="AEN1352"
+>7.4.4.1. The Domain Pattern</A
></H4
><P
> The matching of the domain part offers some flexible options: if the
@@ -3253,8 +3462,8 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="AEN1358"
->5.4.4.2. The Path Pattern</A
+NAME="AEN1414"
+>7.4.4.2. The Path Pattern</A
></H4
><P
> <SPAN
@@ -3295,7 +3504,8 @@ CLASS="QUOTE"
i.e. it matches as if it would start with a <SPAN
CLASS="QUOTE"
>"^"</SPAN
->.</P
+> (regular expression speak
+ for the beginning of a line).</P
><P
> Please also note that matching in the path is case
<I
@@ -3327,33 +3537,33 @@ CLASS="SECT3"
CLASS="SECT3"
><A
NAME="ACTIONS"
->5.4.5. Actions</A
+>7.4.5. Actions</A
></H3
><P
-> Actions are enabled if preceded with a <SPAN
+> All actions are disabled by default, until they are explicitly enabled
+ somewhere in an actions file. Actions are turned on if preceded with a
+ <SPAN
CLASS="QUOTE"
>"+"</SPAN
->, and disabled if
- preceded with a <SPAN
+>, and turned off if preceded with a <SPAN
CLASS="QUOTE"
>"-"</SPAN
->. So a <SPAN
+>. So a
+ <SPAN
CLASS="QUOTE"
>"+action"</SPAN
-> means
- <SPAN
+> means <SPAN
CLASS="QUOTE"
>"do that action"</SPAN
->, e.g. <SPAN
+>, e.g.
+ <SPAN
CLASS="QUOTE"
>"+block"</SPAN
-> means please
- <SPAN
+> means please <SPAN
CLASS="QUOTE"
->"block the following URLs and/or patterns"</SPAN
->. All actions are
- disabled by default, until they are explicitly enabled somewhere in an actions
- file.</P
+>"block the following URL
+ patterns"</SPAN
+>. </P
><P
>
Actions are invoked by enclosing the action name in curly braces (e.g.
@@ -3436,12 +3646,12 @@ CLASS="QUOTE"
Multi-value, e.g. <SPAN
CLASS="QUOTE"
>"{+/-add-header{Name: value}}"</SPAN
-> ot
+> or
<SPAN
CLASS="QUOTE"
->"{+/-wafer{name=value}}"</SPAN
+>"{+/-send-wafer{name=value}}"</SPAN
>), where some value needs to be defined
- in addition to simply enabling the actino. Examples:
+ in addition to simply enabling the action. Examples:
</P
><P
> <TT
@@ -3481,26 +3691,28 @@ CLASS="APPLICATION"
></UL
></P
><P
-> If nothing is specified in this file, no <SPAN
+> If nothing is specified in any actions file, no <SPAN
CLASS="QUOTE"
>"actions"</SPAN
-> are taken.
- So in this case <SPAN
+> are
+ taken. So in this case <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
> would just be a
- normal, non-blocking, non-anonymizing proxy. You must specifically
- enable the privacy and blocking features you need (although the
- provided default <TT
-CLASS="FILENAME"
->default.action</TT
-> file will
- give a good starting point).</P
+ normal, non-blocking, non-anonymizing proxy. You must specifically enable the
+ privacy and blocking features you need (although the provided default actions
+ files will give a good starting point).</P
><P
> Later defined actions always over-ride earlier ones. So exceptions
to any rules you make, should come in the latter part of the file. For
multi-valued actions, the actions are applied in the order they are
- specified.</P
+ specified. Actions files are processed in the order they are defined
+ in <TT
+CLASS="FILENAME"
+>config</TT
+> (the default installation has three
+ actions files). It also quite possible for any given URL pattern to
+ match more than one action!</P
><P
> The list of valid <SPAN
CLASS="APPLICATION"
@@ -3515,7 +3727,7 @@ CLASS="SECT4"
CLASS="SECT4"
><A
NAME="ADD-HEADER"
->5.4.5.1. <I
+>7.4.5.1. <I
CLASS="EMPHASIS"
>+add-header{Name: value}</I
></A
@@ -3582,7 +3794,7 @@ CLASS="SECT4"
CLASS="SECT4"
><A
NAME="BLOCK"
->5.4.5.2. <I
+>7.4.5.2. <I
CLASS="EMPHASIS"
>+block</I
></A
@@ -3624,7 +3836,7 @@ CLASS="EMPHASIS"
><br>
<I
CLASS="EMPHASIS"
->.example.com</I
+>.banners.example.com</I
><br>
<I
CLASS="EMPHASIS"
@@ -3636,41 +3848,77 @@ CLASS="EMPHASIS"
>Notes:</DT
><DD
><P
-> <SPAN
+> If a URL matches one of the blocked patterns, <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> will display its
- special <SPAN
+>
+ will intercept the URL and display its special <SPAN
CLASS="QUOTE"
>"BLOCKED"</SPAN
-> page if a URL matches one of the
- blocked patterns. If there is sufficient space, a large red
- banner will appear with a friendly message about why the page
- was blocked, and a way to go there anyway. If there is insufficient
- space a smaller blocked page will appear without the red banner.
- One exception is if the URL matches both <SPAN
+> page
+ instead. If there is sufficient space, a large red banner will appear with
+ a friendly message about why the page was blocked, and a way to go there
+ anyway. If there is insufficient space a smaller blocked page will appear
+ without the red banner.
+ <A
+HREF="http://ads.bannerserver.example.com/nasty-ads/sponsor.html"
+TARGET="_top"
+>Click here</A
+>
+ to view the default blocked HTML page (<SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> must be running
+ for this to work as intended!).
+ </P
+><P
+>
+ A very important exception is if the URL <I
+CLASS="EMPHASIS"
+>matches both</I
+>
+ <SPAN
CLASS="QUOTE"
>"+block"</SPAN
->
- and <SPAN
+> and <A
+HREF="configuration.html#HANDLE-AS-IMAGE"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
->"+image"</SPAN
->, then it can be handled by
- <SPAN
+>"+handle-as-image"</SPAN
+></A
+>,
+ then it will be handled by
+ <A
+HREF="configuration.html#SET-IMAGE-BLOCKER"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
->"+image-blocker"</SPAN
-> (see below).
+>"+set-image-blocker"</SPAN
+></A
+>
+ (see below). It is important to understand this process, in order
+ to understand how <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> is able to deal with
+ ads and other objectionable content.
</P
><P
-> The <SPAN
+> The <A
+HREF="configuration.html#FILTER"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"+filter"</SPAN
-> action can also perform some of the
+></A
+>
+ action can also perform some of the
same functionality as <SPAN
CLASS="QUOTE"
>"+block"</SPAN
>, but by virtue of very
- different programming techniques, and is typically used for different
+ different programming techniques, and is most often used for different
reasons.
</P
></DD
@@ -3683,7 +3931,7 @@ CLASS="SECT4"
CLASS="SECT4"
><A
NAME="DEANIMATE-GIFS"
->5.4.5.3. <I
+>7.4.5.3. <I
CLASS="EMPHASIS"
>+deanimate-gifs</I
></A
@@ -3761,10 +4009,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="DOWNGRADE"
->5.4.5.4. <I
+NAME="DOWNGRADE-HTTP-VERSION"
+>7.4.5.4. <I
CLASS="EMPHASIS"
->+downgrade</I
+>+downgrade-http-version</I
></A
></H4
><P
@@ -3784,7 +4032,7 @@ CLASS="VARIABLELIST"
><P
> <SPAN
CLASS="QUOTE"
->"+downgrade"</SPAN
+>"+downgrade-http-version"</SPAN
> will downgrade HTTP/1.1 client requests to
HTTP/1.0 and downgrade the responses as well.
</P
@@ -3803,7 +4051,7 @@ CLASS="QUOTE"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+downgrade}</I
+>{+downgrade-http-version}</I
><br>
<I
CLASS="EMPHASIS"
@@ -3821,7 +4069,7 @@ CLASS="APPLICATION"
>Privoxy</SPAN
> doesn't handle well yet. HTTP/1.1 is
only partially implemented. Default is not to downgrade requests. This is
- an infrequently needed action, and is used to help with problem sites only.
+ an infrequently needed action, and is used to help with rare problem sites only.
</P
></DD
></DL
@@ -3833,7 +4081,7 @@ CLASS="SECT4"
CLASS="SECT4"
><A
NAME="FAST-REDIRECTS"
->5.4.5.5. <I
+>7.4.5.5. <I
CLASS="EMPHASIS"
>+fast-redirects</I
></A
@@ -3865,7 +4113,7 @@ CLASS="QUOTE"
CLASS="APPLICATION"
>Privoxy</SPAN
> can cut off
- all but the last valid URL in redirect request and send a local redirect
+ all but the last valid URL in a redirect request and send a local redirect
back to your browser without contacting the intermediate site(s).
</P
></DD
@@ -3914,8 +4162,11 @@ CLASS="EMPHASIS"
the advertisers.
</P
><P
-> This is a normally on feature, and often requires exceptions for sites that
- are sensitive to defeating this mechanism.
+> This is a normally <SPAN
+CLASS="QUOTE"
+>"on"</SPAN
+> feature, and often requires exceptions
+ for sites that are sensitive to defeating this mechanism.
</P
></DD
></DL
@@ -3927,7 +4178,7 @@ CLASS="SECT4"
CLASS="SECT4"
><A
NAME="FILTER"
->5.4.5.6. <I
+>7.4.5.6. <I
CLASS="EMPHASIS"
>+filter</I
></A
@@ -4203,7 +4454,7 @@ CLASS="EMPHASIS"
CLASS="QUOTE"
>"roll your own"</SPAN
>.
- Filtering operates on a line by line basis.
+ Filtering operates on a line by line basis throughout the entire page.
</P
><P
> Filtering requires buffering the page content, which may appear to
@@ -4213,16 +4464,25 @@ CLASS="QUOTE"
noticeable on slower connections.
</P
><P
-> Filtering can achieve some of the effects as the <SPAN
+> Filtering can achieve some of the effects as the
+ <A
+HREF="configuration.html#BLOCK"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"+block"</SPAN
->
+></A
+>
action, i.e. it can be used to block ads and banners. In the overall
- scheme of things, filtering is one of the last things <SPAN
+ scheme of things, filtering is one of the first things <SPAN
CLASS="QUOTE"
>"Privoxy"</SPAN
>
- does with a web page. So other actions are applied first.
+ does with a web page. So other most other actions are applied to the
+ already <SPAN
+CLASS="QUOTE"
+>"filtered"</SPAN
+> page.
</P
></DD
></DL
@@ -4233,10 +4493,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="HIDE-FORWARDED"
->5.4.5.7. <I
+NAME="HIDE-FORWARDED-FOR-HEADERS"
+>7.4.5.7. <I
CLASS="EMPHASIS"
->+hide-forwarded</I
+>+hide-forwarded-for-headers</I
></A
></H4
><P
@@ -4271,7 +4531,7 @@ CLASS="VARIABLELIST"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+hide-forwarded}</I
+>{+hide-forwarded-for-headers}</I
><br>
<I
CLASS="EMPHASIS"
@@ -4294,10 +4554,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="HIDE-FROM"
->5.4.5.8. <I
+NAME="HIDE-FROM-HEADER"
+>7.4.5.8. <I
CLASS="EMPHASIS"
->+hide-from</I
+>+hide-from-header</I
></A
></H4
><P
@@ -4339,7 +4599,7 @@ CLASS="QUOTE"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+hide-from{block}}</I
+>{+hide-from-header{block}}</I
><br>
<I
CLASS="EMPHASIS"
@@ -4354,7 +4614,15 @@ CLASS="EMPHASIS"
> The keyword <SPAN
CLASS="QUOTE"
>"block"</SPAN
-> will completely remove the header.
+> will completely remove the header
+ (not to be confused with the <A
+HREF="configuration.html#BLOCK"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+block"</SPAN
+></A
+> action).
Alternately, you can specify any value you prefer to send to the web
server.
</P
@@ -4368,14 +4636,14 @@ CLASS="SECT4"
CLASS="SECT4"
><A
NAME="HIDE-REFERER"
->5.4.5.9. <I
+>7.4.5.9. <I
CLASS="EMPHASIS"
->+hide-referer</I
-></A
-></H4
><A
NAME="HIDE-REFERRER"
></A
+>+hide-referer</I
+></A
+></H4
><P
></P
><DIV
@@ -4471,7 +4739,7 @@ CLASS="SECT4"
CLASS="SECT4"
><A
NAME="HIDE-USER-AGENT"
->5.4.5.10. <I
+>7.4.5.10. <I
CLASS="EMPHASIS"
>+hide-user-agent</I
></A
@@ -4537,10 +4805,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="IMAGE"
->5.4.5.11. <I
+NAME="HANDLE-AS-IMAGE"
+>7.4.5.11. <I
CLASS="EMPHASIS"
->+image</I
+>+handle-as-image</I
></A
></H4
><P
@@ -4562,7 +4830,8 @@ CLASS="VARIABLELIST"
CLASS="APPLICATION"
>Privoxy</SPAN
> should treat
- automatically as an image.
+ automatically as an image, and is an important ingredient of how
+ ads are handled.
</P
></DD
><DT
@@ -4579,7 +4848,7 @@ CLASS="APPLICATION"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+image}</I
+>{+handle-as-image}</I
><br>
<I
CLASS="EMPHASIS"
@@ -4595,18 +4864,38 @@ CLASS="EMPHASIS"
<SPAN
CLASS="QUOTE"
>"+block"</SPAN
->ed, in which case a <SPAN
+>ed, in which case a user definable image can
+ be sent rather than a HTML page. This is integral to the whole concept of
+ ad blocking: the URL must match <I
+CLASS="EMPHASIS"
+>both</I
+> a <A
+HREF="configuration.html#BLOCK"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
->"blocked"</SPAN
-> image can
- be sent rather than a HTML page. (See <SPAN
+>"+block"</SPAN
+></A
+> rule,
+ <I
+CLASS="EMPHASIS"
+>and</I
+> <SPAN
CLASS="QUOTE"
->"+image-blocker{}"</SPAN
-> below
- for the control over what is actually sent.)
+>"+handle-as-image"</SPAN
+>.
+ (See <A
+HREF="configuration.html#SET-IMAGE-BLOCKER"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+set-image-blocker"</SPAN
+></A
+>
+ below for control over what will actually be displayed by the browser.)
</P
><P
-> There is little reason to change the default definition for this.
+> There is little reason to change the default definition for this action.
</P
></DD
></DL
@@ -4617,10 +4906,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="IMAGE-BLOCKER"
->5.4.5.12. <I
+NAME="SET-IMAGE-BLOCKER"
+>7.4.5.12. <I
CLASS="EMPHASIS"
->+image-blocker</I
+>+set-image-blocker</I
></A
></H4
><P
@@ -4638,14 +4927,27 @@ CLASS="VARIABLELIST"
>Typical uses:</DT
><DD
><P
-> Decide what to do with URLs that end up tagged with both <SPAN
+> Decide what to do with URLs that end up tagged with <I
+CLASS="EMPHASIS"
+>both</I
+>
+ <A
+HREF="configuration.html#BLOCK"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
->"{+block}"</SPAN
+>"+block"</SPAN
+></A
>
- and <SPAN
+ and <A
+HREF="configuration.html#HANDLE-AS-IMAGE"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
->"{+image}"</SPAN
->, e.g an advertisement.
+>"+handle-as-image"</SPAN
+></A
+>,
+ e.g an advertisement.
</P
></DD
><DT
@@ -4654,7 +4956,7 @@ CLASS="QUOTE"
><P
> There are four available options: <SPAN
CLASS="QUOTE"
->"-image-blocker"</SPAN
+>"-set-image-blocker"</SPAN
> will send a HTML
<SPAN
CLASS="QUOTE"
@@ -4663,21 +4965,33 @@ CLASS="QUOTE"
CLASS="QUOTE"
>"broken
image"</SPAN
-> icon. <SPAN
+> icon.
+ <SPAN
CLASS="QUOTE"
->"+image-blocker{blank}"</SPAN
-> will send a 1x1
- transparent GIF image. <SPAN
+>"+set-image-blocker{<I
+CLASS="EMPHASIS"
+>blank</I
+>}"</SPAN
+> will send a
+ 1x1 transparent GIF image.
+ <SPAN
CLASS="QUOTE"
->"+image-blocker{pattern}"</SPAN
+>"+set-image-blocker{<I
+CLASS="EMPHASIS"
+>pattern</I
+>}"</SPAN
> will send a
checkerboard type pattern (the default). And finally,
<SPAN
CLASS="QUOTE"
->"+image-blocker{http://xyz.com}"</SPAN
-> will send a HTTP temporary
- redirect to the specified image. This has the advantage of the icon being
- being cached by the browser, which will speed up the display.
+>"+set-image-blocker{<I
+CLASS="EMPHASIS"
+>http://xyz.com</I
+>}"</SPAN
+> will
+ send a HTTP temporary redirect to the specified image. This has the
+ advantage of the icon being being cached by the browser, which will speed
+ up the display.
</P
></DD
><DT
@@ -4687,7 +5001,7 @@ CLASS="QUOTE"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+image-blocker{blank}}</I
+>{+set-image-blocker{blank}}</I
><br>
<I
CLASS="EMPHASIS"
@@ -4702,15 +5016,15 @@ CLASS="EMPHASIS"
> If you want <I
CLASS="EMPHASIS"
>invisible</I
-> ads, they need to be both
- defined as <I
+> ads, they need to meet
+ criteria as matching both <I
CLASS="EMPHASIS"
>images</I
> and <I
CLASS="EMPHASIS"
>blocked</I
->.
- And then, <SPAN
+>
+ actions. And then, <SPAN
CLASS="QUOTE"
>"image-blocker"</SPAN
> should be set to
@@ -4718,12 +5032,13 @@ CLASS="QUOTE"
CLASS="QUOTE"
>"blank"</SPAN
> for invisibility. Note you cannot treat HTML pages as
- images in most cases. For instance, frames require an HTML page to display.
- So a frame that is an ad, cannot be treated as an image. Forcing an
- <SPAN
+ images in most cases. For instance, frames require an HTML page to
+ display. So a frame that is an ad, typically cannot be treated as an image.
+ Forcing an <SPAN
CLASS="QUOTE"
>"image"</SPAN
-> in this situation just will not work.
+> in this situation just will not work
+ reliably.
</P
></DD
></DL
@@ -4735,7 +5050,7 @@ CLASS="SECT4"
CLASS="SECT4"
><A
NAME="LIMIT-CONNECT"
->5.4.5.13. <I
+>7.4.5.13. <I
CLASS="EMPHASIS"
>+limit-connect</I
></A
@@ -4782,15 +5097,15 @@ CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
>+limit-connect{443}</I
-> # This is the default and need not be specified.<br>
+> # This is the default and need not be specified.<br>
<I
CLASS="EMPHASIS"
>+limit-connect{80,443}</I
-> # Ports 80 and 443 are OK.<br>
+> # Ports 80 and 443 are OK.<br>
<I
CLASS="EMPHASIS"
>+limit-connect{-3, 7, 20-100, 500-}</I
-> # Port less than 3, 7, 20 to 100 and above 500 are OK.<br>
+> # Port less than 3, 7, 20 to 100 and above 500 are OK.<br>
</P
></DD
><DT
@@ -4827,10 +5142,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="NO-COMPRESSION"
->5.4.5.14. <I
+NAME="PREVENT-COMPRESSION"
+>7.4.5.14. <I
CLASS="EMPHASIS"
->+no-compression</I
+>+prevent-compression</I
></A
></H4
><P
@@ -4865,7 +5180,7 @@ CLASS="VARIABLELIST"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+no-compression}</I
+>{+prevent-compression}</I
><br>
<I
CLASS="EMPHASIS"
@@ -4881,21 +5196,36 @@ CLASS="EMPHASIS"
<SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
->, since <SPAN
+>, since
+ <A
+HREF="configuration.html#FILTER"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"+filter"</SPAN
+></A
>,
- <SPAN
+ <A
+HREF="configuration.html#KILL-POPUPS"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
->"+no-popup"</SPAN
-> and <SPAN
+>"+kill-popups"</SPAN
+></A
+>
+ and <A
+HREF="configuration.html#GIF-DEANIMATE"
+TARGET="_top"
+><SPAN
CLASS="QUOTE"
>"+gif-deanimate"</SPAN
-> will not work
- on compressed data. This will slow down connections to those websites,
- though. Default typically is to turn <SPAN
+></A
+>
+ will not work on compressed data. This will slow down connections to those
+ websites, though. Default typically is to turn
+ <SPAN
CLASS="QUOTE"
->"no-compression"</SPAN
+>"prevent-compression"</SPAN
> on.
</P
></DD
@@ -4907,10 +5237,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="NO-COOKIES-KEEP"
->5.4.5.15. <I
+NAME="SESSION-COOKIES-ONLY"
+>7.4.5.15. <I
CLASS="EMPHASIS"
->+no-cookies-keep</I
+>+session-cookies-only</I
></A
></H4
><P
@@ -4928,7 +5258,10 @@ CLASS="VARIABLELIST"
>Typical uses:</DT
><DD
><P
-> Allow cookies for the current browser session only.
+> Allow cookies for the current browser session <I
+CLASS="EMPHASIS"
+>only</I
+>.
</P
></DD
><DT
@@ -4939,13 +5272,13 @@ CLASS="VARIABLELIST"
</P
></DD
><DT
->Example usage:</DT
+>Example usage (disabling):</DT
><DD
><P
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+no-cookies-keep}</I
+>{-session-cookies-only}</I
><br>
<I
CLASS="EMPHASIS"
@@ -4959,15 +5292,27 @@ CLASS="EMPHASIS"
><P
> If websites set cookies, <SPAN
CLASS="QUOTE"
->"no-cookies-keep"</SPAN
+>"+session-cookies-only"</SPAN
> will make sure
they are erased when you exit and restart your web browser. This makes
profiling cookies useless, but won't break sites which require cookies so
that you can log in for transactions. This is generally turned on for all
- sites. Sometimes referred to as <SPAN
+ sites, and is the recommended setting.
+ </P
+><P
+> <SPAN
CLASS="QUOTE"
->"session cookies"</SPAN
->.
+>"+prevent-*-cookies"</SPAN
+> actions should be turned off as well (see
+ below), for <SPAN
+CLASS="QUOTE"
+>"+session-cookies-only"</SPAN
+> to work. Or, else no cookies
+ will get through at all. For, <SPAN
+CLASS="QUOTE"
+>"persistent"</SPAN
+> cookies that survive
+ across browser sessions, see below as well.
</P
></DD
></DL
@@ -4978,10 +5323,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="NO-COOKIES-READ"
->5.4.5.16. <I
+NAME="PREVENT-READING-COOKIES"
+>7.4.5.16. <I
CLASS="EMPHASIS"
->+no-cookies-read</I
+>+prevent-reading-cookies</I
></A
></H4
><P
@@ -5017,7 +5362,7 @@ CLASS="VARIABLELIST"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+no-cookies-read}</I
+>{+prevent-reading-cookies}</I
><br>
<I
CLASS="EMPHASIS"
@@ -5031,9 +5376,29 @@ CLASS="EMPHASIS"
><P
> Often used in conjunction with <SPAN
CLASS="QUOTE"
->"+no-cookies-set"</SPAN
+>"+prevent-setting-cookies"</SPAN
> to
- disable persistant cookies completely.
+ disable cookies completely. Note that
+ <A
+HREF="configuration.html#SESSION-COOKIES-ONLY"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"+session-cookies-only"</SPAN
+></A
+>
+ requires these to both be disabled (or else it never gets any cookies to cache).
+ </P
+><P
+> For <SPAN
+CLASS="QUOTE"
+>"persistent"</SPAN
+> cookies to work (i.e. they survive across browser
+ sessions and reboots), all three cookie settings should be <SPAN
+CLASS="QUOTE"
+>"off"</SPAN
+>
+ for the specified sites.
</P
></DD
></DL
@@ -5044,10 +5409,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="NO-COOKIES-SET"
->5.4.5.17. <I
+NAME="PREVENT-SETTING-COOKIES"
+>7.4.5.17. <I
CLASS="EMPHASIS"
->+no-cookies-set</I
+>+prevent-setting-cookies</I
></A
></H4
><P
@@ -5065,7 +5430,7 @@ CLASS="VARIABLELIST"
>Typical uses:</DT
><DD
><P
-> Explicitly block the web server from sending cookies to your
+> Explicitly block the web server from storing cookies on your
system.
</P
></DD
@@ -5083,7 +5448,7 @@ CLASS="VARIABLELIST"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+no-cookies-set}</I
+>{+prevent-setting-cookies}</I
><br>
<I
CLASS="EMPHASIS"
@@ -5097,9 +5462,9 @@ CLASS="EMPHASIS"
><P
> Often used in conjunction with <SPAN
CLASS="QUOTE"
->"+no-cookies-read"</SPAN
+>"+prevent-reading-cookies"</SPAN
> to
- disable persistant cookies completely.
+ disable cookies completely (see above).
</P
></DD
></DL
@@ -5110,15 +5475,15 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="NO-POPUP"
->5.4.5.18. <I
+NAME="KILL-POPUP"
+>7.4.5.18. <I
CLASS="EMPHASIS"
->+no-popup</I
+>+kill-popups<A
+NAME="KILL-POPUPS"
></A
-></H4
-><A
-NAME="NO-POPUPS"
+></I
></A
+></H4
><P
></P
><DIV
@@ -5151,7 +5516,7 @@ CLASS="VARIABLELIST"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+no-popup}</I
+>{+kill-popups}</I
><br>
<I
CLASS="EMPHASIS"
@@ -5165,20 +5530,25 @@ CLASS="EMPHASIS"
><P
> <SPAN
CLASS="QUOTE"
->"+no-popup"</SPAN
+>"+kill-popups"</SPAN
> uses a built in filter to disable pop-ups
that use the <TT
CLASS="LITERAL"
>window.open()</TT
-> function, etc.
- </P
-><P
-> An alternate spelling is <SPAN
+> function, etc. This is
+ one of the first actions processed by <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+ as it contacts the remote web server. This action is not always 100% reliable,
+ and is supplemented by <SPAN
CLASS="QUOTE"
->"+no-popups"</SPAN
->, which is
- interchangeable.
- </P
+>"+filter{<I
+CLASS="EMPHASIS"
+>popups</I
+>}"</SPAN
+>.
+ </P
></DD
></DL
></DIV
@@ -5188,10 +5558,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="VANILLA-WAFER"
->5.4.5.19. <I
+NAME="SEND-VANILLA-WAFER"
+>7.4.5.19. <I
CLASS="EMPHASIS"
->+vanilla-wafer</I
+>+send-vanilla-wafer</I
></A
></H4
><P
@@ -5227,7 +5597,7 @@ CLASS="VARIABLELIST"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+vanilla-wafer}</I
+>{+send-vanilla-wafer}</I
><br>
<I
CLASS="EMPHASIS"
@@ -5244,7 +5614,7 @@ CLASS="FILENAME"
>jarfile</TT
>
for saving cookies. Of course, this is a (relatively) unique header and
- could be used to track you.
+ could conceivably be used to track you.
</P
></DD
></DL
@@ -5255,10 +5625,10 @@ CLASS="SECT4"
><H4
CLASS="SECT4"
><A
-NAME="WAFER"
->5.4.5.20. <I
+NAME="SEND-WAFER"
+>7.4.5.20. <I
CLASS="EMPHASIS"
->+wafer</I
+>+send-wafer</I
></A
></H4
><P
@@ -5293,7 +5663,7 @@ CLASS="VARIABLELIST"
CLASS="LITERALLAYOUT"
> <I
CLASS="EMPHASIS"
->{+wafer{name=value}}</I
+>{+send-wafer{name=value}}</I
><br>
<I
CLASS="EMPHASIS"
@@ -5318,7 +5688,7 @@ CLASS="SECT4"
CLASS="SECT4"
><A
NAME="ACT-EXAMPLES"
->5.4.5.21. Actions Examples</A
+>7.4.5.21. Actions Examples</A
></H3
><P
> Note that the meaning of any of the above examples is reversed by preceding
@@ -5334,39 +5704,54 @@ CLASS="QUOTE"
CLASS="QUOTE"
>"on"</SPAN
>.
- Some actions that are turned on the default section do typically require
- exceptions to be listed in the lower sections of actions file.</P
+ But, other actions that are turned on the default section <I
+CLASS="EMPHASIS"
+>do
+ typically require</I
+> exceptions to be listed in the lower sections of
+ actions file. E.g. by default no URLs are <SPAN
+CLASS="QUOTE"
+>"blocked"</SPAN
+> (i.e. in
+ the default definitions of <TT
+CLASS="FILENAME"
+>default.action</TT
+>). We need
+ exceptions to this in order to enable ad blocking.</P
><P
> Some examples:</P
><P
-> Turn off cookies by default, then allow a few through for specified sites:</P
+> Turn off cookies by default, then allow a few through for specified sites
+ (showing an excerpt from the <SPAN
+CLASS="QUOTE"
+>"default"</SPAN
+> section of an actions
+ file ONLY):</P
><P
> <TT
CLASS="LITERAL"
> <P
CLASS="LITERALLAYOUT"
-> # Turn off all persistent cookies<br>
- { +no-cookies-read }<br>
- { +no-cookies-set }<br>
- <br>
- # Allow cookies for this browser session ONLY<br>
- { +no-cookies-keep }<br>
+> # Excerpt only:<br>
+ # Allow cookies to and from the server, but<br>
+ # for this browser session ONLY<br>
+ { <br>
+ # other actions normally listed here...<br>
+ -prevent-setting-cookies \<br>
+ -prevent-reading-cookies \<br>
+ +session-cookies-only \ <br>
+ }<br>
+ / # match all URLs<br>
<br>
# Exceptions to the above, sites that benefit from persistent cookies<br>
- # that saved from one browser session to the next.<br>
- { -no-cookies-read }<br>
- { -no-cookies-set }<br>
- { -no-cookies-keep }<br>
- .javasoft.com<br>
- .sun.com<br>
- .yahoo.com<br>
- .msdn.microsoft.com<br>
- .redhat.com<br>
+ # that are saved from one browser session to the next.<br>
+ { -session-cookies-only }<br>
+ .javasoft.com<br>
+ .sun.com<br>
+ .yahoo.com<br>
+ .msdn.microsoft.com<br>
+ .redhat.com<br>
<br>
- # Alternative way of saying the same thing<br>
- {-no-cookies-set -no-cookies-read -no-cookies-keep}<br>
- .sourceforge.net<br>
- .sf.net<br>
</P
>
</TT
@@ -5381,13 +5766,17 @@ CLASS="QUOTE"
CLASS="LITERAL"
> <P
CLASS="LITERALLAYOUT"
-> # Turn them off!<br>
- {+fast-redirects}<br>
+> # Turn them off (excerpt only)!<br>
+ {<br>
+ # other actions normally listed here...<br>
+ +fast-redirects<br>
+ }<br>
+ / # match all URLs<br>
<br>
# Reverse it for these two sites, which don't work right without it.<br>
{-fast-redirects}<br>
- www.ukc.ac.uk/cgi-bin/wac\.cgi\?<br>
- login.yahoo.com<br>
+ www.ukc.ac.uk/cgi-bin/wac\.cgi\?<br>
+ login.yahoo.com<br>
</P
>
</TT
@@ -5405,14 +5794,18 @@ CLASS="FILENAME"
CLASS="LITERAL"
> <P
CLASS="LITERALLAYOUT"
-> # Run everything through the filter file, using only the<br>
+> # Run everything through the filter file, using only certain<br>
# specified sections:<br>
- +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}\<br>
- +filter{webbugs} +filter{nimda} +filter{banners-by-size}<br>
+ {<br>
+ # other actions normally listed here...<br>
+ +filter{html-annoyances} +filter{js-annoyances} +filter{kill-popups}\<br>
+ +filter{webbugs} +filter{nimda} +filter{banners-by-size}<br>
+ }<br>
+ / #match all URLs<br>
<br>
- # Then disable filtering of code from sourceforge!<br>
+ # Then disable filtering of code from all sourceforge domains!<br>
{-filter}<br>
- .cvs.sourceforge.net<br>
+ .sourceforge.net<br>
</P
>
</TT
@@ -5425,12 +5818,16 @@ CLASS="QUOTE"
the <SPAN
CLASS="QUOTE"
>"blocked"</SPAN
-> banner). Many of these use
- <A
+> banner). Typically, the <SPAN
+CLASS="QUOTE"
+>"block"</SPAN
+>
+ action is off by default in the upper section of an actions file, then enabled
+ against certain URLs and patterns in the lower part of the file. Many of these use <A
HREF="appendix.html#REGEX"
>regular expressions</A
-> that will expand to match
- multiple URLs: </P
+> that will expand to match multiple
+ URLs: </P
><P
> <TT
CLASS="LITERAL"
@@ -5438,48 +5835,16 @@ CLASS="LITERAL"
CLASS="LITERALLAYOUT"
> # Blocklist:<br>
{+block}<br>
- /.*/(.*[-_.])?ads?[0-9]?(/|[-_.].*|\.(gif|jpe?g))<br>
- /.*/(.*[-_.])?count(er)?(\.cgi|\.dll|\.exe|[?/])<br>
+ ad*.<br>
+ .*ads.<br>
+ banner?.<br>
+ count*.<br>
+ /.*count(er)?\.(pl|cgi|exe|dll|asp|php[34]?)<br>
+ /(?:.*/)?(publicite|werbung|rekla(ma|me|am)|annonse|maino(kset|nta|s)?)/<br>
+ .hitbox.com <br>
/.*/(ng)?adclient\.cgi<br>
/.*/(plain|live|rotate)[-_.]?ads?/<br>
- /.*/(sponsor)s?[0-9]?/<br>
- /.*/_?(plain|live)?ads?(-banners)?/<br>
/.*/abanners/<br>
- /.*/ad(sdna_image|gifs?)/<br>
- /.*/ad(server|stream|juggler)\.(cgi|pl|dll|exe)<br>
- /.*/adbanners/<br>
- /.*/adserver<br>
- /.*/adstream\.cgi<br>
- /.*/adv((er)?ts?|ertis(ing|ements?))?/<br>
- /.*/banner_?ads/<br>
- /.*/banners?/<br>
- /.*/banners?\.cgi/<br>
- /.*/cgi-bin/centralad/getimage<br>
- /.*/images/addver\.gif<br>
- /.*/images/marketing/.*\.(gif|jpe?g)<br>
- /.*/popupads/<br>
- /.*/siteads/<br>
- /.*/sponsor.*\.gif<br>
- /.*/sponsors?[0-9]?/<br>
- /.*/advert[0-9]+\.jpg<br>
- /Media/Images/Adds/<br>
- /ad_images/<br>
- /adimages/<br>
- /.*/ads/<br>
- /bannerfarm/<br>
- /grafikk/annonse/<br>
- /graphics/defaultAd/<br>
- /image\.ng/AdType<br>
- /image\.ng/transactionID<br>
- /images/.*/.*_anim\.gif # alvin brattli<br>
- /ip_img/.*\.(gif|jpe?g)<br>
- /rotateads/<br>
- /rotations/ <br>
- /worldnet/ad\.cgi<br>
- /cgi-bin/nph-adclick.exe/<br>
- /.*/Image/BannerAdvertising/<br>
- /.*/ad-bin/<br>
- /.*/adlib/server\.cgi<br>
/autoads/<br>
</P
>
@@ -5489,12 +5854,12 @@ CLASS="LITERALLAYOUT"
> Note that many of these actions have the potential to cause a page to
misbehave, possibly even not to display at all. There are many ways
a site designer may choose to design his site, and what HTTP header
- content he may depend on. There is no way to have hard and fast rules
- for all sites. See the <A
+ content, and other criteria, he may depend on. There is no way to have hard
+ and fast rules for all sites. See the <A
HREF="appendix.html#ACTIONSANAT"
>Appendix</A
->
- for a brief example on troubleshooting actions.</P
+> for a brief example on troubleshooting
+ actions.</P
></DIV
></DIV
><DIV
@@ -5502,8 +5867,8 @@ CLASS="SECT3"
><H3
CLASS="SECT3"
><A
-NAME="AEN2110"
->5.4.6. Aliases</A
+NAME="ALIASES"
+>7.4.6. Aliases</A
></H3
><P
> Custom <SPAN
@@ -5557,16 +5922,14 @@ CLASS="QUOTE"
>. Alias names are not case sensitive, and
<I
CLASS="EMPHASIS"
->must be defined before anything</I
-> else in the
- <TT
-CLASS="FILENAME"
->default.action</TT
->file! And there can only be one set of
- <SPAN
+>must be defined before other actions</I
+> in the
+ actions file! And there can only be one set of <SPAN
CLASS="QUOTE"
>"aliases"</SPAN
-> defined.</P
+>
+ defined per file. Each actions file may have its own aliases, but they are
+ only visible within that file.</P
><P
> Now let's define a few aliases:</P
><P
@@ -5576,17 +5939,16 @@ CLASS="LITERAL"
CLASS="LITERALLAYOUT"
> # Useful custom aliases we can use later. These must come first!<br>
{{alias}}<br>
- +no-cookies = +no-cookies-set +no-cookies-read<br>
- -no-cookies = -no-cookies-set -no-cookies-read<br>
- fragile = -block -no-cookies -filter -fast-redirects -hide-referer -no-popups<br>
- shop = -no-cookies -filter -fast-redirects<br>
- +imageblock = +block +image<br>
+ +prevent-cookies = +prevent-setting-cookies +prevent-reading-cookies<br>
+ -prevent-cookies = -prevent-setting-cookies -prevent-reading-cookies<br>
+ fragile = -block -prevent-cookies -filter -fast-redirects -hide-referer -kill-popups<br>
+ shop = -prevent-cookies -filter -fast-redirects<br>
+ +imageblock = +block +handle-as-image<br>
<br>
- #For people who don't like to type too much: ;-)<br>
- c0 = +no-cookies<br>
- c1 = -no-cookies<br>
- c2 = -no-cookies-set +no-cookies-read<br>
- c3 = +no-cookies-set -no-cookies-read<br>
+ # Aliases defined from other aliases, for people who don't like to type <br>
+ # too much: ;-)<br>
+ c0 = +prevent-cookies<br>
+ c1 = -prevent-cookies<br>
#... etc. Customize to your heart's content.<br>
</P
>
@@ -5600,7 +5962,9 @@ CLASS="QUOTE"
CLASS="QUOTE"
>"fragile"</SPAN
>
- aliases from above:</P
+ aliases from above. These would appear in the lower sections of an
+ actions file as exceptions to the default actions (as defined in the
+ upper section):</P
><P
> <TT
CLASS="LITERAL"
@@ -5609,21 +5973,20 @@ CLASS="LITERALLAYOUT"
> # These sites are very complex and require<br>
# minimal interference.<br>
{fragile}<br>
- .office.microsoft.com<br>
- .windowsupdate.microsoft.com<br>
- .nytimes.com<br>
+ .office.microsoft.com<br>
+ .windowsupdate.microsoft.com<br>
+ .nytimes.com<br>
<br>
# Shopping sites - but we still want to block ads.<br>
{shop}<br>
- .quietpc.com<br>
- .worldpay.com # for quietpc.com<br>
- .jungle.com<br>
- .scan.co.uk<br>
+ .quietpc.com<br>
+ .worldpay.com # for quietpc.com<br>
+ .scan.co.uk<br>
<br>
# These shops require pop-ups also <br>
- {shop -no-popups}<br>
- .dabs.com<br>
- .overclockers.co.uk<br>
+ {shop -kill-popups}<br>
+ .dabs.com<br>
+ .overclockers.co.uk<br>
</P
>
</TT
@@ -5648,8 +6011,8 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="FILTERFILE"
->5.5. The Filter File</A
+NAME="FILTER-FILE"
+>7.5. The Filter File</A
></H2
><P
> Any web page can be dynamically modified with the filter file. This
@@ -5767,8 +6130,8 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN2176"
->5.6. Templates</A
+NAME="AEN2273"
+>7.6. Templates</A
></H2
><P
> When <SPAN
@@ -5816,7 +6179,7 @@ WIDTH="33%"
ALIGN="left"
VALIGN="top"
><A
-HREF="quickstart.html"
+HREF="startup.html"
>Prev</A
></TD
><TD
@@ -5841,7 +6204,7 @@ HREF="contact.html"
WIDTH="33%"
ALIGN="left"
VALIGN="top"
->Quickstart to Using <SPAN
+>Starting <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
></TD
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index f11453bb..5c9e4d09 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -72,39 +72,55 @@ CLASS="SECT1"
CLASS="SECT1"
><A
NAME="CONTACT"
->6. Contacting the Developers, Bug Reporting and Feature
+>8. Contacting the Developers, Bug Reporting and Feature
Requests</A
></H1
><P
> We value your feedback. However, to provide you with the best support, please
- note:
-
- <P
-></P
-><UL
-><LI
+ note the following sections.</P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-SUPPORT"
+>8.1. Get Support</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Use the Sourceforge Support Forum to get help:<br>
- <br>
+>To get support, use the Sourceforge Support Forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=211118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=211118</A
><br>
</P
-></LI
-><LI
+>
+ </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-BUGS"
+>8.2. Report bugs</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Submit bugs only through our Sourceforge Bug Forum:<br>
- <br>
+>To submit bugs, use the Sourceforge Bug Forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?group_id=11118&atid=111118"
TARGET="_top"
>http://sourceforge.net/tracker/?group_id=11118&atid=111118</A
>. <br>
</P
+>
+ </P
><P
> Make sure that the bug has not already been submitted. Please try to
verify that it is a <SPAN
@@ -118,44 +134,75 @@ CLASS="APPLICATION"
<SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
->/<SPAN
-CLASS="APPLICATION"
->Junkbuster</SPAN
->
- version, platform, browser, any pertinent log data, any other relevant
- details (please be specific) and, if possible, some way to reproduce the
- bug.
+> version, platform, browser, any
+ pertinent log data, any other relevant details (please be specific) and,
+ if possible, some way to reproduce the bug.
</P
-></LI
-><LI
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-FEATURE"
+>8.3. Request new features</A
+></H2
><P
+> <P
CLASS="LITERALLAYOUT"
->Submit feature requests only through our Sourceforge feature request forum:<br>
- <br>
+>To submit ideas on new features, use the Sourceforge feature request forum:<br>
+<br>
<A
HREF="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse"
TARGET="_top"
>http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse</A
>.<br>
</P
-></LI
-><LI
+>
+ </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-ADS"
+>8.4. Report ads or other filter problems</A
+></H2
><P
-CLASS="LITERALLAYOUT"
->You can also send feedback on websites that Privoxy has problems with. Please bookmark<br>
-the following link: <A
+>You can also send feedback on websites that Privoxy has problems with. Please bookmark
+the following link: <A
HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
TARGET="_top"
><SPAN
CLASS="QUOTE"
>"Privoxy - Submit Filter Feedback"</SPAN
></A
->. Once you surf to a page with problems, use the<br>
-bookmark to send us feedback. We will look into the issue as soon as possible.<br>
- </P
-></LI
-><LI
+>. Once you surf to a page with problems, use the
+bookmark to send us feedback. We will look into the issue as soon as possible.
+ </P
><P
+> New, improved <TT
+CLASS="FILENAME"
+>default.action</TT
+> files will occasionally be made
+ available based on your feedback. These will be announced on the <A
+HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce"
+TARGET="_top"
+>ijbswa-announce</A
+>
+ list.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CONTACT-OTHER"
+>8.5. Other</A
+></H2
+><P
+> <P
CLASS="LITERALLAYOUT"
>For any other issues, feel free to use the mailing lists:<br>
<br>
@@ -165,73 +212,13 @@ TARGET="_top"
>http://sourceforge.net/mail/?group_id=11118</A
>.<br>
</P
+>
+ </P
><P
> Anyone interested in actively participating in development and related
discussions can also join the appropriate mailing list. Archives are
- available, too.
+ available, too. See the page on Sourceforge.
</P
-></LI
-></UL
-></P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="SUBMITACTIONS"
->6.1. Submitting Ads and <SPAN
-CLASS="QUOTE"
->"Action"</SPAN
-> Problems</A
-></H2
-><P
-> Ads and banners that are not stopped by <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
- can be submitted to the developers by accessing a special page and filling
- out the brief, required form. Conversely, you can also report pages, images,
- etc. that <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is blocking, but should not.
- The form itself does require Internet access.</P
-><P
-> To do this, point your browser to <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
- at <A
-HREF="http://config.privoxy.org/"
-TARGET="_top"
->http://config.privoxy.org/</A
->
- (shortcut: <A
-HREF="http://p.p/"
-TARGET="_top"
->http://p.p/</A
->), and then select
- <A
-HREF="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());"
-TARGET="_top"
->Actions file feedback system</A
->,
- near the bottom of the page. Paste in the URL that is the cause of the
- unwanted behavior, and follow the prompts. The developers will
- try to incorporate a fix for the problem you reported into future versions.</P
-><P
-> New <TT
-CLASS="FILENAME"
->default.actions</TT
-> files will occasionally be made
- available based on your feedback. These
- will be announced on the
- <A
-HREF="http://lists.sourceforge.net/lists/listinfo/ijbswa-announce"
-TARGET="_top"
->ijbswa-announce</A
->
- list.</P
></DIV
></DIV
><DIV
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index cc1c5cd7..9df318e3 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -72,15 +72,15 @@ CLASS="SECT1"
CLASS="SECT1"
><A
NAME="COPYRIGHT"
->7. Copyright and History</A
+>9. Copyright and History</A
></H1
><DIV
CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN2227"
->7.1. Copyright</A
+NAME="AEN2320"
+>9.1. Copyright</A
></H2
><P
> <SPAN
@@ -89,12 +89,14 @@ CLASS="APPLICATION"
> is free software; you can
redistribute it and/or modify it under the terms of the GNU General Public
+
License as published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.</P
><P
> This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+
more details, which is available from the Free Software Foundation, Inc, 59
Temple Place - Suite 330, Boston, MA 02111-1307, USA.</P
><P
@@ -112,7 +114,7 @@ CLASS="SECT2"
CLASS="SECT2"
><A
NAME="HISTORY"
->7.2. History</A
+>9.2. History</A
></H2
><P
> <SPAN
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 4ead0e2d..b52ec30d 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -49,7 +49,7 @@ CLASS="ORGNAME"
></DIV
><P
CLASS="PUBDATE"
->$Id: user-manual.sgml,v 1.91 2002/04/24 02:39:31 hal9 Exp $<BR></P
+>$Id: user-manual.sgml,v 1.95 2002/04/26 17:23:29 swa Exp $<BR></P
><DIV
><DIV
CLASS="ABSTRACT"
@@ -59,9 +59,6 @@ NAME="AEN9"
><P
></P
><P
->
- </P
-><P
> The user manual gives users information on how to install, configure and use
<A
HREF="http://www.privoxy.org/"
@@ -137,8 +134,8 @@ HREF="introduction.html"
><DL
><DT
>1.1. <A
-HREF="introduction.html#NEWFEATURES"
->New Features</A
+HREF="introduction.html#FEATURES"
+>Features</A
></DT
></DL
></DD
@@ -151,87 +148,73 @@ HREF="installation.html"
><DL
><DT
>3.1. <A
-HREF="installation.html#INSTALLATION-PACKAGES"
->Binary Packages</A
-></DT
-><DD
-><DL
-><DT
->3.1.1. <A
HREF="installation.html#INSTALLATION-PACK-RPM"
>Red Hat and SuSE RPMs</A
></DT
><DT
->3.1.2. <A
+>3.2. <A
HREF="installation.html#INSTALLATION-DEB"
>Debian</A
></DT
><DT
->3.1.3. <A
+>3.3. <A
HREF="installation.html#INSTALLATION-PACK-WIN"
>Windows</A
></DT
><DT
->3.1.4. <A
+>3.4. <A
HREF="installation.html#INSTALLATION-PACK-BINTGZ"
>Solaris, NetBSD, FreeBSD, HP-UX</A
></DT
><DT
->3.1.5. <A
+>3.5. <A
HREF="installation.html#INSTALLATION-OS2"
>OS/2</A
></DT
><DT
->3.1.6. <A
+>3.6. <A
HREF="installation.html#INSTALLATION-MAC"
>Max OSX</A
></DT
><DT
->3.1.7. <A
+>3.7. <A
HREF="installation.html#INSTALLATION-AMIGA"
>AmigaOS</A
></DT
></DL
></DD
><DT
->3.2. <A
-HREF="installation.html#INSTALLATION-SOURCE"
->Building from Source</A
+>4. <A
+HREF="upgradersnote.html"
+>Note to Upgraders</A
></DT
-></DL
-></DD
><DT
->4. <A
+>5. <A
HREF="quickstart.html"
>Quickstart to Using <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
></A
></DT
-><DD
-><DL
-><DT
->4.1. <A
-HREF="quickstart.html#UPGRADERSNOTE"
->Note to Upgraders</A
-></DT
><DT
->4.2. <A
-HREF="quickstart.html#STARTUP"
+>6. <A
+HREF="startup.html"
>Starting <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
></A
></DT
+><DD
+><DL
><DT
->4.3. <A
-HREF="quickstart.html#CMDOPTIONS"
+>6.1. <A
+HREF="startup.html#CMDOPTIONS"
>Command Line Options</A
></DT
></DL
></DD
><DT
->5. <A
+>7. <A
HREF="configuration.html"
><SPAN
CLASS="APPLICATION"
@@ -241,110 +224,110 @@ CLASS="APPLICATION"
><DD
><DL
><DT
->5.1. <A
-HREF="configuration.html#AEN324"
+>7.1. <A
+HREF="configuration.html#AEN320"
>Controlling <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
> with Your Web Browser</A
></DT
><DT
->5.2. <A
-HREF="configuration.html#AEN343"
+>7.2. <A
+HREF="configuration.html#CONFOVERVIEW"
>Configuration Files Overview</A
></DT
><DT
->5.3. <A
-HREF="configuration.html#AEN383"
+>7.3. <A
+HREF="configuration.html#CONFIG"
>The Main Configuration File</A
></DT
><DD
><DL
><DT
->5.3.1. <A
-HREF="configuration.html#AEN402"
+>7.3.1. <A
+HREF="configuration.html#CONF-LOG-LOC"
>Configuration and Log File Locations</A
></DT
><DT
->5.3.2. <A
-HREF="configuration.html#AEN622"
+>7.3.2. <A
+HREF="configuration.html#LOCAL-SET-UP"
>Local Set-up Documentation</A
></DT
><DT
->5.3.3. <A
-HREF="configuration.html#AEN706"
+>7.3.3. <A
+HREF="configuration.html#DEBUGGING"
>Debugging</A
></DT
><DT
->5.3.4. <A
-HREF="configuration.html#AEN772"
+>7.3.4. <A
+HREF="configuration.html#ACCESS-CONTROL"
>Access Control and Security</A
></DT
><DT
->5.3.5. <A
+>7.3.5. <A
HREF="configuration.html#FORWARDING"
>Forwarding</A
></DT
><DT
->5.3.6. <A
-HREF="configuration.html#AEN1143"
+>7.3.6. <A
+HREF="configuration.html#WINDOWS-GUI"
>Windows GUI Options</A
></DT
></DL
></DD
><DT
->5.4. <A
-HREF="configuration.html#ACTIONSFILE"
->The Actions File</A
+>7.4. <A
+HREF="configuration.html#ACTIONS-FILE"
+>Actions Files</A
></DT
><DD
><DL
><DT
->5.4.1. <A
-HREF="configuration.html#AEN1234"
+>7.4.1. <A
+HREF="configuration.html#AEN1285"
>Finding the Right Mix</A
></DT
><DT
->5.4.2. <A
-HREF="configuration.html#AEN1240"
+>7.4.2. <A
+HREF="configuration.html#AEN1292"
>How to Edit</A
></DT
><DT
->5.4.3. <A
-HREF="configuration.html#AEN1247"
+>7.4.3. <A
+HREF="configuration.html#AEN1298"
>How Actions are Applied to URLs</A
></DT
><DT
->5.4.4. <A
-HREF="configuration.html#AEN1256"
+>7.4.4. <A
+HREF="configuration.html#AEN1312"
>Patterns</A
></DT
><DT
->5.4.5. <A
+>7.4.5. <A
HREF="configuration.html#ACTIONS"
>Actions</A
></DT
><DT
->5.4.6. <A
-HREF="configuration.html#AEN2110"
+>7.4.6. <A
+HREF="configuration.html#ALIASES"
>Aliases</A
></DT
></DL
></DD
><DT
->5.5. <A
-HREF="configuration.html#FILTERFILE"
+>7.5. <A
+HREF="configuration.html#FILTER-FILE"
>The Filter File</A
></DT
><DT
->5.6. <A
-HREF="configuration.html#AEN2176"
+>7.6. <A
+HREF="configuration.html#AEN2273"
>Templates</A
></DT
></DL
></DD
><DT
->6. <A
+>8. <A
HREF="contact.html"
>Contacting the Developers, Bug Reporting and Feature
Requests</A
@@ -352,54 +335,71 @@ Requests</A
><DD
><DL
><DT
->6.1. <A
-HREF="contact.html#SUBMITACTIONS"
->Submitting Ads and <SPAN
-CLASS="QUOTE"
->"Action"</SPAN
-> Problems</A
+>8.1. <A
+HREF="contact.html#CONTACT-SUPPORT"
+>Get Support</A
+></DT
+><DT
+>8.2. <A
+HREF="contact.html#CONTACT-BUGS"
+>Report bugs</A
+></DT
+><DT
+>8.3. <A
+HREF="contact.html#CONTACT-FEATURE"
+>Request new features</A
+></DT
+><DT
+>8.4. <A
+HREF="contact.html#CONTACT-ADS"
+>Report ads or other filter problems</A
+></DT
+><DT
+>8.5. <A
+HREF="contact.html#CONTACT-OTHER"
+>Other</A
></DT
></DL
></DD
><DT
->7. <A
+>9. <A
HREF="copyright.html"
>Copyright and History</A
></DT
><DD
><DL
><DT
->7.1. <A
-HREF="copyright.html#AEN2227"
+>9.1. <A
+HREF="copyright.html#AEN2320"
>Copyright</A
></DT
><DT
->7.2. <A
+>9.2. <A
HREF="copyright.html#HISTORY"
>History</A
></DT
></DL
></DD
><DT
->8. <A
+>10. <A
HREF="seealso.html"
>See Also</A
></DT
><DT
->9. <A
+>11. <A
HREF="appendix.html"
>Appendix</A
></DT
><DD
><DL
><DT
->9.1. <A
+>11.1. <A
HREF="appendix.html#REGEX"
>Regular Expressions</A
></DT
><DT
->9.2. <A
-HREF="appendix.html#AEN2452"
+>11.2. <A
+HREF="appendix.html#AEN2545"
><SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
@@ -408,19 +408,19 @@ CLASS="APPLICATION"
><DD
><DL
><DT
->9.2.1. <A
+>11.2.1. <A
HREF="appendix.html#BOOKMARKLETS"
>Bookmarklets</A
></DT
></DL
></DD
><DT
->9.3. <A
+>11.3. <A
HREF="appendix.html#CHAIN"
>Chain of Events</A
></DT
><DT
->9.4. <A
+>11.4. <A
HREF="appendix.html#ACTIONSANAT"
>Anatomy of an Action</A
></DT
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 192498fe..7c77555b 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -13,8 +13,8 @@ REL="PREVIOUS"
TITLE="Introduction"
HREF="introduction.html"><LINK
REL="NEXT"
-TITLE="Quickstart to Using Privoxy"
-HREF="quickstart.html"><LINK
+TITLE="Note to Upgraders"
+HREF="upgradersnote.html"><LINK
REL="STYLESHEET"
TYPE="text/css"
HREF="../p_doc.css"></HEAD
@@ -57,7 +57,7 @@ WIDTH="10%"
ALIGN="right"
VALIGN="bottom"
><A
-HREF="quickstart.html"
+HREF="upgradersnote.html"
>Next</A
></TD
></TR
@@ -83,8 +83,10 @@ CLASS="APPLICATION"
<A
HREF="http://sourceforge.net/projects/ijbswa/"
TARGET="_top"
->Privoxy Project Page</A
->.</P
+>Privoxy Project
+ Page</A
+>. For installing and compiling the source code, please look
+ into our Developer Manual.</P
><P
> If you like to live on the bleeding edge and are not afraid of using
possibly unstable development versions, you can check out the up-to-the-minute
@@ -98,22 +100,14 @@ HREF="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.gz"
TARGET="_top"
>the nightly CVS
tarball.</A
-></P
+> Again, we refer you to the Developer Manual.</P
><P
> At present, <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> is known to run on Win32, Mac
- OSX, OS/2, AmigaOS, Linux (RedHat, Suse, Debian), FreeBSD, NetBSD, BeOS, and
- many flavors of Unix.</P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="INSTALLATION-PACKAGES"
->3.1. Binary Packages</A
-></H2
+> is known to run on
+ Windows(95, 98, ME, 2000, XP), Linux (RedHat, Suse, Debian), Mac OSX,
+ OS/2, AmigaOS, FreeBSD, NetBSD, BeOS, and many more flavors of Unix.</P
><P
> Note: If you have a previous <SPAN
CLASS="APPLICATION"
@@ -132,19 +126,18 @@ CLASS="EMPHASIS"
if it is valuable to you.</I
> See the
<A
-HREF="quickstart.html#UPGRADERSNOTE"
+HREF="upgradersnote.html"
>note to upgraders</A
->.</P
-><P
-> How to install the binary packages depends on your operating system:</P
+> section
+ below.</P
><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
><A
NAME="INSTALLATION-PACK-RPM"
->3.1.1. Red Hat and SuSE RPMs</A
-></H3
+>3.1. Red Hat and SuSE RPMs</A
+></H2
><P
> RPMs can be installed with <TT
CLASS="LITERAL"
@@ -159,15 +152,20 @@ CLASS="FILENAME"
> Note that on Red Hat, <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> will not be
- automatically started on system boot. You will need to enable that using
- <B
+> will
+ <I
+CLASS="EMPHASIS"
+>not</I
+> be automatically started on system boot. You will
+ need to enable that using <B
CLASS="COMMAND"
>chkconfig</B
->, <B
+>,
+ <B
CLASS="COMMAND"
>ntsysv</B
->, or similar method.</P
+>, or similar methods. Note that SuSE will
+automatically start Privoxy in the boot process.</P
><P
> If you have problems with failed dependencies, try rebuilding the SRC RPM:
<TT
@@ -191,36 +189,38 @@ CLASS="APPLICATION"
>.</P
></DIV
><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
><A
NAME="INSTALLATION-DEB"
->3.1.2. Debian</A
-></H3
+>3.2. Debian</A
+></H2
><P
> FIXME.</P
></DIV
><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
><A
NAME="INSTALLATION-PACK-WIN"
->3.1.3. Windows</A
-></H3
+>3.3. Windows</A
+></H2
><P
> Just double-click the installer, which will guide you through
- the installation process.</P
+ the installation process. You will find the configuration files
+ in the same directory as you installed Privoxy in. We do not
+ use the registry of Windows. </P
></DIV
><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
><A
NAME="INSTALLATION-PACK-BINTGZ"
->3.1.4. Solaris, NetBSD, FreeBSD, HP-UX</A
-></H3
+>3.4. Solaris, NetBSD, FreeBSD, HP-UX</A
+></H2
><P
> Create a new directory, <TT
CLASS="LITERAL"
@@ -230,13 +230,13 @@ CLASS="LITERAL"
things go. FIXME.</P
></DIV
><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
><A
NAME="INSTALLATION-OS2"
->3.1.5. OS/2</A
-></H3
+>3.5. OS/2</A
+></H2
><P
> First, make sure that no previous installations of
<SPAN
@@ -264,13 +264,13 @@ CLASS="APPLICATION"
into will contain all of the configuration files.</P
></DIV
><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
><A
NAME="INSTALLATION-MAC"
->3.1.6. Max OSX</A
-></H3
+>3.6. Max OSX</A
+></H2
><P
> Unzip the downloaded package (you can either double-click on the file
in the finder, or on the desktop if you downloaded it there). Then,
@@ -288,20 +288,20 @@ CLASS="LITERAL"
CLASS="APPLICATION"
>Privoxy</SPAN
> will set itself up to start
- automatically on system bringup via
+ automatically on system bring-up via
<TT
CLASS="LITERAL"
>/System/Library/StartupItems/Privoxy</TT
>.</P
></DIV
><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
><A
NAME="INSTALLATION-AMIGA"
->3.1.7. AmigaOS</A
-></H3
+>3.7. AmigaOS</A
+></H2
><P
> Copy and then unpack the <TT
CLASS="FILENAME"
@@ -339,124 +339,6 @@ CLASS="APPLICATION"
></DIV
></DIV
><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="INSTALLATION-SOURCE"
->3.2. Building from Source</A
-></H2
-><P
-> To build <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> from source,
- autoheader, autoconf, <A
-HREF="http://www.gnu.org/software/make/make.html"
-TARGET="_top"
->GNU make
- (gmake)</A
->, and, of course, a C compiler are required.</P
-><P
-> When building from a source tarball (either release version or
- nightly CVS tarball), first unpack the source: </P
-><P
-> <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
-> tar xzvf privoxy-2.9.14-beta-src* [.tgz or .tar.gz]
- cd privoxy-2.9.14-beta
- </PRE
-></TD
-></TR
-></TABLE
-></P
-><P
-> For retrieving the current CVS sources, you'll need CVS installed.
- Note that sources from CVS are development quality, and may not be
- stable, or well tested. To download CVS source:</P
-><P
-> <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
-> cvs -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa login
- cvs -z3 -d:pserver:anonymous@cvs.ijbswa.sourceforge.net:/cvsroot/ijbswa co current
- cd current
- </PRE
-></TD
-></TR
-></TABLE
-></P
-><P
-> This will create a directory named <TT
-CLASS="FILENAME"
->current/</TT
->, which will
- contain the source tree.</P
-><P
-> Then, in either case, to build from unpacked tarball or CVS source:</P
-><P
-> <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
-> autoheader
- autoconf
- ./configure # (--help to see options)
- make # (the make from gnu, gmake for *BSD)
- su
- make -n install # (to see where all the files will go)
- make install # (to really install)
- </PRE
-></TD
-></TR
-></TABLE
-></P
-><P
-> If you have gnu make, you can have the first four steps
- automatically done for you by just typing</P
-><P
-> <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
-> make
- </PRE
-></TD
-></TR
-></TABLE
-></P
-><P
-> in the freshly downloaded or unpacked source directory.</P
-><P
-> For more detailed instructions on how to build Redhat and SuSE RPMs,
- Windows self-extracting installers, building on platforms with
- special requirements etc, please consult the <A
-HREF="../developer-manual/newrelease.html"
-TARGET="_top"
->developer manual</A
->.</P
-></DIV
-></DIV
-><DIV
CLASS="NAVFOOTER"
><HR
ALIGN="LEFT"
@@ -487,7 +369,7 @@ WIDTH="33%"
ALIGN="right"
VALIGN="top"
><A
-HREF="quickstart.html"
+HREF="upgradersnote.html"
>Next</A
></TD
></TR
@@ -506,10 +388,7 @@ VALIGN="top"
WIDTH="33%"
ALIGN="right"
VALIGN="top"
->Quickstart to Using <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-></TD
+>Note to Upgraders</TD
></TR
></TABLE
></DIV
diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html
index 2319dc8c..68b8dd88 100644
--- a/doc/webserver/user-manual/introduction.html
+++ b/doc/webserver/user-manual/introduction.html
@@ -101,8 +101,8 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="NEWFEATURES"
->1.1. New Features</A
+NAME="FEATURES"
+>1.1. Features</A
></H2
><P
> In addition to <SPAN
@@ -121,6 +121,12 @@ CLASS="APPLICATION"
><UL
><LI
><P
+> FIXME: complete the list of features. change the order: most important
+ features to the top of the list. prefix new features with "NEW".
+ </P
+></LI
+><LI
+><P
> Integrated browser based configuration and control utility at <A
HREF="http://config.privoxy.org/"
TARGET="_top"
@@ -197,13 +203,6 @@ CLASS="QUOTE"
></LI
><LI
><P
-> Builds from source on most UNIX-like systems. Packages available for: Linux
- (RedHat, SuSE, or Debian), Windows, Sun Solaris, Mac OSX, OS/2, HP-UX 11,
- NetBSD and AmigaOS.
- </P
-></LI
-><LI
-><P
> Every feature now controllable on a per-site or per-location basis, configuration
more powerful and versatile over-all.
</P
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index ed0a5010..17120a97 100644
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -10,11 +10,11 @@ REL="HOME"
TITLE="Privoxy User Manual"
HREF="index.html"><LINK
REL="PREVIOUS"
-TITLE="Installation"
-HREF="installation.html"><LINK
+TITLE="Note to Upgraders"
+HREF="upgradersnote.html"><LINK
REL="NEXT"
-TITLE="Privoxy Configuration"
-HREF="configuration.html"><LINK
+TITLE="Starting Privoxy"
+HREF="startup.html"><LINK
REL="STYLESHEET"
TYPE="text/css"
HREF="../p_doc.css"></HEAD
@@ -44,7 +44,7 @@ WIDTH="10%"
ALIGN="left"
VALIGN="bottom"
><A
-HREF="installation.html"
+HREF="upgradersnote.html"
>Prev</A
></TD
><TD
@@ -57,7 +57,7 @@ WIDTH="10%"
ALIGN="right"
VALIGN="bottom"
><A
-HREF="configuration.html"
+HREF="startup.html"
>Next</A
></TD
></TR
@@ -71,558 +71,76 @@ CLASS="SECT1"
CLASS="SECT1"
><A
NAME="QUICKSTART"
->4. Quickstart to Using <SPAN
+>5. Quickstart to Using <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
></A
></H1
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="UPGRADERSNOTE"
->4.1. Note to Upgraders</A
-></H2
-><P
-> There are very significant changes from older versions of
- <SPAN
-CLASS="APPLICATION"
->Junkbuster</SPAN
-> to the current
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->. Configuration is substantially
- changed. <SPAN
-CLASS="APPLICATION"
->Junkbuster 2.0.x</SPAN
-> and earlier
- configuration files will not migrate. The functionality of the old
- <TT
-CLASS="FILENAME"
->blockfile</TT
->, <TT
-CLASS="FILENAME"
->cookiefile</TT
-> and
- <TT
-CLASS="FILENAME"
->imagelist</TT
->, are now combined into the
- <SPAN
-CLASS="QUOTE"
->"actions file"</SPAN
-> (<TT
-CLASS="FILENAME"
->default.action</TT
->
- for most installations).</P
-><P
-> A <SPAN
-CLASS="QUOTE"
->"filter file"</SPAN
-> (typically <TT
-CLASS="FILENAME"
->default.filter</TT
->)
- is new as of <SPAN
-CLASS="APPLICATION"
->Privoxy 2.9.x</SPAN
->, and provides some
- of the new sophistication (explained below). <TT
-CLASS="FILENAME"
->config</TT
-> is
- much the same as before.</P
-><P
-> If upgrading from a 2.0.x version, you will have to use the new config
- files, and possibly adapt any personal rules from your older files.
- When porting personal rules over from the old <TT
-CLASS="FILENAME"
->blockfile</TT
->
- to the new actions file, please note that even the pattern syntax has
- changed. If upgrading from 2.9.x development versions, it is still
- recommended to use the new configuration files.</P
-><P
-> A quick list of things to be aware of before upgrading: </P
><P
> <P
></P
><UL
><LI
><P
-> The default listening port is now 8118 due to a conflict with another
- service (NAS).
- </P
-></LI
-><LI
-><P
->
- Some installers may remove earlier versions completely. Save any
- important configuration files!
- </P
-></LI
-><LI
-><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is controllable with a web browser
- at the special URL: <A
-HREF="http://config.privoxy.org/"
-TARGET="_top"
->http://config.privoxy.org/</A
->
- (Shortcut: <A
-HREF="http://p.p/"
-TARGET="_top"
->http://p.p/</A
->). Many
- aspects of configuration can be done here, including temporarily disabling
- <SPAN
+> Install <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
+>. See the section <A
+HREF="installation.html"
+>Installing</A
>.
</P
></LI
><LI
><P
-> The primary configuration file for cookie management, ad and banner
- blocking, and many other aspects of <SPAN
+> Start <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
->
- configuration is <TT
-CLASS="FILENAME"
->default.action</TT
->. It is strongly
- recommended to become familiar with the new actions concept below,
- before modifying this file.
- </P
-></LI
-><LI
-><P
->
- Some installers may not automatically start
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> after installation.
- </P
-></LI
-></UL
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="STARTUP"
->4.2. Starting <SPAN
+>. See the section <A
+HREF="startup.html"
+>Starting <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
></A
-></H2
-><P
-> Before launching <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> for the first time, you
- will want to configure your browser(s) to use <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
- as a HTTP and HTTPS proxy. The default is localhost for the proxy address,
- and port 8118 (earlier versions used port 8000). This is the one
- configuration step that must be done! </P
-><P
->
- With <SPAN
-CLASS="APPLICATION"
->Netscape</SPAN
-> (and
- <SPAN
-CLASS="APPLICATION"
->Mozilla</SPAN
->), this can be set under <TT
-CLASS="LITERAL"
->Edit
- -> Preferences -> Advanced -> Proxies -> HTTP Proxy</TT
>.
- For <SPAN
-CLASS="APPLICATION"
->Internet Explorer</SPAN
->: <TT
-CLASS="LITERAL"
->Tools ->
- Internet Properties -> Connections -> LAN Setting</TT
->. Then,
- check <SPAN
-CLASS="QUOTE"
->"Use Proxy"</SPAN
-> and fill in the appropriate info (Address:
- localhost, Port: 8118). Include if HTTPS proxy support too.</P
-><P
-> After doing this, flush your browser's disk and memory caches to force a
- re-reading of all pages and to get rid of any ads that may be cached. You
- are now ready to start enjoying the benefits of using
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->!</P
-><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> is typically started by specifying the
- main configuration file to be used on the command line. Example Unix startup
- command:</P
-><P
-> <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->
- # /usr/sbin/privoxy /etc/privoxy/config
-
- </PRE
-></TD
-></TR
-></TABLE
-></P
-><P
-> See <A
-HREF="quickstart.html#CMDOPTIONS"
->below</A
-> for other command line options.</P
-><P
-> An init script is provided for SuSE and Red Hat.</P
-><P
-> For for SuSE: <B
-CLASS="COMMAND"
->rcprivoxy start</B
-></P
-><P
-> For Red Hat and Debian: <B
-CLASS="COMMAND"
->/etc/rc.d/init.d/privoxy start</B
-></P
-><P
-> If no configuration file is specified on the command line,
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> will look for a file named
- <TT
-CLASS="FILENAME"
->config</TT
-> in the current directory. Except on Win32 where
- it will try <TT
-CLASS="FILENAME"
->config.txt</TT
->. If no file is specified on the
- command line and no default configuration file can be found,
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> will fail to start.</P
-><P
-> The included default configuration files should give a reasonable starting
- point. Most of the per site configuration is done in the
- <SPAN
-CLASS="QUOTE"
->"actions"</SPAN
-> files. These are where various cookie actions are
- defined, ad and banner blocking, and other aspects of
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> configuration. There are several such
- files included, with varying levels of aggressiveness. </P
-><P
-> You will probably want to keep an eye out for sites that require persistent
- cookies, and add these to <TT
-CLASS="FILENAME"
->default.action</TT
-> as needed. By
- default, most of these will be accepted only during the current browser
- session (aka <SPAN
-CLASS="QUOTE"
->"session cookies"</SPAN
->), until you add them to the
- configuration. If you want the browser to handle this instead, you will need
- to edit <TT
-CLASS="FILENAME"
->default.action</TT
-> and disable this feature. If you
- use more than one browser, it would make more sense to let
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> handle this. In which case, the
- browser(s) should be set to accept all cookies.</P
+ </P
+></LI
+><LI
><P
-> Another feature where you will probably want to define exceptions for trusted
- sites is the popup-killing (through the <TT
+> Change your browser's configuration to use the proxy <TT
CLASS="LITERAL"
->+popup</TT
-> and
- <TT
+>localhost</TT
+> on port
+ <TT
CLASS="LITERAL"
->+filter{popups}</TT
-> actions), because your favorite shopping,
- banking, or leisure site may need popups. </P
-><P
-> <SPAN
+>8118</TT
+>. See the section <A
+HREF="startup.html"
+>Starting <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> is HTTP/1.1 compliant, but not all of
- the optional 1.1 features are as yet supported. In the unlikely event that
- you experience inexplicable problems with browsers that use HTTP/1.1 per default
- (like <SPAN
-CLASS="APPLICATION"
->Mozilla</SPAN
-> or recent versions of I.E.), you might
- try to force HTTP/1.0 compatibility. For Mozilla, look under <TT
-CLASS="LITERAL"
->Edit ->
- Preferences -> Debug -> Networking</TT
+></A
>.
- Alternatively, set the <SPAN
-CLASS="QUOTE"
->"+downgrade"</SPAN
-> config option in
- <TT
-CLASS="FILENAME"
->default.action</TT
-> which will downgrade your browser's HTTP
- requests from HTTP/1.1 to HTTP/1.0 before processing them.</P
-><P
-> After running <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> for a while, you can
- start to fine tune the configuration to suit your personal, or site,
- preferences and requirements. There are many, many aspects that can
- be customized. <SPAN
-CLASS="QUOTE"
->"Actions"</SPAN
-> (as specified in <TT
-CLASS="FILENAME"
->default.action</TT
->)
- can be adjusted by pointing your browser to
- <A
-HREF="http://config.privoxy.org/"
-TARGET="_top"
->http://config.privoxy.org/</A
->
- (shortcut: <A
-HREF="http://p.p/"
-TARGET="_top"
->http://p.p/</A
->),
- and then follow the link to <SPAN
-CLASS="QUOTE"
->"edit the actions list"</SPAN
->.
- (This is an internal page and does not require Internet access.)</P
-><P
-> In fact, various aspects of <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->
- configuration can be viewed from this page, including
- current configuration parameters, source code version numbers,
- the browser's request headers, and <SPAN
-CLASS="QUOTE"
->"actions"</SPAN
-> that apply
- to a given URL. In addition to the <TT
-CLASS="FILENAME"
->default.action</TT
-> file
- editor mentioned above, <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> can also
- be turned <SPAN
-CLASS="QUOTE"
->"on"</SPAN
-> and <SPAN
-CLASS="QUOTE"
->"off"</SPAN
-> (toggled) from this page.</P
-><P
-> If you encounter problems, try loading the page without
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
->. If that helps, enter the URL where
- you have the problems into <A
-HREF="http://p.p/show-url-info"
-TARGET="_top"
->the browser
- based rule tracing utility</A
->. See which rules apply and why, and
- then try turning them off for that site one after the other, until the problem
- is gone. When you have found the culprit, you might want to turn the rest on
- again.</P
-><P
-> If the above paragraph sounds gibberish to you, you might want to <A
-HREF="configuration.html#ACTIONSFILE"
-TARGET="_top"
->read more about the actions concept</A
->
- or even dive deep into the <A
-HREF="appendix.html#ACTIONSANAT"
-TARGET="_top"
->Appendix
- on actions</A
->.</P
-><P
-> If you can't get rid of the problem at all, think you've found a bug in
- Privoxy, want to propose a new feature or smarter rules, please see the
- chapter "Contacting the Developers, .." below.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="CMDOPTIONS"
->4.3. Command Line Options</A
-></H2
-><P
-> <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> may be invoked with the following
- command-line options:</P
-><P
-> <P
-></P
-><UL
-><LI
-><P
-> <I
-CLASS="EMPHASIS"
->--version</I
->
- </P
-><P
-> Print version info and exit. Unix only.
- </P
-></LI
-><LI
-><P
-> <I
-CLASS="EMPHASIS"
->--help</I
->
- </P
-><P
-> Print short usage info and exit. Unix only.
- </P
-></LI
-><LI
-><P
-> <I
-CLASS="EMPHASIS"
->--no-daemon</I
->
- </P
-><P
-> Don't become a daemon, i.e. don't fork and become process group
- leader, and don't detach from controlling tty. Unix only.
- </P
-></LI
-><LI
-><P
-> <I
-CLASS="EMPHASIS"
->--pidfile FILE</I
->
-
- </P
-><P
-> On startup, write the process ID to <I
-CLASS="EMPHASIS"
->FILE</I
->. Delete the
- <I
-CLASS="EMPHASIS"
->FILE</I
-> on exit. Failure to create or delete the
- <I
-CLASS="EMPHASIS"
->FILE</I
-> is non-fatal. If no <I
-CLASS="EMPHASIS"
->FILE</I
->
- option is given, no PID file will be used. Unix only.
- </P
-></LI
-><LI
-><P
-> <I
-CLASS="EMPHASIS"
->--user USER[.GROUP]</I
->
-
- </P
-><P
-> After (optionally) writing the PID file, assume the user ID of
- <I
-CLASS="EMPHASIS"
->USER</I
->, and if included the GID of GROUP. Exit if the
- privileges are not sufficient to do so. Unix only.
</P
></LI
><LI
><P
-> <I
-CLASS="EMPHASIS"
->configfile</I
->
- </P
-><P
-> If no <I
-CLASS="EMPHASIS"
->configfile</I
-> is included on the command line,
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> will look for a file named
- <SPAN
-CLASS="QUOTE"
->"config"</SPAN
-> in the current directory (except on Win32
- where it will look for <SPAN
-CLASS="QUOTE"
->"config.txt"</SPAN
-> instead). Specify
- full path to avoid confusion. If no config file is found,
- <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> will fail to start.
+> Enjoy surfing with enhanced comfort and privacy. Please see the section
+ <A
+HREF="contact.html"
+>Contacting the Developers</A
+> on how to report
+ bugs or problems with websites or to get help. You may want to change the
+ file <TT
+CLASS="FILENAME"
+>user.action</TT
+> to further tweak your new browsing
+ experience.
</P
></LI
></UL
></P
></DIV
-></DIV
><DIV
CLASS="NAVFOOTER"
><HR
@@ -638,7 +156,7 @@ WIDTH="33%"
ALIGN="left"
VALIGN="top"
><A
-HREF="installation.html"
+HREF="upgradersnote.html"
>Prev</A
></TD
><TD
@@ -654,7 +172,7 @@ WIDTH="33%"
ALIGN="right"
VALIGN="top"
><A
-HREF="configuration.html"
+HREF="startup.html"
>Next</A
></TD
></TR
@@ -663,7 +181,7 @@ HREF="configuration.html"
WIDTH="33%"
ALIGN="left"
VALIGN="top"
->Installation</TD
+>Note to Upgraders</TD
><TD
WIDTH="34%"
ALIGN="center"
@@ -673,10 +191,10 @@ VALIGN="top"
WIDTH="33%"
ALIGN="right"
VALIGN="top"
-><SPAN
+>Starting <SPAN
CLASS="APPLICATION"
>Privoxy</SPAN
-> Configuration</TD
+></TD
></TR
></TABLE
></DIV
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index 6d4f1365..852aa837 100644
--- a/doc/webserver/user-manual/seealso.html
+++ b/doc/webserver/user-manual/seealso.html
@@ -71,7 +71,7 @@ CLASS="SECT1"
CLASS="SECT1"
><A
NAME="SEEALSO"
->8. See Also</A
+>10. See Also</A
></H1
><P
> Other references and sites of interest to <SPAN
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
new file mode 100644
index 00000000..96baff29
--- /dev/null
+++ b/doc/webserver/user-manual/startup.html
@@ -0,0 +1,534 @@
+<HTML
+><HEAD
+><TITLE
+>Starting Privoxy</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
+REL="HOME"
+TITLE="Privoxy 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"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="../p_doc.css"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#EEEEEE"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>Privoxy User Manual</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="quickstart.html"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="configuration.html"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="STARTUP"
+>6. Starting <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+></A
+></H1
+><P
+> Before launching <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> for the first time, you
+ will want to configure your browser(s) to use <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+ as a HTTP and HTTPS proxy. The default is localhost for the proxy address,
+ and port 8118 (earlier versions used port 8000). This is the one
+ configuration step that must be done! </P
+><P
+>
+ With <SPAN
+CLASS="APPLICATION"
+>Netscape</SPAN
+> (and
+ <SPAN
+CLASS="APPLICATION"
+>Mozilla</SPAN
+>), this can be set under <TT
+CLASS="LITERAL"
+>Edit
+ -> Preferences -> Advanced -> Proxies -> HTTP Proxy</TT
+>.
+ For <SPAN
+CLASS="APPLICATION"
+>Internet Explorer</SPAN
+>: <TT
+CLASS="LITERAL"
+>Tools ->
+ Internet Properties -> Connections -> LAN Setting</TT
+>. Then,
+ check <SPAN
+CLASS="QUOTE"
+>"Use Proxy"</SPAN
+> and fill in the appropriate info (Address:
+ localhost, Port: 8118). Include if HTTPS proxy support too.</P
+><P
+> After doing this, flush your browser's disk and memory caches to force a
+ re-reading of all pages and to get rid of any ads that may be cached. You
+ are now ready to start enjoying the benefits of using
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>!</P
+><P
+> <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> is typically started by specifying the
+ main configuration file to be used on the command line. Example Unix startup
+ command:</P
+><P
+> <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>
+ # /usr/sbin/privoxy /etc/privoxy/config</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+> See <A
+HREF="startup.html#CMDOPTIONS"
+>below</A
+> for other command line options.</P
+><P
+> An init script is provided for SuSE and Red Hat.</P
+><P
+> For for SuSE: <B
+CLASS="COMMAND"
+>rcprivoxy start</B
+></P
+><P
+> For Red Hat and Debian: <B
+CLASS="COMMAND"
+>/etc/rc.d/init.d/privoxy start</B
+></P
+><P
+> If no configuration file is specified on the command line,
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> will look for a file named
+ <TT
+CLASS="FILENAME"
+>config</TT
+> in the current directory. Except on Win32 where
+ it will try <TT
+CLASS="FILENAME"
+>config.txt</TT
+>. If no file is specified on the
+ command line and no default configuration file can be found,
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> will fail to start.</P
+><P
+> The included default configuration files should give a reasonable starting
+ point. Most of the per site configuration is done in the
+ <SPAN
+CLASS="QUOTE"
+>"actions"</SPAN
+> files. These are where various cookie actions are
+ defined, ad and banner blocking, and other aspects of
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> configuration. There are several such
+ files included, with varying levels of aggressiveness. </P
+><P
+> You will probably want to keep an eye out for sites for which you may prefer
+ persistent cookies, and add these to your actions configuration as needed. By
+ default, most of these will be accepted only during the current browser
+ session (aka <SPAN
+CLASS="QUOTE"
+>"session cookies"</SPAN
+>), unless you add them to the
+ configuration. If you want the browser to handle this instead, you will need
+ to edit <TT
+CLASS="FILENAME"
+>user.action</TT
+> (or through the web based interface)
+ and disable this feature. If you use more than one browser, it would make
+ more sense to let <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> handle this. In which
+ case, the browser(s) should be set to accept all cookies.</P
+><P
+> Another feature where you will probably want to define exceptions for trusted
+ sites is the popup-killing (through the <TT
+CLASS="LITERAL"
+>+popup</TT
+> and
+ <TT
+CLASS="LITERAL"
+>+filter{popups}</TT
+> actions), because your favorite shopping,
+ banking, or leisure site may need popups (explained below). </P
+><P
+> <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> is HTTP/1.1 compliant, but not all of
+ the optional 1.1 features are as yet supported. In the unlikely event that
+ you experience inexplicable problems with browsers that use HTTP/1.1 per default
+ (like <SPAN
+CLASS="APPLICATION"
+>Mozilla</SPAN
+> or recent versions of I.E.), you might
+ try to force HTTP/1.0 compatibility. For Mozilla, look under <TT
+CLASS="LITERAL"
+>Edit ->
+ Preferences -> Debug -> Networking</TT
+>.
+ Alternatively, set the <SPAN
+CLASS="QUOTE"
+>"+downgrade-http-version"</SPAN
+> config option in
+ <TT
+CLASS="FILENAME"
+>default.action</TT
+> which will downgrade your browser's HTTP
+ requests from HTTP/1.1 to HTTP/1.0 before processing them.</P
+><P
+> After running <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> for a while, you can
+ start to fine tune the configuration to suit your personal, or site,
+ preferences and requirements. There are many, many aspects that can
+ be customized. <SPAN
+CLASS="QUOTE"
+>"Actions"</SPAN
+>
+ can be adjusted by pointing your browser to
+ <A
+HREF="http://config.privoxy.org/"
+TARGET="_top"
+>http://config.privoxy.org/</A
+>
+ (shortcut: <A
+HREF="http://p.p/"
+TARGET="_top"
+>http://p.p/</A
+>),
+ and then follow the link to <SPAN
+CLASS="QUOTE"
+>"View & Change the Current Configuration"</SPAN
+>.
+ (This is an internal page and does not require Internet access.)</P
+><P
+> In fact, various aspects of <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+ configuration can be viewed from this page, including
+ current configuration parameters, source code version numbers,
+ the browser's request headers, and <SPAN
+CLASS="QUOTE"
+>"actions"</SPAN
+> that apply
+ to a given URL. In addition to the actions file
+ editor mentioned above, <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> can also
+ be turned <SPAN
+CLASS="QUOTE"
+>"on"</SPAN
+> and <SPAN
+CLASS="QUOTE"
+>"off"</SPAN
+> (toggled) from this page.</P
+><P
+> If you encounter problems, try loading the page without
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>. If that helps, enter the URL where
+ you have the problems into <A
+HREF="http://p.p/show-url-info"
+TARGET="_top"
+>the browser
+ based rule tracing utility</A
+>. See which rules apply and why, and
+ then try turning them off for that site one after the other, until the problem
+ is gone. When you have found the culprit, you might want to turn the rest on
+ again.</P
+><P
+> If the above paragraph sounds gibberish to you, you might want to <A
+HREF="configuration.html#ACTIONSFILE"
+TARGET="_top"
+>read more about the actions concept</A
+>
+ or even dive deep into the <A
+HREF="appendix.html#ACTIONSANAT"
+TARGET="_top"
+>Appendix
+ on actions</A
+>.</P
+><P
+> If you can't get rid of the problem at all, think you've found a bug in
+ Privoxy, want to propose a new feature or smarter rules, please see the
+ section <A
+HREF="contact.html"
+TARGET="_top"
+><SPAN
+CLASS="QUOTE"
+>"Contacting the
+ Developers"</SPAN
+></A
+> below. </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="CMDOPTIONS"
+>6.1. Command Line Options</A
+></H2
+><P
+> <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> may be invoked with the following
+ command-line options:</P
+><P
+> <P
+></P
+><UL
+><LI
+><P
+> <I
+CLASS="EMPHASIS"
+>--version</I
+>
+ </P
+><P
+> Print version info and exit. Unix only.
+ </P
+></LI
+><LI
+><P
+> <I
+CLASS="EMPHASIS"
+>--help</I
+>
+ </P
+><P
+> Print short usage info and exit. Unix only.
+ </P
+></LI
+><LI
+><P
+> <I
+CLASS="EMPHASIS"
+>--no-daemon</I
+>
+ </P
+><P
+> Don't become a daemon, i.e. don't fork and become process group
+ leader, and don't detach from controlling tty. Unix only.
+ </P
+></LI
+><LI
+><P
+> <I
+CLASS="EMPHASIS"
+>--pidfile FILE</I
+>
+
+ </P
+><P
+> On startup, write the process ID to <I
+CLASS="EMPHASIS"
+>FILE</I
+>. Delete the
+ <I
+CLASS="EMPHASIS"
+>FILE</I
+> on exit. Failure to create or delete the
+ <I
+CLASS="EMPHASIS"
+>FILE</I
+> is non-fatal. If no <I
+CLASS="EMPHASIS"
+>FILE</I
+>
+ option is given, no PID file will be used. Unix only.
+ </P
+></LI
+><LI
+><P
+> <I
+CLASS="EMPHASIS"
+>--user USER[.GROUP]</I
+>
+
+ </P
+><P
+> After (optionally) writing the PID file, assume the user ID of
+ <I
+CLASS="EMPHASIS"
+>USER</I
+>, and if included the GID of GROUP. Exit if the
+ privileges are not sufficient to do so. Unix only.
+ </P
+></LI
+><LI
+><P
+> <I
+CLASS="EMPHASIS"
+>configfile</I
+>
+ </P
+><P
+> If no <I
+CLASS="EMPHASIS"
+>configfile</I
+> is included on the command line,
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> will look for a file named
+ <SPAN
+CLASS="QUOTE"
+>"config"</SPAN
+> in the current directory (except on Win32
+ where it will look for <SPAN
+CLASS="QUOTE"
+>"config.txt"</SPAN
+> instead). Specify
+ full path to avoid confusion. If no config file is found,
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> will fail to start.
+ </P
+></LI
+></UL
+></P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="quickstart.html"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="configuration.html"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Quickstart to Using <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+> </TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> Configuration</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/webserver/user-manual/upgradersnote.html b/doc/webserver/user-manual/upgradersnote.html
new file mode 100644
index 00000000..087a7b77
--- /dev/null
+++ b/doc/webserver/user-manual/upgradersnote.html
@@ -0,0 +1,274 @@
+<HTML
+><HEAD
+><TITLE
+>Note to Upgraders</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
+REL="HOME"
+TITLE="Privoxy User Manual"
+HREF="index.html"><LINK
+REL="PREVIOUS"
+TITLE="Installation"
+HREF="installation.html"><LINK
+REL="NEXT"
+TITLE="Quickstart to Using Privoxy"
+HREF="quickstart.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="../p_doc.css"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#EEEEEE"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>Privoxy User Manual</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="installation.html"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="quickstart.html"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="UPGRADERSNOTE"
+>4. Note to Upgraders</A
+></H1
+><P
+> There are very significant changes from older versions of
+ <SPAN
+CLASS="APPLICATION"
+>Junkbuster</SPAN
+> to the current
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>. Configuration is substantially
+ changed. <SPAN
+CLASS="APPLICATION"
+>Junkbuster 2.0.x</SPAN
+> and earlier
+ configuration files will not migrate. The functionality of the old
+ <TT
+CLASS="FILENAME"
+>blockfile</TT
+>, <TT
+CLASS="FILENAME"
+>cookiefile</TT
+> and
+ <TT
+CLASS="FILENAME"
+>imagelist</TT
+>, are now combined into the
+ <SPAN
+CLASS="QUOTE"
+>"actions files"</SPAN
+>. <TT
+CLASS="FILENAME"
+>default.action</TT
+>,
+ is the main actions file. Local exceptions should best be put into
+ <TT
+CLASS="FILENAME"
+>user.action</TT
+>.</P
+><P
+> A <SPAN
+CLASS="QUOTE"
+>"filter file"</SPAN
+> (typically <TT
+CLASS="FILENAME"
+>default.filter</TT
+>)
+ is new as of <SPAN
+CLASS="APPLICATION"
+>Privoxy 2.9.x</SPAN
+>, and provides some
+ of the new sophistication (explained below). <TT
+CLASS="FILENAME"
+>config</TT
+> is
+ much the same as before.</P
+><P
+> If upgrading from a 2.0.x version, you will have to use the new config
+ files, and possibly adapt any personal rules from your older files.
+ When porting personal rules over from the old <TT
+CLASS="FILENAME"
+>blockfile</TT
+>
+ to the new actions files, please note that even the pattern syntax has
+ changed. If upgrading from 2.9.x development versions, it is still
+ recommended to use the new configuration files.</P
+><P
+> A quick list of things to be aware of before upgrading: </P
+><P
+> <P
+></P
+><UL
+><LI
+><P
+> The default listening port is now 8118 due to a conflict with another
+ service (NAS).
+ </P
+></LI
+><LI
+><P
+>
+ Some installers may remove earlier versions completely. Save any
+ important configuration files!
+ </P
+></LI
+><LI
+><P
+> <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> is controllable with a web browser
+ at the special URL: <A
+HREF="http://config.privoxy.org/"
+TARGET="_top"
+>http://config.privoxy.org/</A
+>
+ (Shortcut: <A
+HREF="http://p.p/"
+TARGET="_top"
+>http://p.p/</A
+>). Many
+ aspects of configuration can be done here, including temporarily disabling
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>.
+ </P
+></LI
+><LI
+><P
+> The primary configuration file for cookie management, ad and banner
+ blocking, and many other aspects of <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+ configuration is in the <SPAN
+CLASS="QUOTE"
+>"actions"</SPAN
+> files. It is strongly
+ recommended to become familiar with the new actions concept below,
+ before modifying these files. Locally defined rules
+ should go into <TT
+CLASS="FILENAME"
+>user.action</TT
+>.
+ </P
+></LI
+><LI
+><P
+>
+ Some installers may not automatically start
+ <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> after installation.
+ </P
+></LI
+></UL
+></P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="installation.html"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="quickstart.html"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Installation</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+> </TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Quickstart to Using <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+></TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file