Synthetic commit for tag v_2_9_7

[privoxy.git] / templates / blocked

diff --git a/templates/blocked b/templates/blocked
index 12f193c..4d0d77e 100644 (file)
--- a/templates/blocked
+++ b/templates/blocked
@@ -6,7 +6,7 @@
 # USING HTML TEMPLATES:
 # ---------------------
 #
-# Template files are written in plain HTML, with a few
+# Template files are written win plain HTML, with a few
 # additions:
 # 
 # - Lines that start with a '#' character like this one
@@ -62,18 +62,10 @@
 #
 #  unstable:
 #    This is an alpha or beta release of the proxy software
-#  have-adminaddr-info:
-#    An e-mail address for the local Junkbuster adminstrator has
-#    been specified and is available through the "admin-address"
-#    symbol
 #  have-proxy-info:
 #    A URL for online documentation about this proxy has been
 #    specified and is available through the "proxy-info-url"
 #    symbol
-#  have-help-info:
-#    If either have-proxy-info is true or have-adminaddr-info is
-#    true, have-help-info is true.  Used to conditionally include
-#    a grey box for any and all help info.
 #  force-support:
 #    Junkbuster has been compiled with support for forced loading
 #    of blocked content. In that case, the symbol "force-prefix" is
@@ -105,13 +97,13 @@
 # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in
     <tr>
       <td bgcolor=#ffdddd colspan=2>
-        <p><b>Please note that this <font color=red>@code-status@</font> release
-          of the proxy software is not intended for production systems!
+        <p><b>Please note that this is a <font color=red>@code-status@</font> release,
+          of the proxy software, 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>
         </p>
 
         <p>Feel free to <a href=mailto:ijbswa-developers@lists.sourceforge.net>mail the developers</a>
-          with any problems you encounter.
+          with any problems you might have
         </p>
       </td>
     </tr>
@@ -138,25 +130,19 @@
       </td>
     </tr>
 
-<!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
-        <h2>Local Junkbuster support:</h2>
+      <td bgcolor=#dddddd colspan=2>
+        <p>If you have any questions about this service,
 
 <!-- @if-have-proxy-info-start -->
-        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Junkbuster installation.         
+          consult the <a href="@proxy-info-url@">online documentation</a> or
 <!-- if-have-proxy-info-end@ -->
 
-<!-- @if-have-adminaddr-info-start -->
-        <p>Address e-mail questions about this service to
-          <a href=mailto:@admin-address@><code>@admin-address@</code></a>,
+          <a href=mailto:@admin-address@>send mail to <code>@admin-address@</code></a>
           who will be glad to help you.
-<!-- if-have-adminaddr-info-end@ -->
-
         </p>
       </td>
     </tr>
-<!-- if-have-help-info-end@ -->
 
   </table>