finish giving content to error messages

deleted some which we don't need any longer

diff --git a/errors/English/ERR_ACCESS_DENIED b/errors/English/ERR_ACCESS_DENIED
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..cd83f2e0b3301afb4f299750fbc191d8462c483c 100644 (file)
--- a/errors/English/ERR_ACCESS_DENIED
+++ b/errors/English/ERR_ACCESS_DENIED
@@ -6,23 +6,17 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Access Denied.
 </STRONG>
-</UL>
-
 <P>
-The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
-
-<P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
+Access control configuration prevents your request from
+being allowed at this time.  Please contact your service provider if
+you feel this is incorrect.
+</UL>
 

diff --git a/errors/English/ERR_CANNOT_FORWARD b/errors/English/ERR_CANNOT_FORWARD
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..de107e06e59bf33772867359346de72522c24f0d 100644 (file)
--- a/errors/English/ERR_CANNOT_FORWARD
+++ b/errors/English/ERR_CANNOT_FORWARD
@@ -6,23 +6,17 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Forwarding Denied.
 </STRONG>
 </UL>
 
 <P>
-The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
-
-<P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+This cache will not forward your request because it is trying to enforce a
+sibling relationship.  Perhaps the client at %i is a cache which has been
+misconfigured.

diff --git a/errors/English/ERR_CONNECT_FAIL b/errors/English/ERR_CONNECT_FAIL
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..bf4dbefa7224059aac5262bae6d9524f4eb60a46 100644 (file)
--- a/errors/English/ERR_CONNECT_FAIL
+++ b/errors/English/ERR_CONNECT_FAIL
@@ -6,23 +6,19 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Connection Failed
 </STRONG>
 </UL>
 
 <P>
 The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
+<PRE><I>    %E</I></PRE>
 
 <P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+The remote host or network may be down.  Please try the request again.

diff --git a/errors/English/ERR_FTP_DISABLED b/errors/English/ERR_FTP_DISABLED
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..53d038d5c440a7d37256bfd74d2115ae895c5b6e 100644 (file)
--- a/errors/English/ERR_FTP_DISABLED
+++ b/errors/English/ERR_FTP_DISABLED
@@ -6,23 +6,15 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+FTP is Disabled
 </STRONG>
 </UL>
 
 <P>
-The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
-
-<P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+This cache does not support FTP.

diff --git a/errors/English/ERR_INVALID_REQ b/errors/English/ERR_INVALID_REQ
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..f215c15e70c2992fded541e600383d623b331de2 100644 (file)
--- a/errors/English/ERR_INVALID_REQ
+++ b/errors/English/ERR_INVALID_REQ
@@ -6,23 +6,23 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Invalid Request
 </STRONG>
 </UL>
 
 <P>
-The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
-
-<P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+Some aspect of the HTTP Request is invalid.  Possible problems:
+<UL>
+<LI>Missing or unknown request method (GET, POST)
+<LI>Missing URL
+<LI>Missing HTTP Identifier (HTTP/1.0)
+<LI>Request may be too large.
+<LI>
+<LI>Illegal character in hostname; underscores are not allowed
+</UL>

diff --git a/errors/English/ERR_INVALID_URL b/errors/English/ERR_INVALID_URL
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..7aec43d36e12976edc9fe819cb6f8aa18a5b8389 100644 (file)
--- a/errors/English/ERR_INVALID_URL
+++ b/errors/English/ERR_INVALID_URL
@@ -6,23 +6,20 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Invalid URL
 </STRONG>
 </UL>
 
 <P>
