From 4cd34abccf768adb1fb30d797689fe9f005ede05 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 13 Jan 2009 16:50:36 +0000
Subject: [PATCH] The standard.action file is gone.

---
 doc/source/buildsource.sgml      |  6 +++---
 doc/source/developer-manual.sgml | 14 ++++++++-----
 doc/source/faq.sgml              | 15 +++++++++-----
 doc/source/privoxy-man-page.sgml |  5 ++---
 doc/source/user-manual.sgml      | 35 ++++++++++++--------------------
 doc/source/webserver/index.sgml  | 13 +++++++-----
 privoxy-rh.spec                  |  6 ++++--
 utils/filter2docs.pl             |  4 ++--
 8 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/doc/source/buildsource.sgml b/doc/source/buildsource.sgml
index b2505020..4c7c08d3 100644
--- a/doc/source/buildsource.sgml
+++ b/doc/source/buildsource.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: buildsource.sgml,v 2.14 2007/11/22 17:38:40 hal9 Exp $
+ $Id: buildsource.sgml,v 2.15 2008/01/17 01:49:51 hal9 Exp $
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -225,8 +225,8 @@ can also be disabled through the configuration file.
 <para>
  If install finds previous versions of local configuration files, most of
  these will not be overwritten, and the new ones will be installed with a
- <quote>new</quote> extension. default.action, default.filter, and 
- standard.action <emphasis>will be overwritten</emphasis>. You will then need
+ <quote>new</quote> extension. default.action and default.filter
+ <emphasis>will be overwritten</emphasis>. You will then need
  to manually update the other installed configuration files as needed. The
  default template files <emphasis>will</emphasis> be overwritten. If you have
  customized, local templates, these should be stored safely in a separate
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index aed9fc55..e75278df 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.22 2008/08/30 15:37:35 fabiankeil Exp $
+ $Id: developer-manual.sgml,v 2.23 2008/09/26 17:02:01 fabiankeil Exp $
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -50,7 +50,7 @@
     </pubdate>
 
 
-    <pubdate>$Id: developer-manual.sgml,v 2.22 2008/08/30 15:37:35 fabiankeil Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 2.23 2008/09/26 17:02:01 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -2387,9 +2387,8 @@ at sourceforge. Three simple steps:
       </listitem> 
       <listitem>
        <para>
-        Other configuration files (<filename>default.action</filename>,
-        <filename>default.filter</filename> and
-        <filename>standard.action</filename>) should be installed as the new
+        Other configuration files (<filename>default.action</filename> and
+        <filename>default.filter</filename>) should be installed as the new
         defaults, but all previously installed configuration files should be
         preserved as backups. This is just good manners :-) These files are
         likely to change between releases and contain important new features
@@ -3024,6 +3023,11 @@ at sourceforge. Three simple steps:
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
+  Revision 2.23  2008/09/26 17:02:01  fabiankeil
+  - Break some more CVS substitutions in examples.
+  - Remove Junkbusters reference in example header
+    for new files.
+
   Revision 2.22  2008/08/30 15:37:35  fabiankeil
   Update entities.
 
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 22a5196d..7f22ff61 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -26,7 +26,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 2.46 2008/08/30 15:37:35 fabiankeil Exp $
+ $Id: faq.sgml,v 2.47 2008/11/24 18:29:39 fabiankeil Exp $
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -77,7 +77,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.46 2008/08/30 15:37:35 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.47 2008/11/24 18:29:39 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -786,9 +786,8 @@ the differences?</title>
  different purposes: These are 
  <filename>default.action</filename>, the <quote>main</quote> actions file
  which is actively maintained by the <application>Privoxy</application>
- developers and typically sets the default policies, <filename>user.action</filename>, where users are encouraged
- to make their private customizations, and <filename>standard.action</filename>, 
- which is for internal <application>Privoxy</application> use only.
+ developers and typically sets the default policies, <filename>user.action</filename>,
+ where users are encouraged to make their private customizations.
  Please see <ulink url="../user-manual/actions-file.html">the actions chapter</ulink>
  in the <ulink url="../user-manual/index.html">User Manual</ulink> for a more
  detailed explanation.
