From 519fdacf5127540638f7c1b4a3656d9a31f16a8b Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Fri, 21 Jun 2013 15:00:06 -0400
Subject: [PATCH] Fixed #20634 - Corrected doc mistake re: staticfiles finders
strategy.
Thanks claudep for the catch and bmispelon for the research.
Backport of 9be93aa809 from master.
---
docs/howto/static-files/index.txt | 2 +-
docs/ref/contrib/staticfiles.txt | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docs/howto/static-files/index.txt b/docs/howto/static-files/index.txt
index 38aded1fd3..6d67fe6297 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/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index a69a595150..522c29297d 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/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``)
+``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