From: jmc Date: Tue, 22 Jul 2014 19:03:21 +0000 (+0000) Subject: some minor fixes; X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f4330d16be53b8e98c61f93c961db60ec3ad2b7c;p=openbsd some minor fixes; --- diff --git a/usr.sbin/httpd/httpd.8 b/usr.sbin/httpd/httpd.8 index 033bf6e37e3..a62378d6146 100644 --- a/usr.sbin/httpd/httpd.8 +++ b/usr.sbin/httpd/httpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.8,v 1.38 2014/07/22 17:54:43 reyk Exp $ +.\" $OpenBSD: httpd.8,v 1.39 2014/07/22 19:03:21 jmc Exp $ .\" .\" Copyright (c) 2014 Reyk Floeter .\" @@ -28,7 +28,6 @@ .Sh DESCRIPTION .Nm is a simple HTTP server that serves static files. -.El .Sh FILES .Bl -tag -width "/var/run/httpd.sockXX" -compact .It /etc/httpd.conf @@ -36,7 +35,7 @@ Default configuration file. .It /var/run/httpd.sock .Ux Ns -domain socket used for communication with -.Xr httpd 8 . +.Nm . .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 c6e67b41454..afef0823695 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.4 2014/07/22 18:31:16 ajacoutot Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.5 2014/07/22 19:03:21 jmc Exp $ .\" .\" Copyright (c) 2014 Reyk Floeter .\" @@ -121,7 +121,7 @@ Configure the supported media types. .Nm httpd will set the .Ar Content-Type -of the response header based on the file extension that is listed in the +of the response header based on the file extension listed in the .Ic types section. If not specified, @@ -140,7 +140,7 @@ The .Ic types section must include one or more lines of the following syntax: .Bl -tag -width Ds -.It Ar type/subtype Ar name Oo Ar name ... Oc Ic ; +.It Ar type/subtype Ar name Op Ar name ... ; Set the media .Ar type and @@ -175,16 +175,16 @@ types { } .Ed .Pp -The syntax of the types section is compatible to the format that is used by +The syntax of the types section is compatible with the format used by .Xr nginx 8 , -so you can optionally include its +so it is possible to include its .Pa mime.types file directly: .Bd -literal -offset indent include "/etc/nginx/mime.types" .Ed .Sh SEE ALSO -.Xr httpd 8 . +.Xr httpd 8 .Sh AUTHORS .An -nosplit The