From 35cc439228cd32dfa7a3ec919db01a8a5cd17d33 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 14 Dec 2009 12:39:20 +0000 Subject: Fixed #7052 -- Added support for natural keys in serialization. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11863 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/django-admin.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'docs/ref') diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index dc18f350c4..2b7af17f1e 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -234,6 +234,17 @@ name to ``dumpdata``, the dumped output will be restricted to that model, rather than the entire application. You can also mix application names and model names. +.. django-admin-option:: --natural + +.. versionadded:: 1.2 + +Use :ref:`natural keys ` to represent +any foreign key and many-to-many relationship with a model that provides +a natural key definition. If you are dumping ``contrib.auth`` ``Permission`` +objects or ``contrib.contenttypes`` ``ContentType`` objects, you should +probably be using this flag. + + flush ----- @@ -701,7 +712,7 @@ information. .. versionadded:: 1.2 -Use the ``--failfast`` option to stop running tests and report the failure +Use the ``--failfast`` option to stop running tests and report the failure immediately after a test fails. testserver -- cgit v1.3