From 19738ce31adbf6590c09d2f6be77b01bbb912edc Mon Sep 17 00:00:00 2001
From: jdixon <>
Date: Sat, 7 Jun 2008 01:59:36 +0000
Subject: [PATCH] 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@
---
 src/etc/mtree/4.4BSD.dist | 96 +++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 4e61e561..2cacb19f 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.193 2008/05/13 21:09:28 miod Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.194 2008/06/07 01:59:36 jdixon Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -593,6 +593,53 @@ milter
 # ./usr/share/doc/html/milter
 ..
 
+# ./usr/share/doc/html/httpd
+httpd  type=dir uname=root gname=wheel mode=755
+
+# ./usr/share/doc/html/httpd/mod
+mod  type=dir uname=root gname=wheel mode=755
+
+# ./usr/share/doc/html/httpd/mod/mod_ssl
+mod_ssl  type=dir uname=root gname=wheel mode=755
+# ./usr/share/doc/html/httpd/mod/mod_ssl
+..
+
+# ./usr/share/doc/html/httpd/mod
+..
+
+# ./usr/share/doc/html/httpd/images
+images  type=dir uname=root gname=wheel mode=755
+# ./usr/share/doc/html/httpd/images
+..
+
+# ./usr/share/doc/html/httpd/vhosts
+vhosts  type=dir uname=root gname=wheel mode=755
+# ./usr/share/doc/html/httpd/vhosts
+..
+
+# ./usr/share/doc/html/httpd/misc
+misc  type=dir uname=root gname=wheel mode=755
+# ./usr/share/doc/html/httpd/misc
+..
+
+# ./usr/share/doc/html/httpd/search
+search  type=dir uname=root gname=wheel mode=755
+# ./usr/share/doc/html/httpd/search
+..
+
+# ./usr/share/doc/html/httpd/howto
+howto  type=dir uname=root gname=wheel mode=755
+# ./usr/share/doc/html/httpd/howto
+..
+
+# ./usr/share/doc/html/httpd/programs
+programs  type=dir uname=root gname=wheel mode=755
+# ./usr/share/doc/html/httpd/programs
+..
+
+# ./usr/share/doc/html/httpd
+..
+
 # ./usr/share/doc/html
 ..
 
@@ -2730,53 +2777,6 @@ cgi-bin  type=dir uname=root gname=daemon mode=755
 #./www/htdocs
 htdocs  type=dir uname=root gname=daemon mode=755
 
-#./www/htdocs/manual
-manual  type=dir uname=root gname=daemon mode=755
-
-#./www/htdocs/manual/mod
-mod  type=dir uname=root gname=daemon mode=755
-
-#./www/htdocs/manual/mod/mod_ssl
-mod_ssl  type=dir uname=root gname=daemon mode=755
-#./www/htdocs/manual/mod/mod_ssl
-..
-
-#./www/htdocs/manual/mod
-..
-
-#./www/htdocs/manual/images
-images  type=dir uname=root gname=daemon mode=755
-#./www/htdocs/manual/images
-..
-
-#./www/htdocs/manual/vhosts
-vhosts  type=dir uname=root gname=daemon mode=755
-#./www/htdocs/manual/vhosts
-..
-
-#./www/htdocs/manual/misc
-misc  type=dir uname=root gname=daemon mode=755
-#./www/htdocs/manual/misc
-..
-
-#./www/htdocs/manual/search
-search  type=dir uname=root gname=daemon mode=755
-#./www/htdocs/manual/search
-..
-
-#./www/htdocs/manual/howto
-howto  type=dir uname=root gname=daemon mode=755
-#./www/htdocs/manual/howto
-..
-
-#./www/htdocs/manual/programs
-programs  type=dir uname=root gname=daemon mode=755
-#./www/htdocs/manual/programs
-..
-
-#./www/htdocs/manual
-..
-
 #./www/htdocs
 ..