Merge pull request #1509 from kianmeng/fix-typos

Fix typos

CHANGES.rst

@@ -423,7 +423,7 @@ Released 2017-01-08
     possible. For more information and a discussion see :issue:`641`
 -   Resolved an issue where ``block scoped`` would not take advantage of
     the new scoping rules. In some more exotic cases a variable
-    overriden in a local scope would not make it into a block.
+    overridden in a local scope would not make it into a block.
 -   Change the code generation of the ``with`` statement to be in line
     with the new scoping rules. This resolves some unlikely bugs in edge
     cases. This also introduces a new internal ``With`` node that can be

src/jinja2/nodes.py

@@ -955,7 +955,7 @@ class Div(BinExpr):
 
 
 class FloorDiv(BinExpr):
-    """Divides the left by the right node and truncates conver the
+    """Divides the left by the right node and converts the
     result into an integer by truncating.
     """
 

tests/test_inheritance.py

@@ -37,7 +37,7 @@ WORKINGTEMPLATE = """\
 {% block block1 %}
   {% if false %}
     {% block block2 %}
-      this should workd
+      this should work
     {% endblock %}
   {% endif %}
 {% endblock %}
@@ -49,7 +49,7 @@ DOUBLEEXTENDS = """\
 {% block block1 %}
   {% if false %}
     {% block block2 %}
-      this should workd
+      this should work
     {% endblock %}
   {% endif %}
 {% endblock %}