Adjust actionsfile directives to use complete file names.

[privoxy.git] / doc / source / p-config.sgml

diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 62979eb..3c74340 100644 (file)
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Used with other docs and files only.
 
- $Id: p-config.sgml,v 2.14 2007/03/22 14:10:59 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.15 2007/05/21 10:58:43 fabiankeil Exp $
 
  Copyright (C) 2001-2007 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -95,7 +95,7 @@
  Sample Configuration File for Privoxy v&p-version;
 </title>
 <para>
- $Id: p-config.sgml,v 2.14 2007/03/22 14:10:59 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.15 2007/05/21 10:58:43 fabiankeil Exp $
 </para>
 <para>
 Copyright (C) 2001-2007 Privoxy Developers http://www.privoxy.org/
@@ -657,7 +657,7 @@ actionsfile
  <varlistentry>
   <term>Type of value:</term>
   <listitem>
-   <para>File name, relative to <literal>confdir</literal>, without the <literal>.action</literal> suffix</para>
+   <para>Complete file name, relative to <literal>confdir</literal></para>
   </listitem>
  </varlistentry>
  <varlistentry>
@@ -665,13 +665,13 @@ actionsfile
   <listitem>
    <simplelist>
     <member>
-     <msgtext><literallayout>  standard     # Internal purposes, no editing recommended</literallayout></msgtext>
+     <msgtext><literallayout>  standard.action     # Internal purposes, no editing recommended</literallayout></msgtext>
     </member>
     <member>
-     <msgtext><literallayout>  default      # Main actions file</literallayout></msgtext>
+     <msgtext><literallayout>  default.action      # Main actions file</literallayout></msgtext>
     </member>
     <member>
-     <msgtext><literallayout>  user         # User customizations</literallayout></msgtext>
+     <msgtext><literallayout>  user.action         # User customizations</literallayout></msgtext>
     </member>
    </simplelist>
   </listitem>
@@ -680,7 +680,7 @@ actionsfile
   <term>Effect if unset:</term>
   <listitem>
    <para>
-    No actions are taken at all. Simple neutral proxying. 
+    No actions are taken at all. More or less neutral proxying. 
    </para>
   </listitem>
  </varlistentry>
@@ -702,15 +702,20 @@ actionsfile
     There is no point in using <application>Privoxy</application> without at 
     least one actions file.
    </para>
+   <para>
+    Note that since Privoxy 3.0.7, the complete filename, including the <quote>.action</quote>
+    extension has to be specified.  The syntax change was necessary to be consistent
+    with the other file options and to allow previously forbidden characters.
+   </para>
   </listitem>
  </varlistentry>
 </variablelist>
 
 <!-- NOTE: alternate markup to make a simpler list doesn't work due to -->
 <!-- html -> text conversion, blah -->
-<![%config-file;[<literallayout>@@actionsfile standard  # Internal purpose, recommended</literallayout>]]>
-<![%config-file;[<literallayout>@@actionsfile default   # Main actions file</literallayout>]]>
-<![%config-file;[<literallayout>@@actionsfile user      # User customizations</literallayout>]]>
+<![%config-file;[<literallayout>@@actionsfile standard.action  # Internal purpose, recommended</literallayout>]]>
+<![%config-file;[<literallayout>@@actionsfile default.action   # Main actions file</literallayout>]]>
+<![%config-file;[<literallayout>@@actionsfile user.action      # User customizations</literallayout>]]>
 </sect3>
 
 <!--   ~~~~~       New section      ~~~~~     -->