# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.176 2008/09/21 13:24:37 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.177 2009/01/13 16:44:32 fabiankeil Exp $
#
# Written by and Copyright (C) 2001 - 2008 the SourceForge
# Privoxy team. http://www.privoxy.org/
#############################################################################
# We include these files in our distributions
#############################################################################
-CONFIGS = config trust default.action user.action default.filter user.filter
+CONFIGS = config trust default.action match-all.action user.action default.filter user.filter
# take care that no CVS .cvsignore or other crappy files
# are included here
# and escape every '#' in the find. doh.
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.177 2009/01/13 16:44:32 fabiankeil
+# Delete the standard.action file after moving
+# the pre-settings over to the default actions.
+#
# Revision 1.176 2008/09/21 13:24:37 fabiankeil
# Add Roland's man page fixes from 19_manpage_fixup.dpatch.
#
# Sample Configuration File for Privoxy v3.0.11
#
-# $Id: config,v 1.69 2008/12/14 15:46:22 fabiankeil Exp $
+# $Id: p-config.sgml,v 2.36 2009/01/23 14:06:07 fabiankeil Exp $
#
-# Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
+# Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
#
####################################################################
# #
#
# Default values:
#
-# default.action # Main actions file
+# match-all.action # Actions that are applied to all sites and maybe overruled later on.
#
-# user.action # User customizations
+# default.action # Main actions file
+#
+# user.action # User customizations
#
# Effect if unset:
#
# was necessary to be consistent with the other file options and
# to allow previously forbidden characters.
#
+actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.
actionsfile default.action # Main actions file
actionsfile user.action # User customizations
#
keep-alive-timeout 300
#
#
+# 5.8. socket-timeout
+# ====================
+#
+# Specifies:
+#
+# Number of seconds after which a socket times out if no data
+# is received.
+#
+# Type of value:
+#
+# Time in seconds.
+#
+# Default value:
+#
+# None
+#
+# Effect if unset:
+#
+# A default value of 180 seconds is used.
+#
+# Examples:
+#
+# socket-timeout 180
+#
+socket-timeout 180
+#
+#
# 6. WINDOWS GUI OPTIONS
# =======================
#
#
# File : $Source: /cvsroot/ijbswa/current/default.action.master,v $
#
-# $Id: default.action.master,v 1.160 2009/01/13 16:44:32 fabiankeil Exp $
+# $Id: default.action.master,v 1.161 2009/01/14 21:50:58 fabiankeil Exp $
#
# Requires : This version requires Privoxy v3.0.11 or later due to
# syntax changes.
#
allow-ads = -block -filter{banners-by-size} -filter{banners-by-link}
-#############################################################################
-# Defaults
-#############################################################################
-{ \
-+change-x-forwarded-for{block} \
-+hide-from-header{block} \
-+set-image-blocker{pattern} \
-}
-/ # Match all URLs
-
################
#
# Cautious settings -- safe for all sites, but offer little privacy protection
Purpose : Used with other docs and files only.
- $Id: p-config.sgml,v 2.35 2009/01/13 16:44:32 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.36 2009/01/23 14:06:07 fabiankeil Exp $
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
See LICENSE.
Sample Configuration File for Privoxy v&p-version;
</title>
<para>
- $Id: p-config.sgml,v 2.35 2009/01/13 16:44:32 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.36 2009/01/23 14:06:07 fabiankeil Exp $
</para>
<para>
Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
<listitem>
<simplelist>
<member>
- <msgtext><literallayout> default.action # Main actions file</literallayout></msgtext>
+ <msgtext><literallayout> match-all.action # Actions that are applied to all sites and maybe overruled later on.</literallayout></msgtext>
</member>
<member>
- <msgtext><literallayout> user.action # User customizations</literallayout></msgtext>
+ <msgtext><literallayout> default.action # Main actions file</literallayout></msgtext>
+ </member>
+ <member>
+ <msgtext><literallayout> user.action # User customizations</literallayout></msgtext>
</member>
</simplelist>
</listitem>
<!-- NOTE: alternate markup to make a simpler list doesn't work due to -->
<!-- html -> text conversion, blah -->
+<![%config-file;[<literallayout>@@actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.</literallayout>]]>
<![%config-file;[<literallayout>@@actionsfile default.action # Main actions file</literallayout>]]>
<!--
XXX: Like user.filter, user.action should probably be commented out