mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 18:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed some documentation and default-settings.py comments that were misleading about the purpose of STATIC_ROOT, and removed an unused import.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Carl Meyer 2011-02-01 14:28:07 +00:00
parent 9a82eb6ff1
commit 76fb2bb0e2
4 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/ref/contrib/staticfiles.txt
View file

@ -26,8 +26,6 @@ Settings
.. note::
The following settings control the behavior of the staticfiles app.
Configuring the global settings :setting:`STATIC_ROOT` and
:setting:`STATIC_URL` is **required**.
.. setting:: STATICFILES_DIRS

22
docs/ref/settings.txt
View file

@ -1628,22 +1628,24 @@ STATIC_ROOT
Default: ``''`` (Empty string)
The absolute path to the directory that contains static files.
The absolute path to the directory where :djadmin:`collectstatic` will collect
static files for deployment.
Example: ``"/home/example.com/static/"``
If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled
(default) this will be used as the directory which the
:djadmin:`collectstatic` management command collects static files in. See
the howto on :doc:`managing static files</howto/static-files>` for more
details about usage.
(default) the :djadmin:`collectstatic` management command will collect static
files into this directory. See the howto on :doc:`managing static
files</howto/static-files>` for more details about usage.
.. warning:: This is not a place to store your static files permanently;
you should do that in directories that will be found by
:doc:`staticfiles</ref/contrib/staticfiles>`'s
.. warning:: This should be an (initially empty) destination directory for
collecting your static files from their permanent locations into one
directory for ease of deployment; it is **not** a place to store your
static files permanently. You should do that in directories that will be
found by :doc:`staticfiles</ref/contrib/staticfiles>`'s
:setting:`finders<STATICFILES_FINDERS>`, which by default, are
``'static'`` app sub directories and any directories you include in
the :setting:`STATICFILES_DIRS`).
``'static/'`` app sub-directories and any directories you include in
:setting:`STATICFILES_DIRS`).
See :doc:`staticfiles reference</ref/contrib/staticfiles>` and
:setting:`STATIC_URL`.