X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fblocked;h=0f70bf2943e3e8e8f1f024c3d940ff3269dc696a;hp=dd0e0764f6fef41e4a3761673cff3f257095a6d3;hb=a2f1da2576306c55f97a25bdc05cb7745feb869e;hpb=22527fea1c44cc8882cef8c700cc9e92f4a11c39

diff --git a/templates/blocked b/templates/blocked
index dd0e0764..0f70bf29 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
@@ -68,7 +68,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:
@@ -90,7 +90,7 @@
   <title>Request blocked (Privoxy@@my-hostname@)</title>
   <meta http-equiv="Content-Style-Type" content="text/css">
   <meta http-equiv="Content-Script-Type" content="text/javascript">
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="robots" content="noindex,nofollow">
   <link rel="shortcut icon" href="@default-cgi@error-favicon.ico" type="image/x-icon">
   <style type="text/css">
@@ -184,7 +184,7 @@
         <p> \
           <b>Please note that this <font color=red>@code-status@</font> release \
           of the proxy software is not intended for production systems! \
-          <br>Use at your own risk. See the <a href="http://www.gnu.org/copyleft/gpl.html">license</a> for details.</b> \
+          <br>Use at your own risk. See the <a href="@user-manual@copyright.html">license</a> for details.</b> \
         </p> \
       </td> \
     </tr> \
@@ -210,35 +210,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 +229,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/faq/general.html#PARTICIPATE">participate</a> \
+          or <a href="https://www.privoxy.org/faq/general.html#DONATE">donate</a>. \
+        </p> \
+      </td> \
+    </tr> \
  \
   </table> \
      ');