current/doc/webserver/actions index.php, 1.26, 1.27 step3.php, 1.17, 1.18

Update of /cvsroot/ijbswa/current/doc/webserver/actions
In directory 
sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26899/doc/webserver/actions

Modified Files:
        index.php step3.php 
Log Message:
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)


Index: index.php
===================================================================
RCS file: /cvsroot/ijbswa/current/doc/webserver/actions/index.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- index.php   4 Sep 2002 09:31:38 -0000       1.26
+++ index.php   18 Jul 2006 14:48:52 -0000      1.27
@@ -11,8 +11,30 @@
   $Id$
 
   $Log$
-  Revision 1.26  2002/09/04 09:31:38  oes
-  Require Privoxy 3.0, AF 1.5; Fixed bad help text.
+  Revision 1.27  2006/07/18 14:48:52  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.25.2.7  2004/01/30 17:16:44  oes
+  Require AF 1.8
+
+  Revision 1.25.2.6  2003/11/30 11:39:52  oes
+  Fixed typo
+
+  Revision 1.25.2.5  2003/09/01 15:20:45  oes
+  Require AF 1.7
+
+  Revision 1.25.2.4  2003/03/19 14:00:20  oes
+  Require AF 1.6
+
+  Revision 1.25.2.3  2002/08/27 16:33:39  oes
+  Require AF 1.5 & Privoxy 3.0
+
+  Revision 1.25.2.2  2002/08/06 08:39:09  oes
+  Require AF 1.4; link to new AF download location
+
+  Revision 1.25.2.1  2002/07/27 18:47:49  oes
+  Require Privoxy 2.9.16 and AF 1.3
 
   Revision 1.25  2002/04/29 17:30:20  oes
   Fixed BML link text
@@ -129,9 +151,9 @@
 /*
  * Config:
  */
-$required_actions_file_version = "1.5";
+$required_actions_file_version = "1.8";
 $required_privoxy_version = "3.0";
-$actions_file_download = 
"http://sourceforge.net/project/showfiles.php?group_id=11118&release_id=107430";;
+$actions_file_download = 
"http://sourceforge.net/project/showfiles.php?group_id=11118&release_id=147447";;
 $submit_target = "http://www.oesterhelt.org/actions/step2.php";;
 
 
@@ -202,16 +224,17 @@
 if (!isset($headers["X-Actions-File-Version"]) || 
$headers["X-Actions-File-Version"] != $required_actions_file_version)
 {
 
-   error_abort("invalid", "<p>As much as we welcome your feedback, please note 
that
-               we can only accept problem reports based on:
+   error_abort("invalid", "<p><b>Thank you for using <a 
href=\"http://www.privoxy.org/\"; target=\"_blank\">Privoxy</a>'s
+               feedback reporting mechanism!</b> However, in order to make 
optimal use of our limited development resources,
+               we regret that we can at this time only accept problem reports 
based on:
                </p>
                <ul>
                 <li><a href=\"http://www.privoxy.org/\"; 
target=\"_blank\">Privoxy</a> version $required_privoxy_version or later</li>
-                <li><a href=\"$actions_file_download\">Actionsfile</a> version 
$required_actions_file_version</li>
+                <li><a href=\"$actions_file_download\">Actionsfile</a> version 
version $required_actions_file_version</li>
                </ul>
                <p>We hope you will understand that we feel unable to maintain 
concurrent versions of the file.</p>
-               <p><i>Hint: To upgrade your actions file, follow the above 
link, then save as default.action, overwriting 
-                  the old copy in your Privoxy config directory</i>
+               <p><i>Hint: To upgrade your actions file, follow the above link 
to download the file, then save as
+                  default.action in your Privoxy config directory</i>
                </p>");
 }
 
@@ -265,7 +288,7 @@
         <option selected value="INVALID">Please select...</option>
         <option value="P1">An advertisment was NOT blocked</option>
         <option value="P2">An innocent image WAS blocked</option>
-        <option value="P3">The whole page was erraneously blocked</option>
+        <option value="P3">The whole page was erroneously blocked</option>
         <option value="P4">The page needs popups but they don't work</option>
         <option value="P5">Other problem</option>
        </select>

Index: step3.php
===================================================================
RCS file: /cvsroot/ijbswa/current/doc/webserver/actions/step3.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- step3.php   4 Sep 2002 11:12:42 -0000       1.17
+++ step3.php   18 Jul 2006 14:48:52 -0000      1.18
@@ -11,8 +11,15 @@
   $Id$
 
   $Log$
-  Revision 1.17  2002/09/04 11:12:42  oes
-  Adapted to master file format (sync from stable branch)
+  Revision 1.18  2006/07/18 14:48:52  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.16.2.2  2002/08/23 16:46:05  oes
+  Adapt to master file format
+
+  Revision 1.16.2.1  2002/08/23 12:25:31  oes
+  Fixed Typo
 
   Revision 1.16  2002/04/13 14:34:59  oes
   Include unique ID in tracker and log; Include URL in tracker summary; add 
more newlines in tracker


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV