summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorZan Anderle <zan.anderle@gmail.com>2014-11-03 20:16:28 +0100
committerTim Graham <timograham@gmail.com>2014-11-03 15:30:46 -0500
commit7b420367524ad9f29b8bf0284f4b40bd6cfc8b93 (patch)
tree15e041668111d6e566684d480b3e72fcdd88a1c4 /docs
parent1cf109515a08aecb34c48bedb1df8027f7fad701 (diff)
Fixed #5405 -- Added admindocs support for reStructured text in model docstrings
Thanks elvard and gkmngrgn for work on the patch and Markus H. for review.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.8.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 875f17f40f..3cf7e77038 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -76,6 +76,11 @@ Minor features
<django.contrib.admin.ModelAdmin.show_full_result_count>` to control whether
or not the full count of objects should be displayed on a filtered admin page.
+:mod:`django.contrib.admindocs`
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* reStructuredText is now parsed in model docstrings.
+
:mod:`django.contrib.auth`
^^^^^^^^^^^^^^^^^^^^^^^^^^