diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/initial-data.txt | 4 | ||||
| -rw-r--r-- | docs/releases/1.7.txt | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt index 6e7fc3ff2a..b7e00d1346 100644 --- a/docs/howto/initial-data.txt +++ b/docs/howto/initial-data.txt @@ -82,7 +82,7 @@ Automatically loading initial data fixtures .. deprecated:: 1.7 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 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 (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 :ref:`data migration <data-migrations>`. diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index 0140f58311..b5888bc52a 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -1520,11 +1520,10 @@ Custom SQL location for models package Previously, if models were organized in a package (``myapp/models/``) rather 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 -will search ``myapp/sql/`` as documented. The old location will continue to -work until Django 1.9. After this issue was fixed, migrations were added which -deprecates initial SQL data. Thus, while this change still exists, the -deprecation is somewhat irrelevant as the entire feature will be removed in -Django 2.0 when migrations become compulsory for all applications. +will search ``myapp/sql/`` as documented. After this issue was fixed, migrations +were added which deprecates initial SQL data. Thus, while this change still +exists, the deprecation is irrelevant as the entire feature will be removed in +Django 1.9. Reorganization of ``django.contrib.sites`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |