Revert "Updated some docs for the delayed deprecation of legacy table creation; refs #22340."

This reverts commit a2e3c96948.

The deprecation was moved back to 1.9 in
61da5f3f02.
This commit is contained in:
Tim Graham 2014-12-30 11:50:50 -05:00
parent df3cc53fda
commit d7fc6eb8ca
2 changed files with 6 additions and 7 deletions

View File

@ -82,7 +82,7 @@ Automatically loading initial data fixtures
.. deprecated:: 1.7 .. deprecated:: 1.7
If an application uses migrations, there is no automatic loading of If an application uses migrations, there is no automatic loading of
fixtures. Since migrations will be required for applications in Django 2.0, fixtures. Since migrations will be required for applications in Django 1.9,
this behavior is considered deprecated. If you want to load initial data this behavior is considered deprecated. If you want to load initial data
for an app, consider doing it in a :ref:`data migration <data-migrations>`. for an app, consider doing it in a :ref:`data migration <data-migrations>`.
@ -116,7 +116,7 @@ Providing initial SQL data
If an application uses migrations, there is no loading of initial SQL data If an application uses migrations, there is no loading of initial SQL data
(including backend-specific SQL data). Since migrations will be required (including backend-specific SQL data). Since migrations will be required
for applications in Django 2.0, this behavior is considered deprecated. for applications in Django 1.9, this behavior is considered deprecated.
If you want to use initial SQL for an app, consider doing it in a If you want to use initial SQL for an app, consider doing it in a
:ref:`data migration <data-migrations>`. :ref:`data migration <data-migrations>`.

View File

@ -1520,11 +1520,10 @@ Custom SQL location for models package
Previously, if models were organized in a package (``myapp/models/``) rather Previously, if models were organized in a package (``myapp/models/``) rather
than simply ``myapp/models.py``, Django would look for :ref:`initial SQL data than simply ``myapp/models.py``, Django would look for :ref:`initial SQL data
<initial-sql>` in ``myapp/models/sql/``. This bug has been fixed so that Django <initial-sql>` in ``myapp/models/sql/``. This bug has been fixed so that Django
will search ``myapp/sql/`` as documented. The old location will continue to will search ``myapp/sql/`` as documented. After this issue was fixed, migrations
work until Django 1.9. After this issue was fixed, migrations were added which were added which deprecates initial SQL data. Thus, while this change still
deprecates initial SQL data. Thus, while this change still exists, the exists, the deprecation is irrelevant as the entire feature will be removed in
deprecation is somewhat irrelevant as the entire feature will be removed in Django 1.9.
Django 2.0 when migrations become compulsory for all applications.
Reorganization of ``django.contrib.sites`` Reorganization of ``django.contrib.sites``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~