From 433bb328353d91eb32612a0787e1ecafffc6e809 Mon Sep 17 00:00:00 2001 From: reyk Date: Mon, 4 Aug 2014 17:12:44 +0000 Subject: [PATCH] manpage tweaks about logging --- usr.sbin/httpd/httpd.8 | 10 +++++++--- usr.sbin/httpd/httpd.conf.5 | 12 +++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/usr.sbin/httpd/httpd.8 b/usr.sbin/httpd/httpd.8 index a62378d6146..66244af92e9 100644 --- a/usr.sbin/httpd/httpd.8 +++ b/usr.sbin/httpd/httpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.8,v 1.39 2014/07/22 19:03:21 jmc Exp $ +.\" $OpenBSD: httpd.8,v 1.40 2014/08/04 17:12:44 reyk Exp $ .\" .\" Copyright (c) 2014 Reyk Floeter .\" @@ -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: July 22 2014 $ +.Dd $Mdocdate: August 4 2014 $ .Dt HTTPD 8 .Os .Sh NAME @@ -29,13 +29,17 @@ .Nm is a simple HTTP server that serves static files. .Sh FILES -.Bl -tag -width "/var/run/httpd.sockXX" -compact +.Bl -tag -width "/var/www/logs/access.logXX" -compact .It /etc/httpd.conf Default configuration file. .It /var/run/httpd.sock .Ux Ns -domain socket used for communication with .Nm . +.It /var/www/logs/access.log +Default access log file. +.It /var/www/logs/error.log +Default error log file. .El .Sh SEE ALSO .Xr httpd.conf 5 diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5 index ded89101a20..c04ddd1ed78 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.19 2014/08/04 15:49:28 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.20 2014/08/04 17:12:44 reyk Exp $ .\" .\" Copyright (c) 2014 Reyk Floeter .\" @@ -145,8 +145,8 @@ except .Ic listen on and .Ic location . -.It Oo Ic no Oc Ic log style Op Ar style -Enable writing an access log to the log files or syslog. +.It Ic log style Op Ar style +Set the logging style. The .Ar style can be @@ -168,8 +168,10 @@ similar to the format that is used by .Xr relayd 8 . If not specified, the default is .Ar common . -.It Oo Ic no Oc Ic log syslog -Log to syslog instead of the log files. +.It Ic log Oo Ic no Oc Ic syslog +Enable or disable logging to syslog instead of the log files. +.It Ic no log +Disable logging. .It Ic root Ar directory Set the document root of the server. The -- 2.20.1