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@

17 files changed, 283 insertions, 290 deletions

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 73838fa5533..06c8662b577 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -4574,15 +4574,6 @@
 ./var/www/conf/modules
 ./var/www/conf/modules.sample
 ./var/www/htdocs
-./var/www/htdocs/manual
-./var/www/htdocs/manual/howto
-./var/www/htdocs/manual/images
-./var/www/htdocs/manual/misc
-./var/www/htdocs/manual/mod
-./var/www/htdocs/manual/mod/mod_ssl
-./var/www/htdocs/manual/programs
-./var/www/htdocs/manual/search
-./var/www/htdocs/manual/vhosts
 ./var/www/icons
 ./var/www/icons/small
 ./var/www/logs
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index d42708fe870..cc570abbdff 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -183,174 +183,6 @@
 ./var/www/htdocs/lock.gif
 ./var/www/htdocs/logo23.jpg
 ./var/www/htdocs/logo24.jpg
-./var/www/htdocs/manual/FAQ.html
-./var/www/htdocs/manual/LICENSE
-./var/www/htdocs/manual/bind.html
-./var/www/htdocs/manual/configuring.html
-./var/www/htdocs/manual/content-negotiation.html
-./var/www/htdocs/manual/custom-error.html
-./var/www/htdocs/manual/dns-caveats.html
-./var/www/htdocs/manual/dso.html
-./var/www/htdocs/manual/env.html
-./var/www/htdocs/manual/handler.html
-./var/www/htdocs/manual/howto/auth.html
-./var/www/htdocs/manual/howto/cgi.html
-./var/www/htdocs/manual/howto/htaccess.html
-./var/www/htdocs/manual/howto/ssi.html
-./var/www/htdocs/manual/images/apache_header.gif
-./var/www/htdocs/manual/images/apache_pb.gif
-./var/www/htdocs/manual/images/custom_errordocs.gif
-./var/www/htdocs/manual/images/feather.jpg
-./var/www/htdocs/manual/images/home.gif
-./var/www/htdocs/manual/images/index.gif
-./var/www/htdocs/manual/images/mod_rewrite_fig1.fig
-./var/www/htdocs/manual/images/mod_rewrite_fig1.gif
-./var/www/htdocs/manual/images/mod_rewrite_fig2.fig
-./var/www/htdocs/manual/images/mod_rewrite_fig2.gif
-./var/www/htdocs/manual/images/mod_ssl_sb.gif
-./var/www/htdocs/manual/images/openssl_ics.gif
-./var/www/htdocs/manual/images/pixel.gif
-./var/www/htdocs/manual/images/sub.gif
-./var/www/htdocs/manual/index.html
-./var/www/htdocs/manual/invoking.html
-./var/www/htdocs/manual/ipv6.html
-./var/www/htdocs/manual/keepalive.html
-./var/www/htdocs/manual/location.html
-./var/www/htdocs/manual/logs.html
-./var/www/htdocs/manual/misc/API.html
-./var/www/htdocs/manual/misc/FAQ.html
-./var/www/htdocs/manual/misc/custom_errordocs.html
-./var/www/htdocs/manual/misc/descriptors.html
-./var/www/htdocs/manual/misc/fin_wait_2.html
-./var/www/htdocs/manual/misc/howto.html
-./var/www/htdocs/manual/misc/index.html
-./var/www/htdocs/manual/misc/known_client_problems.html
-./var/www/htdocs/manual/misc/perf-bsd44.html
-./var/www/htdocs/manual/misc/perf-tuning.html
-./var/www/htdocs/manual/misc/perf.html
-./var/www/htdocs/manual/misc/rewriteguide.html
-./var/www/htdocs/manual/misc/security_tips.html
-./var/www/htdocs/manual/misc/tutorials.html
-./var/www/htdocs/manual/mod/core.html
-./var/www/htdocs/manual/mod/directive-dict.html
-./var/www/htdocs/manual/mod/directives.html
-./var/www/htdocs/manual/mod/index-bytype.html
-./var/www/htdocs/manual/mod/index.html
-./var/www/htdocs/manual/mod/mod_access.html
-./var/www/htdocs/manual/mod/mod_actions.html
-./var/www/htdocs/manual/mod/mod_alias.html
-./var/www/htdocs/manual/mod/mod_asis.html
-./var/www/htdocs/manual/mod/mod_auth.html
-./var/www/htdocs/manual/mod/mod_auth_anon.html
-./var/www/htdocs/manual/mod/mod_auth_db.html
-./var/www/htdocs/manual/mod/mod_auth_dbm.html
-./var/www/htdocs/manual/mod/mod_auth_digest.html
-./var/www/htdocs/manual/mod/mod_autoindex.html
-./var/www/htdocs/manual/mod/mod_cern_meta.html
-./var/www/htdocs/manual/mod/mod_cgi.html
-./var/www/htdocs/manual/mod/mod_define.html
-./var/www/htdocs/manual/mod/mod_digest.html
-./var/www/htdocs/manual/mod/mod_dir.html
-./var/www/htdocs/manual/mod/mod_env.html
-./var/www/htdocs/manual/mod/mod_expires.html
-./var/www/htdocs/manual/mod/mod_headers.html
-./var/www/htdocs/manual/mod/mod_imap.html
-./var/www/htdocs/manual/mod/mod_include.html
-./var/www/htdocs/manual/mod/mod_info.html
-./var/www/htdocs/manual/mod/mod_log_agent.html
-./var/www/htdocs/manual/mod/mod_log_common.html
-./var/www/htdocs/manual/mod/mod_log_config.html
-./var/www/htdocs/manual/mod/mod_log_referer.html
-./var/www/htdocs/manual/mod/mod_mime.html
-./var/www/htdocs/manual/mod/mod_mime_magic.html
-./var/www/htdocs/manual/mod/mod_mmap_static.html
-./var/www/htdocs/manual/mod/mod_negotiation.html
-./var/www/htdocs/manual/mod/mod_proxy.html
-./var/www/htdocs/manual/mod/mod_rewrite.html
-./var/www/htdocs/manual/mod/mod_setenvif.html
-./var/www/htdocs/manual/mod/mod_so.html
-./var/www/htdocs/manual/mod/mod_speling.html
-./var/www/htdocs/manual/mod/mod_ssl/index.html
-./var/www/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_compat.html
-./var/www/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg
-./var/www/htdocs/manual/mod/mod_ssl/ssl_cover_title.jpg
-./var/www/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_faq.html
-./var/www/htdocs/manual/mod/mod_ssl/ssl_glossary.html
-./var/www/htdocs/manual/mod/mod_ssl/ssl_howto.gfont000.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_howto.html
-./var/www/htdocs/manual/mod/mod_ssl/ssl_intro.gfont000.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_intro.html
-./var/www/htdocs/manual/mod/mod_ssl/ssl_intro_fig1.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_intro_fig2.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_intro_fig3.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_overview.gfont000.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_overview.html
-./var/www/htdocs/manual/mod/mod_ssl/ssl_overview_fig1.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_reference.gfont000.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_reference.html
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.head-chapter.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.head-num-1.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.head-num-2.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.head-num-3.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.head-num-4.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.head-num-5.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.head-num-6.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.head-num-7.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-n.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-s.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-n.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-s.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-abstract.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-compat.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-faq.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-gloss.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-howto.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-intro.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-over.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-preface.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-ref.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-toc.gif
-./var/www/htdocs/manual/mod/mod_ssl/ssl_template.title-tutor.gif
-./var/www/htdocs/manual/mod/mod_status.html
-./var/www/htdocs/manual/mod/mod_unique_id.html
-./var/www/htdocs/manual/mod/mod_userdir.html
-./var/www/htdocs/manual/mod/mod_usertrack.html
-./var/www/htdocs/manual/mod/mod_vhost_alias.html
-./var/www/htdocs/manual/mod/module-dict.html
-./var/www/htdocs/manual/multilogs.html
-./var/www/htdocs/manual/process-model.html
-./var/www/htdocs/manual/programs/ab.html
-./var/www/htdocs/manual/programs/apachectl.html
-./var/www/htdocs/manual/programs/apxs.html
-./var/www/htdocs/manual/programs/dbmmanage.html
-./var/www/htdocs/manual/programs/htdigest.html
-./var/www/htdocs/manual/programs/htpasswd.html
-./var/www/htdocs/manual/programs/httpd.html
-./var/www/htdocs/manual/programs/index.html
-./var/www/htdocs/manual/programs/logresolve.html
-./var/www/htdocs/manual/programs/other.html
-./var/www/htdocs/manual/programs/rotatelogs.html
-./var/www/htdocs/manual/programs/suexec.html
-./var/www/htdocs/manual/sections.html
-./var/www/htdocs/manual/server-wide.html
-./var/www/htdocs/manual/sitemap.html
-./var/www/htdocs/manual/stopping.html
-./var/www/htdocs/manual/suexec.html
-./var/www/htdocs/manual/urlmapping.html
-./var/www/htdocs/manual/vhosts/details.html
-./var/www/htdocs/manual/vhosts/examples.html
-./var/www/htdocs/manual/vhosts/fd-limits.html
-./var/www/htdocs/manual/vhosts/host.html
-./var/www/htdocs/manual/vhosts/index.html
-./var/www/htdocs/manual/vhosts/ip-based.html
-./var/www/htdocs/manual/vhosts/mass.html
-./var/www/htdocs/manual/vhosts/name-based.html
-./var/www/htdocs/manual/vhosts/vhosts-in-depth.html
-./var/www/htdocs/manual/vhosts/virtual-host.html
 ./var/www/htdocs/openbsd_pb.gif
 ./var/www/htdocs/openbsdpower.gif
 ./var/www/htdocs/smalltitle.gif
diff --git a/distrib/sets/lists/misc/mi b/distrib/sets/lists/misc/mi
index 9acaa535c9e..809d4ab55ba 100644
--- a/distrib/sets/lists/misc/mi
+++ b/distrib/sets/lists/misc/mi
@@ -5,6 +5,183 @@
 ./usr/share/dict/web2a
 ./usr/share/dict/words
 ./usr/share/doc/README
+./usr/share/doc/html/httpd
+./usr/share/doc/html/httpd/FAQ.html
+./usr/share/doc/html/httpd/LICENSE
+./usr/share/doc/html/httpd/bind.html
+./usr/share/doc/html/httpd/configuring.html
+./usr/share/doc/html/httpd/content-negotiation.html
+./usr/share/doc/html/httpd/custom-error.html
+./usr/share/doc/html/httpd/dns-caveats.html
+./usr/share/doc/html/httpd/dso.html
+./usr/share/doc/html/httpd/env.html
+./usr/share/doc/html/httpd/handler.html
+./usr/share/doc/html/httpd/howto
+./usr/share/doc/html/httpd/howto/auth.html
+./usr/share/doc/html/httpd/howto/cgi.html
+./usr/share/doc/html/httpd/howto/htaccess.html
+./usr/share/doc/html/httpd/howto/ssi.html
+./usr/share/doc/html/httpd/images
+./usr/share/doc/html/httpd/images/apache_header.gif
+./usr/share/doc/html/httpd/images/apache_pb.gif
+./usr/share/doc/html/httpd/images/custom_errordocs.gif
+./usr/share/doc/html/httpd/images/feather.jpg
+./usr/share/doc/html/httpd/images/home.gif
+./usr/share/doc/html/httpd/images/index.gif
+./usr/share/doc/html/httpd/images/mod_rewrite_fig1.fig
+./usr/share/doc/html/httpd/images/mod_rewrite_fig1.gif
+./usr/share/doc/html/httpd/images/mod_rewrite_fig2.fig
+./usr/share/doc/html/httpd/images/mod_rewrite_fig2.gif
+./usr/share/doc/html/httpd/images/mod_ssl_sb.gif
+./usr/share/doc/html/httpd/images/openssl_ics.gif
+./usr/share/doc/html/httpd/images/pixel.gif
+./usr/share/doc/html/httpd/images/sub.gif
+./usr/share/doc/html/httpd/index.html
+./usr/share/doc/html/httpd/invoking.html
+./usr/share/doc/html/httpd/ipv6.html
+./usr/share/doc/html/httpd/keepalive.html
+./usr/share/doc/html/httpd/location.html
+./usr/share/doc/html/httpd/logs.html
+./usr/share/doc/html/httpd/misc
+./usr/share/doc/html/httpd/misc/API.html
+./usr/share/doc/html/httpd/misc/FAQ.html
+./usr/share/doc/html/httpd/misc/custom_errordocs.html
+./usr/share/doc/html/httpd/misc/descriptors.html
+./usr/share/doc/html/httpd/misc/fin_wait_2.html
+./usr/share/doc/html/httpd/misc/howto.html
+./usr/share/doc/html/httpd/misc/index.html
+./usr/share/doc/html/httpd/misc/known_client_problems.html
+./usr/share/doc/html/httpd/misc/perf-bsd44.html
+./usr/share/doc/html/httpd/misc/perf-tuning.html
+./usr/share/doc/html/httpd/misc/perf.html
+./usr/share/doc/html/httpd/misc/rewriteguide.html
+./usr/share/doc/html/httpd/misc/security_tips.html
+./usr/share/doc/html/httpd/misc/tutorials.html
+./usr/share/doc/html/httpd/mod
+./usr/share/doc/html/httpd/mod/core.html
+./usr/share/doc/html/httpd/mod/directive-dict.html
+./usr/share/doc/html/httpd/mod/directives.html
+./usr/share/doc/html/httpd/mod/index-bytype.html
+./usr/share/doc/html/httpd/mod/index.html
+./usr/share/doc/html/httpd/mod/mod_access.html
+./usr/share/doc/html/httpd/mod/mod_actions.html
+./usr/share/doc/html/httpd/mod/mod_alias.html
+./usr/share/doc/html/httpd/mod/mod_asis.html
+./usr/share/doc/html/httpd/mod/mod_auth.html
+./usr/share/doc/html/httpd/mod/mod_auth_anon.html
+./usr/share/doc/html/httpd/mod/mod_auth_db.html
+./usr/share/doc/html/httpd/mod/mod_auth_dbm.html
+./usr/share/doc/html/httpd/mod/mod_auth_digest.html
+./usr/share/doc/html/httpd/mod/mod_autoindex.html
+./usr/share/doc/html/httpd/mod/mod_cern_meta.html
+./usr/share/doc/html/httpd/mod/mod_cgi.html
+./usr/share/doc/html/httpd/mod/mod_define.html
+./usr/share/doc/html/httpd/mod/mod_digest.html
+./usr/share/doc/html/httpd/mod/mod_dir.html
+./usr/share/doc/html/httpd/mod/mod_env.html
+./usr/share/doc/html/httpd/mod/mod_expires.html
+./usr/share/doc/html/httpd/mod/mod_headers.html
+./usr/share/doc/html/httpd/mod/mod_imap.html
+./usr/share/doc/html/httpd/mod/mod_include.html
+./usr/share/doc/html/httpd/mod/mod_info.html
+./usr/share/doc/html/httpd/mod/mod_log_agent.html
+./usr/share/doc/html/httpd/mod/mod_log_common.html
+./usr/share/doc/html/httpd/mod/mod_log_config.html
+./usr/share/doc/html/httpd/mod/mod_log_referer.html
+./usr/share/doc/html/httpd/mod/mod_mime.html
+./usr/share/doc/html/httpd/mod/mod_mime_magic.html
+./usr/share/doc/html/httpd/mod/mod_mmap_static.html
+./usr/share/doc/html/httpd/mod/mod_negotiation.html
+./usr/share/doc/html/httpd/mod/mod_proxy.html
+./usr/share/doc/html/httpd/mod/mod_rewrite.html
+./usr/share/doc/html/httpd/mod/mod_setenvif.html
+./usr/share/doc/html/httpd/mod/mod_so.html
+./usr/share/doc/html/httpd/mod/mod_speling.html
+./usr/share/doc/html/httpd/mod/mod_ssl
+./usr/share/doc/html/httpd/mod/mod_ssl/index.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_compat.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_compat.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_cover_logo.jpg
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_cover_title.jpg
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_faq.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_faq.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_glossary.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_howto.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_howto.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro_fig1.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro_fig2.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro_fig3.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_overview.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_overview.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_overview_fig1.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_reference.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_reference.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-chapter.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-1.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-2.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-3.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-4.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-5.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-6.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-7.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-next-n.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-next-s.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-prev-n.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-prev-s.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-abstract.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-compat.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-faq.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-gloss.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-howto.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-intro.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-over.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-preface.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-ref.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-toc.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-tutor.gif
+./usr/share/doc/html/httpd/mod/mod_status.html
+./usr/share/doc/html/httpd/mod/mod_unique_id.html
+./usr/share/doc/html/httpd/mod/mod_userdir.html
+./usr/share/doc/html/httpd/mod/mod_usertrack.html
+./usr/share/doc/html/httpd/mod/mod_vhost_alias.html
+./usr/share/doc/html/httpd/mod/module-dict.html
+./usr/share/doc/html/httpd/multilogs.html
+./usr/share/doc/html/httpd/process-model.html
+./usr/share/doc/html/httpd/programs
+./usr/share/doc/html/httpd/programs/ab.html
+./usr/share/doc/html/httpd/programs/apachectl.html
+./usr/share/doc/html/httpd/programs/apxs.html
+./usr/share/doc/html/httpd/programs/dbmmanage.html
+./usr/share/doc/html/httpd/programs/htdigest.html
+./usr/share/doc/html/httpd/programs/htpasswd.html
+./usr/share/doc/html/httpd/programs/httpd.html
+./usr/share/doc/html/httpd/programs/index.html
+./usr/share/doc/html/httpd/programs/logresolve.html
+./usr/share/doc/html/httpd/programs/other.html
+./usr/share/doc/html/httpd/programs/rotatelogs.html
+./usr/share/doc/html/httpd/programs/suexec.html
+./usr/share/doc/html/httpd/search
+./usr/share/doc/html/httpd/sections.html
+./usr/share/doc/html/httpd/server-wide.html
+./usr/share/doc/html/httpd/sitemap.html
+./usr/share/doc/html/httpd/stopping.html
+./usr/share/doc/html/httpd/suexec.html
+./usr/share/doc/html/httpd/urlmapping.html
+./usr/share/doc/html/httpd/vhosts
+./usr/share/doc/html/httpd/vhosts/details.html
+./usr/share/doc/html/httpd/vhosts/examples.html
+./usr/share/doc/html/httpd/vhosts/fd-limits.html
+./usr/share/doc/html/httpd/vhosts/host.html
+./usr/share/doc/html/httpd/vhosts/index.html
+./usr/share/doc/html/httpd/vhosts/ip-based.html
+./usr/share/doc/html/httpd/vhosts/mass.html
+./usr/share/doc/html/httpd/vhosts/name-based.html
+./usr/share/doc/html/httpd/vhosts/vhosts-in-depth.html
+./usr/share/doc/html/httpd/vhosts/virtual-host.html
 ./usr/share/doc/html/bind
 ./usr/share/doc/html/bind/Bv9ARM.ch01.html
 ./usr/share/doc/html/bind/Bv9ARM.ch02.html
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 4e61e561a7c..2cacb19f663 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/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
 ..
 