@@ -2820,6 +2819,12 @@ 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.47  2008/11/24 18:29:39  fabiankeil
+Two changes suggested by Roger Dingledine:
+- Use https://www.torproject.org/ in section 4.7, too.
+- Replace the Tor wiki URL in section 4.10 with one
+  with a more useful anchor name.
+
 Revision 2.46  2008/08/30 15:37:35  fabiankeil
 Update entities.
 
diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index cdce0ba7..64c23f04 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.21 2008/08/30 15:37:35 fabiankeil Exp $
+ $Id: privoxy-man-page.sgml,v 2.22 2008/09/21 14:45:05 fabiankeil Exp $
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -53,7 +53,7 @@
 
 <refentry id="privoxy">
 <refentryinfo>
- <date>2007-04-12</date>
+ <date>2009-01-12</date>
 </refentryinfo>
 <refmeta>
  <refentrytitle>privoxy</refentrytitle> 
@@ -386,7 +386,6 @@
  <filename>/usr/sbin/privoxy</filename>
  <filename>/etc/privoxy/config</filename>
  <filename>/etc/privoxy/default.action</filename>
- <filename>/etc/privoxy/standard.action</filename>
  <filename>/etc/privoxy/user.action</filename>
  <filename>/etc/privoxy/default.filter</filename>
  <filename>/etc/privoxy/user.filter</filename>
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index da22d3bf..b9c0789b 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -33,9 +33,9 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: user-manual.sgml,v 2.89 2008/09/21 15:38:56 fabiankeil Exp $
+ $Id: user-manual.sgml,v 2.90 2008/09/26 16:53:09 fabiankeil Exp $
 
- Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
+ Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  ========================================================================
@@ -59,7 +59,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 2.89 2008/09/21 15:38:56 fabiankeil Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.90 2008/09/26 16:53:09 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -518,8 +518,8 @@ How to install the binary packages depends on your operating system:
  </listitem>
  <listitem>
   <para>  
-   <filename>standard.action</filename> now only includes the enabled actions.
-   Not all actions as before.
+   <filename>standard.action</filename> has been merged into
+   the <filename>default.action</filename> file.
   </para>
  </listitem>
  <listitem>
@@ -1649,8 +1649,7 @@ for details.
     <filename>default.action</filename> (which you will most probably want
     to define sooner or later) are probably best applied in
     <filename>user.action</filename>, where you can preserve them across
-    upgrades. <filename>standard.action</filename> is only for
-    <application>Privoxy's</application> internal use.
+    upgrades.
    </para>
    <para>    
     There is also a web based editor that can be accessed from
@@ -1772,8 +1771,8 @@ for details.
      a set of broad rules that should work reasonably well as-is for most users.
      This is the file that the developers are keeping updated, and <link
      linkend="installation-keepupdated">making available to users</link>.
-     The user's preferences as set in <filename>standard.action</filename>,
-     e.g. either <literal>Cautious</literal> (the default),
+     It also contains the pre-defined sets of rules for the default actions,
+     e.g. <literal>Cautious</literal> (the default),
      <literal>Medium</literal>, or <literal>Advanced</literal> (see
      below).
     </para>
@@ -1785,15 +1784,8 @@ for details.
      has specific requirements, and need special handling, this kind of 
      thing should go here. This file will not be upgraded.
     </para>
-  </listitem> 
+   </listitem> 
    <listitem>
-    <para>
-     <filename>standard.action</filename> - is used only by the web based editor
-     at <ulink url="http://config.privoxy.org/edit-actions-list?f=default">
-     http://config.privoxy.org/edit-actions-list?f=default</ulink>, 
-     to set various pre-defined sets of rules for the default actions section
-     in <filename>default.action</filename>. 
-     </para>
      <para>
      <guibutton>Edit</guibutton>  <guibutton>Set to Cautious</guibutton> <guibutton>Set to Medium</guibutton>  <guibutton>Set to Advanced</guibutton>
      </para>
