diff options
| author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2015-05-19 18:03:33 +0000 |
|---|---|---|
| committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2015-05-19 18:03:33 +0000 |
| commit | c12af599efb9766e1708cb1353b026ab103773c8 (patch) | |
| tree | 17221134869db71b12c3fbf96b2df94136249560 /usr.sbin/httpd | |
| parent | 6484d25642f8996c8decf0cb7a36b6cb57f4399b (diff) | |
drop comment about being possible to include /etc/nginx/mime.types,
we do not have to care about nginx anymore.
ok jmc@ (who thinks previously suggested removing it), and reyk@
Diffstat (limited to 'usr.sbin/httpd')
| -rw-r--r-- | usr.sbin/httpd/httpd.conf.5 | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5 index 26d67981f8a..d9f46e69785 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.57 2015/03/26 19:16:57 jmc Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.58 2015/05/19 18:03:32 sobrado Exp $ .\" .\" Copyright (c) 2014, 2015 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: March 26 2015 $ +.Dd $Mdocdate: May 19 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -514,14 +514,6 @@ server "www.example.com" { listen on 10.0.0.1 port 80 } .Ed -.Pp -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: -.Bd -literal -offset indent -include "/etc/nginx/mime.types" -.Ed .Sh SEE ALSO .Xr htpasswd 1 , .Xr httpd 8 , |