Merge branch 'master' of github.com:mitsuhiko/flask

docs/tutorial/dbcon.rst

@@ -9,7 +9,7 @@ connection in all our functions so it makes sense to initialize them
 before each request and shut them down afterwards.
 
 Flask allows us to do that with the :meth:`~flask.Flask.before_request`,
-:meth:`~flask.Flask.teardown_request` and :meth:`~flask.Flask.teardown_request`
+:meth:`~flask.Flask.after_request` and :meth:`~flask.Flask.teardown_request`
 decorators::
 
     @app.before_request

flask/app.py

@@ -112,7 +112,7 @@ class Flask(_PackageBoundObject):
     #: configuration key.  Defaults to `False`.
     debug = ConfigAttribute('DEBUG')
 
-    #: The testing flask.  Set this to `True` to enable the test mode of
+    #: The testing flag.  Set this to `True` to enable the test mode of
     #: Flask extensions (and in the future probably also Flask itself).
     #: For example this might activate unittest helpers that have an
     #: additional runtime cost which should not be enabled by default.

flask/ctx.py

@@ -12,7 +12,6 @@
 from werkzeug.exceptions import HTTPException
 
 from .globals import _request_ctx_stack
-from .session import _NullSession
 from .module import blueprint_is_module