Author: russellm
Date: 2008-11-06 04:48:20 -0600 (Thu, 06 Nov 2008)
New Revision: 9356
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/docs/howto/initial-data.txt
Log:
[1.0.X] Fixed #9518 -- Corrected example JSON snippet in fixture documentation.
Thanks to [EMAIL PROTECTED] for the report.
Merge of [9355] from trunk.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9341
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9341,9355
Modified: django/branches/releases/1.0.X/docs/howto/initial-data.txt
===================================================================
--- django/branches/releases/1.0.X/docs/howto/initial-data.txt 2008-11-06
10:24:24 UTC (rev 9355)
+++ django/branches/releases/1.0.X/docs/howto/initial-data.txt 2008-11-06
10:48:20 UTC (rev 9356)
@@ -33,23 +33,23 @@
[
{
- "model": "myapp.person",
+ "model": "myapp.person",
"pk": 1,
"fields": {
"first_name": "John",
- "last_name": "Lennon",
+ "last_name": "Lennon"
}
},
{
- "model": "myapp.person",
+ "model": "myapp.person",
"pk": 2,
"fields": {
"first_name": "Paul",
- "last_name": "McCartney",
+ "last_name": "McCartney"
}
},
]
-
+
And here's that same fixture as YAML:
.. code-block:: none
@@ -64,7 +64,7 @@
fields:
first_name: Paul
last_name: McCartney
-
+
You'll store this data in a ``fixtures`` directory inside you app.
Loading data is easy: just call :djadmin:`manage.py loaddata fixturename
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
