From 889bfbf7dae3d8e1e105c055fc05d61344913685 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 26 Aug 2007 14:59:49 +0000 Subject: [PATCH] Minor rewordings and fixes. --- doc/source/user-manual.sgml | 87 ++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml index 9f7a8a22..b503ef44 100644 --- a/doc/source/user-manual.sgml +++ b/doc/source/user-manual.sgml @@ -33,7 +33,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: user-manual.sgml,v 2.33 2007/07/27 10:57:35 hal9 Exp $ + $Id: user-manual.sgml,v 2.34 2007/08/05 15:19:50 fabiankeil Exp $ Copyright (C) 2001-2007 Privoxy Developers http://www.privoxy.org/ See LICENSE. @@ -59,7 +59,7 @@ -$Id: user-manual.sgml,v 2.33 2007/07/27 10:57:35 hal9 Exp $ +$Id: user-manual.sgml,v 2.34 2007/08/05 15:19:50 fabiankeil Exp $ @@ -1886,7 +1883,7 @@ for details. The default profiles, and their associated actions, as pre-defined in - standard.action are: + standard.action are: Default Configurations @@ -2022,7 +2019,7 @@ for details. edited from http://config.privoxy.org/show-status. The over-riding principle when applying actions, is that the last action that - matches a given URL, wins. The broadest, most general rules go first + matches a given URL wins. The broadest, most general rules go first (defined in default.action), followed by any exceptions (typically also in default.action), which are then followed lastly by any @@ -2041,15 +2038,15 @@ for details. from consulting any previous file). And then below that, exceptions to the defined universal policies. You can regard user.action as an appendix to default.action, - with the advantage that is a separate file, which makes preserving your + with the advantage that it is a separate file, which makes preserving your personal settings across Privoxy upgrades easier. Actions can be used to block anything you want, including ads, banners, or - just some obnoxious URL that you would rather not see. Cookies can be accepted + just some obnoxious URL whose content you would rather not see. Cookies can be accepted or rejected, or accepted only during the current browser session (i.e. not - written to disk), content can be modified, JavaScripts tamed, user-tracking + written to disk), content can be modified, some JavaScripts tamed, user-tracking fooled, and much more. See below for a complete list of actions. @@ -2068,7 +2065,7 @@ for details. will have to make later. If, for example, you want to crunch all cookies per default, you'll have to make exceptions from that rule for sites that you regularly use and that require cookies for actually useful purposes, like maybe - your bank, favorite shop, or newspaper. + your bank, favorite shop, or newspaper. @@ -2166,7 +2163,7 @@ for details. - Generally, a URL pattern has the form + Generally, an URL pattern has the form <domain>/<path>, where both the <domain> and <path> are optional. (This is why the special / pattern matches all @@ -2460,15 +2457,15 @@ for details. Tag patterns are used to change the applying actions based on the request's tags. Tags can be created with either the - client-header-tagger - or the server-header-tagger action. + client-header-tagger + or the server-header-tagger action. Tag patterns have to start with TAG:, so &my-app; can tell them apart from URL patterns. Everything after the colon including white space, is interpreted as a regular expression with - path patterns syntax, except that tag patterns aren't left-anchored + path pattern syntax, except that tag patterns aren't left-anchored automatically (Privoxy doesn't silently add a ^, you have to do it yourself if you need it). @@ -2612,14 +2609,14 @@ for details. If nothing is specified in any actions file, no actions are taken. So in this case Privoxy would just be a - normal, non-blocking, non-anonymizing proxy. You must specifically enable the + normal, non-blocking, non-filtering proxy. You must specifically enable the privacy and blocking features you need (although the provided default actions files will give a good starting point). - Later defined actions always over-ride earlier ones. So exceptions - to any rules you make, should come in the latter part of the file (or + Later defined action sections always over-ride earlier ones of the same type. + So exceptions to any rules you make, should come in the latter part of the file (or in a file that is processed later when using multiple actions files such as user.action). For multi-valued actions, the actions are applied in the order they are specified. Actions files are processed in @@ -3235,8 +3232,9 @@ new action Example usage (section): - # Let the browser revalidate cached documents without being tracked across sessions -{ +hide-if-modified-since{-60} \ + # Let the browser revalidate cached documents but don't +# allow the server to use the revalidation headers for user tracking. +{+hide-if-modified-since{-60} \ +overwrite-last-modified{randomize} \ +crunch-if-none-match} / @@ -3256,7 +3254,7 @@ new action Typical use: - Prevent the web server from setting any cookies on your system + Prevent the web server from setting HTTP cookies on your system @@ -3712,7 +3710,7 @@ problem-host.example.com { +fast-redirects{simple-check} } - .example.com + one.example.com { +fast-redirects{check-decoded-url} } another.example.com/testing @@ -3933,7 +3931,7 @@ problem-host.example.com - +filter{ie-exploits} # Disable some known Internet Explorer bug exploits + +filter{ie-exploits} # Disable a known Internet Explorer bug exploits @@ -4057,7 +4055,7 @@ new action Effect: - Overrules the forward directives in the configuration files. + Overrules the forward directives in the configuration file. @@ -4309,7 +4307,7 @@ example.org/.*\.js$ # blocked as images: # {+block +handle-as-image} -some.nasty-banner-server.com/junk.cgi?output=trash +some.nasty-banner-server.com/junk.cgi\?output=trash # Banner source! Who cares if they also have non-image content? ad.doubleclick.net @@ -4474,6 +4472,10 @@ new action to another one, but in most cases it isn't worth the time to set it up. + + This action will probably be removed in the future, + use server-header filters instead. + @@ -4584,14 +4586,11 @@ new action hide-forwarded-for-headers - Typical use: - Improve privacy by hiding the true source of the request + Improve privacy by not embedding the source of the request in the HTTP headers. @@ -4626,13 +4625,7 @@ new action Notes: - It is fairly safe to leave this on. - - - This action is scheduled for improvement: It should be able to generate forged - X-Forwarded-for: headers using random IP addresses from a specified network, - to make successive requests from the same client look like requests from a pool of different - users sharing the same proxy. + It is safe to leave this on. @@ -4758,6 +4751,11 @@ new action conditional-block to delete the header completely if the host has changed. + block to delete the header unconditionally. @@ -8944,6 +8942,17 @@ In file: user.action [ View ] [ Edit ]