Merge pull request #275 from vreon/patch-1

typo fix: flask -> flag
Don't use deprecated flask.session in flask.ctx.
Merge pull request #277 from embe/master

Don't use deprecated flask.session in flask.ctx.
Fixed a typo.  This closes #278
Merge branch 'master' of github.com:mitsuhiko/flask
View functions can opt out of the default OPTIONS implementation
Documented view function options
Added a versionadded
Switch to explicit Werkzeug imports
be consistent with app.config['UPLOAD_FOLDER']

Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
Fixed a bug in list_templates
Typo: developped -> developed
Merge pull request #281 from ustun/patch-1

Typo: developped -> developed
Fixed a typo in a docstring
Minor documentation typo / grammar fixes
Merge pull request #282 from callahad/master

Minor documentation grammar / typo fixes
Intersphinx link fixes.
Merge pull request #284 from SimonSapin/patch-2

Intersphinx link fixes.
Add code organization help to tutorial doc.

As suggested by burhan on #pocoo today.
Updated docs for streaming