Regenerate with recent match-all.action-related changes.

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index c561b68..bb00c66 100644 (file)
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -106,58 +106,54 @@ CLASS="APPLICATION"
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > with
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > with

- differing purposes:
- </P
+ differing purposes:</P

 ><P
 ><P

->  <P
+> <P

 ></P
 ><UL
 ><LI
 ><P
 ></P
 ><UL
 ><LI
 ><P

->     <TT
+>    <TT
+CLASS="FILENAME"
+>match-all.action</TT
+> - is used to define which
+    <SPAN
+CLASS="QUOTE"
+>"actions"</SPAN
+> relating to banner-blocking, images, pop-ups,
+    content modification, cookie handling etc should be applied by default.
+    It should be the first actions file loaded
+   </P
+></LI
+><LI
+><P
+>    <TT

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

-> - is the primary action file 
-     that sets the initial values for all actions. It is intended to 
-     provide a base level of functionality for
-     <SPAN
-CLASS="APPLICATION"
->Privoxy's</SPAN
-> array of features. So it is 
-     a set of broad rules that should work reasonably well as-is for most users.
-     This is the file that the developers are keeping updated, and <A
-HREF="installation.html#INSTALLATION-KEEPUPDATED"
->making available to users</A
->.
-     It also contains the pre-defined sets of rules for the default actions,
-     e.g. <TT
-CLASS="LITERAL"
->Cautious</TT
-> (the default),
-     <TT
-CLASS="LITERAL"
->Medium</TT
->, or <TT
-CLASS="LITERAL"
->Advanced</TT
-> (see
-     below).
-    </P
+> - defines many exceptions (both
+    positive and negative) from the default set of actions that's configured
+    in <TT
+CLASS="FILENAME"
+>match-all.action</TT
+>. It is a set of rules that should
+    work reasonably well as-is for most users. This file is only supposed to
+    be edited by the developers. It should be the second actions file loaded.
+   </P

 ></LI
 ><LI
 ><P
 ></LI
 ><LI
 ><P

->     <TT
+>    <TT

 CLASS="FILENAME"
 >user.action</TT
 > - is intended to be for local site 
 CLASS="FILENAME"
 >user.action</TT
 > - is intended to be for local site 

-     preferences and exceptions. As an example, if your ISP or your bank
-     has specific requirements, and need special handling, this kind of 
-     thing should go here. This file will not be upgraded.
-    </P
+    preferences and exceptions. As an example, if your ISP or your bank
+    has specific requirements, and need special handling, this kind of 
+    thing should go here. This file will not be upgraded.
+   </P

 ></LI
 ><LI
 ><P
 ></LI
 ><LI
 ><P

->     <SPAN
+>    <SPAN

 CLASS="GUIBUTTON"
 >Edit</SPAN
 >  <SPAN
 CLASS="GUIBUTTON"
 >Edit</SPAN
 >  <SPAN


@@ -170,73 +166,74 @@ CLASS="GUIBUTTON"
 CLASS="GUIBUTTON"
 >Set to Advanced</SPAN
 >
 CLASS="GUIBUTTON"
 >Set to Advanced</SPAN
 >

-     </P
+   </P

 ><P
 ><P

->     These have increasing levels of aggressiveness <SPAN
+>    These have increasing levels of aggressiveness <SPAN

 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
 >and have no
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
 >and have no

-     influence on your browsing unless you select them explicitly in the
-     editor</I
+    influence on your browsing unless you select them explicitly in the
+    editor</I

 ></SPAN
 >. A default installation should be pre-set to 
 ></SPAN
 >. A default installation should be pre-set to 

-     <TT
+    <TT

 CLASS="LITERAL"
 >Cautious</TT
 CLASS="LITERAL"
 >Cautious</TT

-> (versions prior to 3.0.5 were set to
-     <TT
-CLASS="LITERAL"
->Medium</TT
->). New users should try this for a while before
-     adjusting the settings to more aggressive levels. The more aggressive 
-     the settings, then the more likelihood there is of problems such as sites 
-     not working as they should.
-     </P
+>. New users should try this for a while before
+    adjusting the settings to more aggressive levels. The more aggressive 
+    the settings, then the more likelihood there is of problems such as sites 
+    not working as they should.
+   </P

 ><P
 ><P

