Mercurial > hg > nginx-site
changeset 1386:d796c95f0922
Relocated the max_conns parameter in upstream_conf.
| author | Yaroslav Zhuravlev <yar@nginx.com> |
|---|---|
| date | Mon, 12 Jan 2015 13:39:02 +0300 |
| parents | f08ae1f79000 |
| children | afe06879971a |
| files | xml/en/docs/http/ngx_http_upstream_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml |
| diffstat | 2 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml Mon Jan 12 12:03:09 2015 +0300 +++ b/xml/en/docs/http/ngx_http_upstream_module.xml Mon Jan 12 13:39:02 2015 +0300 @@ -1139,6 +1139,13 @@ </tag-desc> <tag-name> +<literal>max_conns=</literal><value>number</value></tag-name> +<tag-desc> +Same as the “<literal>max_conns</literal>” parameter +of the <link id="server"/> directive. +</tag-desc> + +<tag-name> <literal>max_fails=</literal><value>number</value></tag-name> <tag-desc> Same as the “<literal>max_fails</literal>” parameter @@ -1153,13 +1160,6 @@ </tag-desc> <tag-name> -<literal>max_conns=</literal><value>number</value></tag-name> -<tag-desc> -Same as the “<literal>max_conns</literal>” parameter -of the <link id="server"/> directive. -</tag-desc> - -<tag-name> <literal>slow_start=</literal><value>time</value></tag-name> <tag-desc> Same as the “<literal>slow_start</literal>” parameter
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml Mon Jan 12 12:03:09 2015 +0300 +++ b/xml/ru/docs/http/ngx_http_upstream_module.xml Mon Jan 12 13:39:02 2015 +0300 @@ -1146,6 +1146,13 @@ </tag-desc> <tag-name> +<literal>max_conns=</literal><value>число</value></tag-name> +<tag-desc> +То же, что и параметр “<literal>max_conns</literal>” +директивы <link id="server"/>. +</tag-desc> + +<tag-name> <literal>max_fails=</literal><value>число</value></tag-name> <tag-desc> То же, что и параметр “<literal>max_fails</literal>” @@ -1160,13 +1167,6 @@ </tag-desc> <tag-name> -<literal>max_conns=</literal><value>число</value></tag-name> -<tag-desc> -То же, что и параметр “<literal>max_conns</literal>” -директивы <link id="server"/>. -</tag-desc> - -<tag-name> <literal>slow_start=</literal><value>время</value></tag-name> <tag-desc> То же, что и параметр “<literal>slow_start</literal>”