Browse files

[Book] [Templating] Edits based on feedback from @stof

  • Loading branch information...
1 parent feaf15d commit 6fcab8c2a77898820aa48e3827645ca10c79ece5 Chris Tickner committed Jan 15, 2012
Showing with 5 additions and 5 deletions.
  1. +5 −5 book/templating.rst
View
10 book/templating.rst
@@ -876,14 +876,14 @@ Global Template Variables
During each request, Symfony2 will set a global template variable ``app``
in both Twig and PHP template engines by default. The ``app`` variable
-is a :class:`<Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables>`
-object which will give you access to some application specific variables
+is a :class:`Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables`
+instance which will give you access to some application specific variables
automatically:
-* ``app.security`` - The security context service.
+* ``app.security`` - The security context.
* ``app.user`` - The current user object.
* ``app.request`` - The request object.
-* ``app.session`` - The session object. Equivalent to ``app.request.session``.
+* ``app.session`` - The session object.
* ``app.environment`` - The current environment (dev, prod, etc).
* ``app.debug`` - True if in debug mode. False otherwise.
@@ -907,7 +907,7 @@ automatically:
.. tip::
- You can set your own global template variables. See the cookbook example
+ You can add your own global template variables. See the cookbook example
on :doc:`Global Variables</cookbook/templating/global_variables>`.
.. index::

0 comments on commit 6fcab8c

Please sign in to comment.