Fix typos

diff --git a/CHANGES.rst b/CHANGES.rst
index 0ce916df497fd2605dd3ceef81839c07a2c19e02..f2c6bc59abf69f5a88ed0adfffa30e02ffca9fc2 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -408,7 +408,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

diff --git a/src/jinja2/nodes.py b/src/jinja2/nodes.py
index 226e729c003fc6d259f3dc2f38cf67dced63ed8e..2d8adefb8fa574b4563f4c0ad8353bd3a528f8d5 100644 (file)
--- a/src/jinja2/nodes.py
+++ b/src/jinja2/nodes.py
@@ -956,7 +956,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.
     """
 

diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py
index 5221839808443091eb4706f9f10ff1aa0b781aa6..0c20d4da7d3c29e36bf8c7fb36c747b069b6f6e5 100644 (file)
--- a/tests/test_inheritance.py
+++ b/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 %}