Dump all docs prior to 3.0.6 release. Various minor changes to faq and user

manual.

diff --git a/doc/source/announce.sgml b/doc/source/announce.sgml
index b757e89..928efb6 100644 (file)
--- a/doc/source/announce.sgml
+++ b/doc/source/announce.sgml
@@ -5,11 +5,10 @@
 <!entity contacting SYSTEM "../contacting.sgml">
 <!entity history SYSTEM "../history.sgml">
 <!entity newfeatures SYSTEM "../newfeatures.sgml">
 <!entity contacting SYSTEM "../contacting.sgml">
 <!entity history SYSTEM "../history.sgml">
 <!entity newfeatures SYSTEM "../newfeatures.sgml">

-<!entity newstuff SYSTEM "../newthisrelease.sgml">
-<!entity p-version "3.0.5">
-<!entity p-status "BETA">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-version "3.0.6">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">

 <!entity % p-supp-userman "IGNORE">
 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
 <!entity % p-doc "IGNORE">         <!-- and never a text doc             -->
 <!entity % p-supp-userman "IGNORE">
 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
 <!entity % p-doc "IGNORE">         <!-- and never a text doc             -->


@@ -20,7 +19,7 @@
 
  Purpose     :  Announcement text
                 
 
  Purpose     :  Announcement text
                 

- $Id: announce.sgml,v 2.3 2006/07/18 14:48:50 david__schmidt Exp $
+ $Id: announce.sgml,v 2.4 2006/09/22 01:27:55 hal9 Exp $

 
  Copyright (C) 2001-2006 Privoxy Developers http://www.privoxy.org
  See LICENSE.
 
  Copyright (C) 2001-2006 Privoxy Developers http://www.privoxy.org
  See LICENSE.


@@ -60,16 +59,19 @@
  v.&p-version;
 </para>
 
  v.&p-version;
 </para>
 

+<para>
+ This is a significant release with many new features, including a number of
+ new actions, and as well as many enhancements and numerous bugs done away
+ with. See 
+ <ulink url="http://www.privoxy.org/user-manual/whatsnew.html">http://www.privoxy.org/user-manual/whatsnew.html</ulink>
+ for details.
+</para>
+ 

 
 <!-- Include privoxy.sgml boilerplate: -->
  &p-intro;
 <!-- end boilerplate -->
 
 
 <!-- Include privoxy.sgml boilerplate: -->
  &p-intro;
 <!-- end boilerplate -->
 

-<!-- Include new features in this release: -->
-<para>New in this release</para>
- &newstuff;
-<!-- end boilerplate -->
-

 
 <!-- Include supported.sgml boilerplate: -->
  &supported;
 
 <!-- Include supported.sgml boilerplate: -->
  &supported;

diff --git a/doc/source/authors.sgml b/doc/source/authors.sgml
index 4f20931..e6c65cb 100644 (file)
--- a/doc/source/authors.sgml
+++ b/doc/source/authors.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  AUTHORS file for Privoxy
                 
 
  Purpose     :  AUTHORS file for Privoxy
                 

- $Id: authors.sgml,v 2.3 2006/07/18 14:48:50 david__schmidt Exp $
+ $Id: authors.sgml,v 2.4 2006/09/22 01:27:55 hal9 Exp $

 
  
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
 
  
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org


@@ -26,10 +26,10 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 <!entity % dummy "IGNORE"> 
 <!entity authors SYSTEM "p-authors.sgml">
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 <!entity % dummy "IGNORE"> 
 <!entity authors SYSTEM "p-authors.sgml">

-<!entity p-version "3.0.5">
-<!entity p-status "BETA">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-version "3.0.6">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">

 <!entity % p-text "INCLUDE">           <!-- define we are a text only doc -->
 <!entity % p-authors-formal "INCLUDE"> <!-- include additional text, etc  -->
 ]>
 <!entity % p-text "INCLUDE">           <!-- define we are a text only doc -->
 <!entity % p-authors-formal "INCLUDE"> <!-- include additional text, etc  -->
 ]>

diff --git a/doc/source/buildsource.sgml b/doc/source/buildsource.sgml
index 1db9dce..e128d04 100644 (file)
--- a/doc/source/buildsource.sgml
+++ b/doc/source/buildsource.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
 
  Purpose     :  Entity included in other project documents.
                 

- $Id: buildsource.sgml,v 2.10 2006/10/14 23:03:56 hal9 Exp $
+ $Id: buildsource.sgml,v 2.11 2006/10/14 23:06:48 hal9 Exp $

 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.


@@ -49,7 +49,7 @@
 
 <para>
  For retrieving the current CVS sources, you'll need a CVS client installed.
 
 <para>
  For retrieving the current CVS sources, you'll need a CVS client installed.

- Note that sources from CVS are typicially development quality, and may not be
+ Note that sources from CVS are typically development quality, and may not be

  stable, or well tested. To download CVS source, check the Sourceforge
  documentation, which might give commands like:
 </para>
  stable, or well tested. To download CVS source, check the Sourceforge
  documentation, which might give commands like:
 </para>


@@ -76,9 +76,12 @@
 
 <para>
  It is also strongly recommended to not run <application>Privoxy</application>
 
 <para>
  It is also strongly recommended to not run <application>Privoxy</application>

- as root, and instead it is suggested to create a <quote>privoxy</quote> user
- and group for this purpose. See your local documentation for the correct 
- command line to do this. 
+ as root. You should configure/install/run <application>Privoxy</application> as
+ an unprivileged user, preferably by  creating a <quote>privoxy</quote> user
+ and group just for this purpose. See your local documentation for the correct
+ command line to do add new users and groups (something like
+ <command>adduser</command>, but the command syntax may vary from platform
+ to platform). 

 </para>
 
 <para>
 </para>
 
 <para>


@@ -111,13 +114,13 @@
  autoconf
  ./configure      # (--help to see options)
  make             # (the make from GNU, sometimes called gmake) 
  autoconf
  ./configure      # (--help to see options)
  make             # (the make from GNU, sometimes called gmake) 

- su 
+ su               # Possibly required

  make -n install  # (to see where all the files will go)
  make -s install  # (to really install, -s to silence output)</screen>
 </para>
 
 <para>
  make -n install  # (to see where all the files will go)
  make -s install  # (to really install, -s to silence output)</screen>
 </para>
 
 <para>

-  If you have GNU <command>make</command>, you can have the first four steps
+  Using GNU <command>make</command>, you can have the first four steps

   automatically done for you by just typing:
 </para>
 
   automatically done for you by just typing:
 </para>
 


@@ -133,8 +136,8 @@
 
 <para>
  To build an executable with security enhanced features so that 
 
 <para>
  To build an executable with security enhanced features so that 

- users cannot easily bypass the proxy (e.g. <quote>go there anyway</quote>), or
- change their own configurations, <command>configure</command> like this:
+ users cannot easily bypass the proxy (e.g. <quote>Go There Anyway</quote>), or
+ alter their own configurations, <command>configure</command> like this:

 </para>
 <para>
  <screen>
 </para>
 <para>
  <screen>


@@ -158,8 +161,8 @@ Then build as above.
  <literal>--with-group</literal> options for setting user and group ownership
  of the configuration files (which need to be writable by the daemon). The
  specified <emphasis>user must already exist</emphasis>. When starting
  <literal>--with-group</literal> options for setting user and group ownership
  of the configuration files (which need to be writable by the daemon). The
  specified <emphasis>user must already exist</emphasis>. When starting

- <application>Privoxy</application>, it should be run as this same user to
- insure write access to configuration and log files.
+ <application>Privoxy</application>, it must be run as this same user to
+ insure write access to configuration and log files!

 </para>
 
 <para>
 </para>
 
 <para>


@@ -176,9 +179,10 @@ Then build as above.
  The default installation path for <command>make install</command> is 
  <filename>/usr/local</filename>. This may of course be customized with 
  the various <command>./configure</command> path options. If you are doing 
  The default installation path for <command>make install</command> is 
  <filename>/usr/local</filename>. This may of course be customized with 
  the various <command>./configure</command> path options. If you are doing 

- a root install to anywhere else besides <filename>/usr/local</filename>, be
+ an install to anywhere besides <filename>/usr/local</filename>, be

  sure to set the appropriate paths with the correct configure options
  sure to set the appropriate paths with the correct configure options

- (<command>./configure --help</command>).
+ (<command>./configure --help</command>). Non-privileged users must of course
+ have write access permissions to wherever the target installation is going.

 </para>
 
 <para>
 </para>
 
 <para>


@@ -192,10 +196,10 @@ Then build as above.
 </para>
 
 <para>
 </para>
 
 <para>

- If installing to <filename>/usr/local</filename>, the docs will go by default
- to <filename>$prefix/share/doc</filename>. But if this directory doesn't
- exist, it will then try <filename>$prefix/doc</filename> and install there before
- creating a new <filename>$prefix/share/doc</filename> just for
+ If installing to <filename>/usr/local</filename>, the documentation will go
+ by default to <filename>$prefix/share/doc</filename>. But if this directory
+ doesn't exist, it will then try <filename>$prefix/doc</filename> and install
+ there before creating a new <filename>$prefix/share/doc</filename> just for

  <application>Privoxy</application>.
 </para>
 
  <application>Privoxy</application>.
 </para>
 


@@ -209,8 +213,8 @@ Then build as above.
 
 <para>
  <command>make install</command> will attempt to set the correct values 
 
 <para>
  <command>make install</command> will attempt to set the correct values 

- in <filename>config</filename> (main configuration file). You may want 
- to check this to make sure all values are correct. If appropriate,
+ in <filename>config</filename> (main configuration file). You should  
+ check this to make sure all values are correct. If appropriate,

  an init script will be installed, but it is up to the user to determine 
  how and where to start <application>Privoxy</application>. The init 
  script should be checked for correct paths and values, if anything other than
  an init script will be installed, but it is up to the user to determine 
  how and where to start <application>Privoxy</application>. The init 
  script should be checked for correct paths and values, if anything other than


@@ -218,14 +222,16 @@ Then build as above.
 </para>
 
 <para>
 </para>
 
 <para>

- If install finds previous versions of any local configuration files, these
- will not be overwritten, and the new ones will be installed with a
+ If install finds previous versions of local configuration files, most of
+ these will not be overwritten, and the new ones will be installed with a

  <quote>new</quote> extension. default.action, default.filter, and 
  <quote>new</quote> extension. default.action, default.filter, and 

- standard.action will be overwritten. You will then need to manually update
- the other installed configuration files as needed. All template files will be
- overwritten. If you have customized, local templates, you should save these
- first. If a previous version of <application>Privoxy</application> is
- already running, you will have to restart it manually.
+ standard.action <emphasis>will be overwritten</emphasis>. You will then need
+ to manually update the other installed configuration files as needed. All
+ template files will be overwritten. If you have customized, local templates,
+ you should save these first, and in fact it is wise to always save any
+ important configuration files <quote>just in case</quote>. If a previous
+ version of <application>Privoxy</application> is already running, you will
+ have to restart it manually.

 </para>
 
 <para>
 </para>
 
 <para>

diff --git a/doc/source/config.sgml b/doc/source/config.sgml
index a848b84..318db0e 100644 (file)
--- a/doc/source/config.sgml
+++ b/doc/source/config.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[
 <!entity % dummy "IGNORE"> 
 <!entity config SYSTEM "p-config.sgml">
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[
 <!entity % dummy "IGNORE"> 
 <!entity config SYSTEM "p-config.sgml">

-<!entity p-version "3.0.5">
-<!entity p-status "BETA">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-version "3.0.6">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">

 <!entity % user-man "IGNORE">
 <!entity % config-file "IGNORE">
 ]>
 <!entity % user-man "IGNORE">
 <!entity % config-file "IGNORE">
 ]>


@@ -12,7 +12,7 @@
 
  Purpose     :  config file generation
                 
 
  Purpose     :  config file generation
                 

- $Id: config.sgml,v 2.3 2006/07/18 14:48:50 david__schmidt Exp $
+ $Id: config.sgml,v 2.4 2006/09/22 01:27:55 hal9 Exp $

 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.

diff --git a/doc/source/contacting.sgml b/doc/source/contacting.sgml
index e1bbdec..99192fc 100644 (file)
--- a/doc/source/contacting.sgml
+++ b/doc/source/contacting.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
 
  Purpose     :  Entity included in other project documents.
                 

- $Id: contacting.sgml,v 2.8 2006/09/22 01:27:55 hal9 Exp $
+ $Id: contacting.sgml,v 2.9 2006/09/22 13:30:57 fabiankeil Exp $

 
  Copyright (C) 2001 - 2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001 - 2006 Privoxy Developers http://privoxy.org
  See LICENSE.


@@ -142,7 +142,7 @@ Please be sure to provide the following information:
    <para>
     The operating system and versions you run
     <application>Privoxy</application> on, (e.g. <application>Windows
    <para>
     The operating system and versions you run
     <application>Privoxy</application> on, (e.g. <application>Windows

-    XP SP2</application>), if you are using some kind of Unix flavour,
+    XP SP2</application>), if you are using a Unix flavor,

     sending the output of <quote>uname -a</quote> should do.
    </para>
   </listitem> 
     sending the output of <quote>uname -a</quote> should do.
    </para>
   </listitem> 

diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 362b5f5..c453381 100644 (file)
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -8,10 +8,10 @@
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">

-<!entity p-version "3.0.5">
-<!entity p-status "BETA">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-version "3.0.6">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">

 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->


@@ -23,7 +23,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 

- $Id: developer-manual.sgml,v 2.10 2006/09/22 01:27:55 hal9 Exp $
+ $Id: developer-manual.sgml,v 2.11 2006/09/26 02:36:29 hal9 Exp $

 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.


@@ -50,7 +50,7 @@
     </pubdate>
 
 
     </pubdate>
 
 

-    <pubdate>$Id: developer-manual.sgml,v 2.10 2006/09/22 01:27:55 hal9 Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 2.11 2006/09/26 02:36:29 hal9 Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -1832,7 +1832,7 @@ static void unload_re_filterfile( void *f ) { ... }</programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>

-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.10 2006/09/22 01:27:55 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.11 2006/09/26 02:36:29 hal9 Exp $";

 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$


@@ -1893,7 +1893,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION;
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H

-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.10 2006/09/22 01:27:55 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.11 2006/09/26 02:36:29 hal9 Exp $"

 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$


@@ -3025,6 +3025,9 @@ at sourceforge. Three simple steps:
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $

+  Revision 2.11  2006/09/26 02:36:29  hal9
+  Fix broken link per bug tracker.
+

   Revision 2.10  2006/09/22 01:27:55  hal9
   Final commit of probably various minor changes here and there. Unless
   something changes this should be ready for pending release.
   Revision 2.10  2006/09/22 01:27:55  hal9
   Final commit of probably various minor changes here and there. Unless
   something changes this should be ready for pending release.

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 007f613..9857eb3 100644 (file)
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -8,8 +8,8 @@
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">

-<!entity p-version "3.0.5">
-<!entity p-status "BETA">
+<!entity p-version "3.0.6">
+<!entity p-status "stable">

 <!entity % p-not-stable "IGNORE">
 <!entity % p-stable "INCLUDE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-not-stable "IGNORE">
 <!entity % p-stable "INCLUDE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->


@@ -26,7 +26,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 

- $Id: faq.sgml,v 2.22 2006/10/14 20:33:10 hal9 Exp $
+ $Id: faq.sgml,v 2.23 2006/10/21 22:19:52 hal9 Exp $

 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.


@@ -77,7 +77,7 @@
  </subscript>
 </pubdate>
 
  </subscript>
 </pubdate>
 

-<pubdate>$Id: faq.sgml,v 2.22 2006/10/14 20:33:10 hal9 Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.23 2006/10/21 22:19:52 hal9 Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -212,10 +212,19 @@ Privoxy work? </title>
   it is in a perfect position to filter outbound personal information that your
   browser is leaking, as well as inbound junk. It uses a variety of techniques to do
   this, all of which are under your complete control via the various configuration
   it is in a perfect position to filter outbound personal information that your
   browser is leaking, as well as inbound junk. It uses a variety of techniques to do
   this, all of which are under your complete control via the various configuration

-  files and options.
+  files and options. Being a proxy also makes it easier to share
+  configurations among multiple browsers and/or users.

  </para>
 </sect2>
 
  </para>
 </sect2>
 

+<sect2 renderas="sect3" id="otherstuff">
+<title>Does Privoxy do anything more than ad blocking?</title>
+ <para> 
+  Yes, ad blocking is but one possible use. There are many, many ways &my-app; 
+  can be used to sanitize and customize web browsing. 
+</para>
+</sect2>
+

 <sect2 renderas="sect3" id="newjb"><title>What is this new version of 
 <quote><citetitle>Junkbuster</citetitle></quote>?</title>
 
 <sect2 renderas="sect3" id="newjb"><title>What is this new version of 
 <quote><citetitle>Junkbuster</citetitle></quote>?</title>
 


@@ -230,14 +239,14 @@ Privoxy work? </title>
 <title id="whyprivoxy">Why <quote>Privoxy</quote>? Why change the name from
 Junkbuster at all?</title>
 <para>
 <title id="whyprivoxy">Why <quote>Privoxy</quote>? Why change the name from
 Junkbuster at all?</title>
 <para>

- <ulink url="http://junkbusters.com/">Junkbusters Corporation</ulink>
+ Though outdated, <ulink url="http://junkbusters.com/">Junkbusters Corporation</ulink>

  continues to offer their original version of the <application>Internet
  Junkbuster</application>, so publishing our
  <application> Junkbuster</application>-derived software under the same name
  led to confusion.
 </para>
 <para>
  continues to offer their original version of the <application>Internet
  Junkbuster</application>, so publishing our
  <application> Junkbuster</application>-derived software under the same name
  led to confusion.
 </para>
 <para>

- There are also potential legal complications from the continued use of the 
+ There are also potential legal complications from our use of the 

  <application>Junkbuster</application> name, which is a registered trademark of 
  <ulink url="http://junkbusters.com/">Junkbusters Corporation</ulink>.
  There are, however, no objections from Junkbusters Corporation to the 
  <application>Junkbuster</application> name, which is a registered trademark of 
  <ulink url="http://junkbusters.com/">Junkbusters Corporation</ulink>.
  There are, however, no objections from Junkbusters Corporation to the 


@@ -258,7 +267,6 @@ Junkbuster at all?</title>
 </para>
 </sect2>
 
 </para>
 </sect2>
 

-

 <sect2 renderas="sect3" id="differs"><title>How does Privoxy differ
 from the old Junkbuster?</title> 
 <para>
 <sect2 renderas="sect3" id="differs"><title>How does Privoxy differ
 from the old Junkbuster?</title> 
 <para>


@@ -339,32 +347,42 @@ This does not sound very scientific.</title>
 
 </sect2>
 
 
 </sect2>
 

