From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 8 May 2012 06:32:32 +0000 (+0200)
Subject: added documentation for the bitwise operators (closes #707)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=1dc3c4beaf61608b69f532adec206b581089bbe5;p=web%2Fkonrad%2Ftwig.git

added documentation for the bitwise operators (closes #707)
---

diff --git a/doc/templates.rst b/doc/templates.rst
index bb2e435..a3aa39a 100644
--- a/doc/templates.rst
+++ b/doc/templates.rst
@@ -459,9 +459,9 @@ even if you're not working with PHP you should feel comfortable with it.
 .. note::
 
     The operator precedence is as follows, with the lowest-precedence
-    operators listed first: ``&``, ``^``, ``|``, ``or``, ``and``, ``==``,
-    ``!=``, ``<``, ``>``, ``>=``, ``<=``, ``in``, ``..``, ``+``, ``-``, ``~``,
-    ``*``, ``/``, ``//``, ``%``, ``is``, and ``**``.
+    operators listed first: ``b-and``, ``b-xor``, ``b-or``, ``or``, ``and``,
+    ``==``, ``!=``, ``<``, ``>``, ``>=``, ``<=``, ``in``, ``..``, ``+``,
+    ``-``, ``~``, ``*``, ``/``, ``//``, ``%``, ``is``, and ``**``.
 
 Literals
 ~~~~~~~~
@@ -554,6 +554,10 @@ You can combine multiple expressions with the following operators:
 
 * ``(expr)``: Groups an expression.
 
+.. note::
+
+    Twig also support bitwise operators (``b-and``, ``b-xor``, and ``b-or``).
+
 Comparisons
 ~~~~~~~~~~~