X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Funtrusted;h=b6ee09511232c393db299a6c98d61ee7bda70dea;hp=4d2b0ff1743f318f9fc367c6a01290ad482e9ddf;hb=eaf36cae45ade9aabc5651da1735766b692fcf15;hpb=e8ddf173c26892df3616a9840ff35ee6b69a4deb

diff --git a/templates/untrusted b/templates/untrusted
index 4d2b0ff1..b6ee0951 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -69,10 +69,18 @@
 #
 #  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
@@ -169,19 +177,25 @@
       </td>
     </tr>
 
+<!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd colspan=2>
-        <p>If you have any questions about this service,
+      <td bgcolor=#dddddd>
+        <h2>Local Junkbuster support:</h2>
 
 <!-- @if-have-proxy-info-start -->
-          consult the <a href="@proxy-info-url@">online documentation</a> or
+        <p>You can consult the <a href="@proxy-info-url@">online documentation</a> for more information about this Junkbuster installation.         
 <!-- if-have-proxy-info-end@ -->
 
-          <a href=mailto:@admin-address@>send mail to <code>@admin-address@</code></a>
+<!-- @if-have-adminaddr-info-start -->
+        <p>Address e-mail questions about this service to
+          <a href=mailto:@admin-address@><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>