diff options
| author | Simon Meers <simon@simonmeers.com> | 2010-12-04 01:23:11 +0000 |
|---|---|---|
| committer | Simon Meers <simon@simonmeers.com> | 2010-12-04 01:23:11 +0000 |
| commit | 84e5277a25989cadf54eba5b74292604135ae5dc (patch) | |
| tree | 8687fa49ca57365de4775230ef13f3a17a1607d3 /docs | |
| parent | e0d68084a0a89ada1ff030d03d9f9eb51dcfd159 (diff) | |
[1.2.X] Fixed #14764 -- specified that a set is returned by User.get_..._permissions methods. Thanks MostAwesomeDude for the report.
Backport of r14787 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14788 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 332d61419a..a58e523ea1 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 |