[symfony#2865] No change other than moving the parameters section above the services section per a suggestion by @stof, which I agree with (that parameters are more common to use as global Twig variables)

weaverryan · weaverryan · commit 493a13534719 · 2013-08-17T13:27:03.000-04:00
diff --git a/cookbook/templating/global_variables.rst b/cookbook/templating/global_variables.rst
@@ -43,83 +43,83 @@ Now, the variable ``ga_tracking`` is available in all Twig templates:
 
 It's that easy!
 
-Referencing Services
---------------------
+Using Service Container Parameters
+----------------------------------
 
-Instead of using static values, you can also set the value to a service.
-Whenever the global variabele is accessed in the template, the service will be
-requested from the service container and you get access to that object.
+You can also take advantage of the built-in :ref:`book-service-container-parameters`
+system, which lets you isolate or reuse the value:
 
-This is done by prefixing the string with ``@``, which you already know from
-injecting a service:
+.. code-block:: yaml
+
+    # app/config/parameters.yml
+    parameters:
+        ga_tracking: UA-xxxxx-x
 
 .. configuration-block::
 
     .. code-block:: yaml
 
         # app/config/config.yml
         twig:
-            # ...
             globals:
-                user_management: "@acme_user.user_management"
+                ga_tracking: "%ga_tracking%"
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <twig:config ...>
-            <!-- ... -->
-            <twig:global key="user_management">@acme_user.user_management</twig:global>
+            <twig:global key="ga_tracking">%ga_tracking%</twig:global>
         </twig:config>
 
     .. code-block:: php
 
         // app/config/config.php
         $container->loadFromExtension('twig', array(
-             // ...
              'globals' => array(
-                 'user_management' => '@acme_user.user_management',
+                 'ga_tracking' => '%ga_tracking%',
              ),
         ));
 
-Using Service Container Parameters
-----------------------------------
+The same variable is available exactly as before.
 
-You can also take advantage of the built-in :ref:`book-service-container-parameters`
-system, which lets you isolate or reuse the value:
+Referencing Services
+--------------------
 
-.. code-block:: yaml
+Instead of using static values, you can also set the value to a service.
+Whenever the global variabele is accessed in the template, the service will be
+requested from the service container and you get access to that object.
 
-    # app/config/parameters.yml
-    parameters:
-        ga_tracking: UA-xxxxx-x
+This is done by prefixing the string with ``@``, which you already know from
+injecting a service:
 
 .. configuration-block::
 
     .. code-block:: yaml
 
         # app/config/config.yml
         twig:
+            # ...
             globals:
-                ga_tracking: "%ga_tracking%"
+                user_management: "@acme_user.user_management"
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <twig:config ...>
-            <twig:global key="ga_tracking">%ga_tracking%</twig:global>
+            <!-- ... -->
+            <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(
-                 'ga_tracking' => '%ga_tracking%',
+                 'user_management' => '@acme_user.user_management',
              ),
         ));
 
-The same variable is available exactly as before.
-
 Using a Twig Extension
 ----------------------
 
