summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-03-01 18:08:50 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-03-01 18:08:50 +0100
commit3273bd7b254680a5b241e2fdbc3196956b2b44e8 (patch)
tree818be1016cf0527aa38888151778bfd59fcd9012 /docs/internals
parent8c98f39624a60c63a16e097b64e5f71ecc27271f (diff)
parent775975f15d7d461c154e558cba5fb0592539126f (diff)
Merge pull request #2382 from erikr/deprecate-fix-ampersands
Fixed #22130 -- Deprecated fix_ampersands and clean_html.
Diffstat (limited to 'docs/internals')
-rw-r--r--docs/internals/deprecation.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index f64cc53d25..36bc2ee533 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -209,6 +209,9 @@ details on these changes.
(``django.contrib.gis.sitemaps.views.index`` and
``django.contrib.gis.sitemaps.views.sitemap``).
+* ``django.utils.html.fix_ampersands``, the ``fix_ampersands`` template filter and
+ ``django.utils.html.clean_html`` will be removed following an accelerated deprecation.
+
.. _deprecation-removed-in-1.7:
1.7