added documentation for previous merge

diff --git a/CHANGELOG b/CHANGELOG
index 9f596b4..81bb39c 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 * 1.2.0
 
-n/a
+ * added "if" modifier support to "for" loops
 
 * 1.1.2 (2011-07-30)
 

diff --git a/doc/templates.rst b/doc/templates.rst
index 96699b4..f977026 100644 (file)
--- a/doc/templates.rst
+++ b/doc/templates.rst
@@ -568,9 +568,23 @@ Variable              Description
     ``loop.last`` variables are only available for PHP arrays, or objects that
     implement the ``Countable`` interface.
 
-.. note::
+.. versionadded:: 1.2
+    The ``if`` modifier support has been added in Twig 1.2.
+
+Unlike in PHP, it's not possible to ``break`` or ``continue`` in a loop. You
+can however filter the sequence during iteration which allows you to skip
+items. The following example skips all the users which are not active:
+
+.. code-block:: jinja
+
+    <ul>
+      {% for user in users if user.active %}
+        <li>{{ user.username|e }}</li>
+      {% endfor %}
+    </ul>
 
-    Unlike in PHP it's not possible to ``break`` or ``continue`` in a loop.
+The advantage is that the special loop variable will count correctly thus not
+counting the users not iterated over.
 
 If no iteration took place because the sequence was empty, you can render a
 replacement block by using ``else``: