summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaap Roes <jaap.roes@gmail.com>2015-11-21 01:50:03 +0100
committerSimon Charette <charette.s@gmail.com>2015-11-26 09:59:21 -0500
commitf7e599ad25e52e8108a2bf6c17fb203b398ed986 (patch)
tree53a8a2088a12435c3de73e318d22e49f00668ea9
parent7661a8a104a33afb117af94f7ae8933e78415fe5 (diff)
[1.9.x] Fixed a typo in the template Parser.parse docstring.
Backport of 831514867c9a2f8321ef15d0de25352a5b9ee3b9 from master
-rw-r--r--django/template/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/base.py b/django/template/base.py
index 9e8f5fa7ad..b88ddae8d5 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -461,7 +461,7 @@ class Parser(object):
def parse(self, parse_until=None):
"""
- Iterate through the parser tokens and compils each one into a node.
+ Iterate through the parser tokens and compiles each one into a node.
If parse_until is provided, parsing will stop once one of the
specified tokens has been reached. This is formatted as a list of