From: hal9 Date: Thu, 22 Nov 2007 17:38:41 +0000 (+0000) Subject: Minor change for new "templdir" config option. X-Git-Tag: v_3_0_7~33 X-Git-Url: http://www.privoxy.org/gitweb/%40default-cgi%40toggle?a=commitdiff_plain;h=bd1181991fbe8de53e3fe460bc0274847d02d6e5;p=privoxy.git Minor change for new "templdir" config option. --- diff --git a/INSTALL b/INSTALL index a6c4c107..0a7966ce 100644 --- a/INSTALL +++ b/INSTALL @@ -157,11 +157,12 @@ 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. All template files will be overwritten. If you -have customized, local templates, you should save these first, and in fact it -is wise to always save any important configuration files "just in case". If a -previous version of Privoxy is already running, you will have to restart it -manually. +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 diff --git a/doc/pdf/privoxy-user-manual.pdf b/doc/pdf/privoxy-user-manual.pdf index 53048a74..027186f1 100644 Binary files a/doc/pdf/privoxy-user-manual.pdf and b/doc/pdf/privoxy-user-manual.pdf differ diff --git a/doc/source/buildsource.sgml b/doc/source/buildsource.sgml index 01be1eca..bd764681 100644 --- a/doc/source/buildsource.sgml +++ b/doc/source/buildsource.sgml @@ -3,7 +3,7 @@ Purpose : Entity included in other project documents. - $Id: buildsource.sgml,v 2.12 2006/11/14 01:57:46 hal9 Exp $ + $Id: buildsource.sgml,v 2.13 2007/11/14 18:18:15 fabiankeil Exp $ Copyright (C) 2001-2007 Privoxy Developers http://www.privoxy.org/ See LICENSE. @@ -18,7 +18,7 @@ This file is included into: user-manual - README + INSTALL --> @@ -227,9 +227,11 @@ can also be disabled through the configuration file. 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. All - template files will be overwritten. If you have customized, local templates, - you should save these first, and in fact it is wise to always save any + 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. diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html index a6b600eb..07c6eb45 100644 --- a/doc/webserver/user-manual/actions-file.html +++ b/doc/webserver/user-manual/actions-file.html @@ -259,7 +259,7 @@ CLASS="FILENAME" >

8.1. Finding the Right Mix

8.2. How to Edit

8.4.1. The Domain Pattern

8.4.2. The Path Pattern

8.5.39. Summary

8.7.1. default.action

8.7.2. user.action

14.2. Privoxy's Internal Pages

Short cuts. Turn off, then on:

6.1. Controlling Privoxy with Your Web Browser

    Privoxy Menu

12.1. License

9.1. Filter File Tutorial

6.1. Controlling Privoxy with Your Web Browser
8.1. Finding the Right Mix
8.2. How to Edit
8.4.1. The Domain Pattern
8.4.2. The Path Pattern
8.5.39. Summary
8.7.1. default.action
8.7.2. user.action
9.1. Filter File Tutorial
12.1. License
14.2. Privoxy's Internal Pages
will be overwritten. You will then need - to manually update the other installed configuration files as needed. All - template files will be overwritten. If you have customized, local templates, - you should save these first, and in fact it is wise to always save any + 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"

-