the pre-settings over to the default actions.
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.175 2008/08/30 12:03:07 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.176 2008/09/21 13:24:37 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 standard.action user.action default.filter user.filter
+CONFIGS = config trust default.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.
fi ;\
$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
for i in $(CONFIGS); do \
- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \
+ if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
$(ECHO) Installing fresh $$i;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.176 2008/09/21 13:24:37 fabiankeil
+# Add Roland's man page fixes from 19_manpage_fixup.dpatch.
+#
# Revision 1.175 2008/08/30 12:03:07 fabiankeil
# Remove FEATURE_COOKIE_JAR.
#
If install finds previous versions of local configuration files, most of these
will not be overwritten, and the new ones will be installed with a "new"
-extension. default.action, default.filter, and standard.action will be
-overwritten. You will then need to manually update the other installed
-configuration files as needed. The default template files will be overwritten.
-If you have customized, local templates, these should be stored safely in a
-separate directory and defined in config by the "templdir" directive. It is of
-course wise to always back-up any important configuration files "just in case".
-If a previous version of Privoxy is already running, you will have to restart
-it manually.
+extension. default.action and default.filter will be overwritten. You will then
+need to manually update the other installed configuration files as needed. The
+default template files will be overwritten. If you have customized, local
+templates, these should be stored safely in a separate directory and defined in
+config by the "templdir" directive. It is of course wise to always back-up any
+important configuration files "just in case". If a previous version of Privoxy
+is already running, you will have to restart it manually.
For more detailed instructions on how to build Redhat RPMs, Windows
self-extracting installers, building on platforms with special requirements
# Sample Configuration File for Privoxy v3.0.11
#
-# $Id: config,v 1.68 2008/12/13 18:19:44 fabiankeil Exp $
+# $Id: config,v 1.69 2008/12/14 15:46:22 fabiankeil Exp $
#
# Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
#
#
# Default values:
#
-# standard.action # Internal purposes, no editing recommended
-#
# default.action # Main actions file
#
# user.action # User customizations
# Multiple actionsfile lines are permitted, 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.
+# The default values are default.action, which is the "main"
+# actions file maintained by the developers, and user.action,
+# where you can make your personal additions.
#
# Actions files contain all the per site and per URL configuration
# for ad blocking, cookie management, privacy considerations,
# was necessary to be consistent with the other file options and
# to allow previously forbidden characters.
#
-actionsfile standard.action # Internal purpose, recommended
actionsfile default.action # Main actions file
actionsfile user.action # User customizations
#
#
# File : $Source: /cvsroot/ijbswa/current/default.action.master,v $
#
-# $Id: default.action.master,v 1.158 2009/01/11 16:02:53 hal9 Exp $
+# $Id: default.action.master,v 1.159 2009/01/11 20:26:00 hal9 Exp $
#
# Requires : This version requires Privoxy v3.0.11 or later due to
# syntax changes.
# This file is subject to periodic updating. Local exceptions
# and enhancements are better placed in user.action.
#
-# Copyright : Written by and Copyright (C) 2001-2008 the
+# Copyright : Written by and Copyright (C) 2001-2009 the
# Privoxy team. http://www.privoxy.org/
#
# Note: Updated versions of this file will be made available from time
}
/ # Match all URLs
+################
+#
+# Cautious settings -- safe for all sites, but offer little privacy protection
+#
+{ \
++change-x-forwarded-for{block} \
++hide-from-header{block} \
++set-image-blocker{pattern} \
+}
+standard.Cautious
+
+################
+#
+# Medium settings -- safe for most sites, with reasonable protection/damage tradeoff
+#
+{ \
++change-x-forwarded-for{block} \
++deanimate-gifs{last} \
++filter{refresh-tags} \
++filter{img-reorder} \
++filter{banners-by-size} \
++filter{webbugs} \
++filter{jumping-windows} \
++filter{ie-exploits} \
++hide-from-header{block} \
++hide-referrer{conditional-block} \
++session-cookies-only \
++set-image-blocker{pattern} \
+}
+standard.Medium
+
+################
+#
+# Advanced settings -- reasonable privacy protection but
+# require some exceptions for trusted sites, most likely
+# because of cookies or SSL. Also testing ground for
+# new options.
+#
+# CAUTION: These settings can still be subverted by a
+# misconfigured client that executes code from untrusted
+# sources.
+#
+{ \
++change-x-forwarded-for{block} \
++client-header-tagger{css-requests} \
++client-header-tagger{image-requests} \
++crunch-if-none-match \
++crunch-outgoing-cookies \
++crunch-incoming-cookies \
++deanimate-gifs{last} \
++fast-redirects{check-decoded-url} \
++filter{html-annoyances} \
++filter{content-cookies} \
++filter{refresh-tags} \
++filter{img-reorder} \
++filter{banners-by-size} \
++filter{banners-by-link} \
++filter{webbugs} \
++filter{jumping-windows} \
++filter{frameset-borders} \
++filter{quicktime-kioskmode} \
++hide-if-modified-since{-60} \
++hide-from-header{block} \
++hide-referrer{conditional-block} \
++limit-connect{,} \
++overwrite-last-modified{randomize} \
++set-image-blocker{pattern} \
+}
+standard.Advanced
+
#############################################################################
# These extensions belong to images:
#############################################################################
Purpose : Used with other docs and files only.
- $Id: p-config.sgml,v 2.33 2008/12/13 10:48:21 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.34 2008/12/14 15:46:23 fabiankeil Exp $
Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
See LICENSE.
Sample Configuration File for Privoxy v&p-version;
</title>
<para>
- $Id: p-config.sgml,v 2.33 2008/12/13 10:48:21 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.34 2008/12/14 15:46:23 fabiankeil Exp $
</para>
<para>
Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
<term>Default values:</term>
<listitem>
<simplelist>
- <member>
- <msgtext><literallayout> standard.action # Internal purposes, no editing recommended</literallayout></msgtext>
- </member>
<member>
<msgtext><literallayout> default.action # Main actions file</literallayout></msgtext>
</member>
Multiple <literal>actionsfile</literal> lines are permitted, and are in fact recommended!
</para>
<para>
- The default values include <filename>standard.action</filename>, which is used
- for internal purposes and should be loaded, <filename>default.action</filename>,
- which is the <quote>main</quote> actions file maintained by the developers, and
+ The default values are <filename>default.action</filename>, which is the
+ <quote>main</quote> actions file maintained by the developers, and
<filename>user.action</filename>, where you can make your personal additions.
</para>
<para>
<!-- NOTE: alternate markup to make a simpler list doesn't work due to -->
<!-- html -> text conversion, blah -->
-<![%config-file;[<literallayout>@@actionsfile standard.action # Internal purpose, recommended</literallayout>]]>
<![%config-file;[<literallayout>@@actionsfile default.action # Main actions file</literallayout>]]>
<!--
XXX: Like user.filter, user.action should probably be commented out
+++ /dev/null
-######################################################################
-#
-# File : $Source: /cvsroot/ijbswa/current/standard.action,v $
-#
-# $Id: standard.action,v 1.23 2008/03/04 18:30:40 fabiankeil Exp $
-#
-# Purpose : Provide prefedined sets of actions, see
-# http://www.privoxy.org/user-manual/actions-file.html
-#
-# Copyright : Written by and Copyright 2002-2007
-# Privoxy team. http://www.privoxy.org/
-#
-######################################################################
-
-######################################################################
-#
-# WARNING: THIS FILE IS *NOT* THE PLACE TO CUSTOMIZE YOUR CONFIGURATION!
-#
-# This is not a user modifiable configuration file!
-# Local customizations and preferences should go in
-# user.action and/or user.filter. Or use the custom editor at
-# http://p.p/. Thanks.
-#
-######################################################################
-
-################
-#
-# Cautious settings -- safe for all sites, but offer little privacy protection
-#
-{ \
-+change-x-forwarded-for{block} \
-+hide-from-header{block} \
-+set-image-blocker{pattern} \
-}
-standard.Cautious
-
-################
-#
-# Medium settings -- safe for most sites, with reasonable protection/damage tradeoff
-#
-{ \
-+change-x-forwarded-for{block} \
-+deanimate-gifs{last} \
-+filter{refresh-tags} \
-+filter{img-reorder} \
-+filter{banners-by-size} \
-+filter{webbugs} \
-+filter{jumping-windows} \
-+filter{ie-exploits} \
-+hide-from-header{block} \
-+hide-referrer{conditional-block} \
-+session-cookies-only \
-+set-image-blocker{pattern} \
-}
-standard.Medium
-
-################
-#
-# Advanced settings -- reasonable privacy protection but
-# require some exceptions for trusted sites, most likely
-# because of cookies or SSL. Also testing ground for
-# new options.
-#
-# CAUTION: These settings can still be subverted by a
-# misconfigured client that executes code from untrusted
-# sources.
-#
-{ \
-+change-x-forwarded-for{block} \
-+client-header-tagger{css-requests} \
-+client-header-tagger{image-requests} \
-+crunch-if-none-match \
-+crunch-outgoing-cookies \
-+crunch-incoming-cookies \
-+deanimate-gifs{last} \
-+fast-redirects{check-decoded-url} \
-+filter{html-annoyances} \
-+filter{content-cookies} \
-+filter{refresh-tags} \
-+filter{img-reorder} \
-+filter{banners-by-size} \
-+filter{banners-by-link} \
-+filter{webbugs} \
-+filter{jumping-windows} \
-+filter{frameset-borders} \
-+filter{quicktime-kioskmode} \
-+hide-if-modified-since{-60} \
-+hide-from-header{block} \
-+hide-referrer{conditional-block} \
-+limit-connect{,} \
-+overwrite-last-modified{randomize} \
-+set-image-blocker{pattern} \
-}
-standard.Advanced