Updated Changelog for 2.1.4

Changelog

@@ -5,6 +5,38 @@
 .. contents::
     :local:
 
+.. _version-2.1.4:
+
+2.1.4
+=====
+:release-data: TBA
+
+.. _v214-fixes:
+
+* Error email body now uses `repr(exception)` instead of `str(exception)`,
+  as the latter could result in Unicode decode errors (Issue #245).
+
+* Error e-mail timeout value is now configurable by using the
+  :setting:`EMAIL_TIMEOUT` setting.
+
+* `celeryev`: Now works on Windows (but the curses monitor won't work without
+  having curses).
+
+* Unit test output no longer emits non-standard characters.
+
+* `celeryd`: The broadcast consumer is now closed if the connection is reset.
+
+.. _v214-documentation:
+
+* Adding :ref:`contributing`.
+
+* Added :ref:`guide-optimizing`.
+
+* Added :ref:`faq-security` section to the FAQ.
+
+* Periodic Task User Guide: Fixed typo in crontab example table (Issue #239).
+
+
 .. _version-2.1.3:
 
 2.1.3

docs/configuration.rst

@@ -896,6 +896,8 @@ george@vandelay.com and kramer@vandelay.com:
     # EMAIL_HOST_USER = "servers"
     # EMAIL_HOST_PASSWORD = "s3cr3t"
 
+    EMAIL_TIMEOUT = 2   # two seconds is the default
+
 .. _conf-events:
 
 Events