-The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
-
-<P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+Some aspect of the requested URL is incorrect.  Possible problems:
+<UL>
+<LI>Missing or incorrect access protocol (should be `http://'' or similar)
+<LI>Missing hostname
+<LI>Illegal character in hostname; underscores are not allowed
+</UL>

diff --git a/errors/English/ERR_LIFETIME_EXP b/errors/English/ERR_LIFETIME_EXP
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..cc3ef72bad630b21a35b94e617987558cd032c5d 100644 (file)
--- a/errors/English/ERR_LIFETIME_EXP
+++ b/errors/English/ERR_LIFETIME_EXP
@@ -6,23 +6,16 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Connection Lifetime Expired
 </STRONG>
 </UL>
 
 <P>
-The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
-
-<P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+Squid has terminated the request because it has exceeded the maximum
+connection lifetime.

diff --git a/errors/English/ERR_NO_RELAY b/errors/English/ERR_NO_RELAY
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..eba4c7dedc6acf55b8c5eb8b21a1eae9bd8e256c 100644 (file)
--- a/errors/English/ERR_NO_RELAY
+++ b/errors/English/ERR_NO_RELAY
@@ -6,23 +6,15 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+No Wais Relay
 </STRONG>
 </UL>
 
 <P>
-The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
-
-<P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+There is no WAIS Relay host defined for this Cache!  Yell at the administrator.

diff --git a/errors/English/ERR_READ_ERROR b/errors/English/ERR_READ_ERROR
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..cb56339edcf5b88727da9e3d5ed8fe197060cbe2 100644 (file)
--- a/errors/English/ERR_READ_ERROR
+++ b/errors/English/ERR_READ_ERROR
@@ -6,23 +6,20 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Read Error
 </STRONG>
 </UL>
 
 <P>
 The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
+<PRE><I>    %E</I></PRE>
 
 <P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+An error condition occurred while reading data from the network.  Please
+retry your request.

diff --git a/errors/English/ERR_READ_TIMEOUT b/errors/English/ERR_READ_TIMEOUT
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..99606f61daf6df520611ea1a09ba9dab604188de 100644 (file)
--- a/errors/English/ERR_READ_TIMEOUT
+++ b/errors/English/ERR_READ_TIMEOUT
@@ -6,23 +6,20 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Read Timeout
 </STRONG>
 </UL>
 
 <P>
 The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
+<PRE><I>    %E</I></PRE>
 
 <P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+A Timeout occurred while waiting to read data from the network.  The network
+or server may be down or congested.  Please retry your request.

diff --git a/errors/English/ERR_SOCKET_FAILURE b/errors/English/ERR_SOCKET_FAILURE
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..a7c4a1bc97d14c488969e37ff81022a7b1da9c7a 100644 (file)
--- a/errors/English/ERR_SOCKET_FAILURE
+++ b/errors/English/ERR_SOCKET_FAILURE
@@ -6,23 +6,20 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Socket Failure
 </STRONG>
 </UL>
 
 <P>
 The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
+<PRE><I>    %E</I></PRE>
 
 <P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+Squid is unable to create a TCP socket, presumably due to excessive load.
+Please retry your request.

diff --git a/errors/English/ERR_UNSUP_REQ b/errors/English/ERR_UNSUP_REQ
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..bea2be04df1fcc56307a8b8c7d901c024523d911 100644 (file)
--- a/errors/English/ERR_UNSUP_REQ
+++ b/errors/English/ERR_UNSUP_REQ
@@ -6,23 +6,16 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Unsupported Request Method and Protocol
 </STRONG>
 </UL>
 
 <P>
-The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
-
-<P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+Squid does not support all request methods for all access protocols.
+For example, you can not POST a Gopher request.

diff --git a/errors/English/ERR_WRITE_ERROR b/errors/English/ERR_WRITE_ERROR
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..967089e188974137f2e17fffabb323f941edc27c 100644 (file)
--- a/errors/English/ERR_WRITE_ERROR
+++ b/errors/English/ERR_WRITE_ERROR
@@ -6,23 +6,20 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Write Error
 </STRONG>
 </UL>
 
 <P>
 The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
+<PRE><I>    %E</I></PRE>
 
 <P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+An error condition occurred while writing to the network.  Please retry your
+request.

diff --git a/errors/English/ERR_ZERO_SIZE_OBJECT b/errors/English/ERR_ZERO_SIZE_OBJECT
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..6e391636f478564e19e687023d976e727a41e640 100644 (file)
--- a/errors/English/ERR_ZERO_SIZE_OBJECT
+++ b/errors/English/ERR_ZERO_SIZE_OBJECT
@@ -6,23 +6,15 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
 <LI>
 <STRONG>
-@SHORT_DESCRIPTION@
+Zero Sized Reply
 </STRONG>
 </UL>
 
 <P>
-The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
-
-<P>
-This means that:
-<PRE>
-    @LONG_DESCRIPTION@
-</PRE>
-
+Squid did not receive any data for this request.

diff --git a/errors/English/generic b/errors/English/generic
index 5a07ef0141859c48e65a80feed8a85bc7787fcf3..0810751f51cebef5f505f7cc17d5677c6d1194ef 100644 (file)
--- a/errors/English/generic
+++ b/errors/English/generic
@@ -6,7 +6,7 @@
 <HR>
 <P>
 While trying to retrieve the URL:
-<A HREF="%u">%u</A>
+<A HREF="%U">%U</A>
 <P>
 The following error was encountered:
 <UL>
@@ -18,7 +18,7 @@ The following error was encountered:
 
 <P>
 The system returned:
-<PRE><I>    @XSTRERROR@</I></PRE>
+<PRE><I>    %E</I></PRE>
 
 <P>
 This means that: