Paste in text for user-manual option from user-manual section.

[privoxy.git] / config

diff --git a/config b/config
index 42b58e1..bfa0b2e 100644 (file)
--- a/config
+++ b/config
@@ -1,7 +1,6 @@
 #  Sample Configuration file for Privoxy
-
 #
-# $Id: config,v 1.33 2002/04/15 19:06:43 jongfoster Exp $
+# $Id: config,v 1.36 2002/04/26 12:54:51 oes Exp $
 #
 ###################################################################
 #                                                                 #
@@ -134,24 +133,31 @@ logdir .
 #     
 #  Type of value:
 #     
-#      File name, relative to confdir
-#     
-#  Default value:
+#      File name, relative to confdir, without the .action (Unix)
+#      or .action.txt (Windows) extension.
 #     
-#      default.action (Unix) or default.action.txt (Windows)
+#  Default values:
+#      standard  # Internal purpose, recommended
+#      default   # Main actions file
+#      user      # User customizations
 #     
 #  Effect if unset:
 #     
 #      No action is taken at all. Simple neutral proxying.
 #     
 #  Notes:
+#      Multiple actionsfile lines are OK and are in fact recommended!
+#
+#      The default values include standard.action, which is used for
+#      internal purposes and should be loaded, default.action, which
+#      is the "main" actions file maintained by the developers, and
+#      user.action, where you can make your personal additions.
 #     
-#      There is no point in using Privoxy without an actions file. There
-#      are three different actions files included in the distribution,
-#      with varying degrees of aggressiveness: default.action,
-#      intermediate.action and advanced.action.
+#      There is no point in using Privoxy without an actions file.
 #
-actionsfile default.action
+actionsfile standard  # Internal purpose, recommended
+actionsfile default   # Main actions file
+actionsfile user      # User customizations
 
 
 #  1.4. filterfile
@@ -297,6 +303,39 @@ jarfile jarfile
 #trustfile trust
 
 
+#  1.8. user-manual
+#  ================
+# 
+#  Specifies:
+#    
+#      Location of the Privoxy User Manual.
+#     
+#  Type of value:
+#    
+#      A fully qualified URI
+#    
+#  Default value:
+#    
+#      http://www.privoxy.org/user-manual/
+#    
+#  Effect if unset:
+#    
+#      The default will be used.
+#    
+#  Notes:
+#    
+#     The User Manual is used for help hints from some of the internal
+#     CGI pages. It is normally packaged with the binary distributions,
+#     and would make more sense to have this pointed at a locally
+#     installed copy.
+#    
+#     A more useful example (Unix):
+#    
+#       user-manual  file:///usr/share/doc/privoxy-2.9.14/user-manual/
+#    
+#user-manual http://www.privoxy.org/user-manual/
+
+
 #  2. LOCAL SET-UP DOCUMENTATION
 #  =============================
 #