X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fmod-support-and-service;h=fde47b129f2ce0dbf2e67d03bf44891ca0516e4e;hb=ce0952da61bb0c60341ada1627bcde2a05b46d98;hp=a761e660170549da2e85487c697ecfe1977534cf;hpb=7f64ad8404ae2fb3437b753942e10a5d38370312;p=privoxy.git

diff --git a/templates/mod-support-and-service b/templates/mod-support-and-service
index a761e660..fde47b12 100644
--- a/templates/mod-support-and-service
+++ b/templates/mod-support-and-service
@@ -1,19 +1,53 @@
-        <h2>Support and Service via Sourceforge:</h2>
+##############################################################################
+#
+# File        :  $Source: /cvsroot/ijbswa/current/templates/mod-support-and-service,v $
+#
+# Purpose     :  Template that is included from most of Privoxy's CGI pages
+#                to show the user how to get help or report problems.
+#
+#
+# Copyright   :  Written by and Copyright (C) 2002-2009 members of
+#                the Privoxy team. http://www.privoxy.org/
+#
+#                This template is free software; you can redistribute it
+#                and/or modify it under the terms of the GNU General
+#                Public License as published by the Free Software
+#                Foundation; either version 2 of the License, or (at
+#                your option) any later version.
+#
+##############################################################################
+       <h2>Support and Service:</h2>
         <p>
-         We value your feedback. However, to provide you with the best support, please note:
+          The Privoxy Team values your feedback. To provide you with the best support,
+          we ask that you:
         </p>
         <ul>
           <li>
-	Use the support forum to get help: <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a>.
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">Support Tracker</a>
+            if you need help.
           </li>
           <li>
-	You can also send feedback on websites that Privoxy has problems with. Please bookmark the following link:
-            <a href="javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('http://www.privoxy.org/actions','Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Privoxy - Submit Filter Feedback</a>. Once you surf to a page with problems, use the bookmark to send us feedback.
+            submit ads and configuration related problems with the actions files through the
+            <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=460288">Actionsfile Feedback Tracker</a>.
           </li>
           <li>
-	Submit bugs only through our bug tracker: <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">bug tracker</a>. Make sure that the bug has not yet been submitted.
+            submit bugs only through the
+            <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118">Bug Tracker</a>.
+            Please make sure that the bug has not been submitted yet.
           </li>
           <li>
-	Submit feature requests only through our feature request tracker: <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">feature request tracker</a>.
+            submit feature requests only through the
+            <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118&amp;func=browse">Feature
+            Request Tracker</a>.
+          </li>
+          <li>
+            read the <a title="Contacting the developers, Bug Reporting and Feature Requests"
+             href="@user-manual@contact.html">instructions in the User Manual</a>
+            to make sure your request contains all the information we need.
           </li>
         </ul>
+        <p>
+         If you want to support the Privoxy Team, please have a look at the FAQ to learn how to
+         <a href="http://www.privoxy.org/faq/general.html#PARTICIPATE">participate</a>
+         or to <a href="http://www.privoxy.org/faq/general.html#DONATE">donate</a>.
+        </p>