summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2008-11-12 11:53:16 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2008-11-12 11:53:16 +0000
commit8ec6b87c42722025648732a1f52b1bb561d844c9 (patch)
treedb81db15cfd1848361fdcfb5a51aede51f14347f
parentcecbed5ac97bb5b2717a50e765fb9ac22915881c (diff)
[1.0.X] Fixed #9572 -- Corrected some documentation that misleadingly gave the extension for YAML fixtures as YML. Thanks to django@i-sh.me.uk for the report.
Merge from trunk of [9401] git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/howto/initial-data.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index 580518b5e8..917e11bb64 100644
--- a/docs/howto/initial-data.txt
+++ b/docs/howto/initial-data.txt
@@ -77,7 +77,7 @@ out any changes you've made.
Automatically loading initial data fixtures
-------------------------------------------
-If you create a fixture named ``initial_data.[xml/yml/json]``, that fixture will
+If you create a fixture named ``initial_data.[xml/yaml/json]``, that fixture will
be loaded every time you run :djadmin:`syncdb`. This is extremely convenient,
but be careful: remember that the data will be refreshed *every time* you run
:djadmin:`syncdb`. So don't use ``initial_data`` for data you'll want to edit.