Fix sort order messed up in the previous commit.

[privoxy.git] / doc / source / buildsource.sgml

diff --git a/doc/source/buildsource.sgml b/doc/source/buildsource.sgml
index e128d04..f7ac862 100644 (file)
--- a/doc/source/buildsource.sgml
+++ b/doc/source/buildsource.sgml
@@ -3,9 +3,9 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: buildsource.sgml,v 2.11 2006/10/14 23:06:48 hal9 Exp $
+ $Id: buildsource.sgml,v 2.17 2009/02/21 13:27:58 hal9 Exp $
 
- Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
+ Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  ======================================================================
@@ -18,7 +18,7 @@
  This file is included into:
 
   user-manual
-  README
+  INSTALL
 
 -->
 <para>
@@ -42,8 +42,8 @@
 
 <para>
  <screen>
- tar xzvf privoxy-&p-version;<![%p-not-stable;[-beta]]>-src* [.tgz or .tar.gz]
- cd privoxy-&p-version;<![%p-not-stable;[-beta]]>
+ tar xzvf privoxy-&p-version;<![%p-not-stable;[-beta]]><![%p-stable;[-stable]]>-src.tar.gz
+ cd privoxy-&p-version;<![%p-not-stable;[-beta]]><![%p-stable;[-stable]]>
 </screen>
 </para>
 
@@ -144,7 +144,8 @@
  ./configure  --disable-toggle  --disable-editor  --disable-force</screen>
 </para> 
 <para>
-Then build as above.
+Then build as above. In Privoxy 3.0.7 and later, all of these options
+can also be disabled through the configuration file.
 </para>
 <para>
  <emphasis>WARNING:</emphasis> If installing as root, the install will fail
@@ -224,11 +225,13 @@ Then build as above.
 <para>
  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
- <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
+ <quote>new</quote> extension. default.action and default.filter
+ <emphasis>will be overwritten</emphasis>. You will then need
+ 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.
@@ -238,7 +241,7 @@ Then build as above.
  For more detailed instructions on how to build Redhat RPMs,
  Windows self-extracting installers, building on platforms with
  special requirements etc, please consult the <ulink
- url="../developer-manual/newrelease.html">developer manual</ulink>.
+ url="http://www.privoxy.org/developer-manual/newrelease.html">developer manual</ulink>.
 </para>
 
 <!-- print for README only -->