diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-01-05 12:04:40 +0100 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-01-05 12:04:40 +0100 |
| commit | ec67e5c9f8c6eb37ca482b20277883a65c1311e3 (patch) | |
| tree | a8c385634b9710f91a9484c33e15e0967516f635 | |
| parent | 101ee3483346ad2f557a74f7268f9331a383567e (diff) | |
| download | httpd-ec67e5c9f8c6eb37ca482b20277883a65c1311e3.tar.gz httpd-ec67e5c9f8c6eb37ca482b20277883a65c1311e3.zip | |
sync with -current
| -rw-r--r-- | httpd.conf.5 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/httpd.conf.5 b/httpd.conf.5 index b582385..2f10a73 100644 --- a/httpd.conf.5 +++ b/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.42 2015/01/04 22:23:58 chrisz Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.43 2015/01/05 11:03:57 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: January 4 2015 $ +.Dd $Mdocdate: January 5 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -189,7 +189,7 @@ This statement can be specified multiple times. Specify server configuration rules for a specific location. The .Ar path -argument will be matched against the URL path with shell globbing rules. +argument will be matched against the request path with shell globbing rules. A location section may include most of the server configuration rules except .Ic connection , @@ -251,6 +251,7 @@ Enable or disable logging to instead of the log files. .El .It Ic root Ar option +Configure the document root and options for the request path. Valid options are: .Bl -tag -width Ds .It Ar directory @@ -266,8 +267,8 @@ If not specified, it defaults to .It Ic strip Ar number Strip .Ar number -path components from the beginning of the request URI before -looking up the stripped-down URI at the document root. +path components from the beginning of the request path before looking +up the stripped-down path at the document root. .El .It Ic tcp Ar option Enable or disable the specified TCP/IP options; see |