Minor change for new "templdir" config option.

diff --git a/INSTALL b/INSTALL
index a6c4c10..0a7966c 100644 (file)
--- 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
 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
 
 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 53048a7..027186f 100644 (file)
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 01be1ec..bd76468 100644 (file)
--- a/doc/source/buildsource.sgml
+++ b/doc/source/buildsource.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
 
  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.
 
  Copyright (C) 2001-2007 Privoxy Developers http://www.privoxy.org/
  See LICENSE.


@@ -18,7 +18,7 @@
  This file is included into:
 
   user-manual
  This file is included into:
 
   user-manual

-  README
+  INSTALL

 
 -->
 <para>
 
 -->
 <para>


@@ -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
  <quote>new</quote> extension. default.action, default.filter, and 
  standard.action <emphasis>will be overwritten</emphasis>. You will then need
  these will not be overwritten, and the new ones will be installed with a
  <quote>new</quote> extension. default.action, default.filter, and 
  standard.action <emphasis>will be overwritten</emphasis>. 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 <emphasis>will</emphasis> be overwritten. If you have
+ customized, local templates, these should be stored safely in a separate
+ directory and defined in <filename>config</filename> by the
+ <quote>templdir</quote> directive. It is of course wise to always back-up any

  important configuration files <quote>just in case</quote>. If a previous
  version of <application>Privoxy</application> is already running, you will
  have to restart it manually.
  important configuration files <quote>just in case</quote>. If a previous
  version of <application>Privoxy</application> 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 a6b600e..07c6eb4 100644 (file)
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -259,7 +259,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
 >    <DIV
 CLASS="TABLE"
 ><A

-NAME="AEN2168"
+NAME="AEN2171"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B


@@ -528,7 +528,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN2267"
+NAME="AEN2270"

 >8.1. Finding the Right Mix</A
 ></H2
 ><P
 >8.1. Finding the Right Mix</A
 ></H2
 ><P


@@ -563,7 +563,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN2274"
+NAME="AEN2277"

 >8.2. How to Edit</A
 ></H2
 ><P
 >8.2. How to Edit</A
 ></H2
 ><P


@@ -893,7 +893,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2365"
+NAME="AEN2368"

 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P


@@ -1117,7 +1117,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN2436"
+NAME="AEN2439"

 >8.4.2. The Path Pattern</A
 ></H3
 ><P
 >8.4.2. The Path Pattern</A
 ></H3
 ><P


@@ -7164,7 +7164,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4242"
+NAME="AEN4245"

 >8.5.39. Summary</A
 ></H3
 ><P
 >8.5.39. Summary</A
 ></H3
 ><P


@@ -7469,7 +7469,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4307"
+NAME="AEN4310"

 >8.7.1. default.action</A
 ></H3
 ><P
 >8.7.1. default.action</A
 ></H3
 ><P


@@ -8190,7 +8190,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
 ><H3
 CLASS="SECT3"
 ><A

-NAME="AEN4443"
+NAME="AEN4446"

 >8.7.2. user.action</A
 ></H3
 ><P
 >8.7.2. user.action</A
 ></H3
 ><P

diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index 83ac788..9506e83 100644 (file)
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -745,7 +745,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN5328"
+NAME="AEN5331"

 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P


@@ -791,7 +791,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
    Privoxy main page: 
   </P
 ><A

-NAME="AEN5342"
+NAME="AEN5345"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -824,7 +824,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
     editing of actions files:
   </P
 ><A

-NAME="AEN5350"
+NAME="AEN5353"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -844,7 +844,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
     Show the source code version numbers:
   </P
 ><A

-NAME="AEN5355"
+NAME="AEN5358"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -864,7 +864,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
    Show the browser's request headers:
   </P
 ><A

-NAME="AEN5360"
+NAME="AEN5363"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -884,7 +884,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
    Show which actions apply to a URL and why:
   </P
 ><A

-NAME="AEN5365"
+NAME="AEN5368"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -916,7 +916,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
    place:
   </P
 ><A

-NAME="AEN5373"
+NAME="AEN5376"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -933,7 +933,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
 >   Short cuts. Turn off, then on: 
   </P
 ><A

-NAME="AEN5377"
+NAME="AEN5380"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"


@@ -947,7 +947,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
    </P
 ></BLOCKQUOTE
 ><A

-NAME="AEN5380"
+NAME="AEN5383"

 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"

diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index d8fe22c..0437bf3 100644 (file)
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -95,7 +95,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN813"
+NAME="AEN816"

 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P
 >6.1. Controlling Privoxy with Your Web Browser</A
 ></H2
 ><P


@@ -126,7 +126,7 @@ CLASS="SCREEN"
 > <H2
 CLASS="BRIDGEHEAD"
 ><A
 > <H2
 CLASS="BRIDGEHEAD"
 ><A

-NAME="AEN821"
+NAME="AEN824"

 ></A
 >    Privoxy Menu</H2
 ><P
 ></A
 >    Privoxy Menu</H2
 ><P

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 89031ca..49d8895 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -99,7 +99,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN5071"
+NAME="AEN5074"

 >12.1. License</A
 ></H2
 ><P
 >12.1. License</A
 ></H2
 ><P

diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index 99f419a..8d4d8fc 100644 (file)
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -363,7 +363,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
 ><H2
 CLASS="SECT2"
 ><A

