Merge branch '2.5'

* 2.5:
  [#4099] Trying to get the markup just right
  [#4099] Adding an extra tip
  Added Composer installation tip
  Clarifying a bit more that you're passing variables into your controller
  Update http_cache.rst

Author: weaverryan

book/http_cache.rst

@@ -915,20 +915,20 @@ matter), Symfony uses the standard ``render`` helper to configure ESI tags:
     .. code-block:: jinja
 
         {# you can use a controller reference #}
-        {{ render_esi(controller('...:news', { 'max': 5 })) }}
+        {{ render_esi(controller('...:news', { 'maxPerPage': 5 })) }}
 
         {# ... or a URL #}
-        {{ render_esi(url('latest_news', { 'max': 5 })) }}
+        {{ render_esi(url('latest_news', { 'maxPerPage': 5 })) }}
 
     .. code-block:: html+php
 
         <?php echo $view['actions']->render(
-            new \Symfony\Component\HttpKernel\Controller\ControllerReference('...:news', array('max' => 5)),
+            new \Symfony\Component\HttpKernel\Controller\ControllerReference('...:news', array('maxPerPage' => 5)),
             array('strategy' => 'esi'))
         ?>
 
         <?php echo $view['actions']->render(
-            $view['router']->generate('latest_news', array('max' => 5), true),
+            $view['router']->generate('latest_news', array('maxPerPage' => 5), true),
             array('strategy' => 'esi'),
         ) ?>
 
@@ -938,6 +938,13 @@ wondering why you would want to use a helper instead of just writing the ESI
 tag yourself. That's because using a helper makes your application work even
 if there is no gateway cache installed.
 
+.. tip::
+
+    As you'll see below, the ``maxPerPage`` variable you pass is available
+    as an argument to your controller (i.e. ``$maxPerPage``). The variables
+    passed through ``render_esi`` also become part of the cache key so that
+    you have unique caches for each combination of variables and values.
+
 When using the default ``render`` function (or setting the renderer to
 ``inline``), Symfony merges the included page content into the main one
 before sending the response to the client. But if you use the ``esi`` renderer
@@ -958,7 +965,7 @@ of the master page.
 
 .. code-block:: php
 
-    public function newsAction($max)
+    public function newsAction($maxPerPage)
     {
         // ...
 

book/installation.rst

@@ -66,6 +66,12 @@ Distribution:
     To download the vendor files faster, add the ``--prefer-dist`` option at
     the end of any Composer command.
 
+.. tip::
+
+    Add the ``-vvv`` flag to see everything that Composer is doing - this is
+    especially useful on a slow connection where it may seem that nothing is
+    happening.
+
 This command may take several minutes to run as Composer downloads the Standard
 Distribution along with all of the vendor libraries that it needs. When it finishes,
 you should have a directory that looks something like this:

cookbook/workflow/new_project_git.rst

@@ -26,7 +26,13 @@ git repository:
 
    .. code-block:: bash
 
-        $ php composer.phar create-project symfony/framework-standard-edition path/ "~2.3"
+        $ php composer.phar create-project symfony/framework-standard-edition path/ '~2.5'
+
+   .. tip::
+
+       Add the ``-vvv`` flag to see everything that Composer is doing - this is
+       especially useful on a slow connection where it may seem that nothing is
+       happening.
 
    Composer will now download the Standard Distribution along with all of the
    required vendor libraries. For more information about downloading Symfony using

quick_tour/the_big_picture.rst

@@ -22,6 +22,12 @@ directory:
 
     $ composer create-project symfony/framework-standard-edition myproject/ "~2.3"
 
+.. tip::
+
+    Add the ``-vvv`` flag to see everything that Composer is doing - this is
+    especially useful on a slow connection where it may seem that nothing is
+    happening.
+
 .. note::
 
     `Composer`_ is the package manager used by modern PHP applications and the