Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 62c0c67d88b619d4da7f1d98a4c50e8e6928280b 2 parents 4f1cb42 + 3b9fe7c
@mitsuhiko authored
Showing with 3 additions and 3 deletions.
  1. +1 −1  flask/app.py
  2. +2 −2 flask/templating.py
View
2  flask/app.py
@@ -1265,7 +1265,7 @@ def handle_user_exception(self, e):
def handle_exception(self, e):
"""Default exception handling that kicks in when an exception
- occours that is not caught. In debug mode the exception will
+ occurs that is not caught. In debug mode the exception will
be re-raised immediately, otherwise it is logged and the handler
for a 500 internal server error is used. If no such handler
exists, a default 500 internal server error message is displayed.
View
4 flask/templating.py
@@ -129,8 +129,8 @@ def render_template_string(source, **context):
"""Renders a template from the given template source string
with the given context.
- :param template_name: the sourcecode of the template to be
- rendered
+ :param source: the sourcecode of the template to be
+ rendered
:param context: the variables that should be available in the
context of the template.
"""
Please sign in to comment.
Something went wrong with that request. Please try again.