From 9c113a4c0231441c0005cae73bc9e1cf32a71596 Mon Sep 17 00:00:00 2001
From: hal9 <hal9@users.sourceforge.net>
Date: Fri, 16 Nov 2007 11:48:48 +0000
Subject: [PATCH] Fix one typo, and add a couple of small refinements.

---
 doc/source/user-manual.sgml                  | 26 +++++++++++---
 doc/webserver/user-manual/actions-file.html  | 16 ++++-----
 doc/webserver/user-manual/appendix.html      | 22 ++++++------
 doc/webserver/user-manual/configuration.html |  4 +--
 doc/webserver/user-manual/copyright.html     |  2 +-
 doc/webserver/user-manual/filter-file.html   |  2 +-
 doc/webserver/user-manual/index.html         | 24 ++++++-------
 doc/webserver/user-manual/installation.html  |  2 +-
 doc/webserver/user-manual/quickstart.html    | 36 +++++++++++++++++++-
 doc/webserver/user-manual/startup.html       |  4 +--
 10 files changed, 94 insertions(+), 44 deletions(-)

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index e7c8abc3..f50a10bf 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -33,7 +33,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: user-manual.sgml,v 2.43 2007/11/14 18:45:39 fabiankeil Exp $
+ $Id: user-manual.sgml,v 2.44 2007/11/15 03:30:20 hal9 Exp $
 
  Copyright (C) 2001-2007 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -59,7 +59,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 2.43 2007/11/14 18:45:39 fabiankeil Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.44 2007/11/15 03:30:20 hal9 Exp $</pubdate>
 
 <!--
 
@@ -210,7 +210,7 @@ How to install the binary packages depends on your operating system:
 </sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect3 id="installation-deb"><title>Debian</title>
+<sect3 id="installation-deb"><title>Debian and Ubuntu</title>
 <para>
  DEBs can be installed with <literal>apt-get install privoxy</literal>,
  and will use <filename>/etc/privoxy</filename> for the location of 
@@ -1166,6 +1166,19 @@ How to install the binary packages depends on your operating system:
 </itemizedlist>
 </para>
 
+<para>
+ Advanced users will eventually want to explore &my-app;
+ <literal><link linkend="filter">filters</link></literal> as well. Filters 
+ are very different from <literal><link
+ linkend="block">blocks</link></literal>.
+ A <quote>block</quote> blocks a site, page, or unwanted contented. Filters
+ are a way of filtering or modifying what is actually on the page. An example
+ filter usage: a text replacement of <quote>no-no</quote> for
+ <quote>nasty-word</quote>. That is a very simple example. This process can be
+ used for ad blocking, but it is more in the realm of advanced usage and has
+ some pitfalls to be wary off.
+</para>
+
 <para>
  The quickest way to adjust any of these settings is with your browser through
  the special <application>Privoxy</application> editor at <ulink
@@ -9084,8 +9097,8 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
 <para>
  <emphasis>Remember to flush caches!</emphasis> Note that the 
  <literal>mail.google</literal> reference lacks the TLD portion (e.g. 
- <quote>.com</quote>. This will effectively match any TLD with 
- <literal>google</literal> in it, such as <literal>mail.google.de</literal>, 
+ <quote>.com</quote>). This will effectively match any TLD with 
+ <literal>google</literal> in it, such as <literal>mail.google.de.</literal>, 
  just as an example.
 </para>
 <para> 
@@ -9119,6 +9132,9 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
+ Revision 2.44  2007/11/15 03:30:20  hal9
+ Results of spell check.
+
  Revision 2.43  2007/11/14 18:45:39  fabiankeil
  - Mention some more contributors in the "New in this Release" list.
  - Minor rewordings.
diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 1b4406b2..87a7d517 100644
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -259,7 +259,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN2149"
+NAME="AEN2158"
 ></A
 ><P
 ><B
@@ -528,7 +528,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2248"
+NAME="AEN2257"
 >8.1. Finding the Right Mix</A
 ></H2
 ><P
@@ -563,7 +563,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2255"
+NAME="AEN2264"
 >8.2. How to Edit</A
 ></H2
 ><P
@@ -893,7 +893,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2346"
+NAME="AEN2355"
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
@@ -1117,7 +1117,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2417"
+NAME="AEN2426"
 >8.4.2. The Path Pattern</A
 ></H3
 ><P
@@ -7164,7 +7164,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4223"
+NAME="AEN4232"
 >8.5.39. Summary</A
 ></H3
 ><P
@@ -7469,7 +7469,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4288"
+NAME="AEN4297"
 >8.7.1. default.action</A
 ></H3
 ><P
