diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/django-admin.txt | 9 | ||||
| -rw-r--r-- | docs/topics/serialization.txt | 13 |
2 files changed, 0 insertions, 22 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 3a8f9b2c55..d29213c185 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -304,15 +304,6 @@ When this option is specified, Django will not provide the primary key in the serialized data of this object since it can be calculated during deserialization. -.. django-admin-option:: --natural - -.. deprecated:: 1.7 - Equivalent to the :djadminopt:`--natural-foreign` option; use that instead. - -Use :ref:`natural keys <topics-serialization-natural-keys>` to represent -any foreign key and many-to-many relationship with a model that provides -a natural key definition. - .. django-admin-option:: --pks By default, ``dumpdata`` will output all the records of the model, but diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt index aa56bc25d9..354aa9824d 100644 --- a/docs/topics/serialization.txt +++ b/docs/topics/serialization.txt @@ -479,19 +479,6 @@ line flags to generate natural keys. natural keys during serialization, but *not* be able to load those key values, just don't define the ``get_by_natural_key()`` method. -.. versionchanged:: 1.7 - - Previously there was only a ``use_natural_keys`` argument for - ``serializers.serialize()`` and the `-n` or `--natural` command line flags. - These have been deprecated in favor of the ``use_natural_foreign_keys`` and - ``use_natural_primary_keys`` arguments and the corresponding - :djadminopt:`--natural-foreign` and :djadminopt:`--natural-primary` options - for :djadmin:`dumpdata`. - -The original argument and command line flags remain for backwards -compatibility and map to the new ``use_natural_foreign_keys`` argument and -`--natural-foreign` command line flag. They'll be removed in Django 1.9. - Dependencies during serialization ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |