merged branch ThatGuyBen/patch-1 (PR #1048)

This PR was merged into the master branch.

Discussion
----------

Update json_encode.rst

a more-useful description of the "options" argument >_>

Commits
-------

742043f Update json_encode.rst
This commit is contained in:
Fabien Potencier
2013-04-08 14:10:12 +02:00
+1 -1
View File
@@ -14,6 +14,6 @@ The ``json_encode`` filter returns the JSON representation of a string:
Arguments
---------
* ``options``: The options
* ``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) }}``
.. _`json_encode`: http://php.net/json_encode