Mercurial > hg > nginx-site

changeset 1123:9a9aa8e9d12c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rephrased the "zone" directive, translated into Russian.
author Yaroslav Zhuravlev <yar@nginx.com>
date Thu, 20 Mar 2014 15:41:50 +0400
parents 594093ef96b1
children d790333947f4
files xml/en/docs/http/ngx_http_upstream_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml
diffstat 2 files changed, 32 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml	Fri Mar 14 14:17:07 2014 +0000
+++ b/xml/en/docs/http/ngx_http_upstream_module.xml	Thu Mar 20 15:41:50 2014 +0400
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_upstream_module"
         link="/en/docs/http/ngx_http_upstream_module.html"
         lang="en"
-        rev="14">
+        rev="15">
 
 <section id="summary">
 
@@ -254,13 +254,14 @@
 <context>upstream</context>
 
 <para>
-Makes the group dynamically configurable.
-Defines the <value>name</value> and <value>size</value> of a shared
-memory zone that keeps group’s configuration and run-time state that are
+Defines the <value>name</value> and <value>size</value> of the shared
+memory zone that keeps the group’s configuration and run-time state that are
 shared between worker processes.
-Such groups allow to add, remove, and modify servers at run time.
-The configuration is accessible via a special location handled by
-<link id="upstream_conf"/>.
+Such groups allow changing the group membership
+or modifying the settings of a particular server
+without the need of restarting nginx.
+The configuration is accessible via a special location
+handled by <link id="upstream_conf"/>.
 </para>
 
 <para>
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml	Fri Mar 14 14:17:07 2014 +0000
+++ b/xml/ru/docs/http/ngx_http_upstream_module.xml	Thu Mar 20 15:41:50 2014 +0400
@@ -192,6 +192,30 @@
 </directive>
 
 
+<directive name="zone">
+<syntax><value>имя</value> <value>размер</value></syntax>
+<default/>
+<context>upstream</context>
+
+<para>
+Задаёт <value>имя</value> и <value>размер</value> зоны разделяемой памяти,
+в которой хранятся конфигурация группы и рабочее состояние,
+разделяемые между рабочими процессами.
+В таких группах возможно изменение состава группы или
+настроек отдельных серверов без необходимости перезапуска nginx.
+Конфигурация доступна через специальный location,
+для которого указана директива <link id="upstream_conf"/>.
+</para>
+
+<para>
+<note>
+Эта директива доступна как часть <commercial_version/>.
+</note>
+</para>
+
+</directive>
+
+
 <directive name="ip_hash">
 <syntax/>
 <default/>