Skip to content

Commit 66ee944

Browse files
epochblueweaverryan
authored andcommitted
Replace gendered pronouns with gender-neutral
For consistency sake, instances of "he", "she", "his", "hers", "his/hers", "he/she", etc were replaced with "they", "their", etc (or were removed all together in cases where they weren't necessary). Verb tenses should also have been corrected where changes were made.
1 parent 8d8a0e6 commit 66ee944

File tree

23 files changed

+49
-49
lines changed

23 files changed

+49
-49
lines changed

book/http_cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ The resulting HTTP header will look like this:
474474

475475
Note that in HTTP versions before 1.1 the origin server wasn't required to
476476
send the ``Date`` header. Consequently the cache (e.g. the browser) might
477-
need to rely onto his local clock to evaluate the ``Expires`` header making
477+
need to rely on the local clock to evaluate the ``Expires`` header making
478478
the lifetime calculation vulnerable to clock skew. Another limitation
479479
of the ``Expires`` header is that the specification states that "HTTP/1.1
480480
servers should not send ``Expires`` dates more than one year in the future."

book/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ file:
341341
342342
Now, the vendor directory won't be committed to source control. This is fine
343343
(actually, it's great!) because when someone else clones or checks out the
344-
project, he/she can simply run the ``php composer.phar install`` script to
344+
project, they can simply run the ``php composer.phar install`` script to
345345
install all the necessary project dependencies.
346346

347347
.. _`enable ACL support`: https://help.ubuntu.com/community/FilePermissionsACLs

book/security.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Security
55
========
66

77
Security is a two-step process whose goal is to prevent a user from accessing
8-
a resource that he/she should not have access to.
8+
a resource that they should not have access to.
99

1010
In the first step of the process, the security system identifies who the user
1111
is by requiring the user to submit some sort of identification. This is called
@@ -165,7 +165,7 @@ Firewalls (Authentication)
165165

166166
When a user makes a request to a URL that's protected by a firewall, the
167167
security system is activated. The job of the firewall is to determine whether
168-
or not the user needs to be authenticated, and if he does, to send a response
168+
or not the user needs to be authenticated, and if they do, to send a response
169169
back to the user initiating the authentication process.
170170

171171
A firewall is activated when the URL of an incoming request matches the configured
@@ -217,7 +217,7 @@ If the credentials are valid, the original request can be re-tried.
217217
:align: center
218218

219219
In this example, the user ``ryan`` successfully authenticates with the firewall.
220-
But since ``ryan`` doesn't have the ``ROLE_ADMIN`` role, he's still denied
220+
But since ``ryan`` doesn't have the ``ROLE_ADMIN`` role, they're still denied
221221
access to ``/admin/foo``. Ultimately, this means that the user will see some
222222
sort of message indicating that access has been denied.
223223

@@ -1041,7 +1041,7 @@ Access Control Lists (ACLs): Securing Individual Database Objects
10411041
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10421042

10431043
Imagine you are designing a blog system where your users can comment on your
1044-
posts. Now, you want a user to be able to edit his own comments, but not
1044+
posts. Now, you want a user to be able to edit their own comments, but not
10451045
those of other users. Also, as the admin user, you yourself want to be able
10461046
to edit *all* comments.
10471047

@@ -1809,7 +1809,7 @@ a route so that you can use it to generate the URL:
18091809
As of Symfony 2.1, you *must* have a route that corresponds to your logout
18101810
path. Without this route, logging out will not work.
18111811

1812-
Once the user has been logged out, he will be redirected to whatever path
1812+
Once the user has been logged out, they will be redirected to whatever path
18131813
is defined by the ``target`` parameter above (e.g. the ``homepage``). For
18141814
more information on configuring the logout, see the
18151815
:doc:`Security Configuration Reference </reference/configuration/security>`.

book/templating.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ this classic example:
13621362

13631363
Hello <?php echo $name ?>
13641364

1365-
Imagine that the user enters the following code as his/her name:
1365+
Imagine the user enters the following code for their name:
13661366

13671367
.. code-block:: text
13681368

book/validation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ on that class. To do this, you can organize each constraint into one or more
694694
constraints.
695695

696696
For example, suppose you have a ``User`` class, which is used both when a
697-
user registers and when a user updates his/her contact information later:
697+
user registers and when a user updates their contact information later:
698698

699699
.. configuration-block::
700700

components/console/helpers/dialoghelper.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ if you want to know a bundle name, you can add this to your command::
4949
'AcmeDemoBundle'
5050
);
5151

52-
The user will be asked "Please enter the name of the bundle". She can type
53-
some name which will be returned by the ``ask`` method. If she leaves it empty,
52+
The user will be asked "Please enter the name of the bundle". They can type
53+
some name which will be returned by the ``ask`` method. If they leave it empty,
5454
the default value (``AcmeDemoBundle`` here) is returned.
5555

5656
Hiding the User's Response
@@ -120,8 +120,8 @@ function should also return the value of the user's input if the validation was
120120
You can set the max number of times to ask in the ``$attempts`` argument.
121121
If you reach this max number it will use the default value, which is given
122122
in the last argument. Using ``false`` means the amount of attempts is infinite.
123-
The user will be asked as long as he provides an invalid answer and will only
124-
be able to proceed if her input is valid.
123+
The user will be asked as long as they provide an invalid answer and will only
124+
be able to proceed if their input is valid.
125125

126126
Validating a Hidden Response
127127
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -184,7 +184,7 @@ The option which should be selected by default is provided with the fourth
184184
parameter. The default is ``null``, which means that no option is the default one.
185185

186186
If the user enters an invalid string, an error message is shown and the user
187-
is asked to provide the answer another time, until she enters a valid string
187+
is asked to provide the answer another time, until they enter a valid string
188188
or the maximum attempts is reached (which you can define in the fifth
189189
parameter). The default value for the attempts is ``false``, which means infinite
190190
attempts. You can define your own error message in the sixth parameter.

components/event_dispatcher/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Introduction
1111
Objected Oriented code has gone a long way to ensuring code extensibility. By
1212
creating classes that have well defined responsibilities, your code becomes
1313
more flexible and a developer can extend them with subclasses to modify their
14-
behaviors. But if he wants to share his changes with other developers who have
14+
behaviors. But if they want to share the changes with other developers who have
1515
also made their own subclasses, code inheritance is no longer the answer.
1616

1717
Consider the real-world example where you want to provide a plugin system for

components/security/authentication.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Authenticating Users by their Username and Password
110110
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
111111

112112
An authentication provider will attempt to authenticate a user based on
113-
the credentials he provided. Usually these are a username and a password.
113+
the credentials they provided. Usually these are a username and a password.
114114
Most web applications store their user's username and a hash of the user's
115115
password combined with a randomly generated salt. This means that the average
116116
authentication would consist of fetching the salt and the hashed password
@@ -228,4 +228,4 @@ which should be used to encode this user's password::
228228
$user->getSalt());
229229

