From 9170307ae10c8fb2807661cc362d91d588ae3ebc Mon Sep 17 00:00:00 2001
From: hal9 <hal9@users.sourceforge.net>
Date: Thu, 26 Sep 2002 05:57:14 +0000
Subject: [PATCH] Conditionally exclude 'this doc is evolving' comment in intro
 for non release situations.

---
 doc/source/developer-manual.sgml | 15 ++++++++++-----
 doc/source/faq.sgml              | 11 ++++++++---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 282dd724..dfe6cc70 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -23,7 +23,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: developer-manual.sgml,v 2.2 2002/09/04 01:55:44 hal9 Exp $
+ $Id: developer-manual.sgml,v 2.3 2002/09/05 02:27:59 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -48,7 +48,7 @@
     </pubdate>
 
 
-    <pubdate>$Id: developer-manual.sgml,v 2.2 2002/09/04 01:55:44 hal9 Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 2.3 2002/09/05 02:27:59 hal9 Exp $</pubdate>
 
 <!--
 
@@ -93,8 +93,9 @@ Hal.
 <!-- end boilerplate -->
 
 <para>
+ <![%p-stable;[
  Please note that this document is constantly evolving. This copy represents
- the state at the release of version &p-version;.
+ the state at the release of version &p-version;. ]]>
  You can find the latest version of the this manual at <ulink
  url="http://www.privoxy.org/developer-manual/">http://www.privoxy.org/developer-manual/</ulink>.
  Please see <link linkend="contact">the Contact section</link> 
@@ -1843,7 +1844,7 @@ static void unload_re_filterfile( void *f ) { ... }</programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>
-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.2 2002/09/04 01:55:44 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 2.3 2002/09/05 02:27:59 hal9 Exp $";
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -1903,7 +1904,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION;
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.2 2002/09/04 01:55:44 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 2.3 2002/09/05 02:27:59 hal9 Exp $"
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -2997,6 +2998,10 @@ at sourceforge. Three simple steps:
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
+  Revision 2.3  2002/09/05 02:27:59  hal9
+  Mention tested stable branch fixes in main trunk, as alternate to posting
+  patches.
+
   Revision 2.2  2002/09/04 01:55:44  hal9
   Migrating developer manual, and related sgml files from 3.0. Add additional
   commentary on cvs, versioning, stable branches, and how to handle stable
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index f0c450be..54c8a171 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -24,7 +24,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 2.3 2002/09/13 11:50:55 oes Exp $
+ $Id: faq.sgml,v 2.4 2002/09/26 00:14:42 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -72,7 +72,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.3 2002/09/13 11:50:55 oes Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.4 2002/09/26 00:14:42 hal9 Exp $</pubdate>
 
 <!--
 
@@ -126,8 +126,9 @@ Hal.
 <!-- end boilerplate -->
 
  <para>
+  <![%p-stable;[
   Please note that this document is constantly evolving. This copy represents
-  the state at the release of version &p-version;.
+  the state at the release of version &p-version;. ]]>
   You can find the latest version of the document at <ulink
   url="http://www.privoxy.org/faq/">http://www.privoxy.org/faq/</ulink>.
   Please see the <link linkend="contact">Contact section</link> if you want to
@@ -1873,6 +1874,10 @@ FIXME: Commented out until we have something to put here. HB 03/18/02.
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 $Log: faq.sgml,v $
+Revision 2.4  2002/09/26 00:14:42  hal9
+Small additions for content-cookies/SSL, LAN configuration, and FTP (non)
+support.
+
 Revision 2.3  2002/09/13 11:50:55  oes
 Added MicroSuck topic; Updated PHP bug topic
 
-- 
2.39.2