Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Carl Meyer authored January 04, 2012
7  docs/howto/deployment/modpython.txt
@@ -296,8 +296,11 @@ server you're using, to serve the admin files.
296 296
 The admin files live in (:file:`django/contrib/admin/static/admin`) of the
297 297
 Django distribution.
298 298
 
299  
-We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
300  
-the admin files, but here are two other approaches:
  299
+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
  300
+admin files (this means using the :djadmin:`collectstatic` management command
  301
+to collect the static files in :setting:`STATIC_ROOT`, and then configuring
  302
+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
  303
+here are two other approaches:
301 304
 
302 305
 1. Create a symbolic link to the admin static files from within your
303 306
    document root.
9  docs/howto/deployment/wsgi/modwsgi.txt
@@ -159,9 +159,12 @@ or whichever media server you're using, to serve the admin files.
159 159
 The admin files live in (:file:`django/contrib/admin/static/admin`) of the
160 160
 Django distribution.
161 161
 
162  
-We **strongly** recommend using :mod:`django.contrib.staticfiles` (along with
163  
-a Web server as outlined in the previous section) to handle the admin files, but
164  
-here are three other approaches:
  162
+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
  163
+admin files (along with a Web server as outlined in the previous section; this
  164
+means using the :djadmin:`collectstatic` management command to collect the
  165
+static files in :setting:`STATIC_ROOT`, and then configuring your webserver to
  166
+serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but here are three
  167
+other approaches:
165 168
 
166 169
 1. Create a symbolic link to the admin static files from within your
167 170
    document root (this may require ``+FollowSymLinks`` in your Apache

0 notes on commit 8e9043b

Please sign in to comment.
Something went wrong with that request. Please try again.