-

 <sect2 renderas="sect3">
 <title id="configornot">Will I have to configure Privoxy
  before I can use it?</title>
 <para>
  No, not really. The default installation should give you a good starting
 <sect2 renderas="sect3">
 <title id="configornot">Will I have to configure Privoxy
  before I can use it?</title>
 <para>
  No, not really. The default installation should give you a good starting

- point, and block <emphasis>most</emphasis> unwanted content.
+ point, and block <emphasis>most</emphasis> ads and unwanted content. Many of
+ the more advanced features are off by default, and would require you to 
+ activate them. 
+</para>
+<para>
+ You do have to set up your browser to use
+ <application>Privoxy</application> (see the <link
+ linkend="firststep">Installation section below</link>). 

 </para>
 <para>
 </para>
 <para>

- But you will certainly run into situations where there are false positives,
+ And you will certainly run into situations where there are false positives,

  or ads not being blocked that you may not want to see. In these cases, you
  would certainly benefit by customizing <application>Privoxy's</application>
  configuration to more closely match your individual situation. And we would
  encourage you to do this. This is where the real power of
  <application>Privoxy</application> lies!
 </para>
  or ads not being blocked that you may not want to see. In these cases, you
  would certainly benefit by customizing <application>Privoxy's</application>
  configuration to more closely match your individual situation. And we would
  encourage you to do this. This is where the real power of
  <application>Privoxy</application> lies!
 </para>

-<para>
- You will have to tell your browser about <application>Privoxy</application> 
- (see the Installation section below).
-</para>

 
 </sect2>
 
 
 </sect2>
 

+<sect2 renderas="sect3" id="lan">
+<title>Can Privoxy run as a server on a network?</title>
+ <para> 
+  Yes, &my-app; runs as a server already, and can easily be configured to
+  <quote>serve</quote> more than one client. See <link linkend="lanconfig">
+  How can I set up Privoxy to act as a proxy for my LAN</link> below.
+</para>
+</sect2>
+

 <sect2 renderas="sect3" id="browsers2"><title>My browser does the same things as
 <sect2 renderas="sect3" id="browsers2"><title>My browser does the same things as

-Privoxy. Why should I use
-Privoxy at all?</title>
+Privoxy. Why should I use Privoxy at all?</title>

  <para>
   Modern browsers do indeed have <emphasis>some</emphasis> of the same
   functionality as <application>Privoxy</application>. Maybe this is
  <para>
   Modern browsers do indeed have <emphasis>some</emphasis> of the same
   functionality as <application>Privoxy</application>. Maybe this is


@@ -373,9 +391,10 @@ Privoxy at all?</title>
  </para>
  <para>
   In addition, a proxy is good choice if you use multiple browsers, or 
  </para>
  <para>
   In addition, a proxy is good choice if you use multiple browsers, or 

-  have a LAN with multiple computers. This way all the configuration 
-  is in one place, and you don't have to maintain a similar configuration 
-  for possibly many browsers.
+  have a LAN with multiple computers since &my-app; can run as a server  
+  application. This way all the configuration is in one place, and you don't
+  have to maintain a similar configuration for possibly many browsers or
+  users.

  </para>
 </sect2>
 
  </para>
 </sect2>
 


@@ -416,9 +435,9 @@ warranty? Registration?</title>
 <title>Can Privoxy remove spyware? Adware? Viruses?</title>
 <para>
  No. &my-app; cannot remove anything. It is not a removal tool. It is a
 <title>Can Privoxy remove spyware? Adware? Viruses?</title>
 <para>
  No. &my-app; cannot remove anything. It is not a removal tool. It is a

- preventative. &my-app; can help prevent contact from sites 
- that use such tactics with approriate configuration rules, and thus could
- conceivably prevent contamination from such sites.
+ preventative. &my-app; can help prevent contact from sites that use such
+ tactics with appropriate configuration rules, and thus could conceivably
+ prevent contamination from such sites.

 </para>
 </sect2>
 
 </para>
 </sect2>
 


@@ -457,11 +476,6 @@ warranty? Registration?</title>
    url="../developer-manual/index.html">Developer's Manual</ulink>, at least
    the pertinent sections.
 </para>
    url="../developer-manual/index.html">Developer's Manual</ulink>, at least
    the pertinent sections.
 </para>

-<para>
- Once we have added you to the team, you'll have access to the <ulink
- url="http://sourceforge.net/cvs/?group_id=11118">CVS repository</ulink>, and
- together we'll find a suitable task for you.
-</para>

 </sect3>
 
 <sect3 renderas="sect4" id="jointeam-money"><title>Contribute!</title>
 </sect3>
 
 <sect3 renderas="sect4" id="jointeam-money"><title>Contribute!</title>


@@ -554,15 +568,16 @@ Include supported.sgml here:
 
 </sect2>
 
 
 </sect2>
 

-<sect2 renderas="sect3">
-<title id="firststep">I just installed Privoxy. Is there anything 
+<sect2 renderas="sect3" id="firststep">
+<title>I just installed Privoxy. Is there anything 

 special I have to do now?</title>
 
 <para>
  All browsers must be told to use <application>Privoxy</application> 
  as a proxy by specifying the correct proxy address and port number 
 special I have to do now?</title>
 
 <para>
  All browsers must be told to use <application>Privoxy</application> 
  as a proxy by specifying the correct proxy address and port number 

- in the appropriate configuration area for the browser. See below.
- You should also flush your browser's memory and disk cache to get rid of any
+ in the appropriate configuration area for the browser. See 
+ <ulink url="../user-manual/startup.html">the User Manual for more
+ details</ulink>. You should also flush your browser's memory and disk cache to get rid of any

  cached junk items, and remove any stored 
  <ulink url="http://en.wikipedia.org/wiki/Browser_cookie">cookies</ulink>.
 
  cached junk items, and remove any stored 
  <ulink url="http://en.wikipedia.org/wiki/Browser_cookie">cookies</ulink>.
 


@@ -594,9 +609,10 @@ special I have to do now?</title>
   <application>Privoxy</application> can also be used to proxy for 
   a Local Area Network. In this case, your would enter either the IP 
   address of the LAN host where <application>Privoxy</application> 
   <application>Privoxy</application> can also be used to proxy for 
   a Local Area Network. In this case, your would enter either the IP 
   address of the LAN host where <application>Privoxy</application> 

-  is running, or the equivalent hostname. Port assignment would be 
-  same as above. Note that <application>Privoxy</application> doesn't
-  listen on any LAN interfaces by default.
+  is running, or the equivalent hostname, e.g. <literal>192.168.1.1</literal>.
+  Port assignment would be same as above. Note that
+  <application>Privoxy</application> doesn't listen on any LAN interfaces by
+  default.

  </para>
  <para>
   <application>Privoxy</application> does not currently handle
  </para>
  <para>
   <application>Privoxy</application> does not currently handle


@@ -822,7 +838,7 @@ the differences?</title>
 <sect2 renderas="sect3" id="yahoo"><title>How can I make my Yahoo/Hotmail/Gmail account work?</title>
  <para>
   The default configuration shouldn't impact the usability of any of these services.
 <sect2 renderas="sect3" id="yahoo"><title>How can I make my Yahoo/Hotmail/Gmail account work?</title>
  <para>
   The default configuration shouldn't impact the usability of any of these services.

-  It will, however, make all <ulink 
+  It may, however, make all <ulink 

  url="http://en.wikipedia.org/wiki/Browser_cookie">cookies</ulink> 
   temporary, so that your browser will forget your
   login credentials in between browser sessions. If you would like not to have to log
  url="http://en.wikipedia.org/wiki/Browser_cookie">cookies</ulink> 
   temporary, so that your browser will forget your
   login credentials in between browser sessions. If you would like not to have to log


@@ -848,6 +864,7 @@ the differences?</title>
   <screen># Gmail is a _fragile_ site:
 #
 { <literal>fragile</literal> }
   <screen># Gmail is a _fragile_ site:
 #
 { <literal>fragile</literal> }

+ # Gmail is ...

  mail.google.com</screen>
  </para>
  <para>
  mail.google.com</screen>
  </para>
  <para>


@@ -964,8 +981,8 @@ with a browser? Does that not raise security issues?</title>
 
 </sect2>
 
 
 </sect2>
 

-<sect2 renderas="sect3">
-<title id="lanconfig">How can I set up Privoxy to act as a proxy for my 
+<sect2 renderas="sect3" id="lanconfig">
+<title>How can I set up Privoxy to act as a proxy for my 

  LAN?</title>
 <para>
  By default, <application>Privoxy</application> only responds to requests 
  LAN?</title>
 <para>
  By default, <application>Privoxy</application> only responds to requests 


@@ -1053,7 +1070,7 @@ with a browser? Does that not raise security issues?</title>
  Remember that <link linkend="whatsanad">telling which image is an ad and which
  isn't</link>, is an educated guess. While we hope that the standard configuration
  is rather smart, it will make occasional mistakes. The checkerboard image is visually
  Remember that <link linkend="whatsanad">telling which image is an ad and which
  isn't</link>, is an educated guess. While we hope that the standard configuration
  is rather smart, it will make occasional mistakes. The checkerboard image is visually

- decent, but it shows you that and where images were blocked, which can be very
+ decent, and it shows you where images have been blocked, which can be very

  helpful in case some navigation aid or otherwise innocent image was
  erroneously blocked. It is recommended for new users so they can 
  <quote>see</quote> what is happening. Some people might also enjoy seeing how
  helpful in case some navigation aid or otherwise innocent image was
  erroneously blocked. It is recommended for new users so they can 
  <quote>see</quote> what is happening. Some people might also enjoy seeing how


@@ -1345,8 +1362,7 @@ and thus avoid individual browser configuration?</title>
  <screen>
  # Unblock everybody, everywhere
  { <ulink url="../user-manual/actions-file.html#BLOCK">-block</ulink> }
  <screen>
  # Unblock everybody, everywhere
  { <ulink url="../user-manual/actions-file.html#BLOCK">-block</ulink> }

- / # UN-Block *all* URLs
- </screen>
+ / # UN-Block *all* URLs</screen>

 </para>
 <para> 
  Or even a more comprehensive reversing of various ad related actions:
 </para>
 <para> 
  Or even a more comprehensive reversing of various ad related actions:


@@ -1359,8 +1375,7 @@ and thus avoid individual browser configuration?</title>
   <ulink url="../user-manual/actions-file.html#FILTER-BANNERS-BY-LINK">-filter{banners-by-link}</ulink> \
   <literal>allow-popups</literal> \
  }
   <ulink url="../user-manual/actions-file.html#FILTER-BANNERS-BY-LINK">-filter{banners-by-link}</ulink> \
   <literal>allow-popups</literal> \
  }

- / # UN-Block *all* URLs and allow ads
- </screen>
+ / # UN-Block *all* URLs and allow ads</screen>

 </para>
 <para>
  This last <quote>action</quote> in this compound statement,
 </para>
 <para>
  This last <quote>action</quote> in this compound statement,


@@ -1397,8 +1412,7 @@ the <emphasis>BLOCKED</emphasis> page?</title>
 </para>
 <para>
  <screen>
 </para>
 <para>
  <screen>

- ./configure  --disable-toggle  --disable-editor  --disable-force
- </screen>
+ ./configure  --disable-toggle  --disable-editor  --disable-force</screen>

 </para>
 <para>
  This will create an executable with hard-coded security features so that
 </para>
 <para>
  This will create an executable with hard-coded security features so that


@@ -1759,7 +1773,7 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  Faq 4.2</ulink> to learn how to verify that you are really using <application>Tor</application>.
 </para>
 <para>
  Faq 4.2</ulink> to learn how to verify that you are really using <application>Tor</application>.
 </para>
 <para>

- Afterwards, please take the time to at least skim through the rest
+ Afterward, please take the time to at least skim through the rest

  of <application>Tor's</application> documentation. Make sure you understand
  what <application>Tor</application> does, why it is no replacement for
  application level security, and why you shouldn't use it for unencrypted logins.
  of <application>Tor's</application> documentation. Make sure you understand
  what <application>Tor</application> does, why it is no replacement for
  application level security, and why you shouldn't use it for unencrypted logins.


@@ -2167,8 +2181,7 @@ still getting through. How?</title>
  If the ad had been displayed before you added its URL, it will probably be
  held in the browser's cache for some time, so it will be displayed without
  the need for any request to the server, and <application>Privoxy</application>
  If the ad had been displayed before you added its URL, it will probably be
  held in the browser's cache for some time, so it will be displayed without
  the need for any request to the server, and <application>Privoxy</application>

- will not be in the picture. The best thing to do is try flushing the browser's
- caches. And then try again.
+ will not be involved. Flush the browser's caches, and then try again.

 </para>
 
 <para>
 </para>
 
 <para>


@@ -2183,6 +2196,63 @@ still getting through. How?</title>
  be able to get all the relevant information you need. Alternately, you can 
  find the correct URL by looking at <application>Privoxy's</application> logs.
 </para>
  be able to get all the relevant information you need. Alternately, you can 
  find the correct URL by looking at <application>Privoxy's</application> logs.
 </para>

+<para>
+ Below is a slightly modified real-life log snippet that originates with one 
+ requested URL: <literal>www.example.com</literal> (name of site was changed
+ for this example, the number of requests is real). You can see in this the
+ complexity of what goes into making up this one <quote>page</quote>. There
+ are eight different domains involved here, with thirty two separate URLs
+ requested in all, making up all manner of images, Shockwave Flash,
+ JavaScript, CSS stylesheets, scripts, and other related content. Some of this
+ content is obviously <quote>good</quote> or <quote>bad</quote>, but not all.
+ Many of the more questionable looking requests, are going to outside domains
+ that seem to be identifying themselves with suspicious looking names, making
+ our job a little easier. &my-app; has <quote>crunched</quote> (meaning caught 
+ and BLOCKED) quite a few items in this example, but perhaps missed a few as well. 
+</para>
+<para>
+<screen>
+<![CDATA[
+Request: www.example.com/
+Request: www.example.com/favicon.ico
+Request: img.example.com/main.css
+Request: img.example.com/sr.js
+Request: example.betamarker.com/example.html
+Request: www.lik-sang.com/Banners/bestsellers/skyscraper.php?likref=BSellers
+Request: img.example.com/pb.png
+Request: www.google-analytics.com/urchin.js crunch!
+Request: www.advertising-department.com/ats/switch.ps.php?26856 crunch!
+Request: img.example.com/p.gif
+Request: www.popuptraffic.com/assign.php?l=example&mode=behind crunch!
+Request: www.popuptraffic.com/scripts/popup.php?hid=5c3cf&tmpl=PBa.tmpl crunch!
+Request: www.popuptraffic.com/assign.php?l=example crunch!
+Request: www.lik-sang.com/Banners/best_sellers/best_sellers.css
+Request: www.adtrak.net/adx.js crunch!
+Request: img.example.com/hbg.gif
+Request: img.example.com/example.jpg
+Request: img.example.com/mt.png
+Request: img.example.com/mm.png
+Request: img.example.com/mb.png
+Request: www.popuptraffic.com/scripts/popup.php?hid=a71b91fa5&tmpl=Ua.tmp crunch!
+Request: www.example.com/tracker.js
+Request: www.lik-sang.com/Banners/best_sellers/lsi_head.gif
+Request: www.adtrak.net/adjs.php?n=020548130&what=zone:61 crunch!
+Request: www.adtrak.net/adjs.php?n=463594413&what=zone:58&source=Ua crunch!
+Request: www.lik-sang.com/Banners/best_sellers/bottomani.swf
+Request: mmm.elitemediagroup.net/install.php?allowpop=no&popupmincook=0&allowsp2=1 crunch!
+Request: www.example.com/tracker.js?screen=1400x1050&win=962x693
+Request: www.adtrak.net/adlog.php?bannerid=1309&clientid=439&zoneid=61 crunch!
+Request: 66.70.21.80/scripts/click.php?hid=5c3cf599a9efd0320d26&si
+Request: 66.70.21.80/img/pixel.gif
+Request: www.adtrak.net/adlog.php?bannerid=1309&clientid=439&zoneid=58&source=Ua&block=86400 crunch!
+Request: 66.70.21.80/scripts/click.php?hid=a71b9f6504b0c5681fa5&si=Ua
+]]>
+</screen>
+</para>
+<para>
+ Despite 12 out of 32 requests being blocked, the page looked, and seemed to
+ behave perfectly <quote>normal</quote> (minus some ads, of course).
+</para>

 
 </sect2>
 
 
 </sect2>
 


@@ -2200,14 +2270,20 @@ What can I do?</title>
 </para>
 
 <para>
 </para>
 
 <para>

- If still a problem, go to <ulink
+ If the problem went away, we know we have a configuration related problem.
+ Now go to <ulink

  url="http://config.privoxy.org/show-url-info">http://config.privoxy.org/show-url-info</ulink>
  url="http://config.privoxy.org/show-url-info">http://config.privoxy.org/show-url-info</ulink>

- and paste the full URL of the page in question into the prompt. See which actions
- are being applied to the URL, and which matches in which actions files are
- responsible for that. Now, armed with this information, go to <ulink
+ and paste the full URL of the page in question into the prompt. See which
+ actions are being applied to the URL, and which matches in which actions
+ files are responsible for that. It might be helpful also to look at your logs
+ for this site too, to see what else might be happening. Many sites are
+ complex and require a number of related pages to help present their content.
+ Look at what else might be used by the page in question, and what of that
+ might be <emphasis>required</emphasis>.
+ Now, armed with this information, go to
+ <ulink

  url="http://config.privoxy.org/show-status">http://config.privoxy.org/show-status</ulink>
  url="http://config.privoxy.org/show-status">http://config.privoxy.org/show-status</ulink>

- and select the appropriate actions files for editing.
-</para>
+ and select the appropriate actions files for editing. </para>

 <para>
  You can now either look for a section which disables the actions that
  you suspect to cause the problem and add a pattern for your site there,
 <para>
  You can now either look for a section which disables the actions that
  you suspect to cause the problem and add a pattern for your site there,


@@ -2234,6 +2310,10 @@ What can I do?</title>
  url="../user-manual/actions-file.html#ACT-EXAMPLES">actions tutorial</ulink>
  with general configuration information and examples.
 </para>
  url="../user-manual/actions-file.html#ACT-EXAMPLES">actions tutorial</ulink>
  with general configuration information and examples.
 </para>

+<para>
+ As a last resort, you can always see if your browser has a setting that will 
+ bypass the proxy setting for selective sites. Modern browsers can do this.
+</para>

 
 </sect2>
 
 
 </sect2>
 


@@ -2419,7 +2499,7 @@ Why?</title>
 <para>
  This can be caused by a problem with the local <filename>HOSTS</filename>
  file. If this file has been changed from the original, try reverting it to
 <para>
  This can be caused by a problem with the local <filename>HOSTS</filename>
  file. If this file has been changed from the original, try reverting it to

