X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fblocked;h=f53eae8317ae884d5085a12a67394415b61fc156;hp=3da06f28261f54af766e2429a53fc2109a7a1a14;hb=HEAD;hpb=0428133610c525457cb16f7ac6a54203a2743d6c

diff --git a/templates/blocked b/templates/blocked
index 3da06f28..f53eae83 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:
@@ -82,7 +81,7 @@
 #  force-support:
 #    Privoxy has been compiled with support for forced loading
 #    of blocked content. In that case, the symbol "force-prefix" is
-#    avaiable, which translates to the FORCE_PREFIX
+#    available, which translates to the FORCE_PREFIX
 #
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -90,7 +89,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">
@@ -148,7 +147,7 @@
    <p class="small" align="center"> \
     Request blocked by <a href="@default-cgi@" target="_blank">Privoxy</a>: @block-reason@ \
     <br>See <a href="@default-cgi@show-url-info?url=@hostport@@path-ue@" \
-     target="_blank">why this block applies</a> \
+     >why this block applies</a> \
     <!-- @if-force-support-start --> \
     or <a href="http://@hostport@@force-prefix@@path@">go \
     <!-- if-force-support-end@ --> \
@@ -184,7 +183,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> \
@@ -196,7 +195,7 @@
         <p>Your request for <b>@protocol@@hostport@@path@</b> was blocked. \
          <br>Block reason: @block-reason@ \
          <br><a href="@default-cgi@show-url-info?url=@hostport@@path-ue@" \
-         target="_blank">See why this block applies</a> \
+          >See why this block applies</a> \
 <!-- @if-force-support-start --> \
           or <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>. \
 <!-- if-force-support-end@ --> \
@@ -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> \
      ');
@@ -270,9 +258,9 @@
 
   <noscript>
    <p class="small" align="center">
-    Request blocked by <a href="@default-cgi@" target="_blank">Privoxy</a>: @block-reason@
+    Request blocked by <a href="@default-cgi@">Privoxy</a>: @block-reason@
     <br>See <a href="@default-cgi@show-url-info?url=@hostport@@path-ue@"
-     target="_blank">why this block applies</a>
+     >why this block applies</a>
     <!-- @if-force-support-start -->
     or <a href="http://@hostport@@force-prefix@@path@">go
     <!-- if-force-support-end@ -->
