Commit ca141051 authored by Carl Meyer's avatar Carl Meyer
Browse files

[1.3.X] Clarified deployment docs to avoid giving users the impression that...

[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
parent 79248a7e
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -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.
+5 −2
Original line number Diff line number Diff line
@@ -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.