From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 19 Jun 2002 10:17:04 +0000 (+0000)
Subject: - few updates from 1.3.26 dist config
X-Git-Tag: apache-1_3_26-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache.git;a=commitdiff_plain;h=48184c11b8fc6306da43ea033e49e35884f99779

- few updates from 1.3.26 dist config

Changed files:
    apache-httpd.conf -> 1.18
---

diff --git a/apache-httpd.conf b/apache-httpd.conf
index d4d4ae5..8b643a5 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -300,7 +300,7 @@ UserDir public_html
 #    <LimitExcept GET POST OPTIONS PROPFIND>
 #        Order deny,allow
 #        Deny from all
-#    </Limit>
+#    </LimitExcept>
 #</Directory>
 
 #
@@ -331,6 +331,7 @@ AccessFileName .htaccess
 <Files ~ "^\.ht">
 	Order allow,deny
 	Deny from all
+	Satisfy All
 </Files>
 
 #
@@ -613,13 +614,15 @@ AddLanguage ja .ja
 AddLanguage kr .kr
 AddLanguage ltz .lu
 AddLanguage nl .nl
+AddLanguage nn .nn
 AddLanguage no .no
 AddLanguage pl .po
 AddLanguage pt .pt
 AddLanguage pt-br .pt-br
 AddLanguage ru .ru
-AddLanguage sv .se
+AddLanguage sv .sv
 AddLanguage tw .tw
+AddLanguage zh-tw .tw
 
 AddCharset Big5 .Big5 .big5
 AddCharset CP866 .cp866
@@ -719,7 +722,7 @@ MetaSuffix .meta
 #
 #    1) plain text
 #ErrorDocument 500 "The server made a boo boo.
-#  n.b.  the (") marks it as text, it does not get output
+#  n.b.  the single leading (") marks it as text, it does not get output
 #
 #    2) local redirects
 #ErrorDocument 404 /missing.html
@@ -728,7 +731,7 @@ MetaSuffix .meta
 #  N.B.: You can redirect to a script or a document using server-side-includes.
 #
 #    3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
+#ErrorDocument 402 http://some.other-server.com/subscription_info.html
 #  N.B.: Many of the environment variables associated with the original
 #  request will *not* be available to such a script.
 
@@ -773,14 +776,14 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 
 #
 # Allow remote server configuration reports, with the URL of
-#  http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
+# http://servername/server-info (requires that mod_info.c be loaded).
+# Change the ".your-domain.com" to match your domain to enable.
 #
 #<Location /server-info>
 #	SetHandler server-info
 #	Order deny,allow
 #	Deny from all
-#	Allow from .your_domain.com
+#	Allow from .your-domain.com
 #</Location>
 
 #