summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-11-11 21:43:04 +0000
committerJannis Leidel <jannis@leidel.info>2010-11-11 21:43:04 +0000
commit216fdfab61f3ed82bf21a353d92dec094bd2b298 (patch)
tree5c5ccf45ace406bca3ffb7bb09234c7239e04588 /docs
parent76154c7fe53f90251d922111d651d9fbb4b5bda4 (diff)
Added note about the addition of the django.contrib.staticfiles app. Thanks to Florian Apolloner for reminding me about it and providing a patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.3-alpha-1.txt21
-rw-r--r--docs/releases/1.3.txt21
2 files changed, 42 insertions, 0 deletions
diff --git a/docs/releases/1.3-alpha-1.txt b/docs/releases/1.3-alpha-1.txt
index 550c329c66..843dbd2267 100644
--- a/docs/releases/1.3-alpha-1.txt
+++ b/docs/releases/1.3-alpha-1.txt
@@ -54,6 +54,27 @@ error emails sent on a HTTP 500 server error are now handled as a
logging activity. See :doc:`the documentation on Django's logging
interface </topics/logging>` for more details.
+Extended static files handling
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django 1.3 ships with a new contrib app ``'django.contrib.staticfiles'``
+to help developers handle the static media files (images, CSS, Javascript,
+etc.) that are needed to render a complete web page.
+
+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:`STATICFILES_ROOT` and :setting:`STATICFILES_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.
+
+See the :doc:`reference documentation of the app </ref/contrib/staticfiles>`
+for more details or learn how to :doc:`manage static files
+</howto/static-files>`.
+
``unittest2`` support
~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/releases/1.3.txt b/docs/releases/1.3.txt
index 118d4e1e36..90aeaa8b83 100644
--- a/docs/releases/1.3.txt
+++ b/docs/releases/1.3.txt
@@ -46,6 +46,27 @@ error emails sent on a HTTP 500 server error are now handled as a
logging activity. See :doc:`the documentation on Django's logging
interface </topics/logging>` for more details.
+Extended static files handling
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django 1.3 ships with a new contrib app ``'django.contrib.staticfiles'``
+to help developers handle the static media files (images, CSS, Javascript,
+etc.) that are needed to render a complete web page.
+
+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:`STATICFILES_ROOT` and :setting:`STATICFILES_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.
+
+See the :doc:`reference documentation of the app </ref/contrib/staticfiles>`
+for more details or learn how to :doc:`manage static files
+</howto/static-files>`.
+
``unittest2`` support
~~~~~~~~~~~~~~~~~~~~~