From: Joshua Slive <slive@apache.org>
Date: Wed, 25 May 2005 15:20:55 +0000 (+0000)
Subject: Reverse r168030 because the not-acceptable (406)
X-Git-Tag: 2.1.5~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d2f77b59a6fb278a1c5c0fdca986c86a8342bfe;p=apache

Reverse r168030 because the not-acceptable (406)
custom error doc can't provide all the information
provided by the internal doc.  Also delete the corresponding
.html.var file to avoid future confusion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178453 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/conf/extra/httpd-multilang-errordoc.conf.in b/docs/conf/extra/httpd-multilang-errordoc.conf.in
index d75391cb7b..d3192508b5 100644
--- a/docs/conf/extra/httpd-multilang-errordoc.conf.in
+++ b/docs/conf/extra/httpd-multilang-errordoc.conf.in
@@ -37,7 +37,6 @@ ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
 ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
 ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
 ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-ErrorDocument 406 /error/HTTP_NOT_ACCEPTABLE.html.var
 ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
 ErrorDocument 410 /error/HTTP_GONE.html.var
 ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
diff --git a/docs/error/HTTP_NOT_ACCEPTABLE.html.var b/docs/error/HTTP_NOT_ACCEPTABLE.html.var
deleted file mode 100644
index 28e99822eb..0000000000
--- a/docs/error/HTTP_NOT_ACCEPTABLE.html.var
+++ /dev/null
@@ -1,186 +0,0 @@
-Content-language: cs
-Content-type: text/html; charset=ISO-8859-2
-Body:----------cs--
-<!--#set var="CONTENT_LANGUAGE" value="cs"
---><!--#set var="CHARACTER_ENCODING" value="ISO-8859-2"
---><!--#set var="TITLE" value="Nenalezen ¾ádný akceptovatelný objekt!"
---><!--#include virtual="include/top.html" -->
-
-    Adekvátní reprezentace po¾adoveného zdroje
-    nebyla na tomto serveru nalezena.
-
-<!--#include virtual="include/bottom.html" -->
-----------cs--
-
-Content-language: de
-Content-type: text/html; charset=ISO-8859-1
-Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de"
---><!--#set var="TITLE" value="Kein passendes Objekt gefunden!"
---><!--#include virtual="include/top.html" -->
-
-    Unter dem angeforderten URL konnte kein geeignetes Objekt
-    auf dem Server gefunden werden, das dem vom Browser
-    geforderten Format entsprechen w&uuml;rde. 
-
-<!--#include virtual="include/bottom.html" -->
-----------de--
-
-Content-language: en
-Content-type: text/html; charset=ISO-8859-1
-Body:----------en--
-<!--#set var="TITLE" value="No acceptable object found!"
---><!--#include virtual="include/top.html" -->
-
-    An appropriate representation of the requested resource
-    could not be found on this server.
-
-<!--#include virtual="include/bottom.html" -->
-----------en--
-
-Content-language: es
-Content-type: text/html; charset=ISO-8859-1
-Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es"
---><!--#set var="TITLE" value="&iexcl;No se encontr&oacute; ning&uacute; objeto aceptable!"
---><!--#include virtual="include/top.html" -->
-
-	Una representaci&oacute;n apropiada de los recursos 
-	solicitados no ha podido ser localizada en 
-	este servidor.
-
-<!--#include virtual="include/bottom.html" -->
-----------es--
-
-Content-language: fr
-Content-type: text/html; charset=ISO-8859-1
-Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr"
---><!--#set var="TITLE" value="L'objet trouv&eacute; n'est pas acceptable!"
---><!--#include virtual="include/top.html" -->
-
-    Une repr&eacute;sentation appropri&eacute;e de la ressource requise
-    n'a pu &ecirc;tre trouv&eacute;e sur ce serveur.
-
-<!--#include virtual="include/bottom.html" -->  
-----------fr--
-
-Content-language: it
-Content-type: text/html; charset=ISO-8859-1
-Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it"
---><!--#set var="TITLE" value="Nessun oggetto accettabile!"
---><!--#include virtual="include/top.html" -->
-
-    Questo server non riesce a trovare una rappresentazione
-    appropriata per la risorsa richiesta.
-
-<!--#include virtual="include/bottom.html" -->
-----------it--
-
-Content-language: ja
-Content-type: text/html; charset=ISO-2022-JP
-Body:----------ja--
-<!--#set var="CONTENT_LANGUAGE" value="ja"
---><!--#set var="CHARACTER_ENCODING" value="iso-2022-jp"
---><!--#set var="TITLE" value="No acceptable object found!"
---><!--#include virtual="include/top.html" -->
-
-    $BMW5a$5$l$?%j%=!<%9$NE,@Z$JI=8=$O!"(B
-    $BK\%5!<%P$K$O8+$D$+$j$^$;$s$G$7$?!#(B
-
-<!--#include virtual="include/bottom.html" -->
-----------ja--
-
-Content-language: ko
-Content-type: text/html; charset=EUC-KR
-Body:----------ko--
-<!--#set var="CONTENT_LANGUAGE" value="ko"
---><!--#set var="TITLE" value="Àû´çÇÑ °´Ã¼ ¾øÀ½!"
---><!--#set var="CHARACTER_ENCODING" value="EUC-KR"
---><!--#include virtual="include/top.html" -->
-
-    ¿äûÇÑ °´Ã¼ÀÇ Àû´çÇÑ ÇüŸ¦ ÀÌ ¼­¹ö¿¡¼­ ãÀ» ¼ö ¾ø½À´Ï´Ù.
-
-<!--#include virtual="include/bottom.html" -->
-----------ko--
-
-Content-language: nl
-Content-type: text/html; charset=ISO-8859-1
-Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl"
---><!--#set var="TITLE" value="Geen acceptabel object gevonden!"
---><!--#include virtual="include/top.html" -->
-
-    Een toereikende representatie van het gevraagde object
-    kon niet gevonden worden op deze server.
-
-<!--#include virtual="include/bottom.html" -->
-----------nl--
-
-Content-language: pl
-Content-type: text/html; charset=ISO-8859-2
-Body:----------pl--
-<!--#set var="CONTENT_LANGUAGE" value="pl"
---><!--#set var="TITLE" value="Brak akceptowalnego obiektu!"
---><!--#set var="CHARACTER_ENCODING" value="ISO-8859-2"
---><!--#include virtual="include/top.html" -->
-
-    Nie znaleziono akceptowalnego obiektu reprezentuj±cego
-    ¿±dany zasób.
-
-<!--#include virtual="include/bottom.html" -->
-----------pl--
-
-Content-language: pt-br
-Content-type: text/html; charset=ISO-8859-1
-Body:-------pt-br--
-<!--#set var="CONTENT_LANGUAGE" value="pt-br"
---><!--#set var="TITLE" value="Objeto apropriado n&atilde;o encontrado!"
---><!--#include virtual="include/top.html" -->
-
-    N&atilde;o existe uma representa&ccedil;&atilde;o apropriada
-    para o recurso requisitado neste servidor.
-
-<!--#include virtual="include/bottom.html" -->
--------pt-br--
-
-Content-language: ro
-Content-type: text/html; charset=ISO-8859-1
-Body:----------ro--
-<!--#set var="CONTENT_LANGUAGE" value="ro"
---><!--#set var="TITLE" value="Nici un obiect acceptabil gasit!"
---><!--#include virtual="include/top.html" -->
-
-    Nici o reprezentare potrivita a resursei cerute
-    nu a putut fi gasita pe acest server.
-
-<!--#include virtual="include/bottom.html" -->
-----------ro--
-
-Content-language: sv
-Content-type: text/html; charset=ISO-8859-1
-Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv"
---><!--#set var="TITLE" value="Inget acceptabelt objekt hittat!"
---><!--#include virtual="include/top.html" -->
-
-    En l&auml;mplig representation av den efterfr&aring;gade
-    resursen kunde inte hittas p&aring; denna server.
-
-<!--#include virtual="include/bottom.html" -->
-----------sv--
-
-Content-language: tr
-Content-type: text/html; charset=ISO-8859-9
-Body:----------tr--
-<!--#set var="CONTENT_LANGUAGE" value="tr"
---><!--#set var="CHARACTER_ENCODING" value="ISO-8859-9"
---><!--#set var="TITLE" value="No acceptable object found!"
---><!--#include virtual="include/top.html" -->
-
-    Sunucu üzerinde, talep etti&#287;iniz kayna&#287;&#305;n
-    uygun bir kar&#351;&#305;l&#305;&#287;&#305; bulunamad&#305;.
-
-<!--#include virtual="include/bottom.html" -->
-----------tr--