# HG changeset patch
# User Ruslan Ermilov <ru@nginx.com>
# Date 1319540876 0
# Node ID 370cf5ccd3ca1723b3b5eb288f23d3ae57fc68ee
# Parent  568b4e77c0d0af244129c3790f2abae7618caf18
The "resolver" directive now allows specifying multiple name servers.

diff -r 568b4e77c0d0 -r 370cf5ccd3ca xml/en/docs/http/ngx_http_core_module.xml
--- a/xml/en/docs/http/ngx_http_core_module.xml	Tue Oct 25 10:18:11 2011 +0000
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Tue Oct 25 11:07:56 2011 +0000
@@ -1471,19 +1471,25 @@
 
 
 <directive name="resolver">
-<syntax><argument>address</argument></syntax>
+<syntax><argument>address</argument> ...</syntax>
 <default/>
 <context>http</context>
 <context>server</context>
 <context>location</context>
 
 <para>
-Sets the <argument>address</argument> of a name server, for example:
+Configures name servers used to resolve upstream server names,
+for example:
 <example>
-resolver 127.0.0.1;
+resolver 127.0.0.1 192.0.2.1;
 </example>
-An <argument>address</argument> may also be a hostname, in which case
-the first resolved address is used.
+An <argument>address</argument> argument may be specified as
+either an IPv4 address or a hostname;
+in the latter case, the first resolved IPv4 address is used.
+Name servers are queried in a round-robin fashion.
+<note>
+Before version 1.1.7, only a single name server could be configured.
+</note>
 </para>
 
 </directive>