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

flask/app.py

@@ -1265,7 +1265,7 @@ class Flask(_PackageBoundObject):
 
     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.

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.
     """