[prev in list] [next in list] [prev in thread] [next in thread]
List: privoxy-commits
Subject: [privoxy-commits] current/doc/source buildsource.sgml, 2.15,
From: noreply () sourceforge ! net
Date: 2009-01-13 16:50:38
Message-ID: E1LMmTO-0004WV-3b () 23jxhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Update of /cvsroot/ijbswa/current/doc/source
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17378/doc/source
Modified Files:
buildsource.sgml developer-manual.sgml faq.sgml
privoxy-man-page.sgml user-manual.sgml
Log Message:
The standard.action file is gone.
Index: buildsource.sgml
===================================================================
RCS file: /cvsroot/ijbswa/current/doc/source/buildsource.sgml,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- buildsource.sgml 17 Jan 2008 01:49:51 -0000 2.15
+++ buildsource.sgml 13 Jan 2009 16:50:35 -0000 2.16
@@ -225,8 +225,8 @@
<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
Index: developer-manual.sgml
===================================================================
RCS file: /cvsroot/ijbswa/current/doc/source/developer-manual.sgml,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- developer-manual.sgml 26 Sep 2008 17:02:01 -0000 2.23
+++ developer-manual.sgml 13 Jan 2009 16:50:35 -0000 2.24
@@ -2387,9 +2387,8 @@
</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,9 @@
Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$Log$
+ Revision 2.24 2009/01/13 16:50:35 fabiankeil
+ The standard.action file is gone.
+
Revision 2.23 2008/09/26 17:02:01 fabiankeil
- Break some more CVS substitutions in examples.
- Remove Junkbusters reference in example header
Index: faq.sgml
===================================================================
RCS file: /cvsroot/ijbswa/current/doc/source/faq.sgml,v
retrieving revision 2.47
retrieving revision 2.48
diff -u -d -r2.47 -r2.48
--- faq.sgml 24 Nov 2008 18:29:39 -0000 2.47
+++ faq.sgml 13 Jan 2009 16:50:35 -0000 2.48
@@ -786,9 +786,8 @@
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,9 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
$Log$
+Revision 2.48 2009/01/13 16:50:35 fabiankeil
+The standard.action file is gone.
+
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.
Index: privoxy-man-page.sgml
===================================================================
RCS file: /cvsroot/ijbswa/current/doc/source/privoxy-man-page.sgml,v
retrieving revision 2.22
retrieving revision 2.23
diff -u -d -r2.22 -r2.23
--- privoxy-man-page.sgml 21 Sep 2008 14:45:05 -0000 2.22
+++ privoxy-man-page.sgml 13 Jan 2009 16:50:35 -0000 2.23
@@ -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>
Index: user-manual.sgml
===================================================================
RCS file: /cvsroot/ijbswa/current/doc/source/user-manual.sgml,v
retrieving revision 2.90
retrieving revision 2.91
diff -u -d -r2.90 -r2.91
--- user-manual.sgml 26 Sep 2008 16:53:09 -0000 2.90
+++ user-manual.sgml 13 Jan 2009 16:50:35 -0000 2.91
@@ -35,7 +35,7 @@
$Id$
- Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
+ Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
See LICENSE.
========================================================================
@@ -518,8 +518,8 @@
</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 @@
<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 @@
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 @@
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 @@
<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 @@
USA
$Log$
+ Revision 2.91 2009/01/13 16:50:35 fabiankeil
+ The standard.action file is gone.
+
Revision 2.90 2008/09/26 16:53:09 fabiankeil
Update "What's new" section.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
ijbswa-commits mailing list
ijbswa-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ijbswa-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic