summaryrefslogtreecommitdiff
path: root/docs/ref/contrib/admin/actions.txt
diff options
context:
space:
mode:
authorArthur Koziel <arthur@arthurkoziel.com>2010-09-13 00:04:27 +0000
committerArthur Koziel <arthur@arthurkoziel.com>2010-09-13 00:04:27 +0000
commitdd49269c7db008b2567f50cb03c4d3d9b321daa1 (patch)
tree326dd25bb045ac016cda7966b43cbdfe1f67d699 /docs/ref/contrib/admin/actions.txt
parentc9b188c4ec939abbe48dae5a371276742e64b6b8 (diff)
[soc2010/app-loading] merged trunkarchive/soc2010/app-loading
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/contrib/admin/actions.txt')
-rw-r--r--docs/ref/contrib/admin/actions.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt
index 62f944d9b6..86a5355b28 100644
--- a/docs/ref/contrib/admin/actions.txt
+++ b/docs/ref/contrib/admin/actions.txt
@@ -1,5 +1,3 @@
-.. _ref-contrib-admin-actions:
-
=============
Admin actions
=============
@@ -208,7 +206,7 @@ objects.
To provide an intermediary page, simply return an
:class:`~django.http.HttpResponse` (or subclass) from your action. For
example, you might write a simple export function that uses Django's
-:ref:`serialization functions <topics-serialization>` to dump some selected
+:doc:`serialization functions </topics/serialization>` to dump some selected
objects as JSON::
from django.http import HttpResponse
@@ -294,7 +292,7 @@ Disabling a site-wide action
site-wide.
If, however, you need to re-enable a globally-disabled action for one
- particular model, simply list it explicitally in your ``ModelAdmin.actions``
+ particular model, simply list it explicitly in your ``ModelAdmin.actions``
list::
# Globally disable delete selected