diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 6 | ||||
| -rw-r--r-- | docs/ref/contrib/localflavor.txt | 10 |
2 files changed, 10 insertions, 6 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 diff --git a/docs/ref/contrib/localflavor.txt b/docs/ref/contrib/localflavor.txt index 4935382093..f6dab64217 100644 --- a/docs/ref/contrib/localflavor.txt +++ b/docs/ref/contrib/localflavor.txt @@ -123,7 +123,7 @@ Here's an example of how to use them:: .. _Sweden: `Sweden (se)`_ .. _Switzerland: `Switzerland (ch)`_ .. _Turkey: `Turkey (tr)`_ -.. _United Kingdom: `United Kingdom (uk)`_ +.. _United Kingdom: `United Kingdom (gb)`_ .. _United States of America: `United States of America (us)`_ .. _Uruguay: `Uruguay (uy)`_ @@ -1054,20 +1054,20 @@ Turkey (``tr``) A ``select`` widget that uses a list of Turkish provinces as its choices. -United Kingdom (``uk``) +United Kingdom (``gb``) ======================= -.. class:: uk.forms.UKPostcodeField +.. class:: gb.forms.GBPostcodeField A form field that validates input as a UK postcode. The regular expression used is sourced from the schema for British Standard BS7666 address types at http://www.cabinetoffice.gov.uk/media/291293/bs7666-v2-0.xml. -.. class:: uk.forms.UKCountySelect +.. class:: gb.forms.GBCountySelect A ``Select`` widget that uses a list of UK counties/regions as its choices. -.. class:: uk.forms.UKNationSelect +.. class:: gb.forms.GBNationSelect A ``Select`` widget that uses a list of UK nations as its choices. |