diff --git a/share/doc/README b/share/doc/README
index 06eebf2f2e0..96458e9a4ac 100644
--- a/share/doc/README
+++ b/share/doc/README
@@ -1,4 +1,4 @@
-#	$OpenBSD: README,v 1.4 2004/07/29 10:50:02 jmc Exp $
+#	$OpenBSD: README,v 1.5 2008/06/07 01:59:36 jdixon Exp $
 # 
 #  Copyright (c) 2004 Jason McIntyre <jmc@openbsd.org>
 # 
@@ -17,7 +17,7 @@
 
 The documents in this directory consist of various, miscellaneous, system docs:
 
-	html/		HTML documents for bind, curses, lynx, and milter
+	html/		HTML documents for bind, curses, httpd, lynx, and milter
 	psd/		UNIX Programmer's Supplementary Documents
 	smm/		UNIX System Manager's Manuals
 	usd/		UNIX User's Supplementary Documents
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index f88253b61bf..8447dc215c5 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.8,v 1.14 2008/05/20 11:18:23 jmc Exp $
+.\"	$OpenBSD: intro.8,v 1.15 2008/06/07 01:59:36 jdixon Exp $
 .\"	$NetBSD: intro.8,v 1.3 1994/11/30 19:36:24 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)intro.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: May 20 2008 $
