[1.7.x] Replaced instances of 'his/her' with 'their'.

Backport of 8fbf13a6c8 from master

6 files changed, 10 insertions, 10 deletions

diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py
index 6e07d45568..a21dd89e9a 100644
--- a/django/contrib/auth/forms.py
+++ b/django/contrib/auth/forms.py
@@ -278,8 +278,8 @@ class PasswordResetForm(forms.Form):
 
 class SetPasswordForm(forms.Form):
     """
-    A form that lets a user change set his/her password without entering the
-    old password
+    A form that lets a user change set their password without entering the old
+    password
     """
     error_messages = {
         'password_mismatch': _("The two password fields didn't match."),
@@ -313,8 +313,8 @@ class SetPasswordForm(forms.Form):
 
 class PasswordChangeForm(SetPasswordForm):
     """
-    A form that lets a user change his/her password by entering
-    their old password.
+    A form that lets a user change their password by entering their old
+    password.
     """
     error_messages = dict(SetPasswordForm.error_messages, **{
         'password_incorrect': _("Your old password was entered incorrectly. "
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 8cc28bc85d..24b97556b4 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -305,7 +305,7 @@ class PermissionsMixin(models.Model):
 
     def get_group_permissions(self, obj=None):
         """
-        Returns a list of permission strings that this user has through his/her
+        Returns a list of permission strings that this user has through their
         groups. This method queries all available auth backends. If an object
         is passed in, only permissions matching this object are returned.
         """
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 526eb402c6..4afb388519 100644
--- a/docs/ref/contrib/auth.txt
+++ b/docs/ref/contrib/auth.txt
@@ -179,7 +179,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 f9458a41bb..0248d8048f 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -807,7 +807,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 3fae92c662..f1cd96e99c 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -1211,7 +1211,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
@@ -1229,7 +1229,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`.