230230
.. _`CVE-2013-5750`: http://symfony.com/blog/cve-2013-5750-security-issue-in-fosuserbundle-login-form
231-
.. _`BasePasswordEncoder::checkPasswordLength`: https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
231+
.. _`BasePasswordEncoder::checkPasswordLength`: https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php

components/security/firewall.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ firewall map will jump in.
101101

102102
The exception listener determines what happens next, based on the arguments
103103
it received when it was created. It may start the authentication procedure,
104-
perhaps ask the user to supply his credentials again (when he has only been
104+
perhaps ask the user to supply their credentials again (when they have only been
105105
authenticated based on a "remember-me" cookie), or transform the exception
106106
into an :class:`Symfony\\Component\\HttpKernel\\Exception\\AccessDeniedHttpException`,
107107
which will eventually result in an "HTTP/1.1 403: Access Denied" response.
@@ -119,7 +119,7 @@ object and the exception by which the exception listener was triggered.
119119
The method should return a :class:`Symfony\\Component\\HttpFoundation\\Response`
120120
object. This could be, for instance, the page containing the login form or,
121121
in the case of Basic HTTP authentication, a response with a ``WWW-Authenticate``
122-
header, which will prompt the user to supply his username and password.
122+
header, which will prompt the user to supply their username and password.
123123

124124
Flow: Firewall, Authentication, Authorization
125125
---------------------------------------------

contributing/documentation/translations.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Symfony2 documentation for a new language.
5858
As starting a translation is a lot of work, talk about your plan on the
5959
`Symfony docs mailing-list`_ and try to find motivated people willing to help.
6060

61-
When the team is ready, nominate a team manager; he will be responsible for
61+
When the team is ready, nominate a team manager; they will be responsible for
6262
the *master* repository.
6363

6464
Create the repository and copy the *English* documents.

0 commit comments

Comments
 (0)