-NAME="AEN4598"
+NAME="AEN4601"

 >9.1. Filter File Tutorial</A
 ></H2
 ><P
 >9.1. Filter File Tutorial</A
 ></H2
 ><P

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 9451e4b..21da087 100644 (file)
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -292,7 +292,7 @@ HREF="configuration.html"
 ><DL
 ><DT
 >6.1. <A
 ><DL
 ><DT
 >6.1. <A

-HREF="configuration.html#AEN813"
+HREF="configuration.html#AEN816"

 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT
 >Controlling Privoxy with Your Web Browser</A
 ></DT
 ><DT


@@ -515,12 +515,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
 ><DL
 ><DT
 >8.1. <A

-HREF="actions-file.html#AEN2267"
+HREF="actions-file.html#AEN2270"

 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A

-HREF="actions-file.html#AEN2274"
+HREF="actions-file.html#AEN2277"

 >How to Edit</A
 ></DT
 ><DT
 >How to Edit</A
 ></DT
 ><DT


@@ -537,12 +537,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
 ><DL
 ><DT
 >8.4.1. <A

-HREF="actions-file.html#AEN2365"
+HREF="actions-file.html#AEN2368"

 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A

-HREF="actions-file.html#AEN2436"
+HREF="actions-file.html#AEN2439"

 >The Path Pattern</A
 ></DT
 ><DT
 >The Path Pattern</A
 ></DT
 ><DT


@@ -754,7 +754,7 @@ HREF="actions-file.html#TREAT-FORBIDDEN-CONNECTS-LIKE-BLOCKS"
 ></DT
 ><DT
 >8.5.39. <A
 ></DT
 ><DT
 >8.5.39. <A

-HREF="actions-file.html#AEN4242"
+HREF="actions-file.html#AEN4245"

 >Summary</A
 ></DT
 ></DL
 >Summary</A
 ></DT
 ></DL


@@ -773,12 +773,12 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
 ><DL
 ><DT
 >8.7.1. <A

-HREF="actions-file.html#AEN4307"
+HREF="actions-file.html#AEN4310"

 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A
 >default.action</A
 ></DT
 ><DT
 >8.7.2. <A

-HREF="actions-file.html#AEN4443"
+HREF="actions-file.html#AEN4446"

 >user.action</A
 ></DT
 ></DL
 >user.action</A
 ></DT
 ></DL


@@ -794,7 +794,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
 ><DL
 ><DT
 >9.1. <A

-HREF="filter-file.html#AEN4598"
+HREF="filter-file.html#AEN4601"

 >Filter File Tutorial</A
 ></DT
 ><DT
 >Filter File Tutorial</A
 ></DT
 ><DT


@@ -862,7 +862,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
 ><DL
 ><DT
 >12.1. <A

-HREF="copyright.html#AEN5071"
+HREF="copyright.html#AEN5074"

 >License</A
 ></DT
 ><DT
 >License</A
 ></DT
 ><DT


@@ -896,7 +896,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
 ></DT
 ><DT
 >14.2. <A

-HREF="appendix.html#AEN5328"
+HREF="appendix.html#AEN5331"

 >Privoxy's Internal Pages</A
 ></DT
 ><DD
 >Privoxy's Internal Pages</A
 ></DT
 ><DD

diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index 17dad39..d0167c8 100644 (file)
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -954,9 +954,23 @@ CLASS="EMPHASIS"
 >will be overwritten</I
 ></SPAN
 >. You will then need
 >will be overwritten</I
 ></SPAN
 >. 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 <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>will</I
+></SPAN
+> be overwritten. If you have
+ customized, local templates, these should be stored safely in a separate
+ directory and defined in <TT
+CLASS="FILENAME"
+>config</TT
+> by the
+ <SPAN
+CLASS="QUOTE"
+>"templdir"</SPAN
+> directive. It is of course wise to always back-up any

  important configuration files <SPAN
 CLASS="QUOTE"
 >"just in case"</SPAN
  important configuration files <SPAN
 CLASS="QUOTE"
 >"just in case"</SPAN

diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index 8c54b8d..4dd055a 100644 (file)
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -724,7 +724,7 @@ CLASS="GUIBUTTON"
 >  <DIV
 CLASS="FIGURE"
 ><A
 >  <DIV
 CLASS="FIGURE"
 ><A

-NAME="AEN566"
+NAME="AEN569"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B

diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index ce156c3..33ad43a 100644 (file)
--- a/doc/webserver/user-manual/seealso.html
+++ b/doc/webserver/user-manual/seealso.html
@@ -251,7 +251,6 @@ TARGET="_top"
 ><P
 ></P
 >
 ><P
 ></P
 >

- 

  <P
 ></P
 ><TABLE
  <P
 ></P
 ><TABLE

diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index 66ba8ff..172b1c2 100644 (file)
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -111,7 +111,7 @@ CLASS="APPLICATION"
 >  <DIV
 CLASS="FIGURE"
 ><A
 >  <DIV
 CLASS="FIGURE"
 ><A

-NAME="AEN621"
+NAME="AEN624"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B


@@ -245,7 +245,7 @@ CLASS="EMPHASIS"
 >  <DIV
 CLASS="FIGURE"
 ><A
 >  <DIV
 CLASS="FIGURE"
 ><A

-NAME="AEN665"
+NAME="AEN668"

 ></A
 ><P
 ><B
 ></A
 ><P
 ><B