summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-11-09 22:10:31 +0100
committerTim Graham <timograham@gmail.com>2014-11-09 22:12:21 +0100
commitdf47f0c918a366ddbeba0c7997e64500eeb3f516 (patch)
tree2f6de500f00f369f0b2b89fd2f66669e34bb6a64 /docs
parent61f20b42cdbe9c246d210ad5a0d3a22ada32c443 (diff)
[1.6.x] Fixed #23785 -- Typo in docs/releases/1.6.txt
Backport of 091f5b5a4e from master
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.6.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index c9da6735b7..37a7b6dbb2 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -1021,7 +1021,7 @@ tags render their arguments as-is.
Django 1.6 starts a process to correct this inconsistency. The ``future``
template library provides alternate implementations of :ttag:`cycle` and
:ttag:`firstof` that autoescape their inputs. If you're using these tags,
-you're encourage to include the following line at the top of your templates to
+you're encouraged to include the following line at the top of your templates to
enable the new behavior::
{% load cycle from future %}