Syncing with minor additions on filtering.

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 88de3d0..64e3635 100644 (file)
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -1741,8 +1741,9 @@ CLASS="VARIABLELIST"
 >Effect:</DT
 ><DD
 ><P
 >Effect:</DT
 ><DD
 ><P

->    Text documents, including HTML and JavaScript, to which this action applies, are filtered on-the-fly
-    through the specified regular expression based substitutions.    
+>    Text documents, including HTML and JavaScript, to which this action
+    applies, are filtered on-the-fly through the specified regular expression
+    based substitutions.

    </P
 ></DD
 ><DT
    </P
 ></DD
 ><DT


@@ -1773,15 +1774,35 @@ HREF="config.html#FILTERFILE"
     option in the <A
 HREF="config.html"
 >config file</A
     option in the <A
 HREF="config.html"
 >config file</A

->)
+>). Filtering 
+    can be completely disabled without the use of parameters. Example:
+   </P
+><P
+>    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="90%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>  { -filter }
+     .example.com</PRE
+></TD
+></TR
+></TABLE
+>
+   </P
+><P
+>    Disables filters for that site.

    </P
 ></DD
 ><DT
 >Notes:</DT
 ><DD
 ><P
    </P
 ></DD
 ><DT
 >Notes:</DT
 ><DD
 ><P

->    For your convenience, there are a bunch of pre-defined filters available 
-    in the distribution filter file that you can use. See the example below for
+>    For your convenience, there are a number of pre-defined filters available 
+    in the distribution filter file that you can use. See the examples below for

     a list.
    </P
 ><P
     a list.
    </P
 ><P


@@ -1799,6 +1820,22 @@ CLASS="QUOTE"
     noticeable on slower connections.
    </P
 ><P
     noticeable on slower connections.
    </P
 ><P

+>    The amount of data that can be filtered is limited to the 
+    <TT
+CLASS="LITERAL"
+><A
+HREF="config.html#BUFFER-LIMIT"
+>buffer-limit</A
+></TT
+>
+    option in the main <A
+HREF="config.html"
+>config file</A
+>. The 
+    default is 4096 KB (4 Megs). Once this limit is exceeded, the buffered
+    data, and all pending data, is passed through unfiltered.
+   </P
+><P

 >    At this time, <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >    At this time, <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN


@@ -1818,7 +1855,7 @@ CLASS="LITERAL"
 >.
    </P
 ><P
 >.
    </P
 ><P

->    Filtering can achieve some of the effects as the 
+>    Filtering can achieve some of the same effects as the 

     <TT
 CLASS="LITERAL"
 ><A
     <TT
 CLASS="LITERAL"
 ><A


@@ -1826,14 +1863,17 @@ HREF="actions-file.html#BLOCK"
 >block</A
 ></TT
 >
 >block</A
 ></TT
 >

-    action, i.e. it can be used to block ads and banners. 
+    action, i.e. it can be used to block ads and banners. But the mechanism 
+    works quite differently. One effective use, is to block ad banners 
+    based on their size (see below), since many of these seem to be somewhat 
+    standardized.

    </P
 ><P
 >    <A
 HREF="contact.html"
 >Feedback</A
    </P
 ><P
 >    <A
 HREF="contact.html"
 >Feedback</A

-> with suggestions for new or improved filters is particularly
-    welcome!
+> with suggestions for new or
+    improved filters is particularly welcome!

    </P
 ></DD
 ><DT
    </P
 ></DD
 ><DT


@@ -1893,7 +1933,7 @@ WIDTH="90%"
 ><TD
 ><PRE
 CLASS="SCREEN"
 ><TD
 ><PRE
 CLASS="SCREEN"

->+filter{banners-by-size}     # Kill banners by size (<SPAN
+>+filter{banners-by-size}     # Kill banners based on their size for this page (<SPAN

 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"


@@ -3613,7 +3653,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2631">8.5.21. Summary</H3
+NAME="AEN2638">8.5.21. Summary</H3

 ><P
 > Note that many of these actions have the potential to cause a page to
  misbehave, possibly even not to display at all. There are many ways 
 ><P
 > Note that many of these actions have the potential to cause a page to
  misbehave, possibly even not to display at all. There are many ways 


@@ -3872,7 +3912,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2683">8.7.1. default.action</H3
+NAME="AEN2690">8.7.1. default.action</H3

 ><P
 >Every config file should start with a short comment stating its purpose:</P
 ><P
 ><P
 >Every config file should start with a short comment stating its purpose:</P
 ><P


