diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2009-08-18 05:17:59 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2009-08-18 05:17:59 +0000 |
| commit | 6f983870f3c5b2d7683c20a0d2b92b1a572bc846 (patch) | |
| tree | e3071336bc1376b44040e9baaf0be1f2b0a09208 /django/contrib/admin/options.py | |
| parent | 3a43d539b47cb85dafad7144630f0bc24ce29f4d (diff) | |
| download | django-6f983870f3c5b2d7683c20a0d2b92b1a572bc846.tar.gz | |
[soc2009/multidb] Merged up to trunk r11467.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/admin/options.py')
| -rw-r--r-- | django/contrib/admin/options.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 31a28ccf0b..3144a22a2a 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -482,7 +482,7 @@ class ModelAdmin(BaseModelAdmin): def get_action(self, action): """ - Return a given action from a parameter, which can either be a calable, + Return a given action from a parameter, which can either be a callable, or the name of a method on the ModelAdmin. Return is a tuple of (callable, name, description). """ |