diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-03-07 21:08:55 +0100 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-03-07 21:08:55 +0100 |
| commit | 9fe6c559bd71dd8e7a7efe2166a29898b8970734 (patch) | |
| tree | 28ba61aeb126a8c88b5bdf370a432ba73d3f71b2 | |
| parent | be1b7213b8e8d0de98b5a6445504a583e8c9a064 (diff) | |
| download | httpd-9fe6c559bd71dd8e7a7efe2166a29898b8970734.tar.gz httpd-9fe6c559bd71dd8e7a7efe2166a29898b8970734.zip | |
sync; manpage fixed
| -rw-r--r-- | httpd.8 | 16 | ||||
| -rw-r--r-- | httpd.conf.5 | 8 |
2 files changed, 12 insertions, 12 deletions
@@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.8,v 1.49 2014/12/12 14:45:59 reyk Exp $ +.\" $OpenBSD: httpd.8,v 1.50 2015/02/24 07:56:06 bentley 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: December 12 2014 $ +.Dd $Mdocdate: February 24 2015 $ .Dt HTTPD 8 .Os .Sh NAME @@ -69,19 +69,19 @@ options increases the verbosity. .El .Sh FILES .Bl -tag -width "/etc/ssl/private/server.key" -compact -.It /etc/httpd.conf +.It Pa /etc/httpd.conf Default configuration file. -.It /etc/ssl/private/server.key +.It Pa /etc/ssl/private/server.key Default SSL/TLS server key. -.It /etc/ssl/server.crt +.It Pa /etc/ssl/server.crt Default SSL/TLS server certificate. -.It /var/run/httpd.sock +.It Pa /var/run/httpd.sock .Ux Ns -domain socket used for communication with .Nm . -.It /var/www/logs/access.log +.It Pa /var/www/logs/access.log Default access log file. -.It /var/www/logs/error.log +.It Pa /var/www/logs/error.log Default error log file. .El .Sh SEE ALSO diff --git a/httpd.conf.5 b/httpd.conf.5 index da51ad3..acfb57a 100644 --- a/httpd.conf.5 +++ b/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.53 2015/02/23 18:43:18 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.54 2015/03/06 05:10:18 reyk 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: February 23 2015 $ +.Dd $Mdocdate: March 6 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -183,9 +183,9 @@ The remote user for HTTP authentication. .It Ic $REQUEST_URI The request path and optional query string. .It Ic $SERVER_ADDR -The configured IP address of the relay. +The configured IP address of the server. .It Ic $SERVER_PORT -The configured TCP server port of the relay. +The configured TCP server port of the server. .It Ic $SERVER_NAME The name of the server. .El |