diff options
| author | Jason Dixon <jdixon@cvs.openbsd.org> | 2008-06-07 01:59:37 +0000 |
|---|---|---|
| committer | Jason Dixon <jdixon@cvs.openbsd.org> | 2008-06-07 01:59:37 +0000 |
| commit | 080ed962ddee625f9fc57bd2b75e189752abce38 (patch) | |
| tree | e728c632a4de01de7001ef4df097749c4a37d3f8 /usr.sbin/httpd/conf/httpd.conf | |
| parent | fb29b035e33e3da26b5bfd419708e5b4ca95a25c (diff) | |
Move the Apache manual out of etcXX and to miscXX where it belongs.
It has also been moved to /usr/share/doc/html/httpd/. This will
ease sysmerge upgrades and help keep htdocs clean.
Help from okan and phessler, doc tweaks by jmc
ok deraadt@ millert@ beck@
Diffstat (limited to 'usr.sbin/httpd/conf/httpd.conf')
| -rw-r--r-- | usr.sbin/httpd/conf/httpd.conf | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/usr.sbin/httpd/conf/httpd.conf b/usr.sbin/httpd/conf/httpd.conf index 5fb36f5eec1..e20f8d765cd 100644 --- a/usr.sbin/httpd/conf/httpd.conf +++ b/usr.sbin/httpd/conf/httpd.conf @@ -1,4 +1,4 @@ -# $OpenBSD: httpd.conf,v 1.23 2008/04/25 12:06:45 sthen Exp $ +# $OpenBSD: httpd.conf,v 1.24 2008/06/07 01:59:36 jdixon Exp $ # # Based upon the NCSA server configuration files originally by Rob McCool. # @@ -607,13 +607,6 @@ Alias /icons/ "/var/www/icons/" Allow from all </Directory> -<Directory "/var/www/htdocs/manual"> - Options MultiViews - AllowOverride None - Order allow,deny - Allow from all -</Directory> - # # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that |