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

diff --git a/templates/untrusted b/templates/untrusted
index b6ee0951..d5135fd8 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -49,16 +49,10 @@
 #
 #  hostport:
 #    The host and port part of the request that lead to this problem
-#  hostport-html:
-#    The host and port part of the request that lead to this problem, HTML-encoded
 #  path:
 #    The path part of the request that lead to this problem
-#  path-html:
-#    The path part of the request that lead to this problem, HTML-encoded
 #  referrer:
 #    The referrer of the request that lead to this problem
-#  referrer-html:
-#    The referrer of the request that lead to this problem, HTML-encoded
 #  trusted-referrers:
 #    An HTML-formatted list of referrers that are marked as trusted in
 #    the trustfile
@@ -110,7 +104,7 @@
       </td>
       <td bgcolor=#dddddd width=100%>
         <p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
-          <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+          <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
       </td>
     </tr>
 
@@ -122,10 +116,24 @@
           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>
         </p>
-
-        <p>Feel free to <a href=mailto:ijbswa-developers@lists.sourceforge.net>mail the developers</a>
-          with any problems you encounter.
-        </p>
+ 	<p>
+<h2>Support and Service via Sourceforge</h2>
+<p>
+We value your feedback. However, to provide you with the best support,
+please note:
+<ul>
+  <li>Use the <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118">support forum</a> to get
+  help.</li>
+  <li>Submit bugs only thru our <a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
+      forum</a>. Make sure that the bug has not yet been submitted.</li>
+  <li>Submit feature requests only thru our <a
+      href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature request forum</a>.</li>
+</ul>
+</p>
+<p>
+For any other issues, feel free to use the <a
+href="http://sourceforge.net/mail/?group_id=11118">mailing lists</a>.
+</p>
       </td>
     </tr>
 <!-- if-unstable-end@ -->
@@ -135,9 +143,9 @@
       <td bgcolor=#eeeeee colspan=2>
         <h2>Request for untrusted URL</h2>
         <blockquote>
-          <p>Your request for <b>@hostport-html@@path-html@</b> was blocked,
+          <p>Your request for <b>@hostport@@path@</b> was blocked,
             because neither the request URL itself, nor its referrer
-            (<a href="@referrer@">@referrer-html@</a>) were trusted.
+            (<a href="@referrer@">@referrer@</a>) were trusted.
           </p>
 <!-- @if-force-support-start -->
           <p>(You can <a href="http://@hostport@@force-prefix@@path@">go there anyway</a>.)</p>
@@ -179,7 +187,7 @@
 
 <!-- @if-have-help-info-start -->
     <tr>
-      <td bgcolor=#dddddd>
+      <td bgcolor=#dddddd colspan=2>
         <h2>Local Junkbuster support:</h2>
 
 <!-- @if-have-proxy-info-start -->
@@ -200,4 +208,4 @@
   </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>