Skip to content

Commit

Permalink
[1.2.X] Fixed #14764 -- specified that a set is returned by User.get_…
Browse files Browse the repository at this point in the history
…..._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
  • Loading branch information
DrMeers committed Dec 4, 2010
1 parent e0d6808 commit 84e5277
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docs/topics/auth.txt
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 84e5277

Please sign in to comment.