# HG changeset patch # User Yaroslav Zhuravlev # Date 1424077183 -10800 # Node ID 23b409d1f5c7d7b5e55a2ff838b0885f5f226115 # Parent e7eb996b113e4b147591ba1946622d6253030586 Revised usage of "individual server" in upstream_conf. diff --git a/xml/en/docs/http/ngx_http_upstream_module.xml b/xml/en/docs/http/ngx_http_upstream_module.xml --- a/xml/en/docs/http/ngx_http_upstream_module.xml +++ b/xml/en/docs/http/ngx_http_upstream_module.xml @@ -10,7 +10,7 @@ + rev="35">
@@ -1051,13 +1051,13 @@ Configuration commands can be used to: view the group configuration; -view, modify, or remove an individual server; +view, modify, or remove a server; add a new server. -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 @@ This parameter is mandatory. id=number -Selects an individual server for viewing, modifying, or removing. +Selects a server for viewing, modifying, or removing. remove= -Removes an individual server from the group. +Removes a server from the group. @@ -1196,7 +1196,7 @@ of the directive. 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. @@ -1207,7 +1207,7 @@ For example, to view the configuration o http://127.0.0.1/upstream_conf?upstream=dynamic -To view the configuration of an individual server, also specify its ID: +To view the configuration of a specific server, also specify its ID: http://127.0.0.1/upstream_conf?upstream=dynamic&id=42 diff --git a/xml/ru/docs/http/ngx_http_upstream_module.xml b/xml/ru/docs/http/ngx_http_upstream_module.xml --- a/xml/ru/docs/http/ngx_http_upstream_module.xml +++ b/xml/ru/docs/http/ngx_http_upstream_module.xml @@ -10,7 +10,7 @@ + rev="35">
@@ -1058,7 +1058,7 @@ upstream backend { просматривать или изменять конфигурацию, а также -удалять отдельные серверы; +удалять серверы; добавлять новые серверы. @@ -1095,13 +1095,13 @@ http://127.0.0.1/upstream_conf?upstream= id=число -Выбирает отдельный сервер для просмотра, изменения или удаления. +Выбирает сервер для просмотра, изменения или удаления. remove= -Удаляет выбранный сервер из группы. +Удаляет сервер из группы.