@@ -8400,7 +8400,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4475"
+NAME="AEN4484"
 >8.7.2. user.action</A
 ></H3
 ><P
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index f30e78b6..5dfefaa4 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -745,7 +745,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5359"
+NAME="AEN5368"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -791,7 +791,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5373"
+NAME="AEN5382"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -824,7 +824,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5381"
+NAME="AEN5390"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -844,7 +844,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5386"
+NAME="AEN5395"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -864,7 +864,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5391"
+NAME="AEN5400"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -884,7 +884,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5396"
+NAME="AEN5405"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -916,7 +916,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5404"
+NAME="AEN5413"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -933,7 +933,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5408"
+NAME="AEN5417"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -947,7 +947,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5411"
+NAME="AEN5420"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -2133,13 +2133,13 @@ CLASS="LITERAL"
  <SPAN
 CLASS="QUOTE"
 >".com"</SPAN
->. This will effectively match any TLD with 
+>). This will effectively match any TLD with 
  <TT
 CLASS="LITERAL"
 >google</TT
 > in it, such as <TT
 CLASS="LITERAL"
->mail.google.de</TT
+>mail.google.de.</TT
 >, 
  just as an example.</P
 ><P
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 9f35bda4..c7a96a68 100644
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -95,7 +95,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN794"
+NAME="AEN803"
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
@@ -126,7 +126,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
-NAME="AEN802"
+NAME="AEN811"
 ></A
 >    Privoxy Menu</H2
 ><P
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index f29e38c2..63677f27 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -99,7 +99,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5102"
+NAME="AEN5111"
 >12.1. License</A
 ></H2
 ><P
diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 9e587a9c..98e54a41 100644
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -363,7 +363,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4629"
+NAME="AEN4638"
 >9.1. Filter File Tutorial</A
 ></H2
 ><P
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 6fe04a14..b523f1dd 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -150,7 +150,7 @@ HREF="installation.html#INSTALLATION-PACK-RPM"
 ><DT
 >2.1.2. <A
 HREF="installation.html#INSTALLATION-DEB"
->Debian</A
+>Debian and Ubuntu</A
 ></DT
 ><DT
 >2.1.3. <A
@@ -292,7 +292,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
-HREF="configuration.html#AEN794"
+HREF="configuration.html#AEN803"
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
@@ -515,12 +515,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2248"
+HREF="actions-file.html#AEN2257"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2255"
+HREF="actions-file.html#AEN2264"
 >How to Edit</A
 ></DT
 ><DT
@@ -537,12 +537,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2346"
+HREF="actions-file.html#AEN2355"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2417"
+HREF="actions-file.html#AEN2426"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -754,7 +754,7 @@ HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
 ></DT
 ><DT
 >8.5.39. <A
-HREF="actions-file.html#AEN4223"
+HREF="actions-file.html#AEN4232"
 >Summary</A
 ></DT
 ></DL
@@ -773,12 +773,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4288"
+HREF="actions-file.html#AEN4297"
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4475"
+HREF="actions-file.html#AEN4484"
 >user.action</A
 ></DT
 ></DL
@@ -794,7 +794,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4629"
+HREF="filter-file.html#AEN4638"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -862,7 +862,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN5102"
+HREF="copyright.html#AEN5111"
 >License</A
 ></DT
 ><DT
@@ -896,7 +896,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5359"
+HREF="appendix.html#AEN5368"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 71ab36c7..17dad390 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -181,7 +181,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="INSTALLATION-DEB"
->2.1.2. Debian</A
+>2.1.2. Debian and Ubuntu</A
 ></H3
 ><P
 > DEBs can be installed with <TT
diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 2a1fca26..7eda7fb8 100644
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -588,6 +588,40 @@ CLASS="EMPHASIS"
 ></UL
 ></P
 ><P
+> Advanced users will eventually want to explore <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+ <TT
+CLASS="LITERAL"
+><A
+HREF="actions-file.html#FILTER"
+>filters</A
+></TT
+> as well. Filters 
+ are very different from <TT
+CLASS="LITERAL"
+><A
+HREF="actions-file.html#BLOCK"
+>blocks</A
+></TT
+>.
+ A <SPAN
+CLASS="QUOTE"
+>"block"</SPAN
+> blocks a site, page, or unwanted contented. Filters
+ are a way of filtering or modifying what is actually on the page. An example
+ filter usage: a text replacement of <SPAN
+CLASS="QUOTE"
+>"no-no"</SPAN
+> for
+ <SPAN
+CLASS="QUOTE"
+>"nasty-word"</SPAN
+>. That is a very simple example. This process can be
+ used for ad blocking, but it is more in the realm of advanced usage and has
+ some pitfalls to be wary off.</P
+><P
 > The quickest way to adjust any of these settings is with your browser through
  the special <SPAN
 CLASS="APPLICATION"
@@ -690,7 +724,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN547"
+NAME="AEN556"
 ></A
 ><P
 ><B
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 08e7bf1c..684d2fd0 100644
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -111,7 +111,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN602"
+NAME="AEN611"
 ></A
 ><P
 ><B
@@ -245,7 +245,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
-NAME="AEN646"
+NAME="AEN655"
 ></A
 ><P
 ><B
-- 
2.39.2