Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)

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

diff --git a/doc/source/readme.sgml b/doc/source/readme.sgml
index e97c209..8a6ae66 100644 (file)
--- a/doc/source/readme.sgml
+++ b/doc/source/readme.sgml
@@ -4,12 +4,10 @@
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity buildsource SYSTEM "buildsource.sgml">
-<!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-version "3.0.3">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">
 <!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     -->
@@ -19,9 +17,9 @@
 
  Purpose     :  README for Privoxy
                 
- $Id: readme.sgml,v 2.3 2002/09/05 17:58:29 hal9 Exp $
+ $Id: readme.sgml,v 1.16.2.9 2004/01/30 14:09:59 oes Exp $
 
- Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ Copyright (C) 2001 - 2004 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
 
  ========================================================================
@@ -82,7 +80,7 @@
  *
  * Purpose     :  README file to give a short intro.
  *
- * Copyright   :  Written by and Copyright (C) 2001,2002 the SourceForge
+ * Copyright   :  Written by and Copyright (C) 2001 - 2004  the SourceForge
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -116,10 +114,9 @@
 <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 someday become Privoxy
- v3.2]]>. See http://www.privoxy.org/ for more information. The current code
- level is technically &p-status;<![%p-not-stable;[, but is not yet
- significantly different from the 3.0.0 stable branch at this time.]]>.
+ 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 maturity
+ level is <quote>&p-status;</quote><![%p-not-stable;[, and seems stable to us :)]]>.
 </para>
 </abstract>
 </artheader>
@@ -130,6 +127,18 @@
 
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 id="importantchanges" ><title>IMPORTANT CHANGES</title>
+<para>
+ MORE NEWS! January 2004, Privoxy 3.0.3 is released. This is the another 
+ maintenance release of Privoxy which fixes more bugs, further refines
+ the configuration and works around some known third-party problems. See the
+ ChangeLog for complete details. Upgrading from 3.0.2 is recommended.
+</para>
+<para>
+ NEWS! March 2003, Privoxy 3.0.2 is released. This is the first maintenance
+ release of Privoxy. There are no significant new features in this release.
+ Some bugs are fixed, and some existing features have been enhanced. See 
+ ChangeLog for details. Upgrading from 3.0.0 is recommended.
+</para>
 <para>
  REALLY BIG NEWS! August 2002: The long-awaited, oft-delayed  stable version
  of Privoxy 3.0 is finally released! This is way behind schedule, but better
@@ -153,10 +162,10 @@
 
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 id="install" ><title>INSTALL</title>
-<!-- Install instructions are now in INSTALL -->
-<para>
- See the INSTALL file in this directory, for installing from source, and 
- the User Manual, for other installation types.
+<para> 
+ See the <filename>INSTALL</filename> file in this directory, for installing
+ from source, and the <citetitle>User Manual</citetitle>, for other
+ installation types. 
 </para>
 </sect1>
 
@@ -165,7 +174,7 @@
 <para>
  privoxy [&mdash;&mdash;help] [&mdash;&mdash;version]
  [&mdash;&mdash;no-daemon] [&mdash;&mdash;pidfile PIDFILE] [&mdash;&mdash;user
- USER[.GROUP]] [config_file]
+ USER[.GROUP]] [&mdash;&mdash;chroot] [config_file]
 </para>
 <para>
  See the man page or User Manual for an explanation of each option, and 
@@ -255,7 +264,7 @@
 <!-- </LiteralLayout> -->
 <!-- </para> -->
 <!-- <para> -->
-<!--  $Id: readme.sgml,v 2.3 2002/09/05 17:58:29 hal9 Exp $ -->
+<!--  $Id: readme.sgml,v 1.16.2.9 2004/01/30 14:09:59 oes Exp $ -->
 <!-- </para> -->
 
 </article>