Mercurial > hg > nginx-site
changeset 1418:23b409d1f5c7
Revised usage of "individual server" in upstream_conf.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Mon, 16 Feb 2015 11:59:43 +0300 |
parents | e7eb996b113e |
children | 33e5af4c10d9 |
files | xml/en/docs/http/ngx_http_upstream_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml |
diffstat | 2 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml Sun Feb 15 18:59:21 2015 +0000 +++ b/xml/en/docs/http/ngx_http_upstream_module.xml Mon Feb 16 11:59:43 2015 +0300 @@ -10,7 +10,7 @@ <module name="Module ngx_http_upstream_module" link="/en/docs/http/ngx_http_upstream_module.html" lang="en" - rev="34"> + rev="35"> <section id="summary"> @@ -1051,13 +1051,13 @@ <listitem>view the group configuration;</listitem> -<listitem>view, modify, or remove an individual server;</listitem> +<listitem>view, modify, or remove a server;</listitem> <listitem>add a new server.</listitem> </list> <note> -Since addresses in a group are not required to be unique, individual +Since addresses in a group are not required to be unique, specific servers in a group are referenced by their IDs. IDs are assigned automatically and shown when adding a new server or viewing the group configuration. @@ -1087,13 +1087,13 @@ <tag-name> <literal>id=</literal><value>number</value></tag-name> <tag-desc> -Selects an individual server for viewing, modifying, or removing. +Selects a server for viewing, modifying, or removing. </tag-desc> <tag-name> <literal>remove=</literal></tag-name> <tag-desc> -Removes an individual server from the group. +Removes a server from the group. </tag-desc> <tag-name> @@ -1196,7 +1196,7 @@ </list> The first two parameters select an object. -This can be either the whole group or an individual server. +This can be either the whole group or a specific server. Without other parameters, the configuration of the selected group or server is shown. </para> @@ -1207,7 +1207,7 @@ http://127.0.0.1/upstream_conf?upstream=dynamic </example> -To view the configuration of an individual server, also specify its ID: +To view the configuration of a specific server, also specify its ID: <example> http://127.0.0.1/upstream_conf?upstream=dynamic&id=42 </example>
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml Sun Feb 15 18:59:21 2015 +0000 +++ b/xml/ru/docs/http/ngx_http_upstream_module.xml Mon Feb 16 11:59:43 2015 +0300 @@ -10,7 +10,7 @@ <module name="Модуль ngx_http_upstream_module" link="/ru/docs/http/ngx_http_upstream_module.html" lang="ru" - rev="34"> + rev="35"> <section id="summary"> @@ -1058,7 +1058,7 @@ <listitem> просматривать или изменять конфигурацию, а также -удалять отдельные серверы; +удалять серверы; </listitem> <listitem>добавлять новые серверы.</listitem> @@ -1095,13 +1095,13 @@ <tag-name> <literal>id=</literal><value>число</value></tag-name> <tag-desc> -Выбирает отдельный сервер для просмотра, изменения или удаления. +Выбирает сервер для просмотра, изменения или удаления. </tag-desc> <tag-name> <literal>remove=</literal></tag-name> <tag-desc> -Удаляет выбранный сервер из группы. +Удаляет сервер из группы. </tag-desc> <tag-name>