Merge pull request #282 from callahad/master

Minor documentation grammar / typo fixes

docs/patterns/templateinheritance.rst

@@ -38,7 +38,7 @@ document that you might use for a simple two-column page. It's the job of
     </body>
 
 In this example, the ``{% block %}`` tags define four blocks that child templates
-can fill in. All the `block` tag does is to tell the template engine that a
+can fill in. All the `block` tag does is tell the template engine that a
 child template may override those portions of the template.
 
 Child Template

flask/helpers.py

@@ -421,7 +421,7 @@ def safe_join(directory, filename):
 
     :param directory: the base directory.
     :param filename: the untrusted filename relative to that directory.
-    :raises: :class:`~werkzeug.exceptions.NotFound` if the retsulting path
+    :raises: :class:`~werkzeug.exceptions.NotFound` if the resulting path
              would fall out of `directory`.
     """
     filename = posixpath.normpath(filename)