orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into blueprints

Browse source
This commit is contained in:
Armin Ronacher 2011-06-27 09:30:39 +02:00
commit 4e47ea9105
8 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/patterns/errorpages.rst
View file

@ -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 tries to access a resource he cannot access.
is not lost when he or she tries 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 was
use the 410 code instead and display a message that what he or she was
looking for was deleted for all eternity.
*500 Internal Server Error*

6
docs/patterns/fileuploads.rst
View file

@ -89,7 +89,7 @@ before storing it directly on the filesystem.
Assuming the number of ``../`` is correct and you would join this with
the `UPLOAD_FOLDER` the user might have the ability to modify a file on
the server's filesystem he should not modify. This does require some
the server's filesystem he or she should not modify. This does require some
knowledge about how the application looks like, but trust me, hackers
are patient :)
@ -155,8 +155,8 @@ Upload Progress Bars
A while ago many developers had the idea to read the incoming file in
small chunks and store the upload progress in the database to be able to
poll the progress with JavaScript from the client. Long story short: the
client asks the server every 5 seconds how much he has transmitted
already. Do you realize the irony? The client is asking for something he
client asks the server every 5 seconds how much it has transmitted
already. Do you realize the irony? The client is asking for something it
should already know.
Now there are better solutions to that work faster and more reliable. The

2
docs/patterns/flashing.rst
View file

@ -4,7 +4,7 @@ Message Flashing
================
Good applications and user interfaces are all about feedback. If the user
does not get enough feedback he will probably end up hating the
does not get enough feedback he or she 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

2
docs/patterns/viewdecorators.rst
View file

@ -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 should be redirected to the
goes to the site and is not logged in, he or she should be redirected to the
login page. This is a good example of a use case where a decorator is an
excellent solution.