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

flask/app.py

@@ -928,15 +928,6 @@ class Flask(_PackageBoundObject):
             finally:
                 ctx.pop()
 
-        The big advantage of this approach is that you can use it without
-        the try/finally statement in a shell for interactive testing:
-
-        >>> ctx = app.test_request_context()
-        >>> ctx.bind()
-        >>> request.path
-        u'/'
-        >>> ctx.unbind()
-
         .. versionchanged:: 0.3
            Added support for non-with statement usage and `with` statement
            is now passed the ctx object.

flask/config.py

@@ -141,8 +141,8 @@ class Config(dict):
 
         Objects are usually either modules or classes.
 
-        Just the uppercase variables in that object are stored in the config
-        after lowercasing.  Example usage::
+        Just the uppercase variables in that object are stored in the config.
+        Example usage::
 
             app.config.from_object('yourapplication.default_config')
             from yourapplication import default_config