# HG changeset patch
# User Yaroslav Zhuravlev <yar@nginx.com>
# Date 1442494489 -10800
# Node ID 695999bdd4a5f8c4bd585417274fbd9d535d654c
# Parent  0ca33afb461bdd8ae45fb18d91d40ee74128bd72
Updated description of http2 parameter, translated into Russian.

diff --git a/xml/en/docs/http/ngx_http_core_module.xml b/xml/en/docs/http/ngx_http_core_module.xml
--- a/xml/en/docs/http/ngx_http_core_module.xml
+++ b/xml/en/docs/http/ngx_http_core_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_core_module"
         link="/en/docs/http/ngx_http_core_module.html"
         lang="en"
-        rev="46">
+        rev="47">
 
 <section id="directives" name="Directives">
 
@@ -1118,7 +1118,7 @@ The “wait-read-ignore” cycle is repeated, but no longer than specified by the
     <value>address</value>[:<value>port</value>]
     [<literal>default_server</literal>]
     [<literal>ssl</literal>]
-    [<literal>spdy</literal> | <literal>http2</literal>]
+    [<literal>http2</literal> | <literal>spdy</literal>]
     [<literal>proxy_protocol</literal>]
     [<literal>setfib</literal>=<value>number</value>]
     [<literal>fastopen</literal>=<value>number</value>]
@@ -1135,7 +1135,7 @@ The “wait-read-ignore” cycle is repeated, but no longer than specified by the
     <value>port</value>
     [<literal>default_server</literal>]
     [<literal>ssl</literal>]
-    [<literal>spdy</literal> | <literal>http2</literal>]
+    [<literal>http2</literal> | <literal>spdy</literal>]
     [<literal>proxy_protocol</literal>]
     [<literal>setfib</literal>=<value>number</value>]
     [<literal>fastopen</literal>=<value>number</value>]
@@ -1152,7 +1152,7 @@ The “wait-read-ignore” cycle is repeated, but no longer than specified by the
     <literal>unix:</literal><value>path</value>
     [<literal>default_server</literal>]
     [<literal>ssl</literal>]
-    [<literal>spdy</literal> | <literal>http2</literal>]
+    [<literal>http2</literal> | <literal>spdy</literal>]
     [<literal>proxy_protocol</literal>]
     [<literal>backlog</literal>=<value>number</value>]
     [<literal>rcvbuf</literal>=<value>size</value>]
@@ -1223,7 +1223,21 @@ handles both HTTP and HTTPS requests.
 </para>
 
 <para>
-The <literal>spdy</literal> parameter (1.3.15) allows accepting
+The <literal>http2</literal> parameter (1.9.5) configures the port to accept
+<link doc="ngx_http_v2_module.xml">HTTP/2</link> connections.
+Normally, for this to work the <literal>ssl</literal> parameter should be
+specified as well, but nginx can also be configured to accept HTTP/2
+connections without SSL.
+<note>
+The <literal>http2</literal> parameter is also available in the
+<literal>nginx-plus-http2</literal> package (NGINX Plus release 7).
+Since HTTP/2 supersedes SPDY, the <literal>nginx-plus-http2</literal>
+package does not support the <literal>spdy</literal> parameter.
+</note>
+</para>
+
+<para>
+The <literal>spdy</literal> parameter (1.3.15-1.9.4) allows accepting
 <link doc="ngx_http_spdy_module.xml">SPDY</link> connections on this port.
 Normally, for this to work the <literal>ssl</literal> parameter should be
 specified as well, but nginx can also be configured to accept SPDY
@@ -1231,20 +1245,6 @@ connections without SSL.
 </para>
 
 <para>
-The <literal>http2</literal> parameter configures the port to accept
-HTTP/2 connections.
-Normally, for this to work the <literal>ssl</literal> parameter should be
-specified as well, but nginx can also be configured to accept HTTP/2
-connections without SSL.
-<note>
-The <literal>http2</literal> parameter is only available in the
-<literal>nginx-plus-http2</literal> package (NGINX Plus release 7).
-Since HTTP/2 supersedes SPDY, the <literal>nginx-plus-http2</literal>
-package does not support the <literal>spdy</literal> parameter.
-</note>
-</para>
-
-<para>
 The <literal>proxy_protocol</literal> parameter (1.5.12)
 allows specifying that all connections accepted on this port should use the
 <link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">PROXY
diff --git a/xml/ru/docs/http/ngx_http_core_module.xml b/xml/ru/docs/http/ngx_http_core_module.xml
--- a/xml/ru/docs/http/ngx_http_core_module.xml
+++ b/xml/ru/docs/http/ngx_http_core_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_core_module"
         link="/ru/docs/http/ngx_http_core_module.html"
         lang="ru"
-        rev="45">
+        rev="47">
 
 <section id="directives" name="Директивы">
 
@@ -1113,7 +1113,7 @@ location /flv/ {
     <value>адрес</value>[:<value>порт</value>]
     [<literal>default_server</literal>]
     [<literal>ssl</literal>]
-    [<literal>spdy</literal>]
+    [<literal>http2</literal> | <literal>spdy</literal>]
     [<literal>proxy_protocol</literal>]
     [<literal>setfib</literal>=<value>число</value>]
     [<literal>fastopen</literal>=<value>число</value>]
@@ -1130,7 +1130,7 @@ location /flv/ {
     <value>порт</value>
     [<literal>default_server</literal>]
     [<literal>ssl</literal>]
-    [<literal>spdy</literal>]
+    [<literal>http2</literal> | <literal>spdy</literal>]
     [<literal>proxy_protocol</literal>]
     [<literal>setfib</literal>=<value>число</value>]
     [<literal>fastopen</literal>=<value>число</value>]
@@ -1147,7 +1147,7 @@ location /flv/ {
     <literal>unix:</literal><value>путь</value>
     [<literal>default_server</literal>]
     [<literal>ssl</literal>]
-    [<literal>spdy</literal>]
+    [<literal>http2</literal> | <literal>spdy</literal>]
     [<literal>proxy_protocol</literal>]
     [<literal>backlog</literal>=<value>число</value>]
     [<literal>rcvbuf</literal>=<value>размер</value>]
@@ -1216,7 +1216,21 @@ id="single_http_https_server">конфигурацию</link> для сервера,
 </para>
 
 <para>
-Параметр <literal>spdy</literal> (1.3.15) позволяет принимать на этом порту
+Параметр <literal>http2</literal> (1.9.5) позволяет принимать на этом порту
+<link doc="ngx_http_v2_module.xml">HTTP/2</link>-соединения.
+Обычно, чтобы это работало, следует также указать параметр
+<literal>ssl</literal>, однако nginx можно также настроить и на приём
+HTTP/2-соединений без SSL.
+<note>
+Параметр <literal>http2</literal> также доступен в пакете
+<literal>nginx-plus-http2</literal> (NGINX Plus release 7).
+Так как HTTP/2 заменяет SPDY, пакет <literal>nginx-plus-http2</literal>
+не поддерживает параметр <literal>spdy</literal>.
+</note>
+</para>
+
+<para>
+Параметр <literal>spdy</literal> (1.3.15-1.9.4) позволяет принимать на этом порту
 <link doc="ngx_http_spdy_module.xml">SPDY</link>-соединения.
 Обычно, чтобы это работало, следует также указать параметр
 <literal>ssl</literal>, однако nginx можно также настроить и на приём