Browse files

Fixed #20634 - Corrected doc mistake re: staticfiles finders strategy.

Thanks claudep for the catch and bmispelon for the research.

Backport of 9be93aa from master.
  • Loading branch information...
1 parent 9b0604e commit 519fdacf5127540638f7c1b4a3656d9a31f16a8b @timgraham timgraham committed Jun 21, 2013
Showing with 4 additions and 2 deletions.
  1. +1 −1 docs/howto/static-files/index.txt
  2. +3 −1 docs/ref/contrib/staticfiles.txt
2 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,
4 docs/ref/contrib/staticfiles.txt
@@ -106,7 +106,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``). If multiple
+files with the same name are present, the first file that is found will be
One finder is disabled by default:
``django.contrib.staticfiles.finders.DefaultStorageFinder``. If added to

0 comments on commit 519fdac

Please sign in to comment.