@@ -4692,7 +4732,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2837">8.7.2. user.action</H3
+NAME="AEN2844">8.7.2. user.action</H3

 ><P
 > So far we are painting with a broad brush by setting general policies,
  which would be a reasonable starting point for many people. Now, 
 ><P
 > So far we are painting with a broad brush by setting general policies,
  which would be a reasonable starting point for many people. Now, 

diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 0a89f26..324cede 100644 (file)
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -740,7 +740,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN3384">14.2. <SPAN
+NAME="AEN3391">14.2. <SPAN

 CLASS="APPLICATION"
 >Privoxy</SPAN
 >'s Internal Pages</H2
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >'s Internal Pages</H2


@@ -787,7 +787,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
    Privoxy main page: 
   </P
 ><A

-NAME="AEN3399"><BLOCKQUOTE
+NAME="AEN3406"><BLOCKQUOTE

 CLASS="BLOCKQUOTE"
 ><P
 > 
 CLASS="BLOCKQUOTE"
 ><P
 > 


@@ -818,7 +818,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
     editing of actions files:
   </P
 ><A

-NAME="AEN3407"><BLOCKQUOTE
+NAME="AEN3414"><BLOCKQUOTE

 CLASS="BLOCKQUOTE"
 ><P
 > 
 CLASS="BLOCKQUOTE"
 ><P
 > 


@@ -836,7 +836,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
     Show the source code version numbers:
   </P
 ><A

-NAME="AEN3412"><BLOCKQUOTE
+NAME="AEN3419"><BLOCKQUOTE

 CLASS="BLOCKQUOTE"
 ><P
 > 
 CLASS="BLOCKQUOTE"
 ><P
 > 


@@ -854,7 +854,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
    Show the browser's request headers:
   </P
 ><A

-NAME="AEN3417"><BLOCKQUOTE
+NAME="AEN3424"><BLOCKQUOTE

 CLASS="BLOCKQUOTE"
 ><P
 > 
 CLASS="BLOCKQUOTE"
 ><P
 > 


@@ -872,7 +872,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
    Show which actions apply to a URL and why:
   </P
 ><A

-NAME="AEN3422"><BLOCKQUOTE
+NAME="AEN3429"><BLOCKQUOTE

 CLASS="BLOCKQUOTE"
 ><P
 > 
 CLASS="BLOCKQUOTE"
 ><P
 > 


@@ -894,7 +894,7 @@ CLASS="QUOTE"
    to run, but only as a pass-through proxy, with no actions taking place:
   </P
 ><A
    to run, but only as a pass-through proxy, with no actions taking place:
   </P
 ><A

-NAME="AEN3428"><BLOCKQUOTE
+NAME="AEN3435"><BLOCKQUOTE

 CLASS="BLOCKQUOTE"
 ><P
 > 
 CLASS="BLOCKQUOTE"
 ><P
 > 


@@ -909,7 +909,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
 >   Short cuts. Turn off, then on: 
   </P
 ><A

-NAME="AEN3432"><BLOCKQUOTE
+NAME="AEN3439"><BLOCKQUOTE

 CLASS="BLOCKQUOTE"
 ><P
 > 
 CLASS="BLOCKQUOTE"
 ><P
 > 


@@ -921,7 +921,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
    </P
 ></BLOCKQUOTE
 ><A

-NAME="AEN3435"><BLOCKQUOTE
+NAME="AEN3442"><BLOCKQUOTE

 CLASS="BLOCKQUOTE"
 ><P
 > 
 CLASS="BLOCKQUOTE"
 ><P
 > 


@@ -1326,7 +1326,8 @@ CLASS="APPLICATION"
 HREF="appendix.html#BOOKMARKLETS"
 >the Bookmarklets</A
 > section on a quick 
 HREF="appendix.html#BOOKMARKLETS"
 >the Bookmarklets</A
 > section on a quick 

- and easy way to do this (be sure to flush caches afterward!).</P
+ and easy way to do this (be sure to flush caches afterward!). Looking at the 
+ logs is a good idea too.</P

 ><P
 > <SPAN
 CLASS="APPLICATION"
 ><P
 > <SPAN
 CLASS="APPLICATION"


@@ -1820,8 +1821,9 @@ CLASS="SCREEN"
  One likely cause would be one of the <SPAN
 CLASS="QUOTE"
 >"{+filter}"</SPAN
  One likely cause would be one of the <SPAN
 CLASS="QUOTE"
 >"{+filter}"</SPAN

