diff --git a/docs/upgrading.rst b/docs/upgrading.rst index 4a0676a8..ebea0101 100644 --- a/docs/upgrading.rst +++ b/docs/upgrading.rst @@ -64,8 +64,8 @@ If you maintain an extension that was using :data:`~flask._request_ctx_stack` before, please consider changing to :data:`~flask._app_ctx_stack` if it makes sense for your extension. For instance, the app context stack makes sense for extensions which connect to databases. Using the app context stack instead of -the request stack will make extensions more readily handle use cases outside of -requests. +the request context stack will make extensions more readily handle use cases +outside of requests. Version 0.8 ----------- diff --git a/flask/app.py b/flask/app.py index 6b6da433..bb5cbbd7 100644 --- a/flask/app.py +++ b/flask/app.py @@ -874,7 +874,7 @@ class Flask(_PackageBoundObject): return self.session_interface.make_null_session(self) def register_module(self, module, **options): - """Registers a module with this application. The keyword argument + """Registers a module with this application. The keyword arguments of this function are the same as the ones for the constructor of the :class:`Module` class and will override the values of the module if provided. diff --git a/flask/json.py b/flask/json.py index bdebf707..a0ed7041 100644 --- a/flask/json.py +++ b/flask/json.py @@ -119,7 +119,7 @@ def dumps(obj, **kwargs): This function can return ``unicode`` strings or ascii-only bytestrings by default which coerce into unicode strings automatically. That behavior by default is controlled by the ``JSON_AS_ASCII`` configuration variable - and can be overriden by the simplejson ``ensure_ascii`` parameter. + and can be overridden by the simplejson ``ensure_ascii`` parameter. """ _dump_arg_defaults(kwargs) encoding = kwargs.pop('encoding', None) diff --git a/flask/wrappers.py b/flask/wrappers.py index 528e94f5..f74a3f37 100644 --- a/flask/wrappers.py +++ b/flask/wrappers.py @@ -127,7 +127,7 @@ class Request(RequestBase): parsing fails the :meth:`on_json_loading_failed` method on the request object will be invoked. By default this function will only load the json data if the mimetype is ``application/json`` - but this can be overriden by the `force` parameter. + but this can be overridden by the `force` parameter. :param force: if set to `True` the mimetype is ignored. :param silent: if set to `True` this method will fail silently