manpage tweaks about logging

diff --git a/usr.sbin/httpd/httpd.8 b/usr.sbin/httpd/httpd.8
index a62378d..66244af 100644 (file)
--- 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 <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: 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 ded8910..c04ddd1 100644 (file)
--- 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 <reyk@openbsd.org>
 .\"
@@ -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