summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd/httpd.conf.5
diff options
context:
space:
mode:
authordoug <doug@cvs.openbsd.org>2014-08-02 21:21:48 +0000
committerdoug <doug@cvs.openbsd.org>2014-08-02 21:21:48 +0000
commit1928633ce779090273b4c9bcca6a031f6b69e10c (patch)
tree088faad66a3a377dba6fb4d03bf7a9b398681d8a /usr.sbin/httpd/httpd.conf.5
parent52b488ae85eedfbd40c590af44b0503844a5dc1a (diff)
Locations now inherit access log settings from the server.
Add log to the server flags. input/"Looks ok" reyk@
Diffstat (limited to 'usr.sbin/httpd/httpd.conf.5')
-rw-r--r--usr.sbin/httpd/httpd.conf.54
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5
index 949307e6010..befeaa0f30a 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.16 2014/08/02 10:24:36 reyk Exp $
+.\" $OpenBSD: httpd.conf.5,v 1.17 2014/08/02 21:21:47 doug Exp $
.\"
.\" Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -153,7 +153,7 @@ can be
.Ar common
or
.Ar combined .
-It is similar to the Apache and nginx logging format.
+It is similar to the default Apache and nginx access log.
If not specified, the default is
.Ar common .
.It Ic root Ar directory