summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2002-09-20 08:20:22 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2002-09-20 08:20:22 +0000
commitf5d97394816949104f30ad544f3a1d353af24e0a (patch)
tree673da1bd9b8a717c07e71697a2a9b8a847862bcf /usr.sbin
parent300ac091d942180e4356d784c06cdfbc6aa10309 (diff)
better comment about RessourceConfig and AccessConfig aka srm.conf and
access.conf. "These are now distributed empty" just doesn't fit if we don't install them any more.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/httpd/conf/httpd.conf9
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/httpd/conf/httpd.conf b/usr.sbin/httpd/conf/httpd.conf
index fc33a531dbe..ea945ec546a 100644
--- a/usr.sbin/httpd/conf/httpd.conf
+++ b/usr.sbin/httpd/conf/httpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: httpd.conf,v 1.13 2002/09/18 15:56:50 henning Exp $
+# $OpenBSD: httpd.conf,v 1.14 2002/09/20 08:20:21 henning Exp $
#
# Based upon the NCSA server configuration files originally by Rob McCool.
#
@@ -88,11 +88,8 @@ ScoreBoardFile logs/apache_runtime_status
#
# In the standard configuration, the server will process httpd.conf,
# srm.conf, and access.conf in that order. The latter two files are
-# now distributed empty, as it is recommended that all directives
-# be kept in a single file for simplicity. The commented-out values
-# below are the built-in defaults. You can have the server ignore
-# these files altogether by using "/dev/null" (for Unix) or
-# "nul" (for Win32) for the arguments to the directives.
+# now deprecated and not installed any more, as it is recommended that
+# all directives be kept in a single file for simplicity.
#
#ResourceConfig conf/srm.conf
#AccessConfig conf/access.conf