From 03e14880e78a4d03caa7fb4c809e48dbaef04a37 Mon Sep 17 00:00:00 2001 From: hal9 Date: Fri, 1 Sep 2006 15:10:45 +0000 Subject: [PATCH] Sync actions list with default.action.master, +minor_changes. --- doc/source/privoxy-man-page.sgml | 113 +++++++++++++++--------- privoxy.1 | 146 ++++++++++++++++--------------- 2 files changed, 147 insertions(+), 112 deletions(-) diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml index afb2465c..445a7159 100644 --- a/doc/source/privoxy-man-page.sgml +++ b/doc/source/privoxy-man-page.sgml @@ -5,9 +5,9 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: privoxy-man-page.sgml,v 2.5 2006/07/18 14:48:51 david__schmidt Exp $ + $Id: privoxy-man-page.sgml,v 2.6 2006/08/26 02:37:27 hal9 Exp $ - Copyright (C) 2001, 2002 Privoxy Developers + Copyright (C) 2001-2006 Privoxy Developers See LICENSE. ======================================================================== @@ -43,7 +43,7 @@ - + @@ -207,6 +207,8 @@ The Secure (SSL) Proxy should also be set to the same values, otherwise https: URLs will not be proxied. Note: Privoxy can only proxy HTTP and HTTPS traffic. Do not try it with FTP or other protocols. + HTTPS presents some limitations, and not all features will work with HTTPS + connections. @@ -233,8 +235,8 @@ See the user-manual for a complete - explanation of general usage, configuration options, new features and notes for - upgrading. + explanation of installation, general usage, all configuration options, new + features and notes on upgrading. The actions list (ad blocks, etc) can also be configured with your @@ -267,43 +269,68 @@ -hide-referer -prevent-cookies -kill-popups ## Turn some actions on ################################ - { \ - -add-header \ - -block \ - -content-type-overwrite \ - -crunch-if-none-match \ - +crunch-incoming-cookies \ - +crunch-outgoing-cookies \ - +crunch-server-header {no-cache} \ - +deanimate-gifs{last} \ - -downgrade-http-version \ - -fast-redirects \ - -force-text-mode \ - -filter{html-annoyances} \ - -filter{js-annoyances} \ - +filter{content-cookies} \ - +filter{webbugs} \ - -filter{banners-by-size} \ - -handle-as-empty-document \ - +hide-accept-language{en-ca} \ - +hide-content-disposition {block} \ - +hide-forwarded-for-headers \ - +hide-from-header{block} \ - +hide-if-modified-since {-1} \ - +hide-referrer{forge} \ - -hide-user-agent \ - -handle-as-image \ - -inspect-jpegs \ - -kill-popups \ - +set-image-blocker{pattern} \ - -limit-connect \ - +overwrite-last-modified {randomize} \ - +prevent-compression \ - +session-cookies-only \ - +treat-forbidden-connects-like-blocks \ - -crunch-cookies \ - } - / # '/' Matches *all* URL patterns + ## NOTE: Actions are off by default, unless explictily turned on + ## otherwise with the '+' operator. + +{ \ +-add-header \ +-block \ +-content-type-overwrite \ +-crunch-client-header \ +-crunch-if-none-match \ +-crunch-outgoing-cookies \ +-crunch-incoming-cookies \ +-crunch-server-header \ ++deanimate-gifs{last} \ +-downgrade-http-version \ +-fast-redirects \ ++filter{js-annoyances} \ +-filter{js-events} \ ++filter{html-annoyances} \ +-filter{content-cookies} \ ++filter{refresh-tags} \ ++filter{unsolicited-popups} \ +-filter{all-popups} \ ++filter{img-reorder} \ ++filter{banners-by-size} \ +-filter{banners-by-link} \ ++filter{webbugs} \ +-filter{tiny-textforms} \ ++filter{jumping-windows} \ +-filter{frameset-borders} \ +-filter{demoronizer} \ +-filter{shockwave-flash} \ +-filter{quicktime-kioskmode} \ +-filter{fun} \ +-filter{crude-parental} \ ++filter{ie-exploits} \ +-filter{site-specifics} \ +-filter-client-headers \ +-filter-server-headers \ +-force-text-mode \ +-handle-as-empty-document +-handle-as-image \ +-hide-accept-language \ +-hide-content-disposition \ +-hide-if-modified-since \ ++hide-forwarded-for-headers \ ++hide-from-header{block} \ ++hide-referrer{forge} \ +-hide-user-agent \ +-inspect-jpegs \ +-kill-popups \ +-limit-connect \ +-overwrite-last-modified \ +-redirect \ ++prevent-compression \ +-send-vanilla-wafer \ +-send-wafer \ ++session-cookies-only \ ++set-image-blocker{pattern} \ +-treat-forbidden-connects-like-blocks \ +} +/ # '/' Match *all* URL patterns + # Block, and treat these URL patterns as if they were 'images'. # We would expect these to be ads. @@ -383,7 +410,7 @@ Various other files should be included, but may vary depending on platform - and build configuration. More documentation should be included in the local + and build configuration. Additional documentation should be included in the local documentation directory. diff --git a/privoxy.1 b/privoxy.1 index b4585f57..120033d1 100644 --- a/privoxy.1 +++ b/privoxy.1 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "PRIVOXY" "1" "25 August 2006" "Privoxy 3.0.4 BETA" "" +.TH "PRIVOXY" "1" "01 September 2006" "Privoxy 3.0.4 beta" "" .SH NAME privoxy \- Privacy Enhancing Proxy .SH SYNOPSIS @@ -59,7 +59,7 @@ fail to start. .SH "DESCRIPTION" .PP \fBPrivoxy\fR is a web proxy with advanced filtering -capabilities for protecting privacy, modifying web page content, managing +capabilities for protecting privacy, modifying web page data, managing cookies, controlling access, and removing ads, banners, pop-ups and other obnoxious Internet junk. \fBPrivoxy\fR has a very flexible configuration and can be customized to suit individual needs and @@ -85,6 +85,8 @@ For Internet Explorer, go through: \fBTools\fR; The Secure (SSL) Proxy should also be set to the same values, otherwise https: URLs will not be proxied. Note: \fBPrivoxy\fR can only proxy HTTP and HTTPS traffic. Do not try it with FTP or other protocols. +HTTPS presents some limitations, and not all features will work with HTTPS +connections. .PP For other browsers, check the documentation. .SH "CONFIGURATION" @@ -102,8 +104,8 @@ these files are in the same directory as the \fBPrivoxy\fR executable. .PP See the user-manual for a complete -explanation of general usage, configuration options, new features and notes for -upgrading. +explanation of installation, general usage, all configuration options, new +features and notes on upgrading. .PP The actions list (ad blocks, etc) can also be configured with your web browser at http://config.privoxy.org/. @@ -129,43 +131,69 @@ configuration might look like: -hide-referer -prevent-cookies -kill-popups ## Turn some actions on ################################ - { \\ - -add-header \\ - -block \\ - -content-type-overwrite \\ - -crunch-if-none-match \\ - +crunch-incoming-cookies \\ - +crunch-outgoing-cookies \\ - +crunch-server-header {no-cache} \\ - +deanimate-gifs{last} \\ - -downgrade-http-version \\ - -fast-redirects \\ - -force-text-mode \\ - -filter{html-annoyances} \\ - -filter{js-annoyances} \\ - +filter{content-cookies} \\ - +filter{webbugs} \\ - -filter{banners-by-size} \\ - -handle-as-empty-document \\ - +hide-accept-language{en-ca} \\ - +hide-content-disposition {block} \\ - +hide-forwarded-for-headers \\ - +hide-from-header{block} \\ - +hide-if-modified-since {-1} \\ - +hide-referrer{forge} \\ - -hide-user-agent \\ - -handle-as-image \\ - -inspect-jpegs \\ - -kill-popups \\ - +set-image-blocker{pattern} \\ - -limit-connect \\ - +overwrite-last-modified {randomize} \\ - +prevent-compression \\ - +session-cookies-only \\ - +treat-forbidden-connects-like-blocks \\ - -crunch-cookies \\ - } - / # '/' Matches *all* URL patterns + ## NOTE: Actions are off by default, unless explictily turned on + ## otherwise. + +{ \\ +-add-header \\ +-block \\ +-content-type-overwrite \\ +-crunch-client-header \\ +-crunch-if-none-match \\ +-crunch-outgoing-cookies \\ +-crunch-incoming-cookies \\ +-crunch-server-header \\ ++deanimate-gifs{last} \\ +-downgrade-http-version \\ +-fast-redirects \\ ++filter{js-annoyances} \\ +-filter{js-events} \\ ++filter{html-annoyances} \\ +-filter{content-cookies} \\ ++filter{refresh-tags} \\ ++filter{unsolicited-popups} \\ +-filter{all-popups} \\ ++filter{img-reorder} \\ ++filter{banners-by-size} \\ +-filter{banners-by-link} \\ ++filter{webbugs} \\ +-filter{tiny-textforms} \\ ++filter{jumping-windows} \\ +-filter{frameset-borders} \\ +-filter{demoronizer} \\ +-filter{shockwave-flash} \\ +-filter{quicktime-kioskmode} \\ +-filter{fun} \\ +-filter{crude-parental} \\ ++filter{ie-exploits} \\ +-filter{site-specifics} \\ +-filter-client-headers \\ +-filter-server-headers \\ +-force-text-mode \\ +-handle-as-empty-document +-handle-as-image \\ +-hide-accept-language \\ +-hide-content-disposition \\ +-hide-if-modified-since \\ ++hide-forwarded-for-headers \\ ++hide-from-header{block} \\ ++hide-referrer{forge} \\ +-hide-user-agent \\ +-inspect-jpegs \\ +-kill-popups \\ +-limit-connect \\ +-overwrite-last-modified \\ +-redirect \\ ++prevent-compression \\ +-send-vanilla-wafer \\ +-send-wafer \\ ++session-cookies-only \\ ++set-image-blocker{pattern} \\ +-treat-forbidden-connects-like-blocks \\ +} +/ # '/' Match *all* URL patterns + + # Block, and treat these URL patterns as if they were 'images'. # We would expect these to be ads. @@ -234,7 +262,7 @@ configuration options. .fi .PP Various other files should be included, but may vary depending on platform -and build configuration. More documentation should be included in the local +and build configuration. Additional documentation should be included in the local documentation directory. .SH "SIGNALS" .PP @@ -247,7 +275,7 @@ config file changes by \fBSIGHUP\fR -- it will detect them automatically. .SH "NOTES" .PP -This is a BETA version of \fBPrivoxy\fR. Not +This is a beta version of \fBPrivoxy\fR. Not all features are well tested. .PP Please see the \fIUser Manual\fR on how to contact the @@ -274,19 +302,12 @@ running for this to work. Shortcut: http://p.p/ http://www.privoxy.org/actions/, to submit ``misses'' to the developers. -http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/contrib/, cool -and fun ideas from \fBPrivoxy\fR users. - http://www.junkbusters.com/ht/en/cookies.html, an explanation how cookies are used to track web users. http://www.junkbusters.com/ijb.html, the original Internet Junkbuster. -http://www.waldherr.org/junkbuster/, -Stefan Waldherr's version of Junkbuster, from which \fBPrivoxy\fR was -derived. - http://privacy.net/analyze/, a useful site to check what information about you is leaked while you browse the web. @@ -298,28 +319,15 @@ the \fBPrivoxy\fR developer manual. .SH "DEVELOPMENT TEAM" .nf - David Schmidt Fabian Keil + David Schmidt - Andreas Oesterhelt - Rodrigo Barbosa (RPM specfiles) - Brian Dessent - Jon Foster - Karsten Hopp (Red Hat) - Alexander Lazic - Daniel Leite - Gábor Lipták - Adam Lock (Win32) - Guy Laroche - Haroon Rafique - Georg Sauthoff (Gentoo) - Thomas Steudten - Joerg Strohmayer (Amiga) - Rodney Stromlund - Sviatoslav Sviridov - Sarantis Paskalis - Stefan Waldherr + Johny Agotnes + Moritz Barsnick + Hal Burgiss + Mattes Dolak + Roland Rosenfeld .fi .SH "COPYRIGHT AND LICENSE" .SS "COPYRIGHT" -- 2.39.2