summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2014-11-12 16:52:45 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2014-11-12 16:52:45 +0000
commita2e2bd90e50b4e7d27dba3eb5a0a50a97f628863 (patch)
tree3607d1d8a05e475bec0b4e888fe1b07bd7da1d72 /usr.sbin/httpd
parentfa62ecba407e2715c417c59fefbbf34d5407b613 (diff)
tweak previous;
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/httpd.conf.519
1 files changed, 10 insertions, 9 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5
index 8c9269afba5..b6177d397e8 100644
--- a/usr.sbin/httpd/httpd.conf.5
+++ b/usr.sbin/httpd/httpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: httpd.conf.5,v 1.35 2014/11/11 15:54:45 beck Exp $
+.\" $OpenBSD: httpd.conf.5,v 1.36 2014/11/12 16:52:44 jmc Exp $
.\"
.\" Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 11 2014 $
+.Dd $Mdocdate: November 12 2014 $
.Dt HTTPD.CONF 5
.Os
.Sh NAME
@@ -103,19 +103,20 @@ directory.
If not specified, it defaults to
.Pa /var/www ,
the home directory of the www user.
-.It Ic prefork Ar number
-Run the specified number of server processes.
-This increases the performance and prevents delays when connecting
-to a server.
-.Xr httpd 8
-runs 3 server processes by default.
.It Ic logdir Ar directory
-Specifies the full path of the directory in which log files will be written.
+Specifies the full path of the directory in which log files will be written.
If not specified, it defaults to
.Pa /logs
within the
.Xr chroot 2
directory.
+.It Ic prefork Ar number
+Run the specified number of server processes.
+This increases the performance and prevents delays when connecting
+to a server.
+.Xr httpd 8
+runs 3 server processes by default.
+.El
.Sh SERVERS
The configured web servers.
.Pp