From 22d468e190c4cdd3af8ea0546157f22b53197855 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Tue, 28 Jun 2011 14:34:07 +0200 Subject: [PATCH] Less annoying gender neutral forms --- docs/api.rst | 2 +- docs/patterns/errorpages.rst | 4 ++-- docs/patterns/flashing.rst | 2 +- docs/patterns/viewdecorators.rst | 2 +- docs/quickstart.rst | 8 ++++---- docs/security.rst | 2 +- docs/tutorial/introduction.rst | 2 +- docs/tutorial/views.rst | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index c2ea5b62..b21ec2ce 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -156,7 +156,7 @@ If you have the :attr:`Flask.secret_key` set you can use sessions in Flask applications. A session basically makes it possible to remember information from one request to another. The way Flask does this is by using a signed cookie. So the user can look at the session contents, but -not modify it unless he or she knows the secret key, so make sure to set that +not modify it unless they know the secret key, so make sure to set that to something complex and unguessable. To access the current session you can use the :class:`session` object: diff --git a/docs/patterns/errorpages.rst b/docs/patterns/errorpages.rst index babeae4f..ddf73c93 100644 --- a/docs/patterns/errorpages.rst +++ b/docs/patterns/errorpages.rst @@ -24,7 +24,7 @@ even if the application behaves correctly: *403 Forbidden* If you have some kind of access control on your website, you will have to send a 403 code for disallowed resources. So make sure the user - is not lost when he or she tries to access a forbidden resource. + is not lost when they try to access a forbidden resource. *410 Gone* Did you know that there the "404 Not Found" has a brother named "410 @@ -32,7 +32,7 @@ even if the application behaves correctly: resources that previously existed and got deleted answer with 410 instead of 404. If you are not deleting documents permanently from the database but just mark them as deleted, do the user a favour and - use the 410 code instead and display a message that what he or she was + use the 410 code instead and display a message that what they were looking for was deleted for all eternity. *500 Internal Server Error* diff --git a/docs/patterns/flashing.rst b/docs/patterns/flashing.rst index a8291612..7abe7165 100644 --- a/docs/patterns/flashing.rst +++ b/docs/patterns/flashing.rst @@ -4,7 +4,7 @@ Message Flashing ================ Good applications and user interfaces are all about feedback. If the user -does not get enough feedback he or she will probably end up hating the +does not get enough feedback they will probably end up hating the application. Flask provides a really simple way to give feedback to a user with the flashing system. The flashing system basically makes it possible to record a message at the end of a request and access it next diff --git a/docs/patterns/viewdecorators.rst b/docs/patterns/viewdecorators.rst index 9396fa91..a0948577 100644 --- a/docs/patterns/viewdecorators.rst +++ b/docs/patterns/viewdecorators.rst @@ -8,7 +8,7 @@ functionality to one or more functions. The :meth:`~flask.Flask.route` decorator is the one you probably used already. But there are use cases for implementing your own decorator. For instance, imagine you have a view that should only be used by people that are logged in to. If a user -goes to the site and is not logged in, he or she should be redirected to the +goes to the site and is not logged in, they should be redirected to the login page. This is a good example of a use case where a decorator is an excellent solution. diff --git a/docs/quickstart.rst b/docs/quickstart.rst index b6fdecd0..5eaaf9c5 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -126,7 +126,7 @@ Modern web applications have beautiful URLs. This helps people remember the URLs which is especially handy for applications that are used from mobile devices with slower network connections. If the user can directly go to the desired page without having to hit the index page it is more -likely he or she will like the page and come back next time. +likely they will like the page and come back next time. As you have seen above, the :meth:`~flask.Flask.route` decorator is used to bind a function to a URL. Here are some basic examples:: @@ -614,7 +614,7 @@ code use the :func:`~flask.abort` function. Here an example how this works:: this_is_never_executed() This is a rather pointless example because a user will be redirected from -the index to a page he or she cannot access (401 means access denied) but it +the index to a page they cannot access (401 means access denied) but it shows how that works. By default a black and white error page is shown for each error code. If @@ -641,7 +641,7 @@ Besides the request object there is also a second object called user from one request to the next. This is implemented on top of cookies for you and signs the cookies cryptographically. What this means is that the user could look at the contents of your cookie but not modify it, -unless he or she knows the secret key used for signing. +unless they know the secret key used for signing. In order to use sessions you have to set a secret key. Here is how sessions work:: @@ -697,7 +697,7 @@ Message Flashing ---------------- Good applications and user interfaces are all about feedback. If the user -does not get enough feedback he or she will probably end up hating the +does not get enough feedback they will probably end up hating the application. Flask provides a really simple way to give feedback to a user with the flashing system. The flashing system basically makes it possible to record a message at the end of a request and access it next diff --git a/docs/security.rst b/docs/security.rst index 0e6ff67e..909ef537 100644 --- a/docs/security.rst +++ b/docs/security.rst @@ -73,7 +73,7 @@ them knowing. Say you have a specific URL that, when you sent `POST` requests to will delete a user's profile (say `http://example.com/user/delete`). If an attacker now creates a page that sends a post request to that page with -some JavaScript he or she just has to trick some users to load that page and +some JavaScript they just has to trick some users to load that page and their profiles will end up being deleted. Imagine you were to run Facebook with millions of concurrent users and diff --git a/docs/tutorial/introduction.rst b/docs/tutorial/introduction.rst index 00fe3a00..c72bbd7d 100644 --- a/docs/tutorial/introduction.rst +++ b/docs/tutorial/introduction.rst @@ -8,7 +8,7 @@ less web-2.0-ish name ;) Basically we want it to do the following things: 1. let the user sign in and out with credentials specified in the configuration. Only one user is supported. -2. when the user is logged in he or she can add new entries to the page +2. when the user is logged in they can add new entries to the page consisting of a text-only title and some HTML for the text. This HTML is not sanitized because we trust the user here. 3. the page shows all entries so far in reverse order (newest on top) and diff --git a/docs/tutorial/views.rst b/docs/tutorial/views.rst index 466812dc..93bec3bf 100644 --- a/docs/tutorial/views.rst +++ b/docs/tutorial/views.rst @@ -29,7 +29,7 @@ The view function will pass the entries as dicts to the Add New Entry ------------- -This view lets the user add new entries if he or she is logged in. This only +This view lets the user add new entries if they are logged in. This only responds to `POST` requests, the actual form is shown on the `show_entries` page. If everything worked out well we will :func:`~flask.flash` an information message to the next request and