@@ -1821,13 +1813,9 @@ for details.
       <guibutton>Edit</guibutton> button. More fine-tuning can be done in the
       lower sections of this internal page.
      </para>
-     <para>
-     It is not recommend to edit the <filename>standard.action</filename> file
-     itself.
-    </para>
     <para>
      The default profiles, and their associated actions, as pre-defined in
-     <filename>standard.action</filename> are:
+     <filename>default.action</filename> are:
     </para>
     <para>
     <table frame=all><title>Default Configurations</title>
@@ -8459,6 +8447,9 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
+ Revision 2.90  2008/09/26 16:53:09  fabiankeil
+ Update "What's new" section.
+
  Revision 2.89  2008/09/21 15:38:56  fabiankeil
  Fix Portage tree sync instructions in Gentoo section.
  Anonymously reported at ijbswa-developers@.
diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 6ee9c5ca..b9fa4199 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -5,10 +5,10 @@
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
-<!entity p-version "3.0.10">
-<!entity p-status "stable">
-<!entity % p-not-stable "IGNORE">
-<!entity % p-stable "INCLUDE">
+<!entity p-version "3.0.11">
+<!entity p-status "UNRELEASED">
+<!entity % p-not-stable "INCLUDE">
+<!entity % p-stable "IGNORE">
 <!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.5 2008/06/18 17:42:13 fabiankeil Exp $
+ $Id: index.sgml,v 2.6 2008/08/16 08:51:28 fabiankeil Exp $
 
  Copyright (C) 2001 - 2008 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -249,6 +249,9 @@
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: index.sgml,v $
+ Revision 2.6  2008/08/16 08:51:28  fabiankeil
+ Update version-related entities.
+
  Revision 2.5  2008/06/18 17:42:13  fabiankeil
  - Remove link to soon-to-be-removed PDFs.
  - Use https for the download URL.
diff --git a/privoxy-rh.spec b/privoxy-rh.spec
index fa406a86..97da19f3 100644
--- a/privoxy-rh.spec
+++ b/privoxy-rh.spec
@@ -1,4 +1,4 @@
-# $Id: privoxy-rh.spec,v 1.59 2008/08/13 16:57:46 fabiankeil Exp $
+# $Id: privoxy-rh.spec,v 1.60 2008/08/30 12:46:49 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2006 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -271,7 +271,6 @@ fi
 # -- morcego
 # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
 %config(noreplace) %{privoxyconf}/config
-%config %{privoxyconf}/standard.action
 %config(noreplace) %{privoxyconf}/user.action
 %config %{privoxyconf}/default.action
 %config %{privoxyconf}/default.filter
@@ -765,6 +764,9 @@ fi
 	additional "-r @" flag.
 
 # $Log: privoxy-rh.spec,v $
+# Revision 1.60  2008/08/30 12:46:49  fabiankeil
+# The jarfile directive is gone. Update accordingly.
+#
 # Revision 1.59  2008/08/13 16:57:46  fabiankeil
 # Change version to 3.0.10.
 #
diff --git a/utils/filter2docs.pl b/utils/filter2docs.pl
index 1a4c0a06..b80348c2 100755
--- a/utils/filter2docs.pl
+++ b/utils/filter2docs.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: filter2docs.pl,v 1.4 2008/05/11 15:33:35 fabiankeil Exp $
+# $Id: filter2docs.pl,v 1.5 2008/05/12 09:31:36 fabiankeil Exp $
 # $Source: /cvsroot/ijbswa/current/utils/filter2docs.pl,v $
 
 # Parse the filter names and descriptions from a filter file and
@@ -65,7 +65,7 @@ Producing $type markup:
 Comment lines for default.action:
 
 $comment_lines{$type}
-Block of $type actions for standard.action:
+Block of $type actions for default.action:
 
 $action_lines{$type}
 SGML Source for AF chapter in U-M:
-- 
2.39.2