+.Dd $Mdocdate: June 7 2008 $
 .Dt INTRO 8
 .Os
 .Sh NAME
@@ -104,6 +104,23 @@ Below is a list of some of the daemons available.
 For further information, see
 .Xr rc 8
 and the individual pages for the utilities.
+.Ss Apache web server (HTTP)
+The apache web server,
+.Xr httpd 8 .
+On
+.Ox ,
+it will
+.Xr chroot 2
+to the
+.Dq ServerRoot
+path.
+Detailed information is available in
+.Pa /usr/share/doc/html/httpd/ .
+.Pp
+Relevant
+.Xr rc.conf 8
+variables:
+.Va httpd_flags .
 .Ss Automounter daemon (amd)
 If using the
 .Xr amd 8
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index 585383dc2d3..3b6201941e0 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for Apache 
-# $OpenBSD: Makefile.bsd-wrapper,v 1.65 2008/05/09 08:06:27 mbalmer Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.66 2008/06/07 01:59:36 jdixon Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -19,6 +19,7 @@ LNDIR=	/usr/bin/lndir
 #    datadir:       $prefix
 #    iconsdir:      $prefix/icons
 #    htdocsdir:     $prefix/htdocs
+#    manualdir:     $exec_prefix/share/doc/html/httpd
 #    cgidir:        $prefix/cgi-bin
 #    includedir:    $exec_prefix/lib/apache/include
 #    localstatedir: $prefix
