Mercurial > hg > nginx-site
changeset 88:6876e2558d09
Spell checking.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Fri, 14 Oct 2011 08:47:26 +0000 |
parents | f5539fb36bbb |
children | f451dc5c5c82 |
files | xml/en/docs/http/ngx_http_core_module.xml xml/en/docs/http/ngx_http_mp4_module.xml |
diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml +++ b/xml/en/docs/http/ngx_http_core_module.xml @@ -1006,7 +1006,7 @@ Regular expressions are specified by pre <dq><value>~</value></dq> prefix (for case-sensitive matching). To find a location matching a given request, nginx first checks locations defined using the prefix strings (prefix locations). -Amongst them, the most specific one is searched. +Among them, the most specific one is searched. Then regular expressions are checked, in the order of their appearance in a configuration file. A search terminates on the first match, and its corresponding @@ -1865,7 +1865,7 @@ keep-alive state. Enables or disables the use of the <c-def>TCP_NOPUSH</c-def> socket option on FreeBSD or the <c-def>TCP_CORK</c-def> socket option on Linux. -Opitons are enabled only when <link id="sendfile">sendfile</link> is used. +Options are enabled only when <link id="sendfile">sendfile</link> is used. Enabling the option allows to <list type="bullet"> @@ -2287,6 +2287,12 @@ directives, respectively. </para> </tag-desc> +<tag-name><var>$request_completion</var></tag-name> +<tag-desc> +<dq><code>OK</code></dq> if a request has completed, +or an empty string otherwise +</tag-desc> + <tag-name><var>$request_filename</var></tag-name> <tag-desc> file path for the current query, based on the
--- a/xml/en/docs/http/ngx_http_mp4_module.xml +++ b/xml/en/docs/http/ngx_http_mp4_module.xml @@ -16,7 +16,7 @@ and <pathname>.m4a</pathname>. </para> <para> -Pseudo-streaming works in alliance with conformant Flash players. +Pseudo-streaming works in alliance with conforming Flash players. A player sends an HTTP request to the server with a start time argument in the request URI’s query string (named simply <parameter>start</parameter>