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:28 -0400
commitae78227de3740cce7e2b460b2845f19443c4d090 (patch)
tree6d7a0b4212e1eb8ccb61be001ceb4c718b6c5681 /docs/ref
parentb4681be154dd7194041e94f3eb6d7f24217b9a1b (diff)
[1.7.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 6df99742b6..db8a444ab8 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -381,7 +381,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.