summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd/conf/httpd.conf-dist-nw
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2001-03-29 10:21:59 +0000
committerBob Beck <beck@cvs.openbsd.org>2001-03-29 10:21:59 +0000
commit2b3dc365d4b023a5259d936c068cb5df3426967b (patch)
treeb1346522cde73ec5b607759538d83c41556a8fb5 /usr.sbin/httpd/conf/httpd.conf-dist-nw
parent818340ddb467ba6a4dbdf09a24dc1f0199231090 (diff)
Apache 1.3.19+mod_ssl 2.8.1 merge - also adds shared build of mod_headers
and mod_expire
Diffstat (limited to 'usr.sbin/httpd/conf/httpd.conf-dist-nw')
-rw-r--r--usr.sbin/httpd/conf/httpd.conf-dist-nw7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/httpd/conf/httpd.conf-dist-nw b/usr.sbin/httpd/conf/httpd.conf-dist-nw
index 4d8cdb5894f..166259ac9f5 100644
--- a/usr.sbin/httpd/conf/httpd.conf-dist-nw
+++ b/usr.sbin/httpd/conf/httpd.conf-dist-nw
@@ -56,8 +56,6 @@ ServerType standalone
# (available at <URL:http://www.apache.org/docs/mod/core.html#lockfile>);
# you will save yourself a lot of trouble.
#
-# Do NOT add a slash at the end of the directory path.
-#
ServerRoot "sys:/apache"
#
@@ -290,7 +288,7 @@ DocumentRoot "sys:/apache/htdocs"
# directory if a ~user request is received.
#
<IfModule mod_userdir.c>
- UserDir public_html
+ UserDir /home/*/public_html
</IfModule>
#
@@ -617,7 +615,7 @@ ServerSignature On
# avoid the ambiguity with the common suffix for perl scripts.
#
# Note 2: The example entries below illustrate that in quite
- # some cases the two character 'Language' abbriviation is not
+ # some cases the two character 'Language' abbreviation is not
# identical to the two character 'Country' code for its country,
# E.g. 'Danmark/dk' versus 'Danish/da'.
#
@@ -659,6 +657,7 @@ ServerSignature On
AddLanguage cz .cz
AddLanguage ru .ru
AddLanguage tw .tw
+ AddLanguage zh-tw .tw
AddCharset Big5 .Big5 .big5
AddCharset WINDOWS-1251 .cp-1251
AddCharset CP866 .cp866