From bd13cfa917d3cc4dc854fc0d486adcb45f5b551a Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Mon, 13 Feb 2012 20:57:44 +0000
Subject: [PATCH] Added a note to the release notes about the new format
 strings added in r17473.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/ref/templates/builtins.txt |  4 ++++
 docs/releases/1.4-beta-1.txt    | 22 ++++++++++++++++++++++
 docs/releases/1.4.txt           | 22 ++++++++++++++++++++++
 docs/topics/i18n/formatting.txt |  2 ++
 4 files changed, 50 insertions(+)

diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 0bc293dcd9..1efc3e2621 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1361,6 +1361,10 @@ Z                 Time zone offset in seconds. The          ``-43200`` to ``4320
 
 The ``c`` and ``u`` format specification characters were added in Django 1.2.
 
+.. versionadded:: 1.4
+
+The ``e`` and ``o`` format specification characters were added in Django 1.4.
+
 For example::
 
     {{ value|date:"D d M Y" }}
diff --git a/docs/releases/1.4-beta-1.txt b/docs/releases/1.4-beta-1.txt
index 52f265181a..a955b39785 100644
--- a/docs/releases/1.4-beta-1.txt
+++ b/docs/releases/1.4-beta-1.txt
@@ -502,6 +502,28 @@ Time zone support is enabled by default in new projects created with
 :djadmin:`startproject`. If you want to use this feature in an existing
 project, there is a :ref:`migration guide <time-zones-migration-guide>`.
 
+Two new date format strings
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Two new :tfilter:`date` formats for use in template filters, template tags
+and :ref:`format-localization`:
+
+- ``e`` -- the name of the timezone of the given datetime object
+- ``o`` -- the ISO 8601 year number
+
+Please make sure to update your :ref:`custom format files
+<custom-format-files>` if they contain either ``e`` or ``o`` in a format
+string. For example a Spanish localization format previously only escaped the
+``d`` format character::
+
+  DATE_FORMAT = r'j \de F \de Y'
+
+But now it needs to also escape ``e`` and ``o``::
+
+  DATE_FORMAT = r'j \d\e F \d\e Y'
+
+For more information, see the :tfilter:`date` documentation.
+
 Minor features
 ~~~~~~~~~~~~~~
 
diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt
index 76e67306aa..b44446784b 100644
--- a/docs/releases/1.4.txt
+++ b/docs/releases/1.4.txt
@@ -490,6 +490,28 @@ the ``html=True`` flag with
 client's response contains a given HTML fragment. See the :ref:`assertion
 documentation<assertions>` for more.
 
+Two new date format strings
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Two new :tfilter:`date` formats for use in template filters, template tags
+and :ref:`format-localization`:
+
+- ``e`` -- the name of the timezone of the given datetime object
+- ``o`` -- the ISO 8601 year number
+
+Please make sure to update your :ref:`custom format files
+<custom-format-files>` if they contain either ``e`` or ``o`` in a format
+string. For example a Spanish localization format previously only escaped the
+``d`` format character::
+
+  DATE_FORMAT = r'j \de F \de Y'
+
+But now it needs to also escape ``e`` and ``o``::
+
+  DATE_FORMAT = r'j \d\e F \d\e Y'
+
+For more information, see the :tfilter:`date` documentation.
+
 Minor features
 ~~~~~~~~~~~~~~
 
diff --git a/docs/topics/i18n/formatting.txt b/docs/topics/i18n/formatting.txt
index 4c80786edc..531e6c0b7c 100644
--- a/docs/topics/i18n/formatting.txt
+++ b/docs/topics/i18n/formatting.txt
@@ -149,6 +149,8 @@ To force localization of a single value, use :tfilter:`localize`. To
 control localization over a large section of a template, use the
 :ttag:`localize` template tag.
 
+.. _custom-format-files:
+
 Creating custom format files
 ============================