diff xml/en/docs/http/ngx_http_core_module.xml @ 527:58d79f8c412d

Documented 1.3.1 changes in "resolver".
author Ruslan Ermilov <ru@nginx.com>
date Tue, 05 Jun 2012 22:11:50 +0000
parents ef11546f75ee
children d8c7160527ae
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml	Tue Jun 05 21:42:57 2012 +0000
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Tue Jun 05 22:11:50 2012 +0000
@@ -1845,22 +1845,28 @@
 <context>location</context>
 
 <para>
-Configures name servers used to resolve names of upstream servers,
-for example:
+Configures name servers used to resolve names of upstream servers
+into addresses, for example:
 <example>
-resolver 127.0.0.1 192.0.2.1;
+resolver 127.0.0.1 [::1]:5353;
 </example>
-An <value>address</value> parameter may be specified as
-either an IPv4 address or a hostname;
-in the latter case, the first resolved IPv4 address is used.
+An address can be specified as a domain name or IP address,
+and an optional port (1.3.1).
+<!--
+If address is specified using a domain name, only the first
+resolved IPv4 address is used.
+-->
+If port is not specified, the port 53 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.
+Specifying name servers using IPv6 addresses is supported
+starting from version 1.3.1.
 </note>
 By default, nginx caches answers using the TTL value of a response.
 An optional <literal>valid</literal> parameter allows to override it:
 <example>
-resolver 127.0.0.1 192.0.2.1 valid=30s;
+resolver 127.0.0.1 [::1]:5353 valid=30s;
 </example>
 <note>
 Before version 1.1.9, tuning of caching time was not possible,