From bd1181991fbe8de53e3fe460bc0274847d02d6e5 Mon Sep 17 00:00:00 2001 From: hal9 Date: Thu, 22 Nov 2007 17:38:41 +0000 Subject: [PATCH] Minor change for new "templdir" config option. --- INSTALL | 11 +++++----- doc/pdf/privoxy-user-manual.pdf | Bin 813117 -> 813157 bytes doc/source/buildsource.sgml | 12 +++++----- doc/webserver/user-manual/actions-file.html | 16 +++++++------- doc/webserver/user-manual/appendix.html | 18 +++++++-------- doc/webserver/user-manual/configuration.html | 4 ++-- doc/webserver/user-manual/copyright.html | 2 +- doc/webserver/user-manual/filter-file.html | 2 +- doc/webserver/user-manual/index.html | 22 +++++++++---------- doc/webserver/user-manual/installation.html | 20 ++++++++++++++--- doc/webserver/user-manual/quickstart.html | 2 +- doc/webserver/user-manual/seealso.html | 1 - doc/webserver/user-manual/startup.html | 4 ++-- 13 files changed, 65 insertions(+), 49 deletions(-) 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 53048a743fc27484d1f5d3936c6cae491963610f..027186f1965d9ce01674efda0c9c16d64bea658b 100644 GIT binary patch delta 8033 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 V&;WN2NrKnea3pnfOjnvo{vQQatKk3u delta 7974 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 @@ -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"

-