diff xml/en/docs/http/ngx_http_upstream_module.xml @ 1367:f1e14d87d833

Updated commercial docs for the upcoming release.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 01 Dec 2014 13:40:25 +0300
parents 5e45198fa991
children f08ae1f79000
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml
+++ b/xml/en/docs/http/ngx_http_upstream_module.xml
@@ -320,7 +320,7 @@ This directive is available as part of o
 
 <para>
 Specifies a load balancing method for a server group
-where client-server mapping is based on the hashed <value>key</value> value.
+where the client-server mapping is based on the hashed <value>key</value> value.
 The <value>key</value> can contain text, variables, and their combinations.
 Note that adding or removing a server from the group
 may result in remapping most of the keys to different servers.
@@ -330,9 +330,9 @@ Perl library.
 </para>
 
 <para>
-The <literal>consistent</literal> parameter specifies that
+If the <literal>consistent</literal> parameter is specified
 the <link url="http://www.last.fm/user/RJ/journal/2007/04/10/392555/">ketama</link>
-consistent hashing method should be used instead.
+consistent hashing method will be used instead.
 The method ensures that only a few keys
 will be remapped to different servers
 when a server is added to or removed from the group.
@@ -1166,6 +1166,13 @@ Same as the “<literal>down</literal>” parameter
 of the <link id="server"/> directive.
 </tag-desc>
 
+<tag-name id="drain"><literal>drain=</literal></tag-name>
+<tag-desc>
+Puts the upstream server in the “draining” mode (1.7.5).
+In this mode, only requests <link id="sticky">bound</link> to the server
+will be proxied to it.
+</tag-desc>
+
 <tag-name>
 <literal>up=</literal></tag-name>
 <tag-desc>