@@ -35,6 +36,7 @@ HTTPD_LIBEXECDIR=	${HTTPD_EXEC_PREFIX}/lib/apache/modules
 HTTPD_SYSCONFDIR=	${HTTPD_PREFIX}/conf
 HTTPD_ICONSDIR=		${HTTPD_PREFIX}/icons
 HTTPD_HTDOCSDIR=	${HTTPD_PREFIX}/htdocs
+HTTPD_MANUALDIR=	${HTTPD_EXEC_PREFIX}/share/doc/html/httpd
 HTTPD_INCLUDEDIR=	${HTTPD_EXEC_PREFIX}/lib/apache/include
 HTTPD_RUNDIR=		${HTTPD_PREFIX}/logs
 HTTPD_LOGDIR=		${HTTPD_PREFIX}/logs
@@ -660,7 +662,7 @@ includes:
 		    ${.CURDIR}/$$i ${DESTDIR}${HTTPD_INCLUDEDIR}/xml; \
 	done
 
-install: maninstall
+install: maninstall htmlinstall
 	@-for i in ${BINFILES}; do \
 		j=`basename $$i`; \
 		echo "Installing ${DESTDIR}${HTTPD_BINDIR}/$$j"; \
@@ -741,12 +743,13 @@ cleanman:
 	@echo NOMAN is set
 .endif
 
