Commit 8822d0bf authored by Tim Graham's avatar Tim Graham
Browse files

[1.8.x] Removed usage of deprecated dumpdata options in docs. 

Backport of 1d975ff4 from master
parent a41d4104

docs/ref/contrib/contenttypes.txt

+2 −1
Original line number Diff line number Diff line
@@ -334,7 +334,8 @@ model: 
   generic relations, you should probably be using a natural key to uniquely

   identify related :class:`~django.contrib.contenttypes.models.ContentType`

   objects. See :ref:`natural keys<topics-serialization-natural-keys>` and

   :djadminopt:`dumpdata --natural <--natural>` for more information.

   :djadminopt:`dumpdata --natural-foreign <--natural-foreign>` for more

   information.



This will enable an API similar to the one used for a normal

:class:`~django.db.models.ForeignKey`;

docs/ref/django-admin.txt

+4 −4
Original line number Diff line number Diff line
@@ -1925,14 +1925,14 @@ with ``True`` or ``False``, as you can see with the ``interactive`` option above 
Named arguments can be passed by using either one of the following syntaxes::



      # Similar to the command line

      management.call_command('dumpdata', '--natural')

      management.call_command('dumpdata', '--natural-foreign')



      # Named argument similar to the command line minus the initial dashes and

      # with internal dashes replaced by underscores

      management.call_command('dumpdata', natural=True)

      management.call_command('dumpdata', natural_foreign=True)



      # `use_natural_keys` is the option destination variable

      management.call_command('dumpdata', use_natural_keys=True)

      # `use_natural_foreign_keys` is the option destination variable

      management.call_command('dumpdata', use_natural_foreign_keys=True)



.. versionchanged:: 1.8