From 080ed962ddee625f9fc57bd2b75e189752abce38 Mon Sep 17 00:00:00 2001
From: Jason Dixon <jdixon@cvs.openbsd.org>
Date: Sat, 7 Jun 2008 01:59:37 +0000
Subject: 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@
---
 usr.sbin/httpd/conf/httpd.conf      |  9 +--------
 usr.sbin/httpd/conf/httpd.conf-dist | 13 -------------
 2 files changed, 1 insertion(+), 21 deletions(-)

(limited to 'usr.sbin/httpd/conf')

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
diff --git a/usr.sbin/httpd/conf/httpd.conf-dist b/usr.sbin/httpd/conf/httpd.conf-dist
index 5e159777b3b..e6af0ece430 100644
--- a/usr.sbin/httpd/conf/httpd.conf-dist
+++ b/usr.sbin/httpd/conf/httpd.conf-dist
@@ -572,19 +572,6 @@ ServerSignature On
         Allow from all
     </Directory>
 
-    # This Alias will project the on-line documentation tree under /manual/
-    # even if you change the DocumentRoot. Comment it if you don't want to 
-    # provide access to the on-line documentation.
-    #
-    Alias /manual/ "@@ServerRoot@@/htdocs/manual/"
-
-    <Directory "@@ServerRoot@@/htdocs/manual">
-        Options Indexes FollowSymlinks 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
-- 
cgit v1.2.3