Mercurial > hg > nginx-site

changeset 1672:9c98c4498f08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rephrased the "proxy_next_upstream_timeout" directive.
author Yaroslav Zhuravlev <yar@nginx.com>
date Wed, 30 Mar 2016 18:59:12 +0300
parents 5154b356a1b2
children 3ab18995382b
files 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 xml/en/docs/http/ngx_http_scgi_module.xml xml/en/docs/http/ngx_http_uwsgi_module.xml xml/ru/docs/http/ngx_http_fastcgi_module.xml xml/ru/docs/http/ngx_http_memcached_module.xml xml/ru/docs/http/ngx_http_proxy_module.xml xml/ru/docs/http/ngx_http_scgi_module.xml xml/ru/docs/http/ngx_http_uwsgi_module.xml
diffstat 10 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_fastcgi_module.xml
+++ b/xml/en/docs/http/ngx_http_fastcgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_fastcgi_module"
         link="/en/docs/http/ngx_http_fastcgi_module.html"
         lang="en"
-        rev="32">
+        rev="33">
 
 <section id="summary">
 
@@ -1025,7 +1025,7 @@ and by <link id="fastcgi_next_upstream_t
 <appeared-in>1.7.5</appeared-in>
 
 <para>
-Limits the time allowed to pass a request to the
+Limits the time during which a request can be passed to the
 <link id="fastcgi_next_upstream">next server</link>.
 The <literal>0</literal> value turns off this limitation.
 </para>
--- a/xml/en/docs/http/ngx_http_memcached_module.xml
+++ b/xml/en/docs/http/ngx_http_memcached_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_memcached_module"
         link="/en/docs/http/ngx_http_memcached_module.html"
         lang="en"
-        rev="11">
+        rev="12">
 
 <section id="summary">
 
@@ -208,7 +208,7 @@ and by <link id="memcached_next_upstream
 <appeared-in>1.7.5</appeared-in>
 
 <para>
-Limits the time allowed to pass a request to the
+Limits the time during which a request can be passed to the
 <link id="memcached_next_upstream">next server</link>.
 The <literal>0</literal> value turns off this limitation.
 </para>
--- a/xml/en/docs/http/ngx_http_proxy_module.xml
+++ b/xml/en/docs/http/ngx_http_proxy_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_proxy_module"
         link="/en/docs/http/ngx_http_proxy_module.html"
         lang="en"
-        rev="45">
+        rev="46">
 
 <section id="summary">
 
@@ -1189,7 +1189,7 @@ and by <link id="proxy_next_upstream_tim
 <appeared-in>1.7.5</appeared-in>
 
 <para>
-Limits the time allowed to pass a request to the
+Limits the time during which a request can be passed to the
 <link id="proxy_next_upstream">next server</link>.
 The <literal>0</literal> value turns off this limitation.
 </para>
--- a/xml/en/docs/http/ngx_http_scgi_module.xml
+++ b/xml/en/docs/http/ngx_http_scgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_scgi_module"
         link="/en/docs/http/ngx_http_scgi_module.html"
         lang="en"
-        rev="21">
+        rev="22">
 
 <section id="summary">
 
@@ -944,7 +944,7 @@ and by <link id="scgi_next_upstream_time
 <appeared-in>1.7.5</appeared-in>
 
 <para>
-Limits the time allowed to pass a request to the
+Limits the time during which a request can be passed to the
 <link id="scgi_next_upstream">next server</link>.
 The <literal>0</literal> value turns off this limitation.
 </para>
--- a/xml/en/docs/http/ngx_http_uwsgi_module.xml
+++ b/xml/en/docs/http/ngx_http_uwsgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_uwsgi_module"
         link="/en/docs/http/ngx_http_uwsgi_module.html"
         lang="en"
-        rev="24">
+        rev="25">
 
 <section id="summary">
 
@@ -975,7 +975,7 @@ and by <link id="uwsgi_next_upstream_tim
 <appeared-in>1.7.5</appeared-in>
 
 <para>
-Limits the time allowed to pass a request to the
+Limits the time during which a request can be passed to the
 <link id="uwsgi_next_upstream">next server</link>.
 The <literal>0</literal> value turns off this limitation.
 </para>
--- a/xml/ru/docs/http/ngx_http_fastcgi_module.xml
+++ b/xml/ru/docs/http/ngx_http_fastcgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_fastcgi_module"
         link="/ru/docs/http/ngx_http_fastcgi_module.html"
         lang="ru"
-        rev="32">
+        rev="33">
 
 <section id="summary">
 
--- a/xml/ru/docs/http/ngx_http_memcached_module.xml
+++ b/xml/ru/docs/http/ngx_http_memcached_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_memcached_module"
         link="/ru/docs/http/ngx_http_memcached_module.html"
         lang="ru"
-        rev="11">
+        rev="12">
 
 <section id="summary">
 
--- a/xml/ru/docs/http/ngx_http_proxy_module.xml
+++ b/xml/ru/docs/http/ngx_http_proxy_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_proxy_module"
         link="/ru/docs/http/ngx_http_proxy_module.html"
         lang="ru"
-        rev="45">
+        rev="46">
 
 <section id="summary">
 
--- a/xml/ru/docs/http/ngx_http_scgi_module.xml
+++ b/xml/ru/docs/http/ngx_http_scgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_scgi_module"
         link="/ru/docs/http/ngx_http_scgi_module.html"
         lang="ru"
-        rev="21">
+        rev="22">
 
 <section id="summary">
 
--- a/xml/ru/docs/http/ngx_http_uwsgi_module.xml
+++ b/xml/ru/docs/http/ngx_http_uwsgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_uwsgi_module"
         link="/ru/docs/http/ngx_http_uwsgi_module.html"
         lang="ru"
-        rev="24">
+        rev="25">
 
 <section id="summary">