# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1332942670 0
# Node ID 5efd5404094f2c16ebfc9b5de39f0225e094eb59
# Parent  8275e169f77b151585ace37750c55c97fc58790e
nginx-1.1.18

diff --git a/text/en/CHANGES b/text/en/CHANGES
--- a/text/en/CHANGES
+++ b/text/en/CHANGES
@@ -1,4 +1,27 @@
 
+Changes with nginx 1.1.18                                        28 Mar 2012
+
+    *) Change: keepalive connections are no longer disabled for Safari by
+       default.
+
+    *) Feature: the $connection_requests variable.
+
+    *) Feature: $tcpinfo_rtt, $tcpinfo_rttvar, $tcpinfo_snd_cwnd and
+       $tcpinfo_rcv_space variables.
+
+    *) Feature: the "worker_cpu_affinity" directive now works on FreeBSD.
+
+    *) Feature: the "xslt_param" and "xslt_string_param" directives.
+       Thanks to Samuel Behan.
+
+    *) Bugfix: in configure tests.
+       Thanks to Piotr Sikora.
+
+    *) Bugfix: in the ngx_http_xslt_filter_module.
+
+    *) Bugfix: nginx could not be built on Debian GNU/Hurd.
+
+
 Changes with nginx 1.1.17                                        15 Mar 2012
 
     *) Security: content of previously freed memory might be sent to a
diff --git a/text/ru/CHANGES.ru b/text/ru/CHANGES.ru
--- a/text/ru/CHANGES.ru
+++ b/text/ru/CHANGES.ru
@@ -1,4 +1,27 @@
 
+Изменения в nginx 1.1.18                                          28.03.2012
+
+    *) Изменение: теперь keepalive соединения не запрещены для Safari по
+       умолчанию.
+
+    *) Добавление: переменная $connection_requests.
+
+    *) Добавление: переменные $tcpinfo_rtt, $tcpinfo_rttvar,
+       $tcpinfo_snd_cwnd и $tcpinfo_rcv_space.
+
+    *) Добавление: директива worker_cpu_affinity теперь работает на FreeBSD.
+
+    *) Добавление: директивы xslt_param и xslt_string_param.
+       Спасибо Samuel Behan.
+
+    *) Исправление: в configure.
+       Спасибо Piotr Sikora.
+
+    *) Исправление: в модуле ngx_http_xslt_filter_module.
+
+    *) Исправление: nginx не собирался на Debian GNU/Hurd.
+
+
 Изменения в nginx 1.1.17                                          15.03.2012
 
     *) Безопасность: содержимое ранее освобождённой памяти могло быть
diff --git a/xml/en/download.xml b/xml/en/download.xml
--- a/xml/en/download.xml
+++ b/xml/en/download.xml
@@ -9,6 +9,7 @@
 
 <download last="1" changes="CHANGES">
 
+<item ver="1.1.18" pgp="yes" win="yes" />
 <item ver="1.1.17" pgp="yes" win="yes" />
 <item ver="1.1.16" pgp="yes" win="yes" />
 <item ver="1.1.15" pgp="yes" win="yes" />
diff --git a/xml/index.xml b/xml/index.xml
--- a/xml/index.xml
+++ b/xml/index.xml
@@ -2,6 +2,13 @@
 
 <news name="nginx news" link="/" lang="en">
 
+<event date="2012-03-28">
+<para>
+<link doc="en/download.xml">nginx-1.1.18</link>
+development version has been released.
+</para>
+</event>
+
 <event date="2012-03-15">
 <para>
 <link doc="en/download.xml">nginx-1.0.14</link>
diff --git a/xml/ru/download.xml b/xml/ru/download.xml
--- a/xml/ru/download.xml
+++ b/xml/ru/download.xml
@@ -9,6 +9,7 @@
 
 <download last="1" changes="CHANGES.ru">
 
+<item ver="1.1.18" pgp="yes" win="yes" />
 <item ver="1.1.17" pgp="yes" win="yes" />
 <item ver="1.1.16" pgp="yes" win="yes" />
 <item ver="1.1.15" pgp="yes" win="yes" />
diff --git a/xml/versions.xml b/xml/versions.xml
--- a/xml/versions.xml
+++ b/xml/versions.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE versions SYSTEM "../dtd/versions.dtd">
 
 <versions>
-<development> 1.1.17 </development>
+<development> 1.1.18 </development>
 <stable> 1.0.14 </stable>
 <legacy_stable> 0.8.55 </legacy_stable>
 </versions>