# HG changeset patch # User Ruslan Ermilov # Date 1325141306 0 # Node ID 9f5ee1c6fca55e45e530d1254ee98654c3fdf5d2 # Parent 34246e706f48fee791a9cd1d731b8f20677941c1 Use consistent wording. diff -r 34246e706f48 -r 9f5ee1c6fca5 xml/en/docs/http/ngx_http_image_filter_module.xml --- a/xml/en/docs/http/ngx_http_image_filter_module.xml Wed Dec 28 19:01:03 2011 +0000 +++ b/xml/en/docs/http/ngx_http_image_filter_module.xml Thu Dec 29 06:48:26 2011 +0000 @@ -78,7 +78,7 @@ test -ensures that answers are images in either JPEG, GIF, or PNG format. +ensures that responses are images in either JPEG, GIF, or PNG format. Otherwise, the error is returned. diff -r 34246e706f48 -r 9f5ee1c6fca5 xml/en/docs/http/ngx_http_proxy_module.xml --- a/xml/en/docs/http/ngx_http_proxy_module.xml Wed Dec 28 19:01:03 2011 +0000 +++ b/xml/en/docs/http/ngx_http_proxy_module.xml Thu Dec 29 06:48:26 2011 +0000 @@ -124,9 +124,9 @@ location -Defines conditions under which the answer will not be taken from a cache. +Defines conditions under which the response will not be taken from a cache. If at least one value of the string parameters is not empty and is not -equal to “0” then the answer will not be taken from the cache: +equal to “0” then the response will not be taken from the cache: proxy_cache_bypass $cookie_nocache $arg_nocache$arg_comment; proxy_cache_bypass $http_pragma $http_authorization; @@ -287,7 +287,7 @@ -In addition, it can be specified to cache any answers using the +In addition, it can be specified to cache any responses using the any parameter: proxy_cache_valid 200 302 10m; @@ -329,7 +329,7 @@ server to a client. The proxy_hide_header directive sets additional fields that will not be passed. -If, on the contrary, the passing of fields needs to be enabled, +If, on the contrary, the passing of fields needs to be permitted, the directive can be used. @@ -346,7 +346,7 @@ Determines should the connection with a proxied server be closed if a client closes a connection without waiting -for an answer. +for a response. @@ -360,7 +360,7 @@ location -Disables processing of some response header fields from the proxied server. +Disables processing of certain response header fields from the proxied server. The following fields can be ignored:
X-Accel-Redirect
,
X-Accel-Expires
,
X-Accel-Limit-Rate
(1.1.6),
X-Accel-Buffering
(1.1.6), @@ -458,9 +458,9 @@ location -Defines conditions under which the answer will not be saved to a cache. +Defines conditions under which the response will not be saved to a cache. If at least one value of the string parameters is not empty and is not -equal to “0” then the answer will not be saved: +equal to “0” then the response will not be saved: proxy_no_cache $cookie_nocache $arg_nocache$arg_comment; proxy_no_cache $http_pragma $http_authorization; @@ -494,7 +494,7 @@ -If a domain name maps to several addresses, all of them will be +If a domain name resolves to several addresses, all of them will be used in a round-robin fashion. In addition, an address can be specified as a server group.