changeset 1126:2e28d1c4a0a2

Upstream: revised layout of the "server" directive.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 21 Mar 2014 10:55:50 +0400
parents 9a95b9026a16
children 948c853f5d22
files xml/en/docs/http/ngx_http_upstream_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml
diffstat 2 files changed, 49 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml	Fri Mar 21 10:50:24 2014 +0400
+++ b/xml/en/docs/http/ngx_http_upstream_module.xml	Fri Mar 21 10:55: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="17">
+        rev="18">
 
 <section id="summary">
 
@@ -100,6 +100,8 @@
     server backend1.example.com weight=5;
     server 127.0.0.1:8080       max_fails=3 fail_timeout=30s;
     server unix:/tmp/backend3;
+
+    server backup1.example.com  backup;
 }
 </example>
 </para>
@@ -178,31 +180,6 @@
 By default, the parameter is set to 10 seconds.
 </tag-desc>
 
-<tag-name><literal>slow_start</literal>=<value>time</value></tag-name>
-<tag-desc>
-sets the <value>time</value> during which the server will recover its weight
-from zero to a nominal value, when unhealthy server becomes
-<link id="health_check">healthy</link>,
-or when the server becomes available after a period of time
-it was considered unavailable.
-Default value is zero, i.e. slow start is disabled.
-<note>
-This functionality is available as part of our <commercial_version/>.
-</note>
-</tag-desc>
-
-<tag-name id="max_conns">
-<literal>max_conns</literal>=<value>number</value>
-</tag-name>
-<tag-desc>
-limits the maximum <value>number</value> of simultaneous connections to the
-proxied server (1.5.9).
-Default value is zero, meaning there is no limit.
-<note>
-This functionality is available as part of our <commercial_version/> only.
-</note>
-</tag-desc>
-
 <tag-name><literal>backup</literal></tag-name>
 <tag-desc>
 marks the server as a backup server.
@@ -215,6 +192,23 @@
 the <link id="ip_hash"/> directive.
 </tag-desc>
 
+</list>
+</para>
+
+<para>
+Additionally,
+the following parameters are available as part of our <commercial_version/>:
+<list type="tag">
+
+<tag-name id="max_conns">
+<literal>max_conns</literal>=<value>number</value>
+</tag-name>
+<tag-desc>
+limits the maximum <value>number</value> of simultaneous connections to the
+proxied server (1.5.9).
+Default value is zero, meaning there is no limit.
+</tag-desc>
+
 <tag-name id="resolve">
 <literal>resolve</literal>
 </tag-name>
@@ -240,34 +234,27 @@
 }
 </example>
 </para>
-<note>
-This functionality is available as part of our <commercial_version/>.
-</note>
 </tag-desc>
 
 <tag-name><literal>route</literal>=<value>string</value></tag-name>
 <tag-desc>
 sets the server route name.
-<note>
-This functionality is available as part of our <commercial_version/>.
-</note>
+</tag-desc>
+
+<tag-name><literal>slow_start</literal>=<value>time</value></tag-name>
+<tag-desc>
+sets the <value>time</value> during which the server will recover its weight
+from zero to a nominal value, when unhealthy server becomes
+<link id="health_check">healthy</link>,
+or when the server becomes available after a period of time
+it was considered unavailable.
+Default value is zero, i.e. slow start is disabled.
 </tag-desc>
 
 </list>
 </para>
 
 <para>
-Example:
-<example>
-upstream backend {
-    server backend1.example.com     weight=5;
-    server 127.0.0.1:8080           max_fails=3 fail_timeout=30s;
-    server unix:/tmp/backend3;
-
-    server backup1.example.com:8080 backup;
-}
-</example>
-
 <note>
 If there is only a single server in a group, <literal>max_fails</literal>,
 <literal>fail_timeout</literal> and <literal>slow_start</literal> parameters
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml	Fri Mar 21 10:50:24 2014 +0400
+++ b/xml/ru/docs/http/ngx_http_upstream_module.xml	Fri Mar 21 10:55:50 2014 +0400
@@ -71,6 +71,8 @@
     server backend1.example.com weight=5;
     server 127.0.0.1:8080       max_fails=3 fail_timeout=30s;
     server unix:/tmp/backend3;
+
+    server backup1.example.com  backup;
 }
 </example>
 </para>
@@ -149,18 +151,6 @@
 По умолчанию параметр равен 10 секундам.
 </tag-desc>
 
-<tag-name id="max_conns">
-<literal>max_conns</literal>=<value>число</value>
-</tag-name>
-<tag-desc>
-ограничивает максимальное <value>число</value> одновременных соединений
-к проксируемому серверу (1.5.9).
-Значение по умолчанию равно 0 и означает, что ограничения нет.
-<note>
-Эта функциональность доступна как часть <commercial_version/>.
-</note>
-</tag-desc>
-
 <tag-name><literal>backup</literal></tag-name>
 <tag-desc>
 помечает сервер как запасной сервер.
@@ -173,6 +163,23 @@
 совместно с директивой <link id="ip_hash"/>.
 </tag-desc>
 
+</list>
+</para>
+
+<para>
+Кроме того,
+следующие параметры доступны как часть <commercial_version/>:
+<list type="tag">
+
+<tag-name id="max_conns">
+<literal>max_conns</literal>=<value>число</value>
+</tag-name>
+<tag-desc>
+ограничивает максимальное <value>число</value> одновременных соединений
+к проксируемому серверу (1.5.9).
+Значение по умолчанию равно 0 и означает, что ограничения нет.
+</tag-desc>
+
 <tag-name id="resolve">
 <literal>resolve</literal>
 </tag-name>
@@ -197,27 +204,11 @@
 }
 </example>
 </para>
-<note>
-Эта функциональность доступна как часть <commercial_version/>.
-</note>
 </tag-desc>
 
 </list>
 </para>
 
-<para>
-Пример:
-<example>
-upstream backend {
-    server backend1.example.com     weight=5;
-    server 127.0.0.1:8080           max_fails=3 fail_timeout=30s;
-    server unix:/tmp/backend3;
-
-    server backup1.example.com:8080 backup;
-}
-</example>
-</para>
-
 </directive>