-> actions. Try 
- adding the URL for the site to one of aliases that turn off <SPAN
+> actions. These 
+ tend to be harder to troubleshoot. Try adding the URL for the site to one of
+ aliases that turn off <SPAN

 CLASS="QUOTE"
 >"+filter"</SPAN
 >:</P
 CLASS="QUOTE"
 >"+filter"</SPAN
 >:</P


@@ -1873,11 +1875,20 @@ CLASS="SCREEN"
 ></TABLE
 ></P
 ><P
 ></TABLE
 ></P
 ><P

-> This would probably be most appropriately put in <TT
+> This would turn off all filtering for that site. This would probably be most
+ appropriately put in <TT

 CLASS="FILENAME"
 >user.action</TT
 CLASS="FILENAME"
 >user.action</TT

->, 
- for local site exceptions.</P
+>, for local site
+ exceptions.</P
+><P
+> Images that are inexplicably being blocked, may well be hitting the 
+ <SPAN
+CLASS="QUOTE"
+>"+filter{banners-by-size}"</SPAN
+> rule, which assumes 
+ that images of certain sizes are ad banners (works well most of the time 
+ since these tend to be standardized).</P

 ><P
 > <SPAN
 CLASS="QUOTE"
 ><P
 > <SPAN
 CLASS="QUOTE"

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index b11c3e8..bf24dea 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -98,7 +98,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN3134">12.1. License</H2
+NAME="AEN3141">12.1. License</H2

 ><P
 > <SPAN
 CLASS="APPLICATION"
 ><P
 > <SPAN
 CLASS="APPLICATION"

diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 1e62317..7999b6a 100644 (file)
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -273,7 +273,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN2940">9.1. Filter File Tutorial</H2
+NAME="AEN2947">9.1. Filter File Tutorial</H2

 ><P
 > Now, let's complete our <SPAN
 CLASS="QUOTE"
 ><P
 > Now, let's complete our <SPAN
 CLASS="QUOTE"


@@ -721,7 +721,7 @@ CLASS="QUOTE"
 CLASS="QUOTE"
 >"microsoft"</SPAN
 >
 CLASS="QUOTE"
 >"microsoft"</SPAN
 >

- in the page. This prevents links to microsoft.com from being messed, while
+ in the page. This prevents links to microsoft.com from being trashed, while

  still replacing the word everywhere else.</P
 ><P
 > <TABLE
  still replacing the word everywhere else.</P
 ><P
 > <TABLE

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index b1beef2..35cb709 100644 (file)
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -43,7 +43,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
 ><BR></P
 ><P
 CLASS="PUBDATE"

->$Id: user-manual.sgml,v 1.123.2.5 2002/05/29 02:01:02 hal9 Exp $<BR></P
+>$Id: user-manual.sgml,v 1.123.2.6 2002/06/06 23:11:03 hal9 Exp $<BR></P

 ><DIV
 ><DIV
 CLASS="ABSTRACT"
 ><DIV
 ><DIV
 CLASS="ABSTRACT"


@@ -616,7 +616,7 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 ></DT
 ><DT
 >8.5.21. <A
 ></DT
 ><DT
 >8.5.21. <A

-HREF="actions-file.html#AEN2631"
+HREF="actions-file.html#AEN2638"

 >Summary</A
 ></DT
 ></DL
 >Summary</A
 ></DT
 ></DL


@@ -635,12 +635,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
 ><DL
 ><DT
 >8.7.1. <A

-HREF="actions-file.html#AEN2683"
+HREF="actions-file.html#AEN2690"

 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A

-HREF="actions-file.html#AEN2837"
+HREF="actions-file.html#AEN2844"

 >user.action</A
 ></DT
 ></DL
 >user.action</A
 ></DT
 ></DL


@@ -656,7 +656,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
 ><DL
 ><DT
 >9.1. <A

-HREF="filter-file.html#AEN2940"
+HREF="filter-file.html#AEN2947"

 >Filter File Tutorial</A
 ></DT
 ></DL
 >Filter File Tutorial</A
 ></DT
 ></DL


@@ -713,7 +713,7 @@ CLASS="APPLICATION"
 ><DL
 ><DT
 >12.1. <A
 ><DL
 ><DT
 >12.1. <A

-HREF="copyright.html#AEN3134"
+HREF="copyright.html#AEN3141"

 >License</A
 ></DT
 ><DT
 >License</A
 ></DT
 ><DT


@@ -747,7 +747,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
 ></DT
 ><DT
 >14.2. <A

-HREF="appendix.html#AEN3384"
+HREF="appendix.html#AEN3391"

 ><SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 ><SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN