test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clarified deployment docs to avoid giving users the impression that staticfiles should be used to actually serve files in production. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Carl Meyer 2012-01-04 18:08:13 +00:00
parent 57ac1fc696
commit 8e9043bccb
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/howto/deployment/modpython.txt
View File

@ -296,8 +296,11 @@ server you're using, to serve the admin files.
The admin files live in (:file:`django/contrib/admin/static/admin`) of the
Django distribution.
We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
the admin files, but here are two other approaches:
We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
admin files (this means using the :djadmin:`collectstatic` management command
to collect the static files in :setting:`STATIC_ROOT`, and then configuring
your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
here are two other approaches:
1. Create a symbolic link to the admin static files from within your
document root.

9
docs/howto/deployment/wsgi/modwsgi.txt
View File

@ -159,9 +159,12 @@ or whichever media server you're using, to serve the admin files.
The admin files live in (:file:`django/contrib/admin/static/admin`) of the
Django distribution.
We **strongly** recommend using :mod:`django.contrib.staticfiles` (along with
a Web server as outlined in the previous section) to handle the admin files, but
here are three other approaches:
We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
admin files (along with a Web server as outlined in the previous section; this
means using the :djadmin:`collectstatic` management command to collect the
static files in :setting:`STATIC_ROOT`, and then configuring your webserver to
serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but here are three
other approaches:
1. Create a symbolic link to the admin static files from within your
document root (this may require ``+FollowSymLinks`` in your Apache