maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge pull request #282 from callahad/master

Browse source 
Minor documentation grammar / typo fixes
This commit is contained in:
Armin Ronacher 2011-07-19 16:20:28 -07:00
commit e8e2e93409
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/patterns/templateinheritance.rst
View file

@ -38,7 +38,7 @@ document that you might use for a simple two-column page. It's the job of
</body> </body>
In this example, the ``{% block %}`` tags define four blocks that child templates 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 may override those portions of the template.
Child Template Child Template

2
flask/helpers.py
View file

@ -421,7 +421,7 @@ def safe_join(directory, filename):
:param directory: the base directory. :param directory: the base directory.
:param filename: the untrusted filename relative to that 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`. would fall out of `directory`.
""" """
filename = posixpath.normpath(filename) filename = posixpath.normpath(filename)