From d3b1687e0386b2e82322d38bab96dea6515fd057 Mon Sep 17 00:00:00 2001
From: benoitc <bchesneau@gmail.com>
Date: Wed, 28 Aug 2013 00:31:27 +0200
Subject: [PATCH] update the changes

---
 docs/site/index.html      |  2 +-
 docs/source/2013-news.rst | 23 +++++++++++++++++++++++
 docs/source/news.rst      | 23 +++++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docs/site/index.html b/docs/site/index.html
index 600056ea..f3f1bfce 100644
--- a/docs/site/index.html
+++ b/docs/site/index.html
@@ -16,7 +16,7 @@
     <div class="logo-div">
       <div class="latest">
         Latest version: <strong><a
-            href="http://docs.gunicorn.org/en/latest/news.html#id1">17.5</a></strong>
+            href="http://docs.gunicorn.org/en/18.0/news.html#id1">18.0</a></strong>
       </div>
 
       <div class="logo"><img src="images/logo.jpg" ></div>
diff --git a/docs/source/2013-news.rst b/docs/source/2013-news.rst
index 454d1231..10b74db5 100644
--- a/docs/source/2013-news.rst
+++ b/docs/source/2013-news.rst
@@ -1,6 +1,29 @@
 Changelog - 2013
 ================
 
+18.0 / 2013-08-26
+-----------------
+
+- new: add ``-e/--env`` command line argument to pass an environement variables to
+  gunicorn
+- new: add ``--chdir`` command line argument to specified directory
+  before apps loading.  - new: add wsgi.file_wrapper support in async workers
+- new: add ``--paste`` command line argument to set the paster config file
+- deprecated: the command ``gunicorn_django`` is now deprecated. You should now
+  run your application with the WSGI interface installed with your project (see
+  https://docs.djangoproject.com/en/1.4/howto/deployment/wsgi/gunicorn/) for
+  more infos.
+- deprecated:  the command ``gunicorn_paste`` is deprecated. You now should use
+  the new ``--paste`` argument to set the configuration file of your paster
+  application.
+- fix: Removes unmatched leading quote from the beginning of the default access
+  log format string
+- fix: null timeout
+- fix: gevent worker
+- fix: don't reloead the paster app when using pserve
+- fix: after closing for error do not keep alive the connection
+- fix: responses 1xx, 204 and 304 should not force the connection to be closed
+
 17.5 / 2013-07-03
 ------------------
 
diff --git a/docs/source/news.rst b/docs/source/news.rst
index 948daef5..ce472c69 100644
--- a/docs/source/news.rst
+++ b/docs/source/news.rst
@@ -1,6 +1,29 @@
 Changelog
 =========
 
+18.0 / 2013-08-26
+-----------------
+
+- new: add ``-e/--env`` command line argument to pass an environement variables to
+  gunicorn
+- new: add ``--chdir`` command line argument to specified directory
+  before apps loading.  - new: add wsgi.file_wrapper support in async workers
+- new: add ``--paste`` command line argument to set the paster config file
+- deprecated: the command ``gunicorn_django`` is now deprecated. You should now
+  run your application with the WSGI interface installed with your project (see
+  https://docs.djangoproject.com/en/1.4/howto/deployment/wsgi/gunicorn/) for
+  more infos.
+- deprecated:  the command ``gunicorn_paste`` is deprecated. You now should use
+  the new ``--paste`` argument to set the configuration file of your paster
+  application.
+- fix: Removes unmatched leading quote from the beginning of the default access
+  log format string
+- fix: null timeout
+- fix: gevent worker
+- fix: don't reloead the paster app when using pserve
+- fix: after closing for error do not keep alive the connection
+- fix: responses 1xx, 204 and 304 should not force the connection to be closed
+
 17.5 / 2013-07-03
 ------------------