Mercurial > hg > nginx-site

changeset 1753:256774f145ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documented stream resolver and resolver_timeout for opensource.
author Yaroslav Zhuravlev <yar@nginx.com>
date Sat, 16 Jul 2016 01:04:28 +0300
parents b4de612feff8
children c6c9ed2ea7e4
files xml/en/docs/stream/ngx_stream_core_module.xml xml/ru/docs/stream/ngx_stream_core_module.xml
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/stream/ngx_stream_core_module.xml
+++ b/xml/en/docs/stream/ngx_stream_core_module.xml
@@ -9,7 +9,7 @@
 <module name="Module ngx_stream_core_module"
         link="/en/docs/stream/ngx_stream_core_module.html"
         lang="en"
-        rev="14">
+        rev="15">
 
 <section id="summary">
 
@@ -235,6 +235,7 @@ Different servers must listen on differe
 <default/>
 <context>stream</context>
 <context>server</context>
+<appeared-in>1.11.3</appeared-in>
 
 <para>
 Configures name servers used to resolve names of upstream servers
@@ -261,7 +262,7 @@ The optional <literal>valid</literal> pa
 resolver 127.0.0.1 [::1]:5353 valid=30s;
 </example>
 <note>
-This directive is available as part of our
+Before version 1.11.3, this directive was available as part of our
 <commercial_version>commercial subscription</commercial_version>.
 </note>
 </para>
@@ -274,6 +275,7 @@ This directive is available as part of o
 <default>30s</default>
 <context>stream</context>
 <context>server</context>
+<appeared-in>1.11.3</appeared-in>
 
 <para>
 Sets a timeout for name resolution, for example:
@@ -281,7 +283,7 @@ Sets a timeout for name resolution, for 
 resolver_timeout 5s;
 </example>
 <note>
-This directive is available as part of our
+Before version 1.11.3, this directive was available as part of our
 <commercial_version>commercial subscription</commercial_version>.
 </note>
 </para>
--- a/xml/ru/docs/stream/ngx_stream_core_module.xml
+++ b/xml/ru/docs/stream/ngx_stream_core_module.xml
@@ -9,7 +9,7 @@
 <module name="Модуль ngx_stream_core_module"
         link="/ru/docs/stream/ngx_stream_core_module.html"
         lang="ru"
-        rev="14">
+        rev="15">
 
 <section id="summary">
 
@@ -240,6 +240,7 @@ FreeBSD 9.0-STABLE)
 <default/>
 <context>stream</context>
 <context>server</context>
+<appeared-in>1.11.3</appeared-in>
 
 <para>
 Задаёт серверы DNS, используемые для преобразования имён вышестоящих серверов
@@ -268,7 +269,7 @@ resolver 127.0.0.1 [::1]:5353;
 resolver 127.0.0.1 [::1]:5353 valid=30s;
 </example>
 <note>
-Эта директива доступна как часть
+До версии 1.11.3 эта директива была доступна как часть
 <commercial_version>коммерческой подписки</commercial_version>.
 </note>
 </para>
@@ -281,6 +282,7 @@ resolver 127.0.0.1 [::1]:5353 valid=30s;
 <default>30s</default>
 <context>stream</context>
 <context>server</context>
+<appeared-in>1.11.3</appeared-in>
 
 <para>
 Задаёт таймаут для преобразования имени в адрес, например:
@@ -288,7 +290,7 @@ resolver 127.0.0.1 [::1]:5353 valid=30s;
 resolver_timeout 5s;
 </example>
 <note>
-Эта директива доступна как часть
+До версии 1.11.3 эта директива была доступна как часть
 <commercial_version>коммерческой подписки</commercial_version>.
 </note>
 </para>