summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2014-09-01 12:22:39 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2014-09-01 12:22:39 +0000
commitaa7d972e080578a3fad9cdd960ed7cc41d3e2ce7 (patch)
treec5c1d41b5dcc7a50e40556324accbb6a8cfc2afb
parent41f3970181cb57962eab25c0198464805e9b9d17 (diff)
remove Xr, but not the reference, to nginx, after some discussion with reyk;
-rw-r--r--usr.sbin/httpd/httpd.conf.57
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5
index 788d0a95487..6d267d6a539 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.33 2014/08/25 14:27:54 reyk Exp $
+.\" $OpenBSD: httpd.conf.5,v 1.34 2014/09/01 12:22:38 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: August 25 2014 $
+.Dd $Mdocdate: September 1 2014 $
.Dt HTTPD.CONF 5
.Os
.Sh NAME
@@ -385,8 +385,7 @@ server "intranet.example.com" {
}
.Ed
.Pp
-The syntax of the types section is also compatible with the format used by
-.Xr nginx 8 ,
+The syntax of the types section is also compatible with the format used by nginx,
so it is possible to include its
.Pa mime.types
file directly: