From aaa76ca1b311f774ff7fb004329d4409888ae67f Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Sun, 30 Jan 2011 17:23:30 +0000
Subject: [PATCH] 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
---
 docs/ref/django-admin.txt | 7 +++++++
 1 file changed, 7 insertions(+)

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