-man:
+htmlinstall:
 	@-for i in ${MANUALFILES}; do \
-		j=`dirname $$i`; \
-		echo "Installing ${DESTDIR}${HTTPD_HTDOCSDIR}/$$i"; \
+		j=`dirname $$i | sed 's;^manual/*;;'`; \
+		k=`basename $$i`; \
+		echo "Installing ${DESTDIR}${HTTPD_MANUALDIR}/$$j/$$k"; \
 		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
-		    htdocs/$$i ${DESTDIR}${HTTPD_HTDOCSDIR}/$$j/; \
+		    ${.OBJDIR}/htdocs/$$i ${DESTDIR}${HTTPD_MANUALDIR}/$$j/; \
 	done
 
 distribution:
@@ -766,12 +769,6 @@ distribution:
 		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
 		    ${.OBJDIR}/$$i ${DESTDIR}${HTTPD_PREFIX}/$$j/; \
 	done
-	@-for i in ${MANUALFILES}; do \
-		j=`dirname $$i`; \
-		echo "Installing ${DESTDIR}${HTTPD_HTDOCSDIR}/$$i"; \
-		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
-		    ${.OBJDIR}/htdocs/$$i ${DESTDIR}${HTTPD_HTDOCSDIR}/$$j/; \
-	done
 	@-for i in ${CGIFILES}; do \
 		j=`dirname $$i`; \
 		echo "Installing ${DESTDIR}${HTTPD_PREFIX}/$$i"; \
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
diff --git a/usr.sbin/httpd/config.layout b/usr.sbin/httpd/config.layout
index 77b5bd7f8c3..f2b037fdfea 100644
--- a/usr.sbin/httpd/config.layout
+++ b/usr.sbin/httpd/config.layout
@@ -274,7 +274,7 @@
     datadir:       $prefix
     iconsdir:      $prefix/icons
     htdocsdir:     $prefix/htdocs
-    manualdir:     $htdocsdir/manual
+    manualdir:     $exec_prefix/share/doc/html/httpd
     cgidir:        $prefix/cgi-bin
     includedir:    $exec_prefix/lib/apache/include
     localstatedir: $prefix
diff --git a/usr.sbin/httpd/htdocs/index.html b/usr.sbin/httpd/htdocs/index.html
index 5f53451f397..209d8fe68ec 100644
--- a/usr.sbin/httpd/htdocs/index.html
+++ b/usr.sbin/httpd/htdocs/index.html
@@ -29,12 +29,11 @@
 <h1 align="center">Documentation</h1>
 
 <p>
-    The Apache <a href="manual/index.html" >documentation</a>
-    has been included with this distribution.<br>
-    Especially read the <a href="manual/mod/mod_ssl/">SSL documentation</a>
-    carefully.<br>
-    Also be sure to read the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssl&format=html&sektion=8">ssl(8)</a> and
-    <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=httpd&format=html">httpd(8)</a> manpages.
+    The Apache manual is available with distribution as part of the 
+    <a href="http://www.openbsd.org/faq/faq4.html#FilesNeeded">misc</a> file set.<br>
+    Especially read the SSL documentation carefully within the manual, in addition to 
+    the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssl&format=html&sektion=8">ssl(8)</a> and
+    <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=httpd&format=html">httpd(8)</a> manual pages.
 </p>
 <h1 align="center">Graphics</h1>
 <p>
@@ -55,8 +54,8 @@
 </p>
 <p>
     These images are also appropriate for a webserver using
-    <a href="manual/mod/mod_ssl/">mod_ssl</a> with
-    <a href="http://www.openssl.org">openSSL</a> cryptography.
+    <a href="http://www.modssl.org/">mod_ssl</a> with
+    <a href="http://www.openssl.org/">openSSL</a> cryptography.
 </p>
 <p align="center">
     <img src="manual/images/mod_ssl_sb.gif">
diff --git a/usr.sbin/httpd/httpd.8 b/usr.sbin/httpd/httpd.8
index 7e549e5a42f..2550169c1b6 100644
--- a/usr.sbin/httpd/httpd.8
+++ b/usr.sbin/httpd/httpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: httpd.8,v 1.30 2008/05/21 08:57:38 mbalmer Exp $
+.\"	$OpenBSD: httpd.8,v 1.31 2008/06/07 01:59:36 jdixon Exp $
 .\" Copyright (c) 1995-1997 David Robinson. All rights reserved.
 .\" Copyright (c) 1997-1999 The Apache Group. All rights reserved.
 .\" Copyright (c) 1998-1999 Bob Beck. All rights reserved.
@@ -50,7 +50,7 @@
 .\" Supercomputing Applications, University of Illinois, Urbana-Champaign.
 .\" For more information on the Apache Group and the Apache HTTP server
 .\" project, please see <http://www.apache.org/>.
-.Dd $Mdocdate: May 21 2008 $
+.Dd $Mdocdate: June 7 2008 $
 .Dt HTTPD 8
 .Os
 .Sh NAME
@@ -150,7 +150,7 @@ This manual page only lists the command line arguments.
 For details of the directives necessary to configure
 .Nm ,
 see the Apache manual in
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
 Paths in this manual page reflect those
 compiled into
 .Nm
@@ -304,4 +304,4 @@ They must, however, be readable by this user.
 .Xr suexec 8
 .Pp
 The Apache manual:
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
diff --git a/usr.sbin/httpd/src/support/apachectl.8 b/usr.sbin/httpd/src/support/apachectl.8
index fabd6da2407..9f47b3c0cb3 100644
--- a/usr.sbin/httpd/src/support/apachectl.8
+++ b/usr.sbin/httpd/src/support/apachectl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apachectl.8,v 1.8 2007/05/31 19:20:24 jmc Exp $
+.\"	$OpenBSD: apachectl.8,v 1.9 2008/06/07 01:59:36 jdixon Exp $
 .\"
 .\" ====================================================================
 .\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
 .\" originally written at the National Center for Supercomputing Applications,
 .\" University of Illinois, Urbana-Champaign.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
 .Dt APACHECTL 8
 .Os
 .Sh NAME
