diff options
| author | Iain Dawson <iain@colons.co> | 2014-07-21 18:55:37 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-07-21 19:55:28 +0000 |
| commit | 205090bc7173eff649dd7ef69805f9a760534b01 (patch) | |
| tree | 387c4d4f224b22bf35944557e8ab26277fd6140e /docs | |
| parent | ca44366b15e65453b2ea3f405754af93d0220694 (diff) | |
[1.6.x] Replaced instances of 'his/her' with 'their'.
Backport of 8fbf13a6c8 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/contributing/committing-code.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/auth.txt | 2 | ||||
| -rw-r--r-- | docs/topics/auth/customizing.txt | 2 | ||||
| -rw-r--r-- | docs/topics/auth/default.txt | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index 72d0187cea..5de2ef0378 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -228,7 +228,7 @@ another committer, **before** you commit it in the first place! When a mistaken commit is discovered, please follow these guidelines: -* If possible, have the original author revert his/her own commit. +* If possible, have the original author revert their own commit. * Don't revert another author's changes without permission from the original author. diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt index 244eb79cd5..12953e89e6 100644 --- a/docs/ref/contrib/auth.txt +++ b/docs/ref/contrib/auth.txt @@ -181,7 +181,7 @@ Methods .. method:: get_group_permissions(obj=None) - Returns a set of permission strings that the user has, through his/her + Returns a set of permission strings that the user has, through their groups. If ``obj`` is passed in, only returns the group permissions for diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt index 0cb0401108..8f78c2b4a7 100644 --- a/docs/topics/auth/customizing.txt +++ b/docs/topics/auth/customizing.txt @@ -804,7 +804,7 @@ methods and attributes: .. method:: models.PermissionsMixin.get_group_permissions(obj=None) - Returns a set of permission strings that the user has, through his/her + Returns a set of permission strings that the user has, through their groups. If ``obj`` is passed in, only returns the group permissions for diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt index 79772aa2a8..ca823d67b8 100644 --- a/docs/topics/auth/default.txt +++ b/docs/topics/auth/default.txt @@ -1106,7 +1106,7 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`: .. class:: SetPasswordForm - A form that lets a user change his/her password without entering the old + A form that lets a user change their password without entering the old password. .. class:: UserChangeForm @@ -1124,7 +1124,7 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`: Authentication data in templates -------------------------------- -The currently logged-in user and his/her permissions are made available in the +The currently logged-in user and their permissions are made available in the :doc:`template context </ref/templates/api>` when you use :class:`~django.template.RequestContext`. |