From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 18 May 2013 11:07:27 +0000 (+0100)
Subject: Added missing versionadded and changelog entry
X-Git-Tag: 2.7~67^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=728d69abad71e6b3664d1fc67a4584371ab43b10;p=thirdparty%2Fjinja.git

Added missing versionadded and changelog entry
---

diff --git a/CHANGES b/CHANGES
index c2cd4a43..6a4420dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,8 @@ Version 2.7
 - Accessing `last` on the loop context no longer causes the iterator
   to be consumed into a list.
 - Allow `contextfunction` and other decorators to be applied to `__call__`.
+- Added support for changing from newline to different signs in the `wordwrap`
+  filter.
 
 Version 2.6
 -----------
diff --git a/jinja2/filters.py b/jinja2/filters.py
index 39391296..f0439f4d 100644
--- a/jinja2/filters.py
+++ b/jinja2/filters.py
@@ -479,6 +479,9 @@ def do_wordwrap(environment, s, width=79, break_long_words=True,
     split words apart if they are longer than `width`. By default, the newlines
     will be the default newlines for the environment, but this can be changed
     using the wrapstring keyword argument.
+
+    .. versionadded:: 2.7
+       Added support for the `wrapstring` parameter.
     """
     if not wrapstring:
         wrapstring = environment.newline_sequence