Mercurial > hg > nginx-site

changeset 442:b423d725a932

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try to emphasize that "underscores_in_headers" and "merge_slashes", when specified on the "server" level, only take effect when this is the default server for a listening socket.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 07 Mar 2012 19:44:27 +0000
parents 0b6333a9f8af
children 1b2264bdd433
files xml/en/docs/http/ngx_http_core_module.xml xml/ru/docs/http/ngx_http_core_module.xml
diffstat 2 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml	Mon Mar 05 15:43:52 2012 +0000
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Wed Mar 07 19:44:27 2012 +0000
@@ -1458,10 +1458,10 @@
 </para>
 
 <para>
-If a directive is specified on the
-<link id="server"/>
-level, which is also a default server, its value will cover
-all virtual servers listening on the same address and port.
+A directive can be specified on the <link id="server"/> level
+in a default server.
+In this case, its value will cover all virtual servers
+listening on the same address and port.
 </para>
 
 </directive>
@@ -2517,10 +2517,10 @@
 </para>
 
 <para>
-If a directive is specified on the
-<link id="server"/>
-level, which is also a default server, its value will cover
-all virtual servers listening on the same address and port.
+A directive can be specified on the <link id="server"/> level
+in a default server.
+In this case, its value will cover all virtual servers
+listening on the same address and port.
 </para>
 
 </directive>
--- a/xml/ru/docs/http/ngx_http_core_module.xml	Mon Mar 05 15:43:52 2012 +0000
+++ b/xml/ru/docs/http/ngx_http_core_module.xml	Wed Mar 07 19:44:27 2012 +0000
@@ -1447,10 +1447,10 @@
 </para>
 
 <para>
-Если директива указана на уровне
-<link id="server"/>
-в сервере по умолчанию, то её значение распространяется на
-все виртуальные серверы, слушающие на том же адресе и порту.
+Директива может быть указана на уровне <link id="server"/>
+в сервере по умолчанию.
+В этом случае её значение распространяется на все виртуальные серверы,
+слушающие на том же адресе и порту.
 </para>
 
 </directive>