summaryrefslogtreecommitdiff
path: root/docs/ref/django-admin.txt
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-01-30 17:23:30 +0000
committerJannis Leidel <jannis@leidel.info>2011-01-30 17:23:30 +0000
commitaaa76ca1b311f774ff7fb004329d4409888ae67f (patch)
tree421de61dddda87445b7ce5860bc86c87f5531854 /docs/ref/django-admin.txt
parent8fe42053bcec02769ae76b238d43086eb021ca89 (diff)
Fixed #14978 -- Added versionchanged directive to --adminmedia docs clarifying why it's not working with staticfiles (deprecation of AdminMediaHandler).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/django-admin.txt')
-rw-r--r--docs/ref/django-admin.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index a37da02898..17b8408a42 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -669,6 +669,13 @@ Example usage::
django-admin.py runserver --adminmedia=/tmp/new-admin-style/
+.. versionchanged:: 1.3
+
+If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled
+(default in new projects) the :djadmin:`runserver` command will be overriden
+with an own :djadmin:`runserver<staticfiles-runserver>` command which doesn't
+have the :djadminopt:`--adminmedia` option due to deprecation.
+
.. django-admin-option:: --noreload
Use the ``--noreload`` option to disable the use of the auto-reloader. This