diff options
| author | Tim Graham <timograham@gmail.com> | 2015-06-22 13:54:35 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-06-23 07:22:16 -0400 |
| commit | ae1d663b7913f6da233c55409c4973248372d302 (patch) | |
| tree | 1ac06b1eccd77be127ae8d046e9ade878623c176 /docs/ref/templates | |
| parent | 7439039806038ce35d3a91f430037c667dcab051 (diff) | |
[1.8.x] Renamed RemovedInDjango20Warning to RemovedInDjango110Warning.
Diffstat (limited to 'docs/ref/templates')
| -rw-r--r-- | docs/ref/templates/builtins.txt | 6 | ||||
| -rw-r--r-- | docs/ref/templates/upgrading.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 1caec9a634..b4ca36b5e4 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -990,7 +990,7 @@ ssi .. deprecated:: 1.8 - This tag has been deprecated and will be removed in Django 2.0. Use the + This tag has been deprecated and will be removed in Django 1.10. Use the :ttag:`include` tag instead. Outputs the contents of a given file into the page. @@ -1135,7 +1135,7 @@ by the context as to the current application. .. deprecated:: 1.8 The dotted Python path syntax is deprecated and will be removed in - Django 2.0:: + Django 1.10:: {% url 'path.to.some_view' v1 v2 %} @@ -2327,7 +2327,7 @@ contains ``['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']]``, then An older, more restrictive and verbose input format is also supported: ``['States', [['Kansas', [['Lawrence', []], ['Topeka', []]]], ['Illinois', []]]]``. - Support for this syntax will be removed in Django 2.0. + Support for this syntax will be removed in Django 1.10. .. templatefilter:: upper diff --git a/docs/ref/templates/upgrading.txt b/docs/ref/templates/upgrading.txt index 33057d36bd..887c2719e7 100644 --- a/docs/ref/templates/upgrading.txt +++ b/docs/ref/templates/upgrading.txt @@ -150,7 +150,7 @@ You should write:: Passing a :class:`~django.template.Context` or a :class:`~django.template.RequestContext` is still possible when the template is loaded by a :class:`~django.template.backends.django.DjangoTemplates` -backend but it's deprecated and won't be supported in Django 2.0. +backend but it's deprecated and won't be supported in Django 1.10. If you're loading a template while you're rendering another template with the Django template language and you have access to the current context, for |