X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fblocked;h=9fd6000b178d2e81621b8a643afe729407b84b90;hp=5510e56b1746d10abe73eb638a6bead99ae90fd5;hb=5d67369224f780b21d94cacf31dbcdf288c7ed6c;hpb=340769f5fc2e7b1f94d509ff56ebf98133965252

diff --git a/templates/blocked b/templates/blocked
index 5510e56b..9fd6000b 100644
--- a/templates/blocked
+++ b/templates/blocked
@@ -37,7 +37,7 @@
 #  my-hostname:
 #    The hostname associated with my-ip-addr
 #  admin-address:
-#    The email address of the pxoxy's administrator, as configured
+#    The email address of the proxy administrator, as configured
 #    in the config file
 #  default-cgi:
 #    The URL for the "main menu" builtin CGI of this proxy
@@ -49,8 +49,7 @@
 #    The development status of the proxy software: "alpha", "beta",
 #    or "stable".
 #  homepage:
-#    The URL of the SourceForge ijbswa project, who maintains this
-#    software.
+#    The URL of the Privoxy project, which maintains this software.
 #
 #  protocol:
 #    The request's protocol: http:// or https://
@@ -68,7 +67,7 @@
 #  unstable:
 #    This is an alpha or beta release of the proxy software
 #  have-adminaddr-info:
-#    An e-mail address for the local Privoxy adminstrator has
+#    An e-mail address for the local Privoxy administrator has
 #    been specified and is available through the "admin-address"
 #    symbol
 #  have-proxy-info:
@@ -210,35 +209,6 @@
         <ul>@menu@<li><a href="@user-manual@">Documentation</a></li></ul> \
       </td> \
     </tr> \
- \
-    <tr> \
-      <td class="info" colspan="2"> \
-        <big><b>Support and Service via Sourceforge:</b></big> \
-        <p> \
-          We value 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. \
-          </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>. \
-          </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. \
-          </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>. \
-          </li> \
-        </ul> \
-      </td> \
-    </tr> \
  \
 <!-- @if-have-help-info-start --> \
     <tr> \
@@ -258,6 +228,24 @@
       </td> \
     </tr> \
 <!-- if-have-help-info-end@ --> \
+ \
+    <tr> \
+      <td class="info" colspan="2"> \
+        <big><b>Support and Service:</b></big> \
+        <p> \
+          The Privoxy Team values your feedback. \
+        </p> \
+        <p> \
+          Please have a look at the User Manual to learn how to \
+          <a title="Privoxy User Manual: Contacting the developers, Bug Reporting and Feature Requests" \
+           href="@user-manual@contact.html">get support or report problems</a>. \
+        <p> \
+          If you want to support the Privoxy Team, you can \
+          <a href="https://www.privoxy.org/participate">participate</a> \
+          or <a href="https://www.privoxy.org/donate">donate</a>. \
+        </p> \
+      </td> \
+    </tr> \
  \
   </table> \
      ');