X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fmod-support-and-service;h=df86e5a1ead3513ac098f2f85a3fe18ac7fa70d8;hb=29fb30bdf91f5eee7b0ca4d33c131ec06a4db8a3;hp=527694783b47cef4aebebbfc1bcd6f0ce52d7b35;hpb=3c6406b7e0431bfac8206b6558d29d28051458e8;p=privoxy.git

diff --git a/templates/mod-support-and-service b/templates/mod-support-and-service
index 52769478..df86e5a1 100644
--- a/templates/mod-support-and-service
+++ b/templates/mod-support-and-service
@@ -1,24 +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. To provide you with the best support,
+          The Privoxy Team values your feedback. To provide you with the best support,
           we ask that you:
         </p>
         <ul>
           <li>
-            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">support forum</a> or (better) the
-            <a href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a> to get help.
+            use the <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118">Support Tracker</a>
+            if you need help.
           </li>
           <li>
-            submit banners and all problems with the actions file only through the
-            <a href="javascript:void(window.open('http://www.privoxy.org/actions','Feedback','width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">actions
-            file feedback system</a>.
+            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 <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 <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>