diff options
| author | Carl Meyer <carl@oddbird.net> | 2012-01-04 18:35:45 +0000 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2012-01-04 18:35:45 +0000 |
| commit | ca141051286c116cbbced71eb26a323d30c8a0ca (patch) | |
| tree | 0cdad9efe8a080e45cd9cf5ffc5d0458ee208b46 /docs | |
| parent | 79248a7e0a3918c1ed934601f6c295521c346b03 (diff) | |
[1.3.X] Clarified deployment docs to avoid giving users the impression that staticfiles should be used to actually serve files in production.
Backport of r17338 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/deployment/modpython.txt | 7 | ||||
| -rw-r--r-- | docs/howto/deployment/modwsgi.txt | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt index 75bdcd51cf..693f942b08 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/media/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/modwsgi.txt b/docs/howto/deployment/modwsgi.txt index 99cdbd1f28..fdf9d27d20 100644 --- a/docs/howto/deployment/modwsgi.txt +++ b/docs/howto/deployment/modwsgi.txt @@ -130,8 +130,11 @@ server you're using, to serve the admin files. The admin files live in (:file:`django/contrib/admin/media/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. |