From 8b10545fd39814ece9327a375c5aa23e4e5d5bf1 Mon Sep 17 00:00:00 2001
From: hal9 <hal9@users.sourceforge.net>
Date: Sun, 9 Jun 2002 16:36:33 +0000
Subject: [PATCH] Clarifications on filtering and MIME. Hardcode 'latest
 release' in index.html.

---
 doc/source/faq.sgml             | 39 +++++++++++++++++++++++++++------
 doc/source/user-manual.sgml     | 19 +++++++---------
 doc/source/webserver/index.sgml | 10 ++++++---
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 2b69264f..60d01e11 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -24,7 +24,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 1.61.2.1 2002/06/05 23:10:43 hal9 Exp $
+ $Id: faq.sgml,v 1.61.2.2 2002/06/06 02:51:34 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -72,7 +72,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 1.61.2.1 2002/06/05 23:10:43 hal9 Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 1.61.2.2 2002/06/06 02:51:34 hal9 Exp $</pubdate>
 
 <!--
 
@@ -603,7 +603,7 @@ the differences?</title>
 </sect2>
 
 <sect2 renderas="sect3" id="configfiles"> <title>What's the difference between the
-<quote>Cautious</quote>, <quote>Medium</quote> and <quote>Advenced</quote> defaults?</title>
+<quote>Cautious</quote>, <quote>Medium</quote> and <quote>Advanced</quote> defaults?</title>
  <para>
   Configuring <application>Privoxy</application> is not entirely trivial. To help you get
   started, we provide you with three different default action <quote>packages</quote> in
@@ -760,22 +760,25 @@ with a browser? Does that not raise security issues?</title>
 
 
 <sect2 renderas="sect3">
-<title id="filterfile">What is the <filename>default.filter</filename> file?</title>
+<title id="filterfile">What is the <filename>default.filter</filename> file? What is a <quote>filter</quote>?</title>
 <para>
  The <ulink url="../user-manual/filter-file.html"><filename>default.filter</filename></ulink>
  file is where <emphasis>filters</emphasis> are defined, which can be used to modify or
- remove, web page content on the fly. This applies to <emphasis>anything</emphasis>
+ remove, web page content on the fly. Filters apply to <emphasis>anything</emphasis>
  in the page source, including HTML tags, and JavaScript. Regular expressions are used
  to accomplish this. There are a number of pre-defined filters to deal with common
  annoyances. The filters are only defined here, to invoke them, you need to use the
- <ulink url="../user-manual/actions-file.html#FILTER"><literal>filter</literal> action</ulink>.
+ <ulink
+ url="../user-manual/actions-file.html#FILTER"><literal>filter</literal>
+ action</ulink> in one of the actions files. Filtering is automatically
+ disabled for inappropriate MIME types.
 </para>
 
 <para>
  If you are familiar with regular expressions, and HTML, you can look at 
  the provided <filename>default.filter</filename> with a text editor and define
  your own filters.  This is potentially a very powerful feature, but
- requires some expertise. 
+ requires some expertise in both regular expressions and HTML/HTTP. 
 </para>
 
 <para>
@@ -1069,6 +1072,10 @@ delays in page requests compared to the old Junkbuster. What's wrong?</title>
  content, giving the user a feeling of "it works". This effect is especially
  noticeable on slow dialup connections.
  </para>
+<para>
+ Filtering is automatically disabled for inappropriate MIME types.
+
+</para>
 </sect2>
 
 
@@ -1367,6 +1374,21 @@ secure is it? Do I need to take any special precautions?</title>
  The easiest way is to access <application>Privoxy</application> with your 
  browser by using the remote toggle URL: <ulink
  url="http://config.privoxy.org/toggle">http://config.privoxy.org/toggle</ulink>.
+ See the <ulink url="../user-manual/appendix.html#BOOKMARKLETS">Bookmarklets section</ulink> 
+ of the <citetitle>User Manual</citetitle> for an easy way to access this 
+ feature.
+</para>
+</sect2>
+
+<sect2 renderas="sect3" id="reallyoff">
+<title>When <quote>disabled</quote> is <application>Privoxy</application> totally 
+out of the picture?</title>
+<para>
+ No, this just means all filtering and actions are disabled.
+ <application>Privoxy</application> is still acting as a proxy, but just not 
+ doing any of the things that <application>Privoxy</application> would
+ normally be expected to do. It is still a <quote>middle-man</quote> in 
+ the interaction between your browser and web sites.
 </para>
 </sect2>
 
@@ -1627,6 +1649,9 @@ FIXME: Commented out until we have something to put here. HB 03/18/02.
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 $Log: faq.sgml,v $
+Revision 1.61.2.2  2002/06/06 02:51:34  hal9
+Fix typo in URL http:/config.privoxy.org
+
 Revision 1.61.2.1  2002/06/05 23:10:43  hal9
 Add new FAQ re: DUN/IE. Change release date from May to June :)
 
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index a2a9823a..b01dc539 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -32,7 +32,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: user-manual.sgml,v 1.123.2.6 2002/06/06 23:11:03 hal9 Exp $
+ $Id: user-manual.sgml,v 1.123.2.7 2002/06/09 00:29:34 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -58,7 +58,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 1.123.2.6 2002/06/06 23:11:03 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 1.123.2.7 2002/06/09 00:29:34 hal9 Exp $</pubdate>
 
 <!--
 
@@ -2354,14 +2354,7 @@ problem-host.example.com</screen>
     (typically <filename>default.filter</filename>, set by the
     <literal><link linkend="filterfile">filterfile</link></literal>
     option in the <link linkend="config">config file</link>). Filtering 
-    can be completely disabled without the use of parameters. Example:
-   </para>
-   <para>
-    <screen>  { -filter }
-     .example.com</screen>
-   </para>
-   <para>
-    Disables filters for that site.
+    can be completely disabled without the use of parameters.
    </para>
   </listitem>
  </varlistentry>
@@ -2390,7 +2383,8 @@ problem-host.example.com</screen>
     <literal><link linkend="buffer-limit">buffer-limit</link></literal>
     option in the main <link linkend="config">config file</link>. The 
     default is 4096 KB (4 Megs). Once this limit is exceeded, the buffered
-    data, and all pending data, is passed through unfiltered.
+    data, and all pending data, is passed through unfiltered. Inappropriate 
+    MIME types are not filtered.
    </para>
    <para>
     At this time, <application>Privoxy</application> cannot (yet!) uncompress compressed
@@ -5536,6 +5530,9 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: user-manual.sgml,v $
+ Revision 1.123.2.7  2002/06/09 00:29:34  hal9
+ Touch ups on filtering, in actions section and Anatomy.
+
  Revision 1.123.2.6  2002/06/06 23:11:03  hal9
  Fix broken link. Linkchecked all docs.
 
diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index d2ba7a05..8c26c8b3 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -20,7 +20,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: index.sgml,v 1.16.2.2 2002/05/26 22:04:46 hal9 Exp $
+ $Id: index.sgml,v 1.16.2.3 2002/05/28 02:31:38 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -75,8 +75,8 @@
 
 <![%p-homepage;[
   <para>
-   The most recent version is &p-version; (&p-status;). (Odd numbered versions 
-   are available only through CVS.)
+  <!-- FIXME: Temporarily hard coding this. HB.  -->
+   The most recent release is 2.9.14 (&p-status;). 
   </para>
 ]]>
 
@@ -245,6 +245,10 @@
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: index.sgml,v $
+ Revision 1.16.2.3  2002/05/28 02:31:38  hal9
+ New file, privoxy-index.html, for bundling with documentation. Built from
+ index.sgml, like homepage, but with content toggles more suitable for this use.
+
  Revision 1.16.2.2  2002/05/26 22:04:46  hal9
  Add several comments, and reworded 'most recent release', ie we don't officially
  release odd numbered versions.
-- 
2.39.2