summaryrefslogtreecommitdiff
path: root/share/man
diff options
context:
space:
mode:
authorJason Dixon <jdixon@cvs.openbsd.org>2008-06-07 01:59:37 +0000
committerJason Dixon <jdixon@cvs.openbsd.org>2008-06-07 01:59:37 +0000
commit080ed962ddee625f9fc57bd2b75e189752abce38 (patch)
treee728c632a4de01de7001ef4df097749c4a37d3f8 /share/man
parentfb29b035e33e3da26b5bfd419708e5b4ca95a25c (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 'share/man')
-rw-r--r--share/man/man8/intro.821
1 files changed, 19 insertions, 2 deletions
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