Ticket #17166: 17166_v2.diff

docs/howto/initial-data.txt

@@ -13 +13 @@
 .. _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
 ====================================
 
@@ -80 +82 @@
 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

docs/ref/settings.txt

@@ -1072 +1072 @@
 
 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`.
+Django looks for the fixture data files in the ``fixtures`` directory of each
+app by default, but you can set list of additional locations (in search order)
+with this setting.
+
+Note that these paths should use Unix-style forward slashes, even on Windows.
+See :doc:`/topics/testing` and :ref:`initial-data-via-fixtures`.
 
 FORCE_SCRIPT_NAME
 ------------------