Renamed RemovedInDjangoXYWarnings for new roadmap.

Forwardport of ae1d663b79
from stable/1.8.x plus more.
This commit is contained in:
Tim Graham 2015-06-22 13:54:35 -04:00
parent e73842a95f
commit aaacaeb096
124 changed files with 455 additions and 448 deletions

View file

@ -164,7 +164,7 @@ ModelFormMixin
Support for the new brace-based Python formatting syntax has been
added. The old ``%(slug)s`` placeholder syntax support has been
deprecated and will be removed in Django 2.0.
deprecated and will be removed in Django 1.10.
.. method:: get_form_class()
@ -263,7 +263,7 @@ DeletionMixin
Support for the new brace-based Python formatting syntax has been
added. The old ``%(slug)s`` placeholder syntax support has been
deprecated and will be removed in Django 2.0.
deprecated and will be removed in Django 1.10.
.. method:: get_success_url()

View file

@ -830,7 +830,7 @@ For each field, we describe the default widget used if you don't specify
.. deprecated:: 1.8
The optional argument ``error_message`` is also accepted for backwards
compatibility but will be removed in Django 2.0. The preferred way to
compatibility but will be removed in Django 1.10. The preferred way to
provide an error message is to use the :attr:`~Field.error_messages`
argument, passing a dictionary with ``'invalid'`` as a key and the error
message as the value.

View file

@ -151,7 +151,7 @@ Migrating from the old API
As part of the formalization of the ``Model._meta`` API (from the
:class:`django.db.models.options.Options` class), a number of methods and
properties have been deprecated and will be removed in Django 2.0.
properties have been deprecated and will be removed in Django 1.10.
These old APIs can be replicated by either:

View file

@ -109,7 +109,7 @@ Default: ``[]`` (Empty list)
.. deprecated:: 1.8
This setting, along with the :ttag:`ssi` template tag, is deprecated and
will be removed in Django 2.0.
will be removed in Django 1.10.
.. versionchanged:: 1.8

View file

@ -994,7 +994,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.
@ -1139,7 +1139,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 %}
@ -2320,7 +2320,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

View file

@ -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

View file

@ -119,7 +119,7 @@ parameter is useful.
.. deprecated:: 1.8
Support for string ``view`` arguments is deprecated and will be removed in
Django 2.0. Pass the callable instead.
Django 1.10. Pass the callable instead.
The ``prefix`` parameter has the same meaning as the first argument to
``patterns()`` and is only relevant when you're passing a string as the
@ -163,15 +163,15 @@ See :ref:`including-other-urlconfs` and :ref:`namespaces-and-include`.
.. deprecated:: 1.9
Support for the ``app_name`` argument is deprecated and will be removed in
Django 2.1. Specify the ``app_name`` as explained in
Django 2.0. Specify the ``app_name`` as explained in
:ref:`namespaces-and-include` instead.
Support for passing a 3-tuple is also deprecated and will be removed in
Django 2.1. Pass a 2-tuple containing the pattern list and application
Django 2.0. Pass a 2-tuple containing the pattern list and application
namespace, and use the ``namespace`` argument instead.
Lastly, support for an instance namespace without an application namespace
has been deprecated and will be removed in Django 2.1. Specify the
has been deprecated and will be removed in Django 2.0. Specify the
application namespace or remove the instance namespace.
handler400