# HG changeset patch
# User Yaroslav Zhuravlev <yar@nginx.com>
# Date 1522264913 -10800
# Node ID b19d5d47c16cbae8dd9651b7a8c1afc99a9c3d7e
# Parent  2de0fcd46928647b777c4ebd63e04a0e46674092
Documented ver.2 of the PROXY protocol.

diff -r 2de0fcd46928 -r b19d5d47c16c xml/en/docs/http/ngx_http_core_module.xml
--- a/xml/en/docs/http/ngx_http_core_module.xml	Tue Mar 27 22:34:08 2018 +0300
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Wed Mar 28 22:21:53 2018 +0300
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_core_module"
         link="/en/docs/http/ngx_http_core_module.html"
         lang="en"
-        rev="76">
+        rev="77">
 
 <section id="directives" name="Directives">
 
@@ -1308,6 +1308,9 @@
 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
 protocol</link>.
+<note>
+The PROXY protocol version 2 is supported since version 1.13.11.
+</note>
 </para>
 
 <para>
diff -r 2de0fcd46928 -r b19d5d47c16c xml/en/docs/stream/ngx_stream_core_module.xml
--- a/xml/en/docs/stream/ngx_stream_core_module.xml	Tue Mar 27 22:34:08 2018 +0300
+++ b/xml/en/docs/stream/ngx_stream_core_module.xml	Wed Mar 28 22:21:53 2018 +0300
@@ -9,7 +9,7 @@
 <module name="Module ngx_stream_core_module"
         link="/en/docs/stream/ngx_stream_core_module.html"
         lang="en"
-        rev="23">
+        rev="24">
 
 <section id="summary">
 
@@ -132,6 +132,9 @@
 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
 protocol</link>.
+<note>
+The PROXY protocol version 2 is supported since version 1.13.11.
+</note>
 </para>
 
 <para>
diff -r 2de0fcd46928 -r b19d5d47c16c xml/ru/docs/http/ngx_http_core_module.xml
--- a/xml/ru/docs/http/ngx_http_core_module.xml	Tue Mar 27 22:34:08 2018 +0300
+++ b/xml/ru/docs/http/ngx_http_core_module.xml	Wed Mar 28 22:21:53 2018 +0300
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_core_module"
         link="/ru/docs/http/ngx_http_core_module.html"
         lang="ru"
-        rev="76">
+        rev="77">
 
 <section id="directives" name="Директивы">
 
@@ -1302,6 +1302,9 @@
 должны использовать
 <link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">протокол
 PROXY</link>.
+<note>
+Протокол PROXY версии 2 поддерживается начиная с версии 1.13.11.
+</note>
 </para>
 
 <para>
diff -r 2de0fcd46928 -r b19d5d47c16c xml/ru/docs/stream/ngx_stream_core_module.xml
--- a/xml/ru/docs/stream/ngx_stream_core_module.xml	Tue Mar 27 22:34:08 2018 +0300
+++ b/xml/ru/docs/stream/ngx_stream_core_module.xml	Wed Mar 28 22:21:53 2018 +0300
@@ -9,7 +9,7 @@
 <module name="Модуль ngx_stream_core_module"
         link="/ru/docs/stream/ngx_stream_core_module.html"
         lang="ru"
-        rev="23">
+        rev="24">
 
 <section id="summary">
 
@@ -132,6 +132,9 @@
 должны использовать
 <link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">протокол
 PROXY</link>.
+<note>
+Протокол PROXY версии 2 поддерживается начиная с версии 1.13.11.
+</note>
 </para>
 
 <para>