summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2011-02-21 19:15:02 +0000
committerLuke Plant <L.Plant.98@cantab.net>2011-02-21 19:15:02 +0000
commitfdf9602961bce9439d489ea2d1b11b919b0c7cf4 (patch)
tree16564fd6fa9b5b613420aa1377965e8d8853b7e0 /docs
parent1b062f6613ba234cd2e72df9823ae1b65de02b21 (diff)
Fixed #11058 - list_display_links doesn't allow callables not defined in the model
Thanks to dvine for the report and julien for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 42c0a34055..c28dc8b7b3 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -479,11 +479,11 @@ subclass::
By default, the change list page will link the first column -- the first
field specified in ``list_display`` -- to the change page for each item.
But ``list_display_links`` lets you change which columns are linked. Set
- ``list_display_links`` to a list or tuple of field names (in the same
+ ``list_display_links`` to a list or tuple of fields (in the same
format as ``list_display``) to link.
- ``list_display_links`` can specify one or many field names. As long as the
- field names appear in ``list_display``, Django doesn't care how many (or
+ ``list_display_links`` can specify one or many fields. As long as the
+ fields appear in ``list_display``, Django doesn't care how many (or
how few) fields are linked. The only requirement is: If you want to use
``list_display_links``, you must define ``list_display``.