summaryrefslogtreecommitdiff
path: root/docs/ref
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/ref
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/ref')
-rw-r--r--docs/ref/templates/builtins.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index a5d4c7c26e..bb02187727 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1582,6 +1582,9 @@ fix_ampersands
This is rarely useful as ampersands are automatically escaped. See
:tfilter:`escape` for more information.
+.. deprecated:: 1.7
+ This filter has been deprecated and will be removed in Django 1.8.
+
Replaces ampersands with ``&amp;`` entities.
For example::