summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-04-10 13:31:59 -0400
committerTim Graham <timograham@gmail.com>2014-04-10 13:33:34 -0400
commitde95867284ddf84bb4ca5e5946bae96d5d23babf (patch)
treed32aec9be27bc7986fc3d627d98cc57f7c43a04f /docs/ref
parent129cb7e2228cf076104eb5de69e6063f1bf34dd9 (diff)
[1.6.x] Fixed #21353 -- Noted that description is ignored for TabularInlines.
Thanks nofinator for the report. Backport of d5031ecf88 from master
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/admin/index.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index baa8f99886..b08d201d8e 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -307,7 +307,9 @@ subclass::
* ``description``
A string of optional extra text to be displayed at the top of each
- fieldset, under the heading of the fieldset.
+ fieldset, under the heading of the fieldset. This string is not
+ rendered for :class:`~django.contrib.admin.TabularInline` due to its
+ layout.
Note that this value is *not* HTML-escaped when it's displayed in
the admin interface. This lets you include HTML if you so desire.