X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Funtrusted;h=1a552619b46232f380cd4432b68bd4aaea171e72;hp=017a5383021eb88cffa13a56318a5957f170b98a;hb=e15357d347c1c3b52a482430d87689ab5a76d5a1;hpb=88d71df2d51ef289c934de95813bf229229870fd

diff --git a/templates/untrusted b/templates/untrusted
index 017a5383..1a552619 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -8,7 +8,7 @@
 #
 # Template files are written win plain HTML, with a few
 # additions:
-# 
+#
 # - Lines that start with a '#' character like this one
 #   are ignored
 #
@@ -23,7 +23,7 @@
 #   strings @if-<name>start and if-<name>-end@. The strings
 #   should be placed in HTML comments (<!-- -->), so the
 #   html structure won't be messed when the magic happens.
-#   
+#
 # USABLE SYMBOLS IN THIS TEMPLATE:
 # --------------------------------
 #
@@ -32,7 +32,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
@@ -44,8 +44,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.
 #
 #  hostport:
 #    The host and port part of the request that lead to this problem
@@ -64,7 +63,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:
@@ -78,7 +77,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  
+#    avaiable, which translates to the FORCE_PREFIX
 #  have-trust-info:
 #    There were URLs with info on the trust policy defined in the config
 #    file. In this case the list of URLs is available through the
@@ -91,8 +90,9 @@
   <title>Untrusted request (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">
   <style type="text/css">
 #include cgi-style.css
   </style>
@@ -106,9 +106,9 @@
         UNTRUSTED
       </td>
       <td class="title" style="width: 100%">
- 
+
 #include mod-title
- 
+
       </td>
     </tr>
 
@@ -166,24 +166,24 @@
       </td>
     </tr>
 
+<!-- @if-have-help-info-start -->
     <tr>
       <td class="info" colspan="2">
 
-#include mod-support-and-service
+#include mod-local-help
 
       </td>
     </tr>
+<!-- if-have-help-info-end@ -->
 
-<!-- @if-have-help-info-start -->
     <tr>
       <td class="info" colspan="2">
 
-#include mod-local-help
+#include mod-support-and-service
 
       </td>
     </tr>
-<!-- if-have-help-info-end@ -->
-        
+
   </table>
 
 </body>