From c01ca2fed6ffe149fba107a7896d80528dc9fbea Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 13 Nov 2011 17:03:54 +0000
Subject: [PATCH] Bump entities for 3.0.18 stable

---
 doc/source/authors.sgml          |  8 ++++----
 doc/source/config.sgml           |  6 +++---
 doc/source/developer-manual.sgml | 13 ++++++++-----
 doc/source/faq.sgml              | 17 ++++++++++++-----
 doc/source/install.sgml          |  8 ++++----
 doc/source/privoxy-man-page.sgml |  8 ++++----
 doc/source/readme.sgml           | 10 +++++-----
 doc/source/user-manual.sgml      | 13 ++++++++-----
 doc/source/webserver/index.sgml  | 13 +++++++++----
 9 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/doc/source/authors.sgml b/doc/source/authors.sgml
index 1589d03d..b8c0649f 100644
--- a/doc/source/authors.sgml
+++ b/doc/source/authors.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  AUTHORS file for Privoxy
 
- $Id: authors.sgml,v 2.18 2011/08/17 10:40:07 fabiankeil Exp $
+ $Id: authors.sgml,v 2.19 2011/09/04 11:10:12 fabiankeil Exp $
 
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
@@ -27,9 +27,9 @@
 <!entity % dummy "IGNORE">
 <!entity authors SYSTEM "p-authors.sgml">
 <!entity p-version "3.0.18">
-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!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-authors-formal "INCLUDE"> <!-- include additional text, etc  -->
 ]>
diff --git a/doc/source/config.sgml b/doc/source/config.sgml
index adf9be6c..4860f1e2 100644
--- a/doc/source/config.sgml
+++ b/doc/source/config.sgml
@@ -2,8 +2,8 @@
 <!entity % dummy "IGNORE">
 <!entity config SYSTEM "p-config.sgml">
 <!entity p-version "3.0.18">
-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
 <!entity % user-man "IGNORE">
 <!entity % config-file "IGNORE">
 <!entity  my-app "<application>Privoxy</application>">
@@ -13,7 +13,7 @@
 
  Purpose     :  config file generation
 
- $Id: config.sgml,v 2.19 2011/08/17 10:40:07 fabiankeil Exp $
+ $Id: config.sgml,v 2.20 2011/09/04 11:10:12 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index c805d541..74baa072 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -9,9 +9,9 @@
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity p-version "3.0.18">
-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % seealso-extra "INCLUDE"> <!-- extra stuff from seealso.sgml    -->
@@ -24,7 +24,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: developer-manual.sgml,v 2.35 2011/08/17 10:40:07 fabiankeil Exp $
+ $Id: developer-manual.sgml,v 2.36 2011/09/04 11:10:12 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -51,7 +51,7 @@
     </pubdate>
 
 
-    <pubdate>$Id: developer-manual.sgml,v 2.35 2011/08/17 10:40:07 fabiankeil Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 2.36 2011/09/04 11:10:12 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -3005,6 +3005,9 @@ at sourceforge. Three simple steps:
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
+  Revision 2.36  2011/09/04 11:10:12  fabiankeil
+  Ditch trailing whitespace
+
   Revision 2.35  2011/08/17 10:40:07  fabiankeil
   Update the entities.
 
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 32d9562a..50c2c8a5 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -9,9 +9,9 @@
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity p-version "3.0.18">
-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-supp-userman "INCLUDE"> <!-- Include all from supported.sgml -->
@@ -27,7 +27,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: faq.sgml,v 2.82 2011/11/13 16:50:34 fabiankeil Exp $
+ $Id: faq.sgml,v 2.83 2011/11/13 16:53:24 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -78,7 +78,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.82 2011/11/13 16:50:34 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.83 2011/11/13 16:53:24 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -2992,6 +2992,13 @@ browsing has slowed to a crawl. What gives? </title>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $
+Revision 2.83  2011/11/13 16:53:24  fabiankeil
+Rephrase the donations section some more
+
+Mention that the domain is now sponsored by Mythic Beasts Ltd
+and make it clear that asking questions about donations is
+possible, too.
+
 Revision 2.82  2011/11/13 16:50:34  fabiankeil
 Note that donations for Privoxy are currently only tax-deductible in the US
 
diff --git a/doc/source/install.sgml b/doc/source/install.sgml
index 3b168d52..249a6023 100644
--- a/doc/source/install.sgml
+++ b/doc/source/install.sgml
@@ -2,9 +2,9 @@
 <!entity % dummy "IGNORE">
 <!entity buildsource SYSTEM "buildsource.sgml">
 <!entity p-version "3.0.18">
-<!entity p-status "UNRELEASED">
-<!entity % p-stable "IGNORE">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-status "stable">
+<!entity % p-stable "INCLUDE">
+<!entity % p-not-stable "IGNORE">
 <!entity % p-alpha "IGNORE">
 <!entity % p-beta "IGNORE">
 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
@@ -16,7 +16,7 @@
 
  Purpose     :  INSTALL file for Privoxy
 
- $Id: install.sgml,v 2.18 2011/08/17 10:40:07 fabiankeil Exp $
+ $Id: install.sgml,v 2.19 2011/09/04 11:10:12 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index 0d24c78a..c190d38a 100644
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,7 +5,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: privoxy-man-page.sgml,v 2.37 2011/08/17 10:40:07 fabiankeil Exp $
+ $Id: privoxy-man-page.sgml,v 2.38 2011/09/04 11:10:12 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -43,9 +43,9 @@
 <!entity license SYSTEM "license.sgml">
 <!entity authors SYSTEM "p-authors.sgml">
 <!entity p-version "3.0.18">
-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">
 <!entity % p-text "IGNORE">           <!-- define we are not a text only doc -->
 <!entity % p-authors-formal "IGNORE"> <!-- exclude additional formating      -->
 <!entity my-copy "(C)">               <!-- db2man barfs on copyright symbol  -->
diff --git a/doc/source/readme.sgml b/doc/source/readme.sgml
index 3e563ee8..b843561d 100644
--- a/doc/source/readme.sgml
+++ b/doc/source/readme.sgml
@@ -5,9 +5,9 @@
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity buildsource SYSTEM "buildsource.sgml">
 <!entity p-version "3.0.18">
-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!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     -->
@@ -17,7 +17,7 @@
 
  Purpose     :  README for Privoxy
 
- $Id: readme.sgml,v 2.45 2011/08/18 11:42:50 fabiankeil Exp $
+ $Id: readme.sgml,v 2.46 2011/09/04 11:10:12 fabiankeil Exp $
 
  Copyright (C) 2001-2011 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -244,7 +244,7 @@
 <!-- </LiteralLayout> -->
 <!-- </para> -->
 <!-- <para> -->
-<!--  $Id: readme.sgml,v 2.45 2011/08/18 11:42:50 fabiankeil Exp $ -->
+<!--  $Id: readme.sgml,v 2.46 2011/09/04 11:10:12 fabiankeil Exp $ -->
 <!-- </para> -->
 
 </article>
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 5212a23b..4dbeddad 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -12,10 +12,10 @@
 <!entity p-authors SYSTEM "p-authors.sgml">
 <!entity config SYSTEM "p-config.sgml">
 <!entity p-version "3.0.18">
-<!entity p-status "UNRELEASED">
+<!entity p-status "stable">
 <!entity % p-authors-formal "INCLUDE"> <!-- include additional text, etc  -->
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-readme "IGNORE">
@@ -34,7 +34,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: user-manual.sgml,v 2.136 2011/10/14 16:53:10 fabiankeil Exp $
+ $Id: user-manual.sgml,v 2.137 2011/11/13 17:02:59 fabiankeil Exp $
 
  Copyright (C) 2001-2011 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -60,7 +60,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 2.136 2011/10/14 16:53:10 fabiankeil Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.137 2011/11/13 17:02:59 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -9374,6 +9374,9 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
+ Revision 2.137  2011/11/13 17:02:59  fabiankeil
+ Import the first ChangeLog draft for 3.0.18 stable
+
  Revision 2.136  2011/10/14 16:53:10  fabiankeil
  Clarify the effect of compiling Privoxy with zlib support
 
diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 14275eec..d5a695f3 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -6,9 +6,9 @@
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity p-version "3.0.18">
-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">
 <!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->
 <!entity % p-homepage "IGNORE">    <!-- toggle for webserver index.html   -->
 <!entity % p-index "IGNORE">       <!-- toggle for local doc index        -->
@@ -20,7 +20,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: index.sgml,v 2.17 2010/11/10 21:49:38 fabiankeil Exp $
+ $Id: index.sgml,v 2.18 2011/08/17 10:40:07 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
  See LICENSE.
@@ -249,6 +249,11 @@
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: index.sgml,v $
+ Revision 2.18  2011/08/17 10:40:07  fabiankeil
+ Update the entities.
+
+ This commit is chronological out of order.
+
  Revision 2.17  2010/11/10 21:49:38  fabiankeil
  Set p-version to 3.0.17
 
-- 
2.39.2