Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Removed gender-based pronouns per [c0a2daa].

  • Loading branch information...
commit f3e7ab366c597571198dc8d024f09e619991bac4 1 parent c0a2daa
Tim Graham authored November 30, 2013
2  django/contrib/auth/tests/test_forms.py
@@ -133,7 +133,7 @@ def test_inactive_user_i18n(self):
133 133
                              [force_text(form.error_messages['inactive'])])
134 134
 
135 135
     def test_custom_login_allowed_policy(self):
136  
-        # The user is inactive, but our custom form policy allows him to log in.
  136
+        # The user is inactive, but our custom form policy allows them to log in.
137 137
         data = {
138 138
             'username': 'inactive',
139 139
             'password': 'password',
4  docs/ref/clickjacking.txt
@@ -20,8 +20,8 @@ purchase an item. A user has chosen to stay logged into the store all the time
20 20
 for convenience. An attacker site might create an "I Like Ponies" button on one
21 21
 of their own pages, and load the store's page in a transparent iframe such that
22 22
 the "Buy Now" button is invisibly overlaid on the "I Like Ponies" button. If the
23  
-user visits the attacker site and clicks "I Like Ponies" he or she will inadvertently
24  
-click on the online store's "Buy Now" button and unknowingly purchase the item.
  23
+user visits the attacker's site, clicking "I Like Ponies" will cause an
  24
+inadvertent click on the "Buy Now" button and an unknowing purchase of the item.
25 25
 
26 26
 .. _clickjacking-prevention:
27 27
 
2  docs/ref/contrib/sites.txt
@@ -172,7 +172,7 @@ Getting the current domain for display
172 172
 
173 173
 LJWorld.com and Lawrence.com both have email alert functionality, which lets
174 174
 readers sign up to get notifications when news happens. It's pretty basic: A
175  
-reader signs up on a Web form, and he or she immediately gets an email saying,
  175
+reader signs up on a Web form and immediately gets an email saying,
176 176
 "Thanks for your subscription."
177 177
 
178 178
 It'd be inefficient and redundant to implement this signup-processing code
2  docs/ref/settings.txt
@@ -2468,7 +2468,7 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE
2468 2468
 
2469 2469
 Default: ``False``
2470 2470
 
2471  
-Whether to expire the session when the user closes his or her browser. See
  2471
+Whether to expire the session when the user closes their browser. See
2472 2472
 :ref:`browser-length-vs-persistent-sessions`.
2473 2473
 
2474 2474
 .. setting:: SESSION_FILE_PATH
3  docs/releases/1.3-beta-1.txt
@@ -73,8 +73,7 @@ The Django admin has long had an undocumented "feature" allowing savvy
73 73
 users to manipulate the query string of changelist pages to filter the
74 74
 list of objects displayed. However, this also creates a security
75 75
 issue, as a staff user with sufficient knowledge of model structure
76  
-could use this "feature" to gain access to information he or she would
77  
-not normally have.
  76
+could use this "feature" to gain access to information not normally accessible.
78 77
 
79 78
 As a result, changelist filtering now explicitly validates all lookup
80 79
 arguments in the query string, and permits only fields which are
2  docs/releases/1.4.6.txt
@@ -19,7 +19,7 @@ The security checks for these redirects (namely
19 19
 ``django.util.http.is_safe_url()``) didn't check if the scheme is ``http(s)``
20 20
 and as such allowed ``javascript:...`` URLs to be entered. If a developer
21 21
 relied on ``is_safe_url()`` to provide safe redirect targets and put such a
22  
-URL into a link, he or she could suffer from a XSS attack. This bug doesn't affect
  22
+URL into a link, they could suffer from a XSS attack. This bug doesn't affect
23 23
 Django currently, since we only put this URL into the ``Location`` response
24 24
 header and browsers seem to ignore JavaScript there.
25 25
 
2  docs/releases/1.4.txt
@@ -811,7 +811,7 @@ instance:
811 811
 
812 812
   * Consequences: The user will see an error about the form having expired
813 813
     and will be sent back to the first page of the wizard, losing the data
814  
-    he or she has entered so far.
  814
+    entered so far.
815 815
 
816 816
   * Time period: The amount of time you expect users to take filling out the
817 817
     affected forms.
2  docs/releases/1.5.2.txt
@@ -16,7 +16,7 @@ The security checks for these redirects (namely
16 16
 ``django.util.http.is_safe_url()``) didn't check if the scheme is ``http(s)``
17 17
 and as such allowed ``javascript:...`` URLs to be entered. If a developer
18 18
 relied on ``is_safe_url()`` to provide safe redirect targets and put such a
19  
-URL into a link, he or she could suffer from a XSS attack. This bug doesn't affect
  19
+URL into a link, they could suffer from a XSS attack. This bug doesn't affect
20 20
 Django currently, since we only put this URL into the ``Location`` response
21 21
 header and browsers seem to ignore JavaScript there.
22 22
 
8  docs/topics/cache.txt
@@ -1123,10 +1123,10 @@ Controlling cache: Using other headers
1123 1123
 Other problems with caching are the privacy of data and the question of where
1124 1124
 data should be stored in a cascade of caches.
1125 1125
 
1126  
-A user usually faces two kinds of caches: his or her own browser cache (a
1127  
-private cache) and his or her provider's cache (a public cache). A public cache
1128  
-is used by multiple users and controlled by someone else. This poses problems
1129  
-with sensitive data--you don't want, say, your bank account number stored in a
  1126
+A user usually faces two kinds of caches: their own browser cache (a private
  1127
+cache) and their provider's cache (a public cache). A public cache is used by
  1128
+multiple users and controlled by someone else. This poses problems with
  1129
+sensitive data--you don't want, say, your bank account number stored in a
1130 1130
 public cache. So Web applications need a way to tell caches which data is
1131 1131
 private and which is public.
1132 1132
 
2  docs/topics/db/aggregation.txt
@@ -241,7 +241,7 @@ such alias were specified, it would be the rather long ``'book__pubdate__min'``.
241 241
 
242 242
 This doesn't apply just to foreign keys. It also works with many-to-many
243 243
 relations. For example, we can ask for every author, annotated with the total
244  
-number of pages considering all the books he/she has (co-)authored (note how we
  244
+number of pages considering all the books the author has (co-)authored (note how we
245 245
 use ``'book'`` to specify the ``Author`` -> ``Book`` reverse many-to-many hop)::
246 246
 
247 247
     >>> Author.objects.annotate(total_pages=Sum('book__pages'))
6  docs/topics/http/sessions.txt
@@ -166,7 +166,7 @@ and the :setting:`SECRET_KEY` setting.
166 166
     cookie backend might open you up to `replay attacks`_. Unlike other session
167 167
     backends which keep a server-side record of each session and invalidate it
168 168
     when a user logs out, cookie-based sessions are not invalidated when a user
169  
-    logs out. Thus if an attacker steals a user's cookie, he or she can use that
  169
+    logs out. Thus if an attacker steals a user's cookie, they can use that
170 170
     cookie to login as that user even if the user logs out. Cookies will only
171 171
     be detected as 'stale' if they are older than your
172 172
     :setting:`SESSION_COOKIE_AGE`.
@@ -590,8 +590,8 @@ log in every time they open a browser.
590 590
 
591 591
 If :setting:`SESSION_EXPIRE_AT_BROWSER_CLOSE` is set to ``True``, Django will
592 592
 use browser-length cookies -- cookies that expire as soon as the user closes
593  
-his or her browser. Use this if you want people to have to log in every time
594  
-they open a browser.
  593
+their browser. Use this if you want people to have to log in every time they
  594
+open a browser.
595 595
 
596 596
 This setting is a global default and can be overwritten at a per-session level
597 597
 by explicitly calling the :meth:`~backends.base.SessionBase.set_expiry` method
4  docs/topics/i18n/translation.txt
@@ -1579,8 +1579,8 @@ If all you want is to run Django with your native language all you need to do
1579 1579
 is set :setting:`LANGUAGE_CODE` and make sure the corresponding :term:`message
1580 1580
 files <message file>` and their compiled versions (``.mo``) exist.
1581 1581
 
1582  
-If you want to let each individual user specify which language he or she
1583  
-prefers, then you also need to use use the ``LocaleMiddleware``.
  1582
+If you want to let each individual user specify which language they
  1583
+prefer, then you also need to use use the ``LocaleMiddleware``.
1584 1584
 ``LocaleMiddleware`` enables language selection based on data from the request.
1585 1585
 It customizes content for each user.
1586 1586
 

0 notes on commit f3e7ab3

Please sign in to comment.
Something went wrong with that request. Please try again.