summaryrefslogtreecommitdiff
path: root/docs/ref/settings.txt
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-02-19 09:04:19 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-02-19 09:04:19 +0000
commit25b5da2abdebef867f1e38c95f5622df3741d0db (patch)
tree09e200af5a31a0f1bcd08590d71676b920a7f1e1 /docs/ref/settings.txt
parent7baee7a03b8f9ec4840942eecb80fcbe1c75b231 (diff)
[1.3.X] Fixed #17166 -- Documented how FIXTURE_DIRS works in the inital data how-to, and edited related bits in the settings reference. Backport of r17558 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/settings.txt')
-rw-r--r--docs/ref/settings.txt15
1 files changed, 10 insertions, 5 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 8dc5fdbe0d..1685379edf 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -982,9 +982,12 @@ FIXTURE_DIRS
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`.
+List of directories searched for fixture files, in addition to the
+``fixtures`` directory of each application, in search order.
+
+Note that these paths should use Unix-style forward slashes, even on Windows.
+
+See :ref:`initial-data-via-fixtures` and :ref:`topics-testing-fixtures`.
FORCE_SCRIPT_NAME
------------------
@@ -1746,8 +1749,10 @@ TEMPLATE_DIRS
Default: ``()`` (Empty tuple)
-List of locations of the template source files, in search order. Note that
-these paths should use Unix-style forward slashes, even on Windows.
+List of locations of the template source files searched by
+:class:`django.template.loaders.filesystem.Loader`, in search order.
+
+Note that these paths should use Unix-style forward slashes, even on Windows.
See :doc:`/topics/templates`.