summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorNick Pope <nick.pope@flightdataservices.com>2020-11-13 21:26:30 +0000
committerGitHub <noreply@github.com>2020-11-13 22:26:30 +0100
commit477c800443d091b5f36be9b5f83ce16c85da5879 (patch)
tree9a9ee4642bd221851846e8d8833af8cae63b68f5 /docs
parentfed8129276eac973fd48a2f33b7e1735a866628d (diff)
Changed docs and a code comment to use gender-neutral pronouns.
Follow up to e1b77238171cc96f4451a06fb4682e2378896238.
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/contributing/writing-code/working-with-git.txt2
-rw-r--r--docs/ref/contrib/admin/actions.txt2
-rw-r--r--docs/releases/1.5.3.txt2
-rw-r--r--docs/releases/1.6.txt2
-rw-r--r--docs/topics/db/examples/many_to_one.txt2
5 files changed, 5 insertions, 5 deletions
diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt
index 639f7719b8..5f1ffb5166 100644
--- a/docs/internals/contributing/writing-code/working-with-git.txt
+++ b/docs/internals/contributing/writing-code/working-with-git.txt
@@ -142,7 +142,7 @@ Pull requests at GitHub have only two states: open and closed. The committer
who will deal with your pull request has only two options: merge it or close
it. For this reason, it isn't useful to make a pull request until the code is
ready for merging -- or sufficiently close that a committer will finish it
-himself.
+themselves.
Rebasing branches
-----------------
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt
index 184a4d529a..e1988a039a 100644
--- a/docs/ref/contrib/admin/actions.txt
+++ b/docs/ref/contrib/admin/actions.txt
@@ -186,7 +186,7 @@ provided by the admin.
.. _custom-admin-action:
-For example, we can use ``self`` to flash a message to the user informing her
+For example, we can use ``self`` to flash a message to the user informing them
that the action was successful::
from django.contrib import messages
diff --git a/docs/releases/1.5.3.txt b/docs/releases/1.5.3.txt
index efb662e989..ee493966d7 100644
--- a/docs/releases/1.5.3.txt
+++ b/docs/releases/1.5.3.txt
@@ -32,7 +32,7 @@ Mitigating a remote-code execution vulnerability in :mod:`django.contrib.session
session data before storing it in the backend. If you're using the :ref:`signed
cookie session backend<cookie-session-backend>` and :setting:`SECRET_KEY` is
known by an attacker (there isn't an inherent vulnerability in Django that
-would cause it to leak), the attacker could insert a string into his session
+would cause it to leak), the attacker could insert a string into their session
which, when unpickled, executes arbitrary code on the server. The technique for
doing so is simple and easily available on the internet. Although the cookie
session storage signs the cookie-stored data to prevent tampering, a
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 304c12c324..60df27ad31 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -797,7 +797,7 @@ Historically, :mod:`django.contrib.sessions` used :mod:`pickle` to serialize
session data before storing it in the backend. If you're using the :ref:`signed
cookie session backend<cookie-session-backend>` and :setting:`SECRET_KEY` is
known by an attacker (there isn't an inherent vulnerability in Django that
-would cause it to leak), the attacker could insert a string into his session
+would cause it to leak), the attacker could insert a string into their session
which, when unpickled, executes arbitrary code on the server. The technique for
doing so is simple and easily available on the internet. Although the cookie
session storage signs the cookie-stored data to prevent tampering, a
diff --git a/docs/topics/db/examples/many_to_one.txt b/docs/topics/db/examples/many_to_one.txt
index 6c07b5a45d..b9142243f9 100644
--- a/docs/topics/db/examples/many_to_one.txt
+++ b/docs/topics/db/examples/many_to_one.txt
@@ -185,7 +185,7 @@ Queries can go round in circles::
>>> Reporter.objects.filter(article__reporter=r).distinct()
<QuerySet [<Reporter: John Smith>]>
-If you delete a reporter, his articles will be deleted (assuming that the
+If you delete a reporter, their articles will be deleted (assuming that the
ForeignKey was defined with :attr:`django.db.models.ForeignKey.on_delete` set to
``CASCADE``, which is the default)::