summaryrefslogtreecommitdiffstats
path: root/httpd.conf
diff options
context:
space:
mode:
authorcvsdist <cvsdist@fedoraproject.org>2004-09-09 06:08:51 +0000
committercvsdist <cvsdist@fedoraproject.org>2004-09-09 06:08:51 +0000
commitc70491735f9f89e64318af4bf96c9bccc4d7d0f2 (patch)
tree9c989d29514dc2dcd82206c177e669c9580e415d /httpd.conf
parent3cbd43bfe959217a1e7b971a76ee0f396c8ca3dd (diff)
downloadhttpd-c70491735f9f89e64318af4bf96c9bccc4d7d0f2.tar.gz
httpd-c70491735f9f89e64318af4bf96c9bccc4d7d0f2.tar.xz
httpd-c70491735f9f89e64318af4bf96c9bccc4d7d0f2.zip
auto-import changelog data from httpd-2.0.40-1.src.rpmhttpd-2_0_40-1
Mon Aug 12 2002 Joe Orton <jorton@redhat.com> 2.0.40-1 - update to 2.0.40 Wed Jul 24 2002 Joe Orton <jorton@redhat.com> 2.0.36-8 - improve comment on use of UserDir in default config (#66886)
Diffstat (limited to 'httpd.conf')
-rw-r--r--httpd.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/httpd.conf b/httpd.conf
index 0ee32a3..8b10ef0 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -245,7 +245,7 @@ Group apache
# e-mailed. This address appears on some server-generated pages, such
# as error documents. e.g. admin@your-domain.com
#
-ServerAdmin you@your.address
+ServerAdmin root@localhost
#
# ServerName gives the name and port that the server uses to identify itself.
@@ -362,7 +362,8 @@ DocumentRoot "/var/www/html"
#
# To enable requests to /~user/ to serve the user's public_html
- # directory, use this directive instead of "UserDir disable":
+ # directory, remove the "UserDir disable" line above, and uncomment
+ # the following line instead:
#
#UserDir public_html