From 806f3b26f80c729dede7f10b463691d1f5aae13e Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 7 Aug 2010 14:57:24 +0000
Subject: Fixed #11021 -- Clarified newline stripping behavior in the
 truncatewords and truncatewords_html filters. Thanks to Ben Spaulding for the
 report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/ref/templates/builtins.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/ref')

diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 002aa3f416..0cf445cab7 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1883,6 +1883,8 @@ For example::
 
 If ``value`` is ``"Joel is a slug"``, the output will be ``"Joel is ..."``.
 
+Newlines within the string will be removed.
+
 .. templatefilter:: truncatewords_html
 
 truncatewords_html
@@ -1902,6 +1904,8 @@ For example::
 If ``value`` is ``"<p>Joel is a slug</p>"``, the output will be
 ``"<p>Joel is ...</p>"``.
 
+Newlines in the HTML content will be preserved.
+
 .. templatefilter:: unordered_list
 
 unordered_list
-- 
cgit v1.3