diff options
| author | Simon Meers <simon@simonmeers.com> | 2010-12-04 00:50:49 +0000 |
|---|---|---|
| committer | Simon Meers <simon@simonmeers.com> | 2010-12-04 00:50:49 +0000 |
| commit | 174f222b39312f7152b0116f92bb07a15ae2160f (patch) | |
| tree | 2d768653d6edc2330f3611dc89efa4563f646e0b /docs | |
| parent | d68598e0220908ca82cf98ba769e618404c010c8 (diff) | |
Fixed #14764 -- specified that a set is returned by User.get_..._permissions methods. Thanks MostAwesomeDude for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/auth.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt index d49fbf6ffc..04b6d39964 100644 --- a/docs/topics/auth.txt +++ b/docs/topics/auth.txt @@ -212,7 +212,7 @@ Methods .. method:: models.User.get_group_permissions(obj=None) - Returns a list of permission strings that the user has, through his/her + Returns a set of permission strings that the user has, through his/her groups. .. versionadded:: 1.2 @@ -222,7 +222,7 @@ Methods .. method:: models.User.get_all_permissions(obj=None) - Returns a list of permission strings that the user has, both through + Returns a set of permission strings that the user has, both through group and user permissions. .. versionadded:: 1.2 |