Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Clarified deployment docs to avoid giving users the impression that s…

…taticfiles 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
  • Loading branch information...
commit 8e9043bccbe18d4b6d1550bffeff4c28e5135f6c 1 parent 57ac1fc
@carljm carljm authored
View
7 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.
View
9 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
Please sign in to comment.
Something went wrong with that request. Please try again.