Mention match-all.action as default configuration file.

[privoxy.git] / doc / source / privoxy-man-page.sgml

diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index 3ae4a1a..f0469f0 100644 (file)
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,9 +5,9 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: privoxy-man-page.sgml,v 2.20 2008/08/16 08:51:28 fabiankeil Exp $
+ $Id: privoxy-man-page.sgml,v 2.26 2009/02/15 15:19:35 fabiankeil Exp $
 
- Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
+ Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  ========================================================================
@@ -43,9 +43,9 @@
 <!entity license SYSTEM "license.sgml">
 <!entity authors SYSTEM "p-authors.sgml">
 <!entity p-version "3.0.11">
-<!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  -->
@@ -53,7 +53,7 @@
 
 <refentry id="privoxy">
 <refentryinfo>
- <date>2007-04-12</date>
+ <date>2009-02-15</date>
 </refentryinfo>
 <refmeta>
  <refentrytitle>privoxy</refentrytitle> 
@@ -175,7 +175,7 @@
  <para>
   If the <filename>configfile</filename> is not specified on  the  command  line,
   <command>Privoxy</command>  will  look for a file named
-  <filename>config</filename> in the current directory . If no
+  <filename>config</filename> in the current directory. If no
   <filename>configfile</filename> is found, <command>Privoxy</command> will 
   fail to start.
  </para>
@@ -235,12 +235,12 @@
 <para>
  <command>Privoxy</command> can be configured with the various configuration
  files. The default configuration files are: <filename>config</filename>,
- <filename>default.filter</filename>, and
+ <filename>default.filter</filename>, <filename>default.action</filename> and
  <filename>default.action</filename>. <filename>user.action</filename> should 
- be used for locally defined exceptions to the default rules of
- <filename>default.action</filename>, and <filename>user.filter</filename> for 
- locally defined filters. These are well commented.  On Unix
- and Unix-like systems, these are located in
+ be used for locally defined exceptions to the default rules in
+ <filename>match-all.action</filename> and <filename>default.action</filename>,
+ and <filename>user.filter</filename> for locally defined filters. These are
+ well commented.  On Unix and Unix-like systems, these are located in
  <filename>/etc/privoxy/</filename> by default. 
 </para>
 <para> 
@@ -294,6 +294,7 @@
  ## otherwise with the '+' operator.
 
 { \
++change-x-forwarded-for{block} \
 +deanimate-gifs{last} \
 +filter{refresh-tags} \
 +filter{img-reorder} \
@@ -301,7 +302,6 @@
 +filter{webbugs} \
 +filter{jumping-windows} \
 +filter{ie-exploits} \
-+hide-forwarded-for-headers \
 +hide-from-header{block} \
 +hide-referrer{conditional-block} \
 +session-cookies-only \
@@ -385,8 +385,8 @@
 <literallayout> 
  <filename>/usr/sbin/privoxy</filename>
  <filename>/etc/privoxy/config</filename>
+ <filename>/etc/privoxy/match-all.action</filename>
  <filename>/etc/privoxy/default.action</filename>
- <filename>/etc/privoxy/standard.action</filename>
  <filename>/etc/privoxy/user.action</filename>
  <filename>/etc/privoxy/default.filter</filename>
  <filename>/etc/privoxy/user.filter</filename>