diff options
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/cache.txt | 8 | ||||
| -rw-r--r-- | docs/topics/db/aggregation.txt | 2 | ||||
| -rw-r--r-- | docs/topics/http/sessions.txt | 6 | ||||
| -rw-r--r-- | docs/topics/i18n/translation.txt | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt index e08ea5f960..7ef7285fb7 100644 --- a/docs/topics/cache.txt +++ b/docs/topics/cache.txt @@ -1123,10 +1123,10 @@ Controlling cache: Using other headers Other problems with caching are the privacy of data and the question of where data should be stored in a cascade of caches. -A user usually faces two kinds of caches: his or her own browser cache (a -private cache) and his or her provider's cache (a public cache). A public cache -is used by multiple users and controlled by someone else. This poses problems -with sensitive data--you don't want, say, your bank account number stored in a +A user usually faces two kinds of caches: their own browser cache (a private +cache) and their provider's cache (a public cache). A public cache is used by +multiple users and controlled by someone else. This poses problems with +sensitive data--you don't want, say, your bank account number stored in a public cache. So Web applications need a way to tell caches which data is private and which is public. diff --git a/docs/topics/db/aggregation.txt b/docs/topics/db/aggregation.txt index 1024d6b0c2..9e02b50c67 100644 --- a/docs/topics/db/aggregation.txt +++ b/docs/topics/db/aggregation.txt @@ -241,7 +241,7 @@ such alias were specified, it would be the rather long ``'book__pubdate__min'``. This doesn't apply just to foreign keys. It also works with many-to-many relations. For example, we can ask for every author, annotated with the total -number of pages considering all the books he/she has (co-)authored (note how we +number of pages considering all the books the author has (co-)authored (note how we use ``'book'`` to specify the ``Author`` -> ``Book`` reverse many-to-many hop):: >>> Author.objects.annotate(total_pages=Sum('book__pages')) diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt index d39b8344c6..f7e8807945 100644 --- a/docs/topics/http/sessions.txt +++ b/docs/topics/http/sessions.txt @@ -166,7 +166,7 @@ and the :setting:`SECRET_KEY` setting. cookie backend might open you up to `replay attacks`_. Unlike other session backends which keep a server-side record of each session and invalidate it when a user logs out, cookie-based sessions are not invalidated when a user - logs out. Thus if an attacker steals a user's cookie, he or she can use that + logs out. Thus if an attacker steals a user's cookie, they can use that cookie to login as that user even if the user logs out. Cookies will only be detected as 'stale' if they are older than your :setting:`SESSION_COOKIE_AGE`. @@ -590,8 +590,8 @@ log in every time they open a browser. If :setting:`SESSION_EXPIRE_AT_BROWSER_CLOSE` is set to ``True``, Django will use browser-length cookies -- cookies that expire as soon as the user closes -his or her browser. Use this if you want people to have to log in every time -they open a browser. +their browser. Use this if you want people to have to log in every time they +open a browser. This setting is a global default and can be overwritten at a per-session level by explicitly calling the :meth:`~backends.base.SessionBase.set_expiry` method diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 66b9a99e21..6e56831a6b 100644 --- a/docs/topics/i18n/translation.txt +++ b/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 is set :setting:`LANGUAGE_CODE` and make sure the corresponding :term:`message files <message file>` and their compiled versions (``.mo``) exist. -If you want to let each individual user specify which language he or she -prefers, then you also need to use use the ``LocaleMiddleware``. +If you want to let each individual user specify which language they +prefer, then you also need to use use the ``LocaleMiddleware``. ``LocaleMiddleware`` enables language selection based on data from the request. It customizes content for each user. |