X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Finstallation.html;h=d0167c8aeead9e02572e1c889606bd3bbddb04f1;hb=9cc96e485bce416f04f758a6785e655348b186c8;hp=b095ba5bebe0f80143811d8075f8f114032000fb;hpb=46174e1f222d671ce9aab072e6174499756911ed;p=privoxy.git

diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html
index b095ba5b..d0167c8a 100644
--- a/doc/webserver/user-manual/installation.html
+++ b/doc/webserver/user-manual/installation.html
@@ -181,7 +181,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="INSTALLATION-DEB"
->2.1.2. Debian</A
+>2.1.2. Debian and Ubuntu</A
 ></H3
 ><P
 > DEBs can be installed with <TT
@@ -753,7 +753,8 @@ CLASS="SCREEN"
 ></TABLE
 ></P
 ><P
->Then build as above.</P
+>Then build as above. In Privoxy 3.0.7 and later, all of these options
+can also be disabled through the configuration file.</P
 ><P
 > <SPAN
 CLASS="emphasis"
@@ -953,9 +954,23 @@ CLASS="EMPHASIS"
 >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