diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-08-07 15:02:01 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-08-07 15:02:01 +0000 |
| commit | c7c59bc24f6b680277c05e4b631d9e4a69f44473 (patch) | |
| tree | 1e4f9bd418ac0f24cca97245b70e69e35c76d7da /docs/ref | |
| parent | 0ea661cb12649f0b374d598725eea5803b5689cc (diff) | |
[1.2.X] Fixed #11021 -- Clarified newline stripping behavior in the truncatewords and truncatewords_html filters. Thanks to Ben Spaulding for the report and patch.
Backport of r13555 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/templates/builtins.txt | 4 |
1 files changed, 4 insertions, 0 deletions
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 |