Merge branch '3.2'

xabbuh · xabbuh · commit 3a9e1baa79eb · 2017-05-08T13:08:09.000+02:00
* 3.2: [#7808] add description for app.token Added docs for workflow_marked_places() function Improved the description of the global Twig variables
diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst
@@ -731,11 +731,13 @@ needed objects and values. It is an instance of
 
 The available attributes are:
 
-* ``app.user``
-* ``app.request``
-* ``app.session``
-* ``app.environment``
-* ``app.debug``
+* ``app.user``, a PHP object representing the current user;
+* ``app.request``, a :class:``Symfony\\Component\\HttpFoundation\\Request`` object;
+* ``app.session``, a :class:``Symfony\\Component\\HttpFoundation\\Session\\Session`` object;
+* ``app.environment``, a string with the name of the execution environment;
+* ``app.debug``, a boolean telling whether the debug mode is enabled in the app;
+* ``app.token`` (a :class:`Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface`
+  object representing the security token)
 
 .. _`Twig Reference`: http://twig.sensiolabs.org/documentation#reference
 .. _`Twig Extensions repository`: https://github.com/twigphp/Twig-extensions
