summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2013-05-18 04:10:40 -0700
committerArmin Ronacher <armin.ronacher@active-4.com>2013-05-18 04:10:40 -0700
commit77e0fa2aecb5db68471785fe397c037911f0f889 (patch)
treef50398c2ff350d5a3261169e6e70008ba48f6778 /docs
parent728d69abad71e6b3664d1fc67a4584371ab43b10 (diff)
parentbdd09dd305dd66e92be919601821de42a0a41815 (diff)
downloadjinja2-77e0fa2aecb5db68471785fe397c037911f0f889.tar.gz
Merge pull request #188 from lemonad/master
Fixed typos: overriden to overridden
Diffstat (limited to 'docs')
-rw-r--r--docs/faq.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/faq.rst b/docs/faq.rst
index d066bff..5c80d33 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -174,7 +174,7 @@ harder to maintain the code for older Python versions. If you really need
Python 2.3 support you either have to use `Jinja 1`_ or other templating
engines that still support 2.3.
-My Macros are overriden by something
+My Macros are overridden by something
------------------------------------
In some situations the Jinja scoping appears arbitrary: