Updated for 3.0.7 beta

[privoxy.git] / doc / text / user-manual.txt

diff --git a/doc/text/user-manual.txt b/doc/text/user-manual.txt
index d513759..aa815b6 100644 (file)
--- a/doc/text/user-manual.txt
+++ b/doc/text/user-manual.txt
@@ -212,16 +212,24 @@ Table of Contents
 
 1. Introduction
 
-This documentation is included with the current stable version of Privoxy,
-v.3.0.7.
+This documentation is included with the current beta version of Privoxy,
+v.3.0.7, and is mostly complete at this point. The most up to date reference
+for the time being is still the comments in the source files and in the
+individual configuration files. Development of a new version is currently
+nearing completion, and includes significant changes and enhancements over
+earlier versions. .
+
+Since this is a beta version, not all new features are well tested. This
+documentation may be slightly out of sync as a result (especially with CVS
+sources). And there may be bugs, though hopefully not many!
 
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 1.1. Features
 
 In addition to the core features of ad blocking and cookie management, Privoxy
-provides many supplemental features, that give the end-user more control, more
-privacy and more freedom:
+provides many supplemental features, some of them currently under development,
+that give the end-user more control, more privacy and more freedom:
 
   • Integrated browser based configuration and control utility at http://
     config.privoxy.org/ (shortcut: http://p.p/). Browser-based tracing of rule
@@ -427,8 +435,8 @@ compiler like gcc are required.
 
 When building from a source tarball, first unpack the source:
 
- tar xzvf privoxy-3.0.7-src* [.tgz or .tar.gz]
- cd privoxy-3.0.7
+ tar xzvf privoxy-3.0.7-beta-src* [.tgz or .tar.gz]
+ cd privoxy-3.0.7-beta
 
 
 For retrieving the current CVS sources, you'll need a CVS client installed.
@@ -1144,7 +1152,9 @@ which cases it's safe to enable them again.
 
 For Unix, *BSD and Linux, all configuration files are located in /etc/privoxy/
 by default. For MS Windows, OS/2, and AmigaOS these are all in the same
-directory as the Privoxy executable.
+directory as the Privoxy executable. The name and number of configuration files
+has changed from previous versions, and is subject to change as development
+progresses.
 
 The installed defaults provide a reasonable starting point, though some
 settings may be aggressive by some standards. For the time being, the principle
@@ -1200,6 +1210,11 @@ however, that it may take one or two additional requests for the change to take
 effect. When changing the listening address of Privoxy, these "wake up"
 requests must obviously be sent to the old listening address.
 
+While under development, the configuration content is subject to change. The
+below documentation may not be accurate by the time you read this. Also, what
+constitutes a "default" setting, may change, so please check all your
+configuration files on important issues.
+
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 7. The Main Configuration File