->      The <SPAN
+>    The <SPAN

 CLASS="GUIBUTTON"
 >Edit</SPAN
 > button allows you to turn each 
 CLASS="GUIBUTTON"
 >Edit</SPAN
 > button allows you to turn each 

-      action on/off individually for fine-tuning. The <SPAN
+    action on/off individually for fine-tuning. The <SPAN

 CLASS="GUIBUTTON"
 >Cautious</SPAN
 >
 CLASS="GUIBUTTON"
 >Cautious</SPAN
 >

-      button changes the actions list to low/safe settings which will activate 
-      ad blocking and a minimal set of <SPAN
+    button changes the actions list to low/safe settings which will activate 
+    ad blocking and a minimal set of <SPAN

 CLASS="APPLICATION"
 >Privoxy</SPAN
 >'s features, and subsequently
 CLASS="APPLICATION"
 >Privoxy</SPAN
 >'s features, and subsequently

-      there will be less of a chance for accidental problems. The
-      <SPAN
+    there will be less of a chance for accidental problems. The
+    <SPAN

 CLASS="GUIBUTTON"
 >Medium</SPAN
 > button sets the list to a medium level of
 CLASS="GUIBUTTON"
 >Medium</SPAN
 > button sets the list to a medium level of

-      other features and a low level set of privacy features. The
-      <SPAN
+    other features and a low level set of privacy features. The
+    <SPAN

 CLASS="GUIBUTTON"
 >Advanced</SPAN
 > button sets the list to a high level of
 CLASS="GUIBUTTON"
 >Advanced</SPAN
 > button sets the list to a high level of

-      ad blocking and medium level of privacy. See the chart below. The latter
-      three buttons over-ride any changes via with the
-      <SPAN
+    ad blocking and medium level of privacy. See the chart below. The latter
+    three buttons over-ride any changes via with the
+    <SPAN

 CLASS="GUIBUTTON"
 >Edit</SPAN
 > button. More fine-tuning can be done in the
 CLASS="GUIBUTTON"
 >Edit</SPAN
 > button. More fine-tuning can be done in the

-      lower sections of this internal page.
-     </P
+    lower sections of this internal page.
+   </P

 ><P
 ><P

->     The default profiles, and their associated actions, as pre-defined in
-     <TT
+>    While the actions file editor allows to enable these settings in all
+    actions files, they are only supposed to be enabled in the first one
+    to make sure you don't unintentionally overrule earlier rules.
+   </P
+><P
+>    The default profiles, and their associated actions, as pre-defined in
+    <TT

 CLASS="FILENAME"
 >default.action</TT
 > are:
 CLASS="FILENAME"
 >default.action</TT
 > are:

-    </P
+   </P

 ><P
 >    <DIV
 CLASS="TABLE"
 ><A
 ><P
 >    <DIV
 CLASS="TABLE"
 ><A

-NAME="AEN2165"
+NAME="AEN2166"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B


@@ -405,8 +402,7 @@ TITLE="C4"><THEAD
     </P
 ></LI
 ></UL
     </P
 ></LI
 ></UL

