diff options
| author | Preston Holmes <preston@ptone.com> | 2012-06-23 17:57:20 +0300 |
|---|---|---|
| committer | Julien Phalip <jphalip@gmail.com> | 2012-09-08 12:13:46 -0400 |
| commit | 3da43c11113e0ef109ffbecae528aef853879281 (patch) | |
| tree | 6aa70976b417d5f314985e00a0bb707e9eb74891 /docs | |
| parent | 617d077f1f5be6cfb67a1f4f9ab0334f3c793e4c (diff) | |
Fixed #18054 -- Deprecated contrib.markup. Thanks to simukis for the initial patch.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 3 | ||||
| -rw-r--r-- | docs/ref/contrib/markup.txt | 3 | ||||
| -rw-r--r-- | docs/releases/1.5.txt | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 9359c82e46..4add751912 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -264,6 +264,9 @@ these changes. in 1.4. The backward compatibility will be removed -- ``HttpRequest.raw_post_data`` will no longer work. +* ``django.contrib.markup`` will be removed following an accelerated + deprecation. + 1.7 --- diff --git a/docs/ref/contrib/markup.txt b/docs/ref/contrib/markup.txt index 8f3e0a95f9..9215c64f93 100644 --- a/docs/ref/contrib/markup.txt +++ b/docs/ref/contrib/markup.txt @@ -5,6 +5,9 @@ django.contrib.markup .. module:: django.contrib.markup :synopsis: A collection of template filters that implement common markup languages. +.. deprecated:: 1.5 + This module has been deprecated. + Django provides template filters that implement the following markup languages: diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt index 5728d8559a..5578e8efcb 100644 --- a/docs/releases/1.5.txt +++ b/docs/releases/1.5.txt @@ -358,3 +358,11 @@ the built-in :func:`itertools.product` instead. The :class:`~django.utils.encoding.StrAndUnicode` mix-in has been deprecated. Define a ``__str__`` method and apply the :func:`~django.utils.encoding.python_2_unicode_compatible` decorator instead. + +``django.utils.markup`` +~~~~~~~~~~~~~~~~~~~~~~~ + +The markup contrib module has been deprecated and will follow an accelerated +deprecation schedule. Direct use of python markup libraries or 3rd party tag +libraries is preferred to Django maintaining this functionality in the +framework. |