# HG changeset patch
# User Ruslan Ermilov <ru@nginx.com>
# Date 1318182687 0
# Node ID 9de85defbcf804f67a69b01731909fbc670bec9a
# Parent  d98323a15ba4bd40d4fbc33eb15fb4f7a4f10c65
- "optimize_server_names" is deprecated in favour of "server_name_in_redirects"
- "resolver" can take hostname as an argument

diff -r d98323a15ba4 -r 9de85defbcf8 xml/en/docs/http/ngx_http_core_module.xml
--- a/xml/en/docs/http/ngx_http_core_module.xml	Sun Oct 09 16:56:56 2011 +0000
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Sun Oct 09 17:51:27 2011 +0000
@@ -1151,7 +1151,7 @@
 
 <para>
 Turning the compression <value>off</value> can become necessary if a URI
-contains base64-encoded names, since base64 uses the "/" character internally.
+contains base64-encoded names, since base64 uses the “/” character internally.
 However, for security considerations, it is better to avoid turning off
 the compression.
 </para>
@@ -1196,10 +1196,10 @@
 
 
 <directive name="open_file_cache">
+<syntax>open_file_cache <value>off</value></syntax>
 <syntax>open_file_cache
 <parameter>max</parameter>=<argument>N</argument>
-[<parameter>inactive</parameter>=<argument>time</argument>] |
-<value>off</value>
+[<parameter>inactive</parameter>=<argument>time</argument>]
 </syntax>
 <default>open_file_cache off</default>
 <context>http</context>
@@ -1219,7 +1219,7 @@
 </listitem>
 
 <listitem>
-file lookup errors, such as "file not found", "no read permission",
+file lookup errors, such as “file not found”, “no read permission”,
 and so on.
 Caching of errors should be enabled separately by the
 <link id="open_file_cache_errors">open_file_cache_errors</link>
@@ -1245,7 +1245,7 @@
 <parameter>inactive</parameter>
 </tag-name>
 <tag-desc>
-defines a time, after which the element gets removed from the cache
+defines a time, after which an element gets removed from the cache
 if there were no accesses to it during this time;
 by default, it is 60 seconds;
 </tag-desc>
@@ -1284,7 +1284,7 @@
 <context>location</context>
 
 <para>
-Enables or disables caching of file lookup errors by the
+Enables or disables caching of file lookup errors by
 <link id="open_file_cache">open_file_cache</link>.
 </para>
 
@@ -1337,7 +1337,7 @@
 
 <directive name="open_file_cache_valid">
 <syntax>open_file_cache_valid <argument>time</argument></syntax>
-<default>open_file_cache_valid 60</default>
+<default>open_file_cache_valid 60s</default>
 <context>http</context>
 <context>server</context>
 <context>location</context>
@@ -1364,9 +1364,11 @@
 <context>server</context>
 
 <para>
-This directive is obsolete.
+This directive is made obsolete by the
+<link id="server_name_in_redirect">server_name_in_redirect</link> directive.
 </para>
 
+<!--
 <para>
 Enables or disables optimization of hostname checking in name-based
 virtual servers.
@@ -1378,6 +1380,7 @@
 In case redirects should use hostnames sent by clients,
 optimization needs to be disabled.
 </para>
+-->
 
 </directive>
 
@@ -1479,6 +1482,8 @@
 <example>
 resolver 127.0.0.1;
 </example>
+An <argument>address</argument> may also be a hostname, in which case
+the first resolved address is used.
 </para>
 
 </directive>
@@ -1576,7 +1581,7 @@
 
 <directive name="send_timeout">
 <syntax>send_timeout <argument>time</argument></syntax>
-<default>send_timeout 60</default>
+<default>send_timeout 60s</default>
 <context>http</context>
 <context>server</context>
 <context>location</context>