summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGabriel Hurley <gabehr@gmail.com>2010-11-22 06:44:59 +0000
committerGabriel Hurley <gabehr@gmail.com>2010-11-22 06:44:59 +0000
commit56b9e0c45f75338c928806aa59f7f33ff204c948 (patch)
tree515160efbc16909e69cb959dc867797e360c5098 /docs
parent2aa47f2b32ada4f78b98765441489bd59445c181 (diff)
[1.2.X] Fixed #14736 -- corrected an ungrammatical sentence in the template tags docs. Thanks to DD for the report and adamv for the draft patch.
Backport of [14677] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/templates/builtins.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 9313e2ffe7..e390e4f49e 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1009,9 +1009,8 @@ output will be ``[1, 2, 3, 4, 5, 6]``.
.. warning::
- Keep in mind that strings that can both be coerced to integers will be,
- and thus will be will be *summed*, not concatenated, as in the first
- example above.
+ Strings that can be coerced to integers will be **summed**, not
+ concatenated, as in the first example above.
.. templatefilter:: addslashes