Doh! reversing my previous commit.

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

diff --git a/doc/source/readme.sgml b/doc/source/readme.sgml
index aa6c2f2..2882344 100644 (file)
--- a/doc/source/readme.sgml
+++ b/doc/source/readme.sgml
@@ -4,10 +4,12 @@
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity buildsource SYSTEM "buildsource.sgml">
-<!entity p-version "2.9.15">
-<!entity p-status "beta">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
 <!entity % p-stable "IGNORE">
+<!entity % p-not-stable "IGNORE">  <!-- beta or alpha -->
+<!entity % p-alpha "IGNORE">
+<!entity % p-beta "IGNORE">
 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
 <!entity % p-doc "IGNORE">         <!-- and never a text doc             -->
 <!entity % p-readme "INCLUDE">     <!-- all your README belong to us     -->
@@ -17,7 +19,7 @@
 
  Purpose     :  README for Privoxy
                 
- $Id: readme.sgml,v 1.16 2002/05/26 17:04:25 hal9 Exp $
+ $Id: readme.sgml,v 1.19 2002/07/25 21:51:25 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -100,10 +102,13 @@
 <para>
  <!-- include some conditional text -->
  This README is included with <![%p-not-stable;[ the development version of]]>
- Privoxy &p-version;<![%p-not-stable;[, which will eventually become Privoxy v3.0 (and soon we
- hope!)]]>. See http://www.privoxy.org/ for more information. The current code
- level is &p-status;<![%p-not-stable;[, and seems stable to us :)]]>.
-</para>
+ Privoxy &p-version;<![%p-not-stable;[, which will eventually become Privoxy v3.2]]><![%p-beta;[ (and soon we hope!)]]>. 
+ See http://www.privoxy.org/ for more information. The current code
+ level is &p-status;<![%p-beta;[, but seems stable to us :)]]><![%p-alpha;[,
+ and may break in mysterious ways :) There may be features only partially 
+ implemented, or worse, not functional. If you are interested in participating 
+ in Privoxy development, please see the Links at the bottom of this page]]>. 
+ </para>
 </abstract>
 </artheader>
 
@@ -178,7 +183,8 @@
 <para>
  Be sure to set your browser(s) for HTTP/HTTPS Proxy at &lt;IP&gt;:&lt;Port&gt;, or
  whatever you specify in the config file under 'listen-address'. DEFAULT is
- localhost:8118.
+ localhost:8118. Note that Privoxy ONLY proxies HTTP (and HTTPS) traffic. Do not try it 
+ with FTP or other protocols for the simple reason it does not work.
 </para>
 <para>
  The actions list can be configured via the web interface accessed via
@@ -196,14 +202,14 @@
 <sect1 id="documentation"><title>DOCUMENTATION</title>
 <para>
  There should be documentation in the 'doc' subdirectory<![%p-not-stable;[, but it
- is not completed at this point]]>. In particular, see the User Manual there,
+ may not be in sync with current code]]>. In particular, see the User Manual there,
  the FAQ, and those interested in Privoxy development, should look at
  developer-manual. 
 </para>
 <para>
  <![%p-not-stable;[
  The most up to date source of information on the current development version,
- may still be either comments in the source code, or the included
+ may  be either comments in the source code, or the included
  configuration files. ]]>The source and configuration files are all well
  commented. The main configuration files are: 'config', 'default.action', and
  'default.filter'<![%p-not-stable;[ in the toplevel source directory]]>. 
@@ -228,7 +234,7 @@
 <!-- </LiteralLayout> -->
 <!-- </para> -->
 <!-- <para> -->
-<!--  $Id: readme.sgml,v 1.16.2.1 2002/05/26 17:04:25 hal9 Exp $ -->
+<!--  $Id: readme.sgml,v 1.19 2002/07/25 21:51:25 hal9 Exp $ -->
 <!-- </para> -->
 
 </article>