summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-09-21 16:00:19 +0200
committerClaude Paroz <claude@2xlibre.net>2014-09-21 16:05:26 +0200
commit8a782571333f21e83980411301a0c8cc2d59a0b7 (patch)
treeb8e6e2fb4035e825ec2cbca2d20473ab55fe00d4 /docs
parent17a4038cf3aad025c653342eb18882c38dbdb1a9 (diff)
[1.7.x] Fixed #23530 -- Specified PyYAML requirement in initial-data.txt
Thanks aks for the report. Backport of 5bf654e44b7 from master.
Diffstat (limited to 'docs')
-rw-r--r--docs/howto/initial-data.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index b22cf73d34..6e7fc3ff2a 100644
--- a/docs/howto/initial-data.txt
+++ b/docs/howto/initial-data.txt
@@ -21,10 +21,12 @@ Providing initial data with fixtures
A fixture is a collection of data that Django knows how to import into a
database. The most straightforward way of creating a fixture if you've already
got some data is to use the :djadmin:`manage.py dumpdata <dumpdata>` command.
-Or, you can write fixtures by hand; fixtures can be written as XML, YAML, or
-JSON documents. The :doc:`serialization documentation </topics/serialization>`
-has more details about each of these supported :ref:`serialization formats
-<serialization-formats>`.
+Or, you can write fixtures by hand; fixtures can be written as JSON, XML or YAML
+(with PyYAML_ installed) documents. The :doc:`serialization documentation
+</topics/serialization>` has more details about each of these supported
+:ref:`serialization formats <serialization-formats>`.
+
+.. _PyYAML: http://www.pyyaml.org/
As an example, though, here's what a fixture for a simple ``Person`` model might
look like in JSON: