Mercurial > hg > nginx-site
changeset 1149:1501e5848052
Corrected the usage of the definite article.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Tue, 08 Apr 2014 20:13:53 +0400 |
parents | 2b9dc2c5e129 |
children | ed7a62ec7b51 |
files | xml/en/docs/http/ngx_http_core_module.xml xml/en/docs/http/ngx_http_fastcgi_module.xml xml/en/docs/http/ngx_http_memcached_module.xml xml/en/docs/http/ngx_http_proxy_module.xml |
diffstat | 4 files changed, 27 insertions(+), 25 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 @@ -2164,10 +2164,10 @@ This directive is ignored on Linux, Sola <para> Sets a timeout for transmitting a response to the client. -A timeout is set only between two successive write operations, +The timeout is set only between two successive write operations, not for the transmission of the whole response. -If a client does not receive anything within this time, -a connection is closed. +If the client does not receive anything within this time, +the connection is closed. </para> </directive>
--- a/xml/en/docs/http/ngx_http_fastcgi_module.xml +++ b/xml/en/docs/http/ngx_http_fastcgi_module.xml @@ -962,10 +962,10 @@ fields from a FastCGI server to a client <para> Defines a timeout for reading a response from the FastCGI server. -A timeout is set only between two successive read operations, +The timeout is set only between two successive read operations, not for the transmission of the whole response. -If a FastCGI server does not transmit anything within this time, -a connection is closed. +If the FastCGI server does not transmit anything within this time, +the connection is closed. </para> </directive> @@ -1036,10 +1036,10 @@ This directive is ignored on Linux, Sola <para> Sets a timeout for transmitting a request to the FastCGI server. -A timeout is set only between two successive write operations, +The timeout is set only between two successive write operations, not for the transmission of the whole request. -If a FastCGI server does not receive anything within this time, -a connection is closed. +If the FastCGI server does not receive anything within this time, +the connection is closed. </para> </directive> @@ -1053,7 +1053,7 @@ a connection is closed. <para> Defines a regular expression that captures a value for the <var>$fastcgi_path_info</var> variable. -A regular expression should have two captures: the first becomes +The regular expression should have two captures: the first becomes a value of the <var>$fastcgi_script_name</var> variable, the second becomes a value of the <var>$fastcgi_path_info</var> variable. For example, with these settings @@ -1100,7 +1100,8 @@ fastcgi_store /data/www$original_uri; <para> The modification time of files is set according to the received <header>Last-Modified</header> response header field. -A response is first written to a temporary file, and then the file is renamed. +The response is first written to a temporary file, +and then the file is renamed. Starting from version 0.8.9, temporary files and the persistent store can be put on different file systems. However, be aware that in this case a file is copied
--- a/xml/en/docs/http/ngx_http_memcached_module.xml +++ b/xml/en/docs/http/ngx_http_memcached_module.xml @@ -213,9 +213,9 @@ In addition, an address can be specified <para> Defines a timeout for reading a response from the memcached server. -A timeout is set only between two successive read operations, +The timeout is set only between two successive read operations, not for the transmission of the whole response. -If a memcached server does not transmit anything within this time, +If the memcached server does not transmit anything within this time, the connection is closed. </para> @@ -231,10 +231,10 @@ the connection is closed. <para> Sets a timeout for transmitting a request to the memcached server. -A timeout is set only between two successive write operations, +The timeout is set only between two successive write operations, not for the transmission of the whole request. -If a memcached server does not receive anything within this time, -a connection is closed. +If the memcached server does not receive anything within this time, +the connection is closed. </para> </directive>
--- a/xml/en/docs/http/ngx_http_proxy_module.xml +++ b/xml/en/docs/http/ngx_http_proxy_module.xml @@ -658,7 +658,7 @@ In this case, <value>path</value> should the “<literal>~</literal>” symbol for a case-sensitive matching, or from the “<literal>~*</literal>” symbols for case-insensitive matching. -A regular expression can contain named and positional captures, +The regular expression can contain named and positional captures, and <value>replacement</value> can reference them: <example> proxy_cookie_path ~*^/user/([^/]+) /u/$1; @@ -1142,10 +1142,10 @@ fields from a proxied server to a client <para> Defines a timeout for reading a response from the proxied server. -A timeout is set only between two successive read operations, +The timeout is set only between two successive read operations, not for the transmission of the whole response. -If a proxied server does not transmit anything within this time, -a connection is closed. +If the proxied server does not transmit anything within this time, +the connection is closed. </para> </directive> @@ -1275,7 +1275,7 @@ In this case, <value>redirect</value> sh the “<literal>~</literal>” symbol for a case-sensitive matching, or with the “<literal>~*</literal>” symbols for case-insensitive matching. -A regular expression can contain named and positional captures, +The regular expression can contain named and positional captures, and <value>replacement</value> can reference them: <example> proxy_redirect ~^(http://[^:]+):\d+(/.+)$ $1$2; @@ -1347,10 +1347,10 @@ This directive is ignored on Linux, Sola <para> Sets a timeout for transmitting a request to the proxied server. -A timeout is set only between two successive write operations, +The timeout is set only between two successive write operations, not for the transmission of the whole request. -If a proxied server does not receive anything within this time, -a connection is closed. +If the proxied server does not receive anything within this time, +the connection is closed. </para> </directive> @@ -1517,7 +1517,8 @@ proxy_store /data/www$original_uri; <para> The modification time of files is set according to the received <header>Last-Modified</header> response header field. -A response is first written to a temporary file, and then the file is renamed. +The response is first written to a temporary file, +and then the file is renamed. Starting from version 0.8.9, temporary files and the persistent store can be put on different file systems. However, be aware that in this case a file is copied