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

diff --git a/templates/forwarding-failed b/templates/forwarding-failed
index db82911b..d555470b 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:
 # --------------------------------
 #
@@ -47,7 +47,7 @@
 #    The URL of the SourceForge ijbswa project, who 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 +55,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:
@@ -98,7 +99,7 @@
     <tr>
       <td class="status">
         503
-      </td>     
+      </td>
       <td class="title" style="width: 100%">
 
 #include mod-title
@@ -120,13 +121,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>