diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-02-19 09:02:52 +0000 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-02-19 09:02:52 +0000 |
| commit | 1d78897c5de5bc387dabd997ed8e64dd541708bb (patch) | |
| tree | 722da9905b4b792ca5c2f1d8c2f8a10e06ee2f55 /docs/ref | |
| parent | 9d0bf662734b4a7bdf1ae339390c8fe8b0991ea7 (diff) | |
Fixed #17166 -- Documented how FIXTURE_DIRS works in the inital data how-to, and edited related bits in the settings reference.
Performed minor edits for consistency while I was there.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/settings.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 7116046967..cbe5606a76 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1098,9 +1098,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 ------------------ @@ -1945,8 +1948,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`. |