summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-03-01 14:41:11 +0000
committerJannis Leidel <jannis@leidel.info>2010-03-01 14:41:11 +0000
commitf09eabfb901b3bdb4a5ec51a88259f39ab745ce3 (patch)
tree73f46ad53297aa706dbce05737fd0be8dc320de5
parent4871b654b59544ba99a6ab5b9c70f9c220d954fa (diff)
[1.1.X] Fixed #12987 - Added a few versionadded directives to the docs. Thanks, Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/ref/contrib/admin/index.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index ca0e136091..02a278fbcf 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -622,6 +622,8 @@ with an operator:
.. attribute:: ModelAdmin.formfield_overrides
+.. versionadded:: 1.1
+
This provides a quick-and-dirty way to override some of the
:class:`~django.forms.Field` options for use in the admin.
``formfield_overrides`` is a dictionary mapping a field class to a dict of
@@ -662,12 +664,16 @@ The value is another dictionary; these arguments will be passed to
.. attribute:: ModelAdmin.actions
+.. versionadded:: 1.1
+
A list of actions to make available on the change list page. See
:ref:`ref-contrib-admin-actions` for details.
.. attribute:: ModelAdmin.actions_on_top
.. attribute:: ModelAdmin.actions_on_bottom
+.. versionadded:: 1.1
+
Controls where on the page the actions bar appears. By default, the admin
changelist displays actions at the top of the page (``actions_on_top = True;
actions_on_bottom = False``).