summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-06-21 14:55:59 -0400
committerTim Graham <timograham@gmail.com>2013-06-21 14:57:12 -0400
commit9be93aa809c34083ebef8392e52c83df0e383be3 (patch)
tree23f0278735b1b7263e1f65171179916132c02e74
parentba610cb319d8882a663effcaf0a4e53c04593f98 (diff)
Fixed #20634 - Corrected doc mistake re: staticfiles finders strategy.
Thanks claudep for the catch and bmispelon for the research.
-rw-r--r--docs/howto/static-files/index.txt2
-rw-r--r--docs/ref/settings.txt4
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/howto/static-files/index.txt b/docs/howto/static-files/index.txt
index 3668c5dc41..db8bd38e9c 100644
--- a/docs/howto/static-files/index.txt
+++ b/docs/howto/static-files/index.txt
@@ -68,7 +68,7 @@ details on how ``staticfiles`` finds your files.
Now we *might* be able to get away with putting our static files directly
in ``my_app/static/`` (rather than creating another ``my_app``
subdirectory), but it would actually be a bad idea. Django will use the
- last static file it finds whose name matches, and if you had a static file
+ first static file it finds whose name matches, and if you had a static file
with the same name in a *different* application, Django would be unable to
distinguish between them. We need to be able to point Django at the right
one, and the easiest way to ensure this is by *namespacing* them. That is,
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 897af275a0..902eefa86a 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2564,7 +2564,9 @@ various locations.
The default will find files stored in the :setting:`STATICFILES_DIRS` setting
(using ``django.contrib.staticfiles.finders.FileSystemFinder``) and in a
``static`` subdirectory of each app (using
-``django.contrib.staticfiles.finders.AppDirectoriesFinder``)
+``django.contrib.staticfiles.finders.AppDirectoriesFinder``). If multiple
+files with the same name are present, the first file that is found will be
+used.
One finder is disabled by default:
``django.contrib.staticfiles.finders.DefaultStorageFinder``. If added to