@@ -183,4 +183,4 @@ only the error from the last one is reported.
 .Xr ssl 8
 .Pp
 Full documentation for httpd can be found at
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
diff --git a/usr.sbin/httpd/src/support/dbmmanage.1 b/usr.sbin/httpd/src/support/dbmmanage.1
index c9eb8aa327d..4ed4d947adc 100644
--- a/usr.sbin/httpd/src/support/dbmmanage.1
+++ b/usr.sbin/httpd/src/support/dbmmanage.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dbmmanage.1,v 1.10 2007/05/31 19:20:24 jmc Exp $
+.\"	$OpenBSD: dbmmanage.1,v 1.11 2008/06/07 01:59:36 jdixon Exp $
 .\"
 .\" ====================================================================
 .\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
 .\" originally written at the National Center for Supercomputing Applications,
 .\" University of Illinois, Urbana-Champaign.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
 .Dt DBMMANAGE 1
 .Os
 .Sh NAME
@@ -86,7 +86,7 @@ For details of the directives necessary to configure user authentication in
 .Xr httpd 8 ,
 see
 the Apache manual, which can be found in
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
 .Pp
 The options are as follows:
 .Bl -tag -width "encpasswordXX"
diff --git a/usr.sbin/httpd/src/support/htdigest.1 b/usr.sbin/httpd/src/support/htdigest.1
index 7915a8396e7..cd2b519d258 100644
--- a/usr.sbin/httpd/src/support/htdigest.1
+++ b/usr.sbin/httpd/src/support/htdigest.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: htdigest.1,v 1.9 2007/05/31 19:20:24 jmc Exp $
+.\"	$OpenBSD: htdigest.1,v 1.10 2008/06/07 01:59:36 jdixon Exp $
 .\"
 .\" ====================================================================
 .\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
 .\" originally written at the National Center for Supercomputing Applications,
 .\" University of Illinois, Urbana-Champaign.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
 .Dt HTDIGEST 1
 .Os
 .Sh NAME
@@ -84,7 +84,7 @@ For details of the directives necessary to
 configure digest authentication in
 .Xr httpd 8 ,
 see the Apache manual, which can be found at
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
 .Pp
 The options are as follows:
 .Bl -tag -width "passwordfileXX"
diff --git a/usr.sbin/httpd/src/support/htpasswd.1 b/usr.sbin/httpd/src/support/htpasswd.1
index 294df750054..ca5dccb4a66 100644
--- a/usr.sbin/httpd/src/support/htpasswd.1
+++ b/usr.sbin/httpd/src/support/htpasswd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: htpasswd.1,v 1.15 2007/05/31 19:20:24 jmc Exp $
+.\"	$OpenBSD: htpasswd.1,v 1.16 2008/06/07 01:59:36 jdixon Exp $
 .\"
 .\" ====================================================================
 .\" The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
 .\" originally written at the National Center for Supercomputing Applications,
 .\" University of Illinois, Urbana-Champaign.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
 .Dt HTPASSWD 1
 .Os
 .Sh NAME
@@ -134,7 +134,7 @@ For details of the directives necessary to configure user authentication in
 .Xr httpd 8 ,
 see
 the Apache manual, which can be found in
-.Pa /var/www/htdocs/manual/ .
+.Pa /usr/share/doc/html/httpd/ .
 .Pp
 The options are as follows:
 .Bl -tag -width "passwordfileXX"
diff --git a/usr.sbin/httpd/src/support/suexec.8 b/usr.sbin/httpd/src/support/suexec.8
index 937be87303d..770ca9f05fe 100644
--- a/usr.sbin/httpd/src/support/suexec.8
+++ b/usr.sbin/httpd/src/support/suexec.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: suexec.8,v 1.13 2007/05/31 19:20:24 jmc Exp $
+.\"	$OpenBSD: suexec.8,v 1.14 2008/06/07 01:59:36 jdixon Exp $
 .\" ====================================================================
 .\" The Apache Software License, Version 1.1
 .\"
@@ -56,7 +56,7 @@
 .\" originally written at the National Center for Supercomputing Applications,
 .\" University of Illinois, Urbana-Champaign.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 7 2008 $
 .Dt SUEXEC 8
 .Os
 .Sh NAME
@@ -108,4 +108,4 @@ so a change of file mode is necessary to enable it:
 .Xr httpd 8
 .Pp
 Apache suEXEC Support:
-.Pa /var/www/htdocs/manual/suexec.html
+.Pa /usr/share/doc/html/httpd/suexec.html