Merge branch '2.4'

Conflicts:
	cookbook/form/dynamic_form_modification.rst

Author: weaverryan

README.markdown

@@ -8,9 +8,9 @@ Contributing
 
 >**Note**
 >Unless you're documenting a feature that's new to a specific version of Symfony
->(e.g. Symfony 2.3), all pull requests must be based off of the **2.2** branch, 
+>(e.g. Symfony 2.3), all pull requests must be based off of the **2.2** branch,
 >**not** the master or 2.3 branch.
 
 We love contributors! For more information on how you can contribute to the
-Symfony documentation, please read 
-[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html) 
+Symfony documentation, please read
+[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)

book/controller.rst

@@ -726,7 +726,7 @@ the ``notice`` message:
 
     .. code-block:: html+php
 
-        <?php foreach ($view['session']->getFlashBag()->get('notice') as $message): ?>
+        <?php foreach ($view['session']->getFlash('notice') as $message): ?>
             <div class="flash-notice">
                 <?php echo "<div class='flash-error'>$message</div>" ?>
             </div>