X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fforwarding-failed;h=af8de2245b17abfc03571b32c460297afb27e0de;hb=8c89425e758750c0610802f4a20ecd196c47ca2e;hp=db82911b39973bdbce2756f261a526f08755f5de;hpb=b6c268cca2189e8b28f43fe9417df75d0ca80076;p=privoxy.git

diff --git a/templates/forwarding-failed b/templates/forwarding-failed
index db82911b..af8de224 100644
--- a/templates/forwarding-failed
+++ b/templates/forwarding-failed
@@ -6,9 +6,9 @@
 # USING HTML TEMPLATES:
 # ---------------------
 #
-# Template files are written win plain HTML, with a few
+# Template files are written in 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,10 +44,9 @@
 #    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.
 #
-#  host-ip
+#  gateway
 #    The IP or hostname of the forwarding server
 #  hostport:
 #    The host and port part of the request that lead to this problem
@@ -55,8 +54,9 @@
 #    The path part of the request that lead to this problem
 #  error-message:
 #    The failure reason.
-#  socks-type:
-#    The type of the socks request: SOCKS4 or SOCKS4a
+#  forwarding-type:
+#    The type of the forwarding request: "socks4-", "socks4a-"
+#    or (in the future) "" for direct connections to the forwarder.
 #
 #
 # CONDITIONAL SYMBOLS FOR THIS TEMPLATE AND THEIR DEPANDANT SYMBOLS:
@@ -65,7 +65,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:
@@ -84,7 +84,7 @@
   <title>503 - Forwarding failure (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">
@@ -98,7 +98,7 @@
     <tr>
       <td class="status">
         503
-      </td>     
+      </td>
       <td class="title" style="width: 100%">
 
 #include mod-title
@@ -120,13 +120,17 @@
     <tr>
       <td class="warning" colspan=2>
         <h2>Forwarding failure</h2>
-          <p>Privoxy was unable to @forwarding-type@forward your request
-             <a href="@protocol@@hostport@@path@"><b>@protocol@@hostport@@path@</b></a>
+          <p>Privoxy was unable to <b>@forwarding-type@forward</b> your request
+             <a  title="Repeat the request"
+              href="@protocol@@hostport@@path@"><b>@protocol@@hostport@@path@</b></a>
              through <b>@gateway@</b>:
-            <br><strong>@error-message@</strong></p>
+            <strong>@error-message@</strong></p>
           </p>
-          <p>If you think it's a temporary failure, you might just
-            <a href="@protocol@@hostport@@path@">try again</a>.
+          <p>Just <a title="Repeat the request" href="@protocol@@hostport@@path@">try again</a> to
+             see if this is a temporary problem, or check your <a title="Privoxy's show-status page"
+              href="@default-cgi@show-status">forwarding settings</a>
+             and make sure that all forwarding servers are working correctly and
+             listening where they are supposed to be listening.
          </p>
       </td>
     </tr>
@@ -138,23 +142,23 @@
       </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>