->
- </P
+></P

 ><P
 > The list of actions files to be used are defined in the main configuration 
  file, and are processed in the order they are defined (e.g.
 ><P
 > The list of actions files to be used are defined in the main configuration 
  file, and are processed in the order they are defined (e.g.


@@ -505,7 +501,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN2264"
+NAME="AEN2265"

 >8.1. Finding the Right Mix</A
 ></H2
 ><P
 >8.1. Finding the Right Mix</A
 ></H2
 ><P


@@ -540,7 +536,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN2271"
+NAME="AEN2272"

 >8.2. How to Edit</A
 ></H2
 ><P
 >8.2. How to Edit</A
 ></H2
 ><P


@@ -870,7 +866,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2362"
+NAME="AEN2363"

 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P


@@ -1110,7 +1106,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2438"
+NAME="AEN2439"

 >8.4.2. The Path Pattern</A
 ></H3
 ><P
 >8.4.2. The Path Pattern</A
 ></H3
 ><P


@@ -6678,7 +6674,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4069"
+NAME="AEN4070"

 >8.5.34. Summary</A
 ></H3
 ><P
 >8.5.34. Summary</A
 ></H3
 ><P


@@ -6966,22 +6962,81 @@ HREF="actions-file.html#ALIASES"
 >. Now, let's look at an
  example <TT
 CLASS="FILENAME"
 >. Now, let's look at an
  example <TT
 CLASS="FILENAME"

+>match-all.action</TT
+>, <TT
+CLASS="FILENAME"

 >default.action</TT
 >default.action</TT

-> and <TT
+>
+ and <TT

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

->
- file and see how all these pieces come together:</P
+> file and see how all these pieces come together:</P

 ><DIV
 CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><DIV
 CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4132"
->8.7.1. default.action</A
+NAME="AEN4134"
+>8.7.1. match-all.action</A

 ></H3
 ><P
 ></H3
 ><P

->Every config file should start with a short comment stating its purpose:</P
+> Remember <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>all actions are disabled when matching starts</I
+></SPAN
+>,
+ so we have to explicitly enable the ones we want.</P
+><P
+> While the <TT
+CLASS="FILENAME"
+>match-all.action</TT
+> file only contains a
+ single section, it is probably the most important one. It has only one
+ pattern, <SPAN
+CLASS="QUOTE"
+>"<TT
+CLASS="LITERAL"
+>/</TT
+>"</SPAN
+>, but this pattern
+ <A
+HREF="actions-file.html#AF-PATTERNS"
+>matches all URLs</A
+>. Therefore, the set of
+ actions used in this <SPAN
+CLASS="QUOTE"
+>"default"</SPAN
+> section <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>will
+ be applied to all requests as a start</I
+></SPAN
+>. It can  be partly or
+ wholly overridden by other actions files like <TT
+CLASS="FILENAME"
+>default.action</TT
+>
+ and <TT
+CLASS="FILENAME"
+>user.action</TT
+>, but it will still be largely responsible
+ for your overall browsing experience.</P
+><P
+> Again, at the start of matching, all actions are disabled, so there is
+ no need to disable any actions here. (Remember: a <SPAN
+CLASS="QUOTE"
+>"+"</SPAN
+>
+ preceding the action name enables the action, a <SPAN
+CLASS="QUOTE"
+>"-"</SPAN
+> disables!).
+ Also note how this long line has been made more readable by splitting it into
+ multiple lines with line continuation.</P

 ><P
 > <TABLE
 BORDER="0"
 ><P
 > <TABLE
 BORDER="0"


@@ -6991,18 +7046,66 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="SCREEN"
 ><TD
 ><PRE
 CLASS="SCREEN"

-># Sample default.action file &#60;ijbswa-developers@lists.sourceforge.net&#62;</PRE
+>{ \
+ +<A
+HREF="actions-file.html#CHANGE-X-FORWARDED-FOR"
+>change-x-forwarded-for{block}</A
+> \
+ +<A
+HREF="actions-file.html#HIDE-FROM-HEADER"
+>hide-from-header{block}</A
+> \
+ +<A
+HREF="actions-file.html#SET-IMAGE-BLOCKER"
+>set-image-blocker{pattern}</A
+> \
+}
+/ # Match all URLs
+ </PRE

 ></TD
 ></TR
 ></TABLE
 ></P
 ><P
 ></TD
 ></TR
 ></TABLE
 ></P
 ><P

->Then, since this is the <TT
+> The default behavior is now set.</P
+></DIV
+><DIV
+CLASS="SECT3"
+><H3
+CLASS="SECT3"
+><A
+NAME="AEN4156"
+>8.7.2. default.action</A
+></H3
+><P
+> If you aren't a developer, there's no need for you to edit the
+ <TT

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

-> file, the
-first section is a special section for internal use that you needn't
-change or worry about:</P
+> file. It is maintained by
+ the <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> developers and if you disagree with some of the
+ sections, you should overrule them in your <TT
+CLASS="FILENAME"
+>user.action</TT
+>.</P
+><P
+> Understanding the <TT
+CLASS="FILENAME"
+>default.action</TT
+> file can
+ help you with your <TT
+CLASS="FILENAME"
+>user.action</TT
+>, though.</P
+><P
+> The first section in this file is a special section for internal use
+ that prevents older <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> versions from reading the file:</P

 ><P
 > <TABLE
 BORDER="0"
 ><P
 > <TABLE
 BORDER="0"


@@ -7015,20 +7118,19 @@ CLASS="SCREEN"
 >##########################################################################
 # Settings -- Don't change! For internal Privoxy use ONLY.
 ##########################################################################
 >##########################################################################
 # Settings -- Don't change! For internal Privoxy use ONLY.
 ##########################################################################

-

 {{settings}}
 {{settings}}

-for-privoxy-version=3.0</PRE
+for-privoxy-version=3.0.11</PRE

 ></TD
 ></TR
 ></TABLE
 ></P
 ><P
 ></TD
 ></TR
 ></TABLE
 ></P
 ><P

->After that comes the (optional) alias section. We'll use the example
-section from the above <A
+> After that comes the (optional) alias section. We'll use the example
+ section from the above <A

 HREF="actions-file.html#ALIASES"
 >chapter on aliases</A
 >,
 HREF="actions-file.html#ALIASES"
 >chapter on aliases</A
 >,

-that also explains why and how aliases are used:</P
+ that also explains why and how aliases are used:</P

 ><P
 > <TABLE
 BORDER="0"
 ><P
 > <TABLE
 BORDER="0"


@@ -7094,122 +7196,6 @@ HREF="actions-file.html#FILTER-ALL-POPUPS"
 ></TABLE
 ></P
 ><P
 ></TABLE
 ></P
 ><P

-> Now come the regular sections, i.e. sets of actions, accompanied
- by URL patterns to which they apply. Remember <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->all actions
- are disabled when matching starts</I
-></SPAN
->, so we have to explicitly
- enable the ones we want.</P
-><P
-> The first regular section is probably the most important. It has only
- one pattern, <SPAN
-CLASS="QUOTE"
->"<TT
-CLASS="LITERAL"
->/</TT
->"</SPAN
->, but this pattern
- <A
-HREF="actions-file.html#AF-PATTERNS"
->matches all URLs</A
->. Therefore, the
- set of actions used in this <SPAN
-CLASS="QUOTE"
->"default"</SPAN
-> section <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->will
- be applied to all requests as a start</I
-></SPAN
->. It can  be partly or
- wholly overridden by later matches further down this file, or in user.action,
- but it will still be largely responsible for your overall browsing
- experience.</P
-><P
-> Again, at the start of matching, all actions are disabled, so there is
- no need to disable any actions here. (Remember: a <SPAN
-CLASS="QUOTE"
->"+"</SPAN
->
- preceding the action name enables the action, a <SPAN
-CLASS="QUOTE"
->"-"</SPAN
-> disables!).
- Also note how this long line has been made more readable by splitting it into
- multiple lines with line continuation.</P
-><P
-> <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->##########################################################################
-# "Defaults" section:
-##########################################################################
- { \
- +<A
-HREF="actions-file.html#CHANGE-X-FORWARDED-FOR"
->change-x-forwarded-for{block}</A
-> \
- +<A
-HREF="actions-file.html#DEANIMATE-GIFS"
->deanimate-gifs</A
-> \
- +<A
-HREF="actions-file.html#FILTER-HTML-ANNOYANCES"
->filter{html-annoyances}</A
-> \
- +<A
-HREF="actions-file.html#FILTER-REFRESH-TAGS"
->filter{refresh-tags}</A
-> \
- +<A
-HREF="actions-file.html#FILTER-WEBBUGS"
->filter{webbugs}</A
-> \
- +<A
-HREF="actions-file.html#FILTER-IE-EXPLOITS"
->filter{ie-exploits}</A
-> \     
- +<A
-HREF="actions-file.html#HIDE-FROM-HEADER"
->hide-from-header{block}</A
-> \
- +<A
-HREF="actions-file.html#HIDE-REFERER"
->hide-referrer{forge}</A
-> \
- +<A
-HREF="actions-file.html#PREVENT-COMPRESSION"
->prevent-compression</A
-> \
- +<A
-HREF="actions-file.html#SESSION-COOKIES-ONLY"
->session-cookies-only</A
-> \
- +<A
-HREF="actions-file.html#SET-IMAGE-BLOCKER"
->set-image-blocker{pattern}</A
-> \
- }
- / # forward slash will match *all* potential URL patterns.</PRE
-></TD
-></TR
-></TABLE
-></P
-><P
-> The default behavior is now set.
- </P
-><P

 > The first of our specialized sections is concerned with <SPAN
 CLASS="QUOTE"
 >"fragile"</SPAN
 > The first of our specialized sections is concerned with <SPAN
 CLASS="QUOTE"
 >"fragile"</SPAN


@@ -7277,8 +7263,11 @@ HREF="actions-file.html#FAST-REDIRECTS"
 >fast-redirects</A
 ></TT
 >
 >fast-redirects</A
 ></TT
 >

- action, which we enabled per default above,  breaks some sites. So disable
- it for popular sites where we know it misbehaves:</P
+ action, which may have been enabled in <TT
+CLASS="FILENAME"
+>match-all.action</TT
+>,
+ breaks some sites. So disable it for popular sites where we know it misbehaves:</P

 ><P
 > <TABLE
 BORDER="0"
 ><P
 > <TABLE
 BORDER="0"


@@ -7317,14 +7306,8 @@ CLASS="EMPHASIS"
  be blocked, a substitute image can be sent, rather than an HTML page.
  Contacting the remote site to find out is not an option, since it
  would destroy the loading time advantage of banner blocking, and it
  be blocked, a substitute image can be sent, rather than an HTML page.
  Contacting the remote site to find out is not an option, since it
  would destroy the loading time advantage of banner blocking, and it

- would feed the advertisers (in terms of money <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->and</I
-></SPAN
->
- information). We can mark any URL as an image with the <TT
+ would feed the advertisers information about you. We can mark any
+ URL as an image with the <TT

 CLASS="LITERAL"
 ><A
 HREF="actions-file.html#HANDLE-AS-IMAGE"
 CLASS="LITERAL"
 ><A
 HREF="actions-file.html#HANDLE-AS-IMAGE"


@@ -7692,8 +7675,8 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4266"
->8.7.2. user.action</A
+NAME="AEN4269"
+>8.7.3. user.action</A

 ></H3
 ><P
 > So far we are painting with a broad brush by setting general policies,
 ></H3
 ><P
 > So far we are painting with a broad brush by setting general policies,

diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index c6896bc..40b6c86 100644 (file)
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -748,7 +748,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN5149"
+NAME="AEN5152"

 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P


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

-NAME="AEN5163"
+NAME="AEN5166"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


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

-NAME="AEN5171"
+NAME="AEN5174"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


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

-NAME="AEN5176"
+NAME="AEN5179"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


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

-NAME="AEN5181"
+NAME="AEN5184"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -887,7 +887,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="AEN5186"
+NAME="AEN5189"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
    place:
   </P
 ><A

-NAME="AEN5194"
+NAME="AEN5197"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


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

-NAME="AEN5198"
+NAME="AEN5201"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


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

-NAME="AEN5201"
+NAME="AEN5204"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"

diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index 62f6eec..32876d6 100644 (file)
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -304,22 +304,24 @@ CLASS="FILENAME"
 ><P
 >    <TT
 CLASS="FILENAME"
 ><P
 >    <TT
 CLASS="FILENAME"

->default.action</TT
-> (the main <A
-HREF="actions-file.html"
->actions file</A
->)
-    is used to define which <SPAN
+>match-all.action</TT
+> is used to define which <SPAN

 CLASS="QUOTE"
 >"actions"</SPAN
 CLASS="QUOTE"
 >"actions"</SPAN

-> relating to banner-blocking, images, pop-ups,
-    content modification, cookie handling etc should be applied by default. It also defines many
-    exceptions (both positive and negative) from this default set of actions that enable 
-    <SPAN
-CLASS="APPLICATION"
->Privoxy</SPAN
-> to selectively eliminate the junk, and only the junk, on
-    as many websites as possible.
+>
+    relating to banner-blocking, images, pop-ups, content modification, cookie handling
+    etc should be applied by default. It should be the first actions file loaded.
+   </P
+><P
+>    <TT
+CLASS="FILENAME"
+>default.action</TT
+> defines many exceptions (both positive and negative)
+    from the default set of actions that's configured in <TT
+CLASS="FILENAME"
+>match-all.action</TT
+>.
+    It should be the second actions file loaded and shouldn't be edited by the user.

    </P
 ><P
 >    Multiple actions files may be defined in <TT
    </P
 ><P
 >    Multiple actions files may be defined in <TT


@@ -327,17 +329,17 @@ CLASS="FILENAME"
 >config</TT
 >. These 
     are processed in the order they are defined. Local customizations and locally 
 >config</TT
 >. These 
     are processed in the order they are defined. Local customizations and locally 

-    preferred exceptions to the default policies  as defined in
+    preferred exceptions to the default policies as defined in

     <TT
 CLASS="FILENAME"
     <TT
 CLASS="FILENAME"

->default.action</TT
+>match-all.action</TT

 > (which you will most probably want
 > (which you will most probably want

-    to define sooner or later) are probably best applied in
-    <TT
+    to define sooner or later) are best applied in <TT

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

->, where you can preserve them across
-    upgrades.
+>,
+    where you can preserve them across upgrades. The file isn't installed by all
+    installers, but you can easily create it yourself with a text editor.

    </P
 ><P
 >    
    </P
 ><P
 >    

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 569ef8d..93a21ee 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN4895"
+NAME="AEN4898"

 >12.1. License</A
 ></H2
 ><P
 >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 f9e9b63..20fbccc 100644 (file)
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -366,7 +366,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN4421"
+NAME="AEN4424"

 >9.1. Filter File Tutorial</A
 ></H2
 ><P
 >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 559ac0a..4f15c0a 100644 (file)
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
 ><BR></P
 ><P
 CLASS="PUBDATE"

->$Id: user-manual.sgml,v 2.92 2009/02/12 16:08:26 fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.96 2009/02/14 13:14:03 fabiankeil Exp $<BR></P

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


@@ -528,12 +528,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
 ><DL
 ><DT
 >8.1. <A

-HREF="actions-file.html#AEN2264"
+HREF="actions-file.html#AEN2265"

 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A

-HREF="actions-file.html#AEN2271"
+HREF="actions-file.html#AEN2272"

 >How to Edit</A
 ></DT
 ><DT
 >How to Edit</A
 ></DT
 ><DT


@@ -550,12 +550,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
 ><DL
 ><DT
 >8.4.1. <A

-HREF="actions-file.html#AEN2362"
+HREF="actions-file.html#AEN2363"

 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A

-HREF="actions-file.html#AEN2438"
+HREF="actions-file.html#AEN2439"

 >The Path Pattern</A
 ></DT
 ><DT
 >The Path Pattern</A
 ></DT
 ><DT


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

-HREF="actions-file.html#AEN4069"
+HREF="actions-file.html#AEN4070"

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


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

-HREF="actions-file.html#AEN4132"
->default.action</A
+HREF="actions-file.html#AEN4134"
+>match-all.action</A

 ></DT
 ><DT
 >8.7.2. <A
 ></DT
 ><DT
 >8.7.2. <A

-HREF="actions-file.html#AEN4266"
+HREF="actions-file.html#AEN4156"
+>default.action</A
+></DT
+><DT
+>8.7.3. <A
+HREF="actions-file.html#AEN4269"

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


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

-HREF="filter-file.html#AEN4421"
+HREF="filter-file.html#AEN4424"

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


@@ -847,7 +852,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
 ><DL
 ><DT
 >12.1. <A

-HREF="copyright.html#AEN4895"
+HREF="copyright.html#AEN4898"

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


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

-HREF="appendix.html#AEN5149"
+HREF="appendix.html#AEN5152"

 >Privoxy's Internal Pages</A
 ></DT
 ><DD
 >Privoxy's Internal Pages</A
 ></DT
 ><DD