Commit 56b9e0c4 authored by Gabriel Hurley's avatar Gabriel Hurley
Browse files

[1.2.X] Fixed #14736 -- corrected an ungrammatical sentence in the template... 

[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
parent 2aa47f2b

docs/ref/templates/builtins.txt

+2 −3
Original line number Diff line number Diff line
@@ -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