diff options
| author | Carl Meyer <carl@oddbird.net> | 2012-01-04 18:08:13 +0000 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2012-01-04 18:08:13 +0000 |
| commit | 8e9043bccbe18d4b6d1550bffeff4c28e5135f6c (patch) | |
| tree | 2098eaf5bc4be4d1aa78d6f703d216b5fb82de01 | |
| parent | 57ac1fc69600f0a27df02e3c2ddbd341ff35d5af (diff) | |
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
| -rw-r--r-- | docs/howto/deployment/modpython.txt | 7 | ||||
| -rw-r--r-- | docs/howto/deployment/wsgi/modwsgi.txt | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt index 952cb3247b..fe1cd79c3a 100644 --- a/docs/howto/deployment/modpython.txt +++ b/docs/howto/deployment/modpython.txt @@ -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. diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt index 7ef0fb47d5..d87d7d305b 100644 --- a/docs/howto/deployment/wsgi/modwsgi.txt +++ b/docs/howto/deployment/wsgi/modwsgi.txt @@ -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 |