From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 8 Apr 2013 12:11:21 +0000 (+0200)
Subject: tweaked previous merge
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=481abb83323f4dcabadc9292b0e9f104df0719de;p=web%2Fkonrad%2Ftwig.git

tweaked previous merge
---

diff --git a/doc/filters/json_encode.rst b/doc/filters/json_encode.rst
index d62fb93..a33fef1 100644
--- a/doc/filters/json_encode.rst
+++ b/doc/filters/json_encode.rst
@@ -14,6 +14,8 @@ The ``json_encode`` filter returns the JSON representation of a string:
 Arguments
 ---------
 
- * ``options``: A bitmask. See http://www.php.net/manual/en/json.constants.php for a list of possible values. Ex: ``{{ data|json_encode(JSON_PRETTY_PRINT) }}``
+ * ``options``: A bitmask of `json_encode options`_ (``{{
+   data|json_encode(constant(JSON_PRETTY_PRINT)) }}``)
 
 .. _`json_encode`: http://php.net/json_encode
+.. _`json_encode options`: http://www.php.net/manual/en/json.constants.php