From 7e7451168d14ecf15af0f3f59dc0b55be40e86aa Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 10 Nov 2007 17:10:59 +0000 Subject: [PATCH] In the first third of the file, mention several times that the action editor is disabled by default in 3.0.7 beta and later. --- doc/source/user-manual.sgml | 55 +++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml index 00227364..c51c1462 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.38 2007/09/22 16:01:42 fabiankeil Exp $ + $Id: user-manual.sgml,v 2.39 2007/11/05 02:34:49 hal9 Exp $ Copyright (C) 2001-2007 Privoxy Developers http://www.privoxy.org/ See LICENSE. @@ -59,7 +59,7 @@ -$Id: user-manual.sgml,v 2.38 2007/09/22 16:01:42 fabiankeil Exp $ +$Id: user-manual.sgml,v 2.39 2007/11/05 02:34:49 hal9 Exp $ -Solaris, NetBSD, HP-UX +Solaris <!--, NetBSD, HP-UX--> Create a new directory, cd to it, then unzip and @@ -351,8 +351,8 @@ How to install the binary packages depends on your operating system: The port skeleton and the package can also be downloaded from the File Release - Page, but if you're interested in stable releases only you don't - gain anything by using them. + Page, but there's no reason to use them unless you're interested in the + beta releases which are only available there. @@ -789,7 +789,8 @@ How to install the binary packages depends on your operating system: by setting the proxy configuration for address of 127.0.0.1 and port 8118. DO NOT activate proxying for FTP or - any protocols besides HTTP and HTTPS (SSL)! It won't work! + any protocols besides HTTP and HTTPS (SSL) unless you intend to prevent your + browser from using these protocols. @@ -807,7 +808,10 @@ How to install the binary packages depends on your operating system: A default installation should provide a reasonable starting point for most. There will undoubtedly be occasions where you will want to adjust the configuration, but that can be dealt with as the need arises. Little - to no initial configuration is required in most cases. + to no initial configuration is required in most cases, you may want + to enable the + web-based action editor though. + Be sure to read the warnings first. See the Configuration section for more @@ -834,6 +838,9 @@ How to install the binary packages depends on your operating system: + @@ -855,7 +863,7 @@ How to install the binary packages depends on your operating system: Now enjoy surfing with enhanced control, comfort and privacy! - + @@ -895,7 +903,7 @@ How to install the binary packages depends on your operating system: Secondly, a brief explanation of Privoxy's actions. Actions in this context, are the directives we use to tell Privoxy to perform - some task relating to WWW transactions (i.e. web browsing). We tell + some task relating to HTTP transactions (i.e. web browsing). We tell Privoxy to take some action. Each action has a unique name and function. While there are many potential actions in Privoxy's @@ -1016,8 +1024,20 @@ How to install the binary packages depends on your operating system: the special Privoxy editor at http://config.privoxy.org/show-status (shortcut: http://p.p/show-status). This - is an internal page, and does not require Internet access. Select the - appropriate actions file, and click + is an internal page, and does not require Internet access. + + + + Note that as of Privoxy 3.0.7 beta the + action editor is disabled by default. Check the + enable-edit-actions + section in the configuration file to learn why and in which + cases it's safe to enable again. + + + + If you decided to enable the action editor, select the appropriate + actions file, and click Edit. It is best to put personal or local preferences in user.action since this is not meant to be overwritten during upgrades, and will over-ride the settings in @@ -1687,6 +1707,14 @@ for details. your browser. + + Note that several of the features described above are disabled by default + in Privoxy 3.0.7 beta and later. + Check the + configuration file to learn why + and in which cases it's safe to enable them again. + + @@ -8932,6 +8960,9 @@ In file: user.action [ View ] [ Edit ]