Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit 50aa6a58e0da · 2013-08-17T13:31:26.000-04:00
diff --git a/cookbook/templating/global_variables.rst b/cookbook/templating/global_variables.rst
@@ -41,7 +41,12 @@ Now, the variable ``ga_tracking`` is available in all Twig templates:
 
     <p>The google tracking code is: {{ ga_tracking }}</p>
 
-It's that easy! You can also take advantage of the built-in :ref:`book-service-container-parameters`
+It's that easy!
+
+Using Service Container Parameters
+----------------------------------
+
+You can also take advantage of the built-in :ref:`book-service-container-parameters`
 system, which lets you isolate or reuse the value:
 
 .. code-block:: yaml
@@ -77,8 +82,52 @@ system, which lets you isolate or reuse the value:
 
 The same variable is available exactly as before.
 
-More Complex Global Variables
------------------------------
+Referencing Services
+--------------------
+
+Instead of using static values, you can also set the value to a service.
+Whenever the global variable is accessed in the template, the service will be
+requested from the service container and you get access to that object.
+
+.. note::
+
+    The service is not loaded lazily. In other words, as soon as Twig is
+    loaded, your service is instantiated, even if you never use that global
+    variable.
+
+To define a service as a global Twig variable, prefix the string with ``@``.
+This should feel familiar, as it's the same syntax you use in service configuration.
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        twig:
+            # ...
+            globals:
+                user_management: "@acme_user.user_management"
+
+    .. code-block:: xml
+
+        <!-- app/config/config.xml -->
+        <twig:config ...>
+            <!-- ... -->
+            <twig:global key="user_management">@acme_user.user_management</twig:global>
+        </twig:config>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('twig', array(
+             // ...
+             'globals' => array(
+                 'user_management' => '@acme_user.user_management',
+             ),
+        ));
+
+Using a Twig Extension
+----------------------
 
 If the global variable you want to set is more complicated - say an object -
 then you won't be able to use the above method. Instead, you'll need to create
