summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
Diffstat (limited to 'docs/internals')
-rw-r--r--docs/internals/deprecation.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index a38823f409..98b2138bc1 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -175,7 +175,6 @@ their deprecation, as per the :ref:`Django deprecation policy
combine paths in templates.
* 1.6
-
* The compatibility modules ``django.utils.copycompat`` and
``django.utils.hashcompat`` as well as the functions
``django.utils.itercompat.all`` and ``django.utils.itercompat.any``
@@ -195,6 +194,11 @@ their deprecation, as per the :ref:`Django deprecation policy
is now an alias for :class:`~django.core.cache.backends.memcached.MemcachedCache`.
In Django 1.6, the historical alias will be removed.
+ * The UK-prefixed objects of ``django.contrib.localflavor.uk`` will only
+ be accessible through their new GB-prefixed names (GB is the correct
+ ISO 3166 code for United Kingdom). They have been depreacted since the
+ 1.4 release.
+
* 2.0
* ``django.views.defaults.shortcut()``. This function has been moved
to ``django.contrib.contenttypes.views.shortcut()`` as part of the