summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2011-03-07 16:38:04 +0000
committerCarl Meyer <carl@oddbird.net>2011-03-07 16:38:04 +0000
commit0d88312855949ac5fdc73daa878df415c6ff8156 (patch)
treeb09b8b1e613fbd25d51d77936d241cdfdca964bd
parent7f363eb6dceaed4bebad0df3cb8200a9b685f711 (diff)
Clearer mile-high description of migrating to staticfiles in 1.3 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/releases/1.3.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/releases/1.3.txt b/docs/releases/1.3.txt
index e5e37971f8..bbfe985ebf 100644
--- a/docs/releases/1.3.txt
+++ b/docs/releases/1.3.txt
@@ -57,11 +57,9 @@ In previous versions of Django, it was common to place static assets in
:setting:`MEDIA_ROOT` along with user-uploaded files, and serve them both at
:setting:`MEDIA_URL`. Part of the purpose of introducing the ``staticfiles``
app is to make it easier to keep static files separate from user-uploaded
-files. For this reason, you will probably want to make your
-:setting:`MEDIA_ROOT` and :setting:`MEDIA_URL` different from your
-:setting:`STATIC_ROOT` and :setting:`STATIC_URL`. You will need to
-arrange for serving of files in :setting:`MEDIA_ROOT` yourself;
-``staticfiles`` does not deal with user-uploaded media at all.
+files. Static assets should now go in ``static/`` subdirectories of your apps
+or in "project-wide" static directories listed in :setting:`STATICFILES_DIRS`,
+and will be served at :setting:`STATIC_URL`.
See the :doc:`reference documentation of the app </ref/contrib/staticfiles>`
for more details or learn how to :doc:`manage static files