summaryrefslogtreecommitdiff
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:00 +0100
commit3fb6e178572d72d7ed1d4637005bb0f62964c40e (patch)
treeb2fdd96166ba2c3fd54a7f6c8912745afe3e09b9
parent1f50ea730e250acdc9f62f1ce1a769296fc20bb8 (diff)
[1.7.x] Fixed #23785 -- Typo in docs/releases/1.6.txt
Backport of 091f5b5a4e from master
-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 8e5748e32e..41a9ae34a6 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 %}