# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1587479888 -10800
# Node ID 8cc141e0460f221fce78abe97654ecb9aaf84c32
# Parent  cb25aefb6b8bd17c24ddab44a96caf88bf9d0766
nginx-1.18.0

diff --git a/text/en/CHANGES b/text/en/CHANGES-1.18
copy from text/en/CHANGES
copy to text/en/CHANGES-1.18
--- a/text/en/CHANGES
+++ b/text/en/CHANGES-1.18
@@ -1,4 +1,9 @@
 
+Changes with nginx 1.18.0                                        21 Apr 2020
+
+    *) 1.18.x stable branch.
+
+
 Changes with nginx 1.17.10                                       14 Apr 2020
 
     *) Feature: the "auth_delay" directive.
diff --git a/text/ru/CHANGES.ru b/text/ru/CHANGES.ru-1.18
copy from text/ru/CHANGES.ru
copy to text/ru/CHANGES.ru-1.18
--- a/text/ru/CHANGES.ru
+++ b/text/ru/CHANGES.ru-1.18
@@ -1,4 +1,9 @@
 
+Изменения в nginx 1.18.0                                          21.04.2020
+
+    *) Стабильная ветка 1.18.x.
+
+
 Изменения в nginx 1.17.10                                         14.04.2020
 
     *) Добавление: директива auth_delay.
diff --git a/xml/index.xml b/xml/index.xml
--- a/xml/index.xml
+++ b/xml/index.xml
@@ -7,6 +7,29 @@
 
 <news name="nginx news" link="/" lang="en">
 
+<event date="2020-04-21">
+<para>
+<link doc="en/download.xml">nginx-1.18.0</link>
+stable version has been released,
+incorporating new features and bug fixes from the 1.17.x mainline branch -
+including
+the dry run mode in
+<link doc="en/docs/http/ngx_http_limit_req_module.xml" id="limit_req_dry_run">limit_req</link>
+and
+<link doc="en/docs/http/ngx_http_limit_conn_module.xml" id="limit_conn_dry_run">limit_conn</link>,
+variables support in the
+<link doc="en/docs/http/ngx_http_core_module.xml" id="limit_rate">limit_rate</link>,
+<link doc="en/docs/http/ngx_http_core_module.xml" id="limit_rate_after">limit_rate_after</link>,
+and
+<link doc="en/docs/http/ngx_http_grpc_module.xml" id="grpc_pass">grpc_pass</link>
+directives,
+the
+<link doc="en/docs/http/ngx_http_core_module.xml" id="auth_delay">auth_delay</link>
+directive,
+and more.
+</para>
+</event>
+
 <event date="2020-04-16">
 <para>
 <link url="https://unit.nginx.org/">unit-1.17.0</link> version has been
diff --git a/xml/versions.xml b/xml/versions.xml
--- a/xml/versions.xml
+++ b/xml/versions.xml
@@ -10,6 +10,14 @@
 <download tag="mainline" changes="">
 
 <item ver="1.17.10" />
+
+</download>
+
+
+<download tag="stable" changes="1.18">
+
+<item ver="1.18.0" />
+<item ver="1.17.10" />
 <item ver="1.17.9" />
 <item ver="1.17.8" />
 <item ver="1.17.7" />
@@ -24,7 +32,7 @@
 </download>
 
 
-<download tag="stable" changes="1.16">
+<download tag="legacy" changes="1.16">
 
 <item ver="1.16.1" />
 <item ver="1.16.0" />