Context Navigation

Ticket #17166: 17166.diff

File 17166.diff, 1.8 KB (added by Dan Poirier, 12 years ago)

diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index dbb5b61..67085ab 100644

                but initial SQL is also quite a bit more flexible.
 .. _initial data as sql: `providing initial sql data`_
 .. _initial data via fixtures: `providing initial data with fixtures`_
+.. _initial-data-via-fixtures:
 Providing initial data with fixtures
 ====================================
-…
+               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.
+Where Django finds fixture files
+--------------------------------
+By default, Django looks in the ``fixtures`` directory inside each app for
+fixtures. You can set the :setting:`FIXTURE_DIRS` setting to a list of
+additional directories where Django should look.
+When running :djadmin:`manage.py loaddata <loaddata>`, you can also
+specify an absolute path to a fixture file, which overrides searching
+the usual directories.
 .. seealso::
     Fixtures are also used by the :ref:`testing framework

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 20366e3..1a0a63c 100644

                Default: ``()`` (Empty tuple)
 List of locations of the fixture data files, in search order. Note that
 these paths should use Unix-style forward slashes, even on Windows. See
+:doc:`/topics/testing`.
+:doc:`/topics/testing` and :ref:`initial-data-via-fixtures`.
+Django looks in the ``fixtures`` directory of each app by default. This
+setting adds other places where Django will look.
 FORCE_SCRIPT_NAME
 ------------------