X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fedit-actions-list;fp=templates%2Fedit-actions-list;h=7bab9e7fb7b77ac42e7fe821a573f483a51e6a2c;hp=c67580d9e608f20d90fd99e5efe44d47d2fdc7a0;hb=1fba182a3c55cd5c820a530e46c96018c137d0b7;hpb=8c4fe387c2087588d068cb1a7c94ca125ca0e99a

diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index c67580d9..7bab9e7f 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -5,7 +5,7 @@
 # Purpose     :  Template used to edit the actions file.
 # 
 #
-# Copyright   :  Written by and Copyright (C) 2001 the SourceForge
+# Copyright   :  Written by and Copyright (C) 2001-2006 the SourceForge
 #                Privoxy team. http://www.privoxy.org/
 #
 #                Original Author: Copyright (C) 2001 Jonathan Foster
@@ -31,6 +31,10 @@
 #
 # Revisions   :
 #    $Log: edit-actions-list,v $
+#    Revision 1.29  2006/07/18 14:49:13  david__schmidt
+#    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+#    with what was really the latest development (the v_3_0_branch branch)
+#
 #    Revision 1.26.2.4  2003/12/17 16:35:17  oes
 #    Work around new & silly MSIE behaviour where the request resulting from
 #    changing window.location.href doesn't reveal the referrer anymore
@@ -291,7 +295,7 @@ function a_p(link,section)
         <p>
          If you haven't already done so, it is <b>strongly recommended</b> that you at 
          least skim <a href="@user-manual@@actions-help-prefix@ACTIONS-FILE">the
-         chapter on actions files</a> in the <a href="@user-manual@">user manual</a>
+         chapter on actions files</a> in the <a href="@user-manual@">User Manual</a>
          before making any changes. You will also find a comprehensive list of all available actions
          there.
         </p>
@@ -306,7 +310,7 @@ function a_p(link,section)
         <!-- @if-default-action-then@ -->
         <p>
          This is the default action file. Updates for it are available from
-         <a href="http://www.privoxy.org/">Privoxy.org</a> on a regular basis. 
+         <a href="http://www.privoxy.org/">Privoxy.org</a>from time to time. 
          It is therefore <b>not recommended</b> that you add your private
          rules here, since they will be lost if you install an update in the future.
          Put your rules in a separate actions file, like <tt>user.action</tt> instead.