- see if that helps. Make sure what ever name(s) are used for the local system,
+ see if that helps. Make sure whatever name(s) are used for the local system,

  that they resolve both ways.
 </para>
 </sect2>
  that they resolve both ways.
 </para>
 </sect2>


@@ -2668,6 +2748,9 @@ browsing has slowed to a crawl. What gives? </title>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $

+Revision 2.23  2006/10/21 22:19:52  hal9
+Two new FAQs, a rewrite or two, and some touch ups.
+

 Revision 2.22  2006/10/14 20:33:10  hal9
 Three new FAQ's re: templates and blocking, and various minor touch-ups/improvements.
 
 Revision 2.22  2006/10/14 20:33:10  hal9
 Three new FAQ's re: templates and blocking, and various minor touch-ups/improvements.
 

diff --git a/doc/source/install.sgml b/doc/source/install.sgml
index a0b8aff..d76800f 100644 (file)
--- a/doc/source/install.sgml
+++ b/doc/source/install.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 <!entity % dummy "IGNORE"> 
 <!entity buildsource SYSTEM "buildsource.sgml">
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 <!entity % dummy "IGNORE"> 
 <!entity buildsource SYSTEM "buildsource.sgml">

-<!entity p-version "3.0.5">
-<!entity p-status "BETA">
-<!entity % p-stable "IGNORE">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-version "3.0.6">
+<!entity p-status "stable">
+<!entity % p-stable "INCLUDE">
+<!entity % p-not-stable "IGNORE">

 <!entity % p-alpha "IGNORE">
 <!entity % p-beta "IGNORE">
 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
 <!entity % p-alpha "IGNORE">
 <!entity % p-beta "IGNORE">
 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->


@@ -16,7 +16,7 @@
 
  Purpose     :  INSTALL file for Privoxy
                 
 
  Purpose     :  INSTALL file for Privoxy
                 

- $Id: install.sgml,v 2.2 2006/07/18 14:48:50 david__schmidt Exp $
+ $Id: install.sgml,v 2.3 2006/09/22 01:27:55 hal9 Exp $

 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.

diff --git a/doc/source/newfeatures.sgml b/doc/source/newfeatures.sgml
index ef4c77c..d118669 100644 (file)
--- a/doc/source/newfeatures.sgml
+++ b/doc/source/newfeatures.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
 
  Purpose     :  Entity included in other project documents.
                 

- $Id: newfeatures.sgml,v 2.3 2006/07/18 14:48:51 david__schmidt Exp $
+ $Id: newfeatures.sgml,v 2.4 2006/09/22 01:27:55 hal9 Exp $

 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.


@@ -44,8 +44,9 @@
 
  <listitem>
   <para>
 
  <listitem>
   <para>

-   Web page content filtering (removes banners based on size,
-   invisible <quote>web-bugs</quote>, JavaScript and HTML annoyances, pop-up windows, etc.)
+   Web page filtering (text replacements, removes banners based on size,
+   invisible <quote>web-bugs</quote>, JavaScript and HTML annoyances, 
+   pop-up windows, header manipulation, etc.)

   </para>
  </listitem> 
 
   </para>
  </listitem> 
 

diff --git a/doc/source/p-authors.sgml b/doc/source/p-authors.sgml
index 027b825..b13f77b 100644 (file)
--- a/doc/source/p-authors.sgml
+++ b/doc/source/p-authors.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
 
  Purpose     :  Entity included in other project documents.
                 

- $Id: p-authors.sgml,v 2.17 2006/10/22 14:23:34 hal9 Exp $
+ $Id: p-authors.sgml,v 2.18 2006/10/22 14:29:34 hal9 Exp $

 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.


@@ -70,8 +70,9 @@ Current Privoxy Team:
 </literallayout>
 <![%p-authors-formal;[
 <para>
 </literallayout>
 <![%p-authors-formal;[
 <para>

- Thanks to the many people who have tested Privoxy, reported bugs, made
- suggestions or contributed in some way. These include (in alphabetical order):
+ Thanks to the many people who have tested Privoxy, reported bugs, provided 
+ patches, made suggestions or contributed in some way. These include (in
+ alphabetical order):

 </para>
 <literallayout>
  Ken Arromdee
 </para>
 <literallayout>
  Ken Arromdee


@@ -83,22 +84,29 @@ Current Privoxy Team:
  Michael T. Davis
  Mattes Dolak 
  Peter E
  Michael T. Davis
  Mattes Dolak 
  Peter E

+ Florian Effenberger
+ Dean Gaudet

  Aaron Hamid
  Aaron Hamid

+ Darel Henman

  Magnus Holmgren
  Magnus Holmgren

+ Derek Jennings

  David Laight
  Don Libes  
  Paul Lieverse
  Jindrich Makovicka 
  David Mediavilla 
  David Laight
  Don Libes  
  Paul Lieverse
  Jindrich Makovicka 
  David Mediavilla 

+ Raphael Moll

  Oliver Stoeneberg
  Oliver Stoeneberg

+ Martin Thomas

  Roberto Ragusa
  Félix Rauch
  Maynard Riley
  Spinor S
  Bart Schelstraete
  Bobby G. Vinyard
  Roberto Ragusa
  Félix Rauch
  Maynard Riley
  Spinor S
  Bart Schelstraete
  Bobby G. Vinyard

- Darren Wiebe

  Jörg Weinmann 
  Jörg Weinmann 

+ Darren Wiebe
+ Anduin Withers

  Oliver Yeoh
  Jamie Zawinski
 </literallayout>
  Oliver Yeoh
  Jamie Zawinski
 </literallayout>

diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index 6df2d2b..22c2ec8 100644 (file)
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,7 +5,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 

- $Id: privoxy-man-page.sgml,v 2.10 2006/10/03 11:12:18 hal9 Exp $
+ $Id: privoxy-man-page.sgml,v 2.11 2006/10/24 10:57:00 hal9 Exp $

 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.


@@ -43,9 +43,9 @@
 <!entity license SYSTEM "license.sgml">
 <!entity authors SYSTEM "p-authors.sgml">
 <!entity p-version "3.0.6">
 <!entity license SYSTEM "license.sgml">
 <!entity authors SYSTEM "p-authors.sgml">
 <!entity p-version "3.0.6">

-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">

 <!entity % p-text "IGNORE">           <!-- define we are not a text only doc -->
 <!entity % p-authors-formal "IGNORE"> <!-- exclude additional formating      -->
 <!entity my-copy "(C)">               <!-- db2man barfs on copyright symbol  -->
 <!entity % p-text "IGNORE">           <!-- define we are not a text only doc -->
 <!entity % p-authors-formal "IGNORE"> <!-- exclude additional formating      -->
 <!entity my-copy "(C)">               <!-- db2man barfs on copyright symbol  -->

diff --git a/doc/source/readme.sgml b/doc/source/readme.sgml
index 4e9d651..08df5a9 100644 (file)
--- a/doc/source/readme.sgml
+++ b/doc/source/readme.sgml
@@ -4,10 +4,10 @@
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity buildsource SYSTEM "buildsource.sgml">
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity buildsource SYSTEM "buildsource.sgml">

-<!entity p-version "3.0.5">
-<!entity p-status "BETA">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-version "3.0.6">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">

 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
 <!entity % p-doc "IGNORE">         <!-- and never a text doc             -->
 <!entity % p-readme "INCLUDE">     <!-- all your README belong to us     -->
 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
 <!entity % p-doc "IGNORE">         <!-- and never a text doc             -->
 <!entity % p-readme "INCLUDE">     <!-- all your README belong to us     -->


@@ -17,7 +17,7 @@
 
  Purpose     :  README for Privoxy
                 
 
  Purpose     :  README for Privoxy
                 

- $Id: readme.sgml,v 2.7 2006/09/10 15:30:46 hal9 Exp $
+ $Id: readme.sgml,v 2.8 2006/09/20 23:49:25 hal9 Exp $

 
  Copyright (C) 2001 - 2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  Copyright (C) 2001 - 2006 Privoxy Developers http://privoxy.org
  See LICENSE.


@@ -128,12 +128,18 @@
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 id="importantchanges" ><title>IMPORTANT CHANGES</title>
 <para>
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 id="importantchanges" ><title>IMPORTANT CHANGES</title>
 <para>

- BIG NEWS! September 2006, Privoxy 3.0.5 is released. This is a significant
- upgrade with many new and enhanced features, and many bugs fixed. There are
- fifteen new actions available, and several actions have enhanced
- capabilities. Multiple filter files are now supported as well. See the
- "What's New" section and the "Upgrader's Notes" in <citetitle>the User
- Manual</citetitle> for details and specifics. 
+ NEWS! November 2006, Privoxy 3.0.6 is released. This is a significant upgrade
+ with many new and enhanced features, and many bugs fixed. It is also the
+ first stable release in quite some time. There are fifteen new actions
+ available, and several actions have enhanced capabilities. Multiple filter
+ files are now supported as well. There are many improvements and refinements.
+ See the "What's New" section and the "Upgrader's Notes" in <citetitle>the
+ User Manual</citetitle> for details and specifics. Preliminary work on 
+ 3.0.7 is already underway.
+</para>
+<para>
+ NEWS! September 2006, Privoxy 3.0.5 BETA is released. This is a significant
+ upgrade with many new and enhanced features, and many bugs fixed. 

 </para>
 <para>
  There was and will not be an official 3.0.4 release. This release cycle 
 </para>
 <para>
  There was and will not be an official 3.0.4 release. This release cycle 


@@ -252,7 +258,7 @@
 <!-- </LiteralLayout> -->
 <!-- </para> -->
 <!-- <para> -->
 <!-- </LiteralLayout> -->
 <!-- </para> -->
 <!-- <para> -->

-<!--  $Id: readme.sgml,v 2.7 2006/09/10 15:30:46 hal9 Exp $ -->
+<!--  $Id: readme.sgml,v 2.8 2006/09/20 23:49:25 hal9 Exp $ -->

 <!-- </para> -->
 
 </article>
 <!-- </para> -->
 
 </article>

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index d687a86..dee7405 100644 (file)
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -12,10 +12,10 @@
 <!entity p-authors SYSTEM "p-authors.sgml">
 <!entity config SYSTEM "p-config.sgml">
 <!entity p-version "3.0.6">
 <!entity p-authors SYSTEM "p-authors.sgml">
 <!entity config SYSTEM "p-config.sgml">
 <!entity p-version "3.0.6">

-<!entity p-status "UNRELEASED">
+<!entity p-status "stable">

 <!entity % p-authors-formal "INCLUDE"> <!-- include additional text, etc  -->
 <!entity % p-authors-formal "INCLUDE"> <!-- include additional text, etc  -->

-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">

 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-readme "IGNORE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-readme "IGNORE">


@@ -33,7 +33,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 

- $Id: user-manual.sgml,v 2.25 2006/10/18 10:50:33 hal9 Exp $
+ $Id: user-manual.sgml,v 2.26 2006/10/24 11:16:44 hal9 Exp $

 
  Copyright (C) 2001- 2006 Privoxy Developers http://www.privoxy.org
  See LICENSE.
 
  Copyright (C) 2001- 2006 Privoxy Developers http://www.privoxy.org
  See LICENSE.


@@ -59,7 +59,7 @@
  </subscript>
 </pubdate>
 
  </subscript>
 </pubdate>
 

-<pubdate>$Id: user-manual.sgml,v 2.25 2006/10/18 10:50:33 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.26 2006/10/24 11:16:44 hal9 Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -178,7 +178,7 @@ How to install the binary packages depends on your operating system:
 </para>
 
 <!--   ~~~~~       New section      ~~~~~     -->
 </para>
 
 <!--   ~~~~~       New section      ~~~~~     -->

-<sect3 id="installation-pack-rpm"><title>Red Hat, SuSE and Conectiva RPMs</title>
+<sect3 id="installation-pack-rpm"><title>Red Hat and Fedora RPMs</title>

 
 <para>
  RPMs can be installed with <literal>rpm -Uvh privoxy-&p-version;-1.rpm</literal>,
 
 <para>
  RPMs can be installed with <literal>rpm -Uvh privoxy-&p-version;-1.rpm</literal>,


@@ -363,7 +363,8 @@ How to install the binary packages depends on your operating system:
 
 <para>
  The most convenient way to obtain the <application>Privoxy</application> sources
 
 <para>
  The most convenient way to obtain the <application>Privoxy</application> sources

- is to download the source tarball from our <ulink url="http://sf.net/projects/ijbswa/">project
+ is to download the source tarball from our 
+ <ulink url="http://sourceforge.net/project/showfiles.php?group_id=11118&amp;package_id=10571">project download

  page</ulink>.
 </para>
 
  page</ulink>.
 </para>
 


@@ -422,7 +423,7 @@ How to install the binary packages depends on your operating system:
 <sect1 id="whatsnew">
 <title>What's New in this Release</title>
 <para>
 <sect1 id="whatsnew">
 <title>What's New in this Release</title>
 <para>

- There are many improvements and new features since the last <application>Privoxy</application> stable release:
+ There are many improvements and new features since <application>Privoxy 3.0.3</application>, the last stable release:

 </para>
 
 <para>
 </para>
 
 <para>


@@ -576,39 +577,11 @@ How to install the binary packages depends on your operating system:
    <para>
     In addition, there are numerous bug fixes and significant enhancements,
     including error pages should no longer be cached if the problem is fixed,
    <para>
     In addition, there are numerous bug fixes and significant enhancements,
     including error pages should no longer be cached if the problem is fixed,

-    much better DNS error handling, and various logging improvements.
+    much better DNS error handling, various logging improvements, and 
+    configuration updates for better ad blocking and junk elimination.

    </para>
   </listitem>
 
    </para>
   </listitem>
 

-  <listitem>
-   <para>
-    The default actions setting is now <literal>Cautious</literal>. Previous
-    releases had a default setting of <literal>Medium</literal>. Experienced
-    users may want to adjust this, as it is fairly conservative by &my-app;
-    standards and past practices. See <ulink
-    url="http://config.privoxy.org/edit-actions-list?f=default">
-    http://config.privoxy.org/edit-actions-list?f=default</ulink>. New users
-    should try the default settings for a while before turning up the volume.
-   </para>
-   <para>
-    The default setting has filtering turned <emphasis>off</emphasis>, which
-    subsequently means that compression is <emphasis>on</emphasis>. Remember
-    that filtering does not work on compressed pages, so if you use, or want to
-    use, filtering, you will need to force compression off. Example:
-   </para>
-   <para>
- <screen>
-  { +<link linkend="filter">filter</link>{google}  +<link linkend="prevent-compression">prevent-compression</link> }
-   .google.</screen>
-   </para>
-   <para>
-    Or if you use a number of filters, or filter many sites, you may just want
-    to turn off compression for all sites in
-    <filename>default.action</filename> (or
-    <filename>user.action</filename>). 
-   </para>
-
-  </listitem>

 
  </itemizedlist>
 </para>
 
  </itemizedlist>
 </para>


@@ -673,11 +646,53 @@ How to install the binary packages depends on your operating system:
    default. This is primarily a matter of emphasis, but some features 
    you may have been used to, may now be <quote>off</quote> by default.
    There are also a number of new actions and filters you may want to
    default. This is primarily a matter of emphasis, but some features 
    you may have been used to, may now be <quote>off</quote> by default.
    There are also a number of new actions and filters you may want to

-   consider, most of which are not incorporated into the default settings as
-   yet (see above).
+   consider, most of which are not fully incorporated into the default
+   settings as yet (see above).

   </para>
  </listitem>
   </para>
  </listitem>

- 
+
+  <listitem>
+   <para>
+    The default actions setting is now <literal>Cautious</literal>. Previous
+    releases had a default setting of <literal>Medium</literal>. Experienced
+    users may want to adjust this, as it is fairly conservative by &my-app;
+    standards and past practices. See <ulink
+    url="http://config.privoxy.org/edit-actions-list?f=default">
+    http://config.privoxy.org/edit-actions-list?f=default</ulink>. New users
+    should try the default settings for a while before turning up the volume.
+   </para>
+  </listitem>
+
+  <listitem>
+   <para>
+    The default setting has filtering turned <emphasis>off</emphasis>, which
+    subsequently means that compression is <emphasis>on</emphasis>. Remember
+    that filtering does not work on compressed pages, so if you use, or want to
+    use, filtering, you will need to force compression off. Example:
+   </para>
+   <para>
+ <screen>
+  { +<link linkend="filter">filter</link>{google}  +<link linkend="prevent-compression">prevent-compression</link> }
+   .google.</screen>
+   </para>
+   <para>
+    Or if you use a number of filters, or filter many sites, you may just want
+    to turn off compression for all sites in
+    <filename>default.action</filename> (or
+    <filename>user.action</filename>). 
+   </para>
+
+  </listitem>
+
+  <listitem>
+  <para>
+   Also, <link linkend="SESSION-COOKIES-ONLY">session-cookies-only</link> is 
+   off by default now. If you've liked this feature in the past, you may want 
+   to turn it back on in <filename>user.action</filename> now.
+  </para>
+  </listitem>
+
+

   <listitem>
   <para>
 <!-- I think it is best to keep this somewhat vague, in case  -->
   <listitem>
   <para>
 <!-- I think it is best to keep this somewhat vague, in case  -->


@@ -687,6 +702,7 @@ How to install the binary packages depends on your operating system:
   </para>
  </listitem> 
 
   </para>
  </listitem> 
 

+

  </itemizedlist>
 </para>
 </sect2>
  </itemizedlist>
 </para>
 </sect2>


@@ -822,7 +838,8 @@ How to install the binary packages depends on your operating system:
 <para>
  First a bit of a warning ... blocking ads is much like blocking SPAM: the
  more aggressive you are about it, the more likely you are to block 
 <para>
  First a bit of a warning ... blocking ads is much like blocking SPAM: the
  more aggressive you are about it, the more likely you are to block 

- things that were not intended. So there is a trade off here. If you want
+ things that were not intended. And the more likely that some things 
+ may not work as intended. So there is a trade off here. If you want

  extreme ad free browsing, be prepared to deal with more
  <quote>problem</quote> sites, and to spend more time adjusting the
  configuration to solve these unintended consequences. In short, there is 
  extreme ad free browsing, be prepared to deal with more
  <quote>problem</quote> sites, and to spend more time adjusting the
  configuration to solve these unintended consequences. In short, there is 


@@ -835,7 +852,7 @@ How to install the binary packages depends on your operating system:
  Secondly, a brief explanation of <application>Privoxy's </application>
  <quote>actions</quote>. <quote>Actions</quote> in this context, are 
  the directives we use to tell <application>Privoxy</application> to perform
  Secondly, a brief explanation of <application>Privoxy's </application>
  <quote>actions</quote>. <quote>Actions</quote> in this context, are 
  the directives we use to tell <application>Privoxy</application> to perform

- some task relating to HTTP transactions (i.e. web browsing). We tell
+ some task relating to WWW transactions (i.e. web browsing). We tell

  <application>Privoxy</application> to take some <quote>action</quote>. Each
  action has a unique name and function. While there are many potential
  <application>actions</application> in <application>Privoxy's</application>
  <application>Privoxy</application> to take some <quote>action</quote>. Each
  action has a unique name and function. While there are many potential
  <application>actions</application> in <application>Privoxy's</application>


@@ -860,13 +877,17 @@ How to install the binary packages depends on your operating system:
  original page's HTML content. An ad image for instance, is just an URL
  embedded in the page somewhere. The image itself may be on the same server,
  or a server somewhere else on the Internet. Complex web pages will have many
  original page's HTML content. An ad image for instance, is just an URL
  embedded in the page somewhere. The image itself may be on the same server,
  or a server somewhere else on the Internet. Complex web pages will have many

- such embedded URLs.
+ such embedded URLs. &my-app; can deal with each URL individually, so, for
+ instance, the main page text is not touched, but images from such-and-such
+ server are blocked.

 </para>
 
 <para>
 </para>
 
 <para>

- The actions we need to know about for ad blocking are:  <literal><link
+ The most important actions for basic ad blocking are:  <literal><link

  linkend="block">block</link></literal>, <literal><link
  linkend="block">block</link></literal>, <literal><link

- linkend="handle-as-image">handle-as-image</link></literal>, and
+ linkend="handle-as-image">handle-as-image</link></literal>, 
+ <literal><link
+ linkend="handle-as-empty-document">handle-as-empty-document</link></literal>,and

  <literal><link linkend="set-image-blocker">set-image-blocker</link></literal>:
 </para>
 
  <literal><link linkend="set-image-blocker">set-image-blocker</link></literal>:
 </para>
 


@@ -875,12 +896,14 @@ How to install the binary packages depends on your operating system:
   
  <listitem>
   <para>
   
  <listitem>
   <para>

-   <literal><link linkend="block">block</link></literal> - this action stops
-   any contact between your browser and any URL patterns that match this
-   action's configuration. It can be used for blocking ads, but also anything
-   that is determined to be unwanted. By itself, it simply stops any
-   communication with the remote server and sends <application>Privoxy</application>'s
-   own built-in BLOCKED page instead to let you now what has happened.
+   <literal><link linkend="block">block</link></literal> - this is perhaps 
+   the single most used action, and is particularly important for ad blocking.
+   This action stops any contact between your browser and any URL patterns
+   that match this action's configuration. It can be used for blocking ads,
+   but also anything that is determined to be unwanted. By itself, it simply
+   stops any communication with the remote server and sends
+   <application>Privoxy</application>'s own built-in BLOCKED page instead to
+   let you now what has happened (with some exceptions, see below).

   </para>
  </listitem> 
 
   </para>
  </listitem> 
 


@@ -900,6 +923,15 @@ How to install the binary packages depends on your operating system:
   </para>
  </listitem> 
 
   </para>
  </listitem> 
 

+ <listitem>
+  <para>
+   <literal><link linkend="handle-as-empty-document">handle-as-empty-document</link></literal> - 
+   sends an empty document instead of <application>Privoxy's</application> 
+   normal BLOCKED HTML page. This is useful for file types that are neither 
+   HTML nor images, such as blocking JavaScript files.
+  </para>
+ </listitem> 
+

  <listitem>
   <para>
    <literal><link
  <listitem>
   <para>
    <literal><link


@@ -1040,6 +1072,13 @@ How to install the binary packages depends on your operating system:
  to now go to the <link linkend="act-examples">Actions Files Tutorial</link>.
  The ideas explained therein also apply to the web-based editor.
 </para>
  to now go to the <link linkend="act-examples">Actions Files Tutorial</link>.
  The ideas explained therein also apply to the web-based editor.
 </para>

+<para>
+ There are also various 
+ <link linkend="filter">filters</link> that can be used for ad blocking 
+ (filters are a special subset of actions). These 
+ fall into the <quote>advanced</quote> usage category, and are explained in
+ depth in later sections. 
+</para>

 
 </sect2>
 
 
 </sect2>
 


@@ -1082,7 +1121,7 @@ How to install the binary packages depends on your operating system:
  
 
 <para> 
  
 
 <para> 

- With <application>Firefox</application>, this can be set under:
+ With <application>Firefox</application>, this is typically set under:

 </para>
  
 <literallayout>
 </para>
  
 <literallayout>


@@ -1090,6 +1129,15 @@ How to install the binary packages depends on your operating system:
 
 </literallayout>
 
 
 </literallayout>
 

+<para> 
+ Or optionally on some platforms:
+</para>
+ 
+<literallayout>
+ <guibutton>Edit</guibutton> -> <guibutton>Preferences</guibutton> -> <guibutton>General</guibutton> -> <guibutton>Connection Settings</guibutton> -> <guibutton>Manual Proxy Configuration</guibutton>
+
+</literallayout>
+

 
 <para> 
  With <application>Netscape</application> (and
 
 <para> 
  With <application>Netscape</application> (and


@@ -1154,7 +1202,7 @@ How to install the binary packages depends on your operating system:
 </para>
 
 <sect2 id="start-redhat">
 </para>
 
 <sect2 id="start-redhat">

-<title>Red Hat, Fedora and Conectiva</title>
+<title>Red Hat and Fedora</title>

 <para>
  A default Red Hat installation may not start &my-app; upon boot. It will use
  the file <filename>/etc/privoxy/config</filename> as its main configuration
 <para>
  A default Red Hat installation may not start &my-app; upon boot. It will use
  the file <filename>/etc/privoxy/config</filename> as its main configuration


@@ -1190,6 +1238,9 @@ How to install the binary packages depends on your operating system:
 </para>
 </sect2>
 
 </para>
 </sect2>
 

+<!--
+ omitting 10/31/06 HB
+

 <sect2 id="start-suse">
 <title>SuSE</title>
 <para>
 <sect2 id="start-suse">
 <title>SuSE</title>
 <para>


@@ -1203,7 +1254,7 @@ your PC.
 </screen>
 </para>
 </sect2>
 </screen>
 </para>
 </sect2>

-
+-->

 <sect2 id="start-windows">
 <title>Windows</title>
 <para>
 <sect2 id="start-windows">
 <title>Windows</title>
 <para>


@@ -1631,7 +1682,7 @@ for details.
     <filename>default.action</filename> (which you will most probably want
     to define sooner or later) are probably best applied in
     <filename>user.action</filename>, where you can preserve them across
     <filename>default.action</filename> (which you will most probably want
     to define sooner or later) are probably best applied in
     <filename>user.action</filename>, where you can preserve them across

-    upgrades. <filename>standard.action</filename> is for
+    upgrades. <filename>standard.action</filename> is only for

     <application>Privoxy's</application> internal use.
    </para>
    <para>    
     <application>Privoxy's</application> internal use.
    </para>
    <para>    


@@ -1773,7 +1824,7 @@ for details.
   </listitem> 
    <listitem>
     <para>
   </listitem> 
    <listitem>
     <para>

-     <filename>standard.action</filename> - is used by the web based editor
+     <filename>standard.action</filename> - is used only by the web based editor

      at <ulink url="http://config.privoxy.org/edit-actions-list?f=default">
      http://config.privoxy.org/edit-actions-list?f=default</ulink>, 
      to set various pre-defined sets of rules for the default actions section
      at <ulink url="http://config.privoxy.org/edit-actions-list?f=default">
      http://config.privoxy.org/edit-actions-list?f=default</ulink>, 
      to set various pre-defined sets of rules for the default actions section


@@ -2255,7 +2306,7 @@ for details.
 </variablelist>
 
 <para>
 </variablelist>
 
 <para>

- While flexibile, this is not the sophistication of full regular expression based syntax.
+ While flexible, this is not the sophistication of full regular expression based syntax.

 </para>
 
 </sect3>
 </para>
 
 </sect3>


@@ -2766,7 +2817,7 @@ new action
   <listitem>
     <para>
      <screen># Check if www.example.net/ really uses valid XHTML
   <listitem>
     <para>
      <screen># Check if www.example.net/ really uses valid XHTML

-{+content-type-overwrite {application/xml}}
+{ +content-type-overwrite{application/xml} }

 www.example.net/
 
 # but leave the content type unmodified if the URL looks like a style sheet
 www.example.net/
 
 # but leave the content type unmodified if the URL looks like a style sheet


@@ -2856,7 +2907,7 @@ new action
   <listitem>
     <para>
      <screen># Block the non-existent "Privacy-Violation:" client header 
   <listitem>
     <para>
      <screen># Block the non-existent "Privacy-Violation:" client header 

-{+crunch-client-header {Privacy-Violation:}}
+{ +crunch-client-header{Privacy-Violation:} }

 /
     </screen>
    </para>
 /
     </screen>
    </para>


@@ -2938,9 +2989,9 @@ new action
   <listitem>
     <para>
      <screen># Let the browser revalidate cached documents without being tracked across sessions
   <listitem>
     <para>
      <screen># Let the browser revalidate cached documents without being tracked across sessions

-{+hide-if-modified-since {-60} \
-+overwrite-last-modified {randomize} \
-+crunch-if-none-match}
+{ +hide-if-modified-since{-60} \
+ +overwrite-last-modified{randomize} \
+ +crunch-if-none-match}

 /   </screen>
    </para>
   </listitem>
 /   </screen>
    </para>
   </listitem>


@@ -3092,7 +3143,7 @@ new action
   <listitem>
     <para>
      <screen># Crunch server headers that try to prevent caching
   <listitem>
     <para>
      <screen># Crunch server headers that try to prevent caching

-{+crunch-server-header {no-cache}}
+{ +crunch-server-header{no-cache} }

 /   </screen>
    </para>
   </listitem>
 /   </screen>
    </para>
   </listitem>


@@ -3963,7 +4014,7 @@ new action
    <para>
     This action alone doesn't do anything noticeable. It just marks URLs.
     If the <literal><link linkend="block">block</link></literal> action <emphasis>also applies</emphasis>,
    <para>
     This action alone doesn't do anything noticeable. It just marks URLs.
     If the <literal><link linkend="block">block</link></literal> action <emphasis>also applies</emphasis>,

-    the presence or absence of this mark decides whether an HTML <quote>blocked</quote>
+    the presence or absence of this mark decides whether an HTML <quote>BLOCKED</quote>

     page, or an empty document will be sent to the client as a substitute for the blocked content.
     The <emphasis>empty</emphasis> document isn't literally empty, but actually contains a single space.
    </para>
     page, or an empty document will be sent to the client as a substitute for the blocked content.
     The <emphasis>empty</emphasis> document isn't literally empty, but actually contains a single space.
    </para>


@@ -3994,6 +4045,8 @@ new action
     Some browsers complain about syntax errors if JavaScript documents
     are blocked with <application>Privoxy's</application>
     default HTML page; this option can be used to silence them.
     Some browsers complain about syntax errors if JavaScript documents
     are blocked with <application>Privoxy's</application>
     default HTML page; this option can be used to silence them.

+    And of course this action can also be used to eliminate the &my-app;
+    BLOCKED message in frames.

    </para>
    <para>
     The content type for the empty document can be specified with
    </para>
    <para>
     The content type for the empty document can be specified with


@@ -4270,10 +4323,10 @@ new action
   <listitem>
     <para>
      <screen># Disarm the download link in Sourceforge's patch tracker
   <listitem>
     <para>
      <screen># Disarm the download link in Sourceforge's patch tracker

-{-filter\
-+content-type-overwrite {text/plain}\
-+hide-content-disposition {block} }
-.sourceforge.net/tracker/download.php</screen>
+{ -filter \
+ +content-type-overwrite{text/plain}\
+ +hide-content-disposition{block} }
+ .sourceforge.net/tracker/download.php</screen>

    </para>
   </listitem>
  </varlistentry>
    </para>
   </listitem>
  </varlistentry>


@@ -4358,9 +4411,9 @@ new action
   <listitem>
     <para>
      <screen># Let the browser revalidate without being tracked across sessions
   <listitem>
     <para>
      <screen># Let the browser revalidate without being tracked across sessions

-{+hide-if-modified-since {-60}\
-+overwrite-last-modified {randomize}\
-+crunch-if-none-match}
+{ +hide-if-modified-since{-60} \
+ +overwrite-last-modified{randomize} \
+ +crunch-if-none-match}

 /</screen>
    </para>
   </listitem>
 /</screen>
    </para>
   </listitem>


@@ -5131,9 +5184,9 @@ new action
   <listitem>
     <para>
      <screen># Let the browser revalidate without being tracked across sessions
   <listitem>
     <para>
      <screen># Let the browser revalidate without being tracked across sessions

-{+hide-if-modified-since {-60}\
-+overwrite-last-modified {randomize}\
-+crunch-if-none-match}
+{ +hide-if-modified-since{-60} \
+ +overwrite-last-modified{randomize} \
+ +crunch-if-none-match}

 /</screen>
    </para>
   </listitem>
 /</screen>
    </para>
   </listitem>


@@ -5767,7 +5820,7 @@ new action
 
  # These shops require pop-ups:
  #
 
  # These shops require pop-ups:
  #

- {-kill-popups -filter{all-popups} -filter{unsolicted-popups}}
+ {-kill-popups -filter{all-popups} -filter{unsolicited-popups}}

   .dabs.com
   .overclockers.co.uk</screen>
 </para>
   .dabs.com
   .overclockers.co.uk</screen>
 </para>


@@ -7828,8 +7881,9 @@ Requests</title>
 <sect2 id="chain">
 <title>Chain of Events</title>
 <para>
 <sect2 id="chain">
 <title>Chain of Events</title>
 <para>

- Let's take a quick look at the basic sequence of events when a web page is 
- requested by your browser and <application>Privoxy</application> is on duty:
+ Let's take a quick look at how some of <application>Privoxy's</application> 
+ core features are triggered, and the ensuing sequence of events when a web
+ page is requested by your browser:

 </para>
 
 <para>
 </para>
 
 <para>


@@ -7855,10 +7909,13 @@ Requests</title>
    linkend="BLOCK"><quote>+block</quote></link> patterns. If
    so, the URL is then blocked, and the remote web server will not be contacted.
    <link linkend="HANDLE-AS-IMAGE"><quote>+handle-as-image</quote></link> 
    linkend="BLOCK"><quote>+block</quote></link> patterns. If
    so, the URL is then blocked, and the remote web server will not be contacted.
    <link linkend="HANDLE-AS-IMAGE"><quote>+handle-as-image</quote></link> 

-   is then checked and if it does not match, an 
-   HTML <quote>BLOCKED</quote> page is sent back. Otherwise, if it does match,
-   an image is returned. The type of image depends on the setting of <link
-   linkend="SET-IMAGE-BLOCKER"><quote>+set-image-blocker</quote></link>
+   and 
+   <link linkend="HANDLE-AS-EMPTY-DOCUMENT"><quote>+handle-as-empty-document</quote></link>
+   are then checked, and if there is no match, an 
+   HTML <quote>BLOCKED</quote> page is sent back to the browser. Otherwise, if
+   it does match, an image is returned for the former, and an empty text
+   document for the latter. The type of image would depend on the setting of
+   <link linkend="SET-IMAGE-BLOCKER"><quote>+set-image-blocker</quote></link>

    (blank, checkerboard pattern, or an HTTP redirect to an image elsewhere).
   </para>
  </listitem> 
    (blank, checkerboard pattern, or an HTTP redirect to an image elsewhere).
   </para>
  </listitem> 


@@ -7886,8 +7943,8 @@ Requests</title>
  </listitem> 
  <listitem>
   <para>
  </listitem> 
  <listitem>
   <para>

-   Now the web server starts sending its response back (i.e. typically a web page and related 
-   data).
+   Now the web server starts sending its response back (i.e. typically a web
+   page).

   </para>
  </listitem> 
  <listitem>
   </para>
  </listitem> 
  <listitem>


@@ -7910,7 +7967,7 @@ Requests</title>
  </listitem> 
  <listitem>
   <para>
  </listitem> 
  <listitem>
   <para>

-   If a <link linkend="FILTER"><quote>+filter</quote></link>
+   If any <link linkend="FILTER"><quote>+filter</quote></link> action

    or <link
    linkend="DEANIMATE-GIFS"><quote>+deanimate-gifs</quote></link>
    action applies (and the document type fits the action), the rest of the page is
    or <link
    linkend="DEANIMATE-GIFS"><quote>+deanimate-gifs</quote></link>
    action applies (and the document type fits the action), the rest of the page is


@@ -7923,7 +7980,7 @@ Requests</title>
    <application>Privoxy</application> back to your browser. 
   </para>
   <para>
    <application>Privoxy</application> back to your browser. 
   </para>
   <para>

-   If neither <link linkend="FILTER"><quote>+filter</quote></link>
+   If neither a <link linkend="FILTER"><quote>+filter</quote></link> action

    or <link
    linkend="DEANIMATE-GIFS"><quote>+deanimate-gifs</quote></link>
    matches, then <application>Privoxy</application> passes the raw data through 
    or <link
    linkend="DEANIMATE-GIFS"><quote>+deanimate-gifs</quote></link>
    matches, then <application>Privoxy</application> passes the raw data through 


@@ -7935,14 +7992,22 @@ Requests</title>
    As the browser receives the now (possibly 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.
    As the browser receives the now (possibly 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.
+   frames), sounds, etc. For each of these objects, the browser issues a
+   separate request (this is easily viewable in <application>Privoxy's</application>
+   logs). And each such request is in turn processed just as above. Note that a
+   complex web page will have many, many such embedded URLs. If these 
+   secondary requests are to a different server, then quite possibly a very 
+   differing set of actions is triggered.

   </para>
  </listitem> 
  
  </itemizedlist>
 </para>
   </para>
  </listitem> 
  
  </itemizedlist>
 </para>

+<para>
+ NOTE: This is somewhat of a simplistic overview of what happens with each URL
+ request. For the sake of brevity and simplicity, we have focused on 
+ <application>Privoxy's</application> core features only.
+</para>

 
 </sect2>
 
 
 </sect2>
 


@@ -8437,7 +8502,7 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  put in <filename>user.action</filename>, for local site
  exceptions. Note that when a simple domain pattern is used by itself (without
  the subsequent path portion), all sub-pages within that domain are included 
  put in <filename>user.action</filename>, for local site
  exceptions. Note that when a simple domain pattern is used by itself (without
  the subsequent path portion), all sub-pages within that domain are included 

- automatcially in the scope of the action.
+ automatically in the scope of the action.

 </para>
 
 <para>
 </para>
 
 <para>


@@ -8501,6 +8566,9 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
  USA
 
  $Log: user-manual.sgml,v $

+ Revision 2.26  2006/10/24 11:16:44  hal9
+ Add new filters.
+

  Revision 2.25  2006/10/18 10:50:33  hal9
  Add note that since filters are off in Cautious, compression is ON. Turn off
  compression to make filters work on all sites.
  Revision 2.25  2006/10/18 10:50:33  hal9
  Add note that since filters are off in Cautious, compression is ON. Turn off
  compression to make filters work on all sites.