Merge branch '2.4' into 2.5

Conflicts:
	changelog.rst

Author: wouterj

components/dependency_injection/types.rst

@@ -170,8 +170,8 @@ The disadvantages of setter injection are:
 
 * The setter can be called more than just at the time of construction so
   you cannot be sure the dependency is not replaced during the lifetime of the
-  object (except by explicitly writing the setter method to check if has already been
-  called).
+  object (except by explicitly writing the setter method to check if it has already
+  been called).
 
 * You cannot be sure the setter will be called and so you need to add checks
   that any required dependencies are injected.

contributing/community/releases.rst

@@ -86,29 +86,20 @@ Below is the schedule for the first few versions that use this release model:
 
 This results in very predictable dates and maintenance periods:
 
-+---------+---------+--------------------------+-------------+
-| Version | Release | End of Maintenance       | End of Life |
-+=========+=========+==========================+=============+
-| 2.0     | 07/2011 | 03/2013 (20 months)      | 09/2013     |
-+---------+---------+--------------------------+-------------+
-| 2.1     | 09/2012 | 05/2013 (9 months)       | 11/2013     |
-+---------+---------+--------------------------+-------------+
-| 2.2     | 03/2013 | 11/2013 (8 months)       | 05/2014     |
-+---------+---------+--------------------------+-------------+
-| **2.3** | 05/2013 | 05/2016 (36 months)      | 05/2017     |
-+---------+---------+--------------------------+-------------+
-| 2.4     | 11/2013 | 09/2014 (10 months [1]_) | 01/2015     |
-+---------+---------+--------------------------+-------------+
-| 2.5     | 05/2014 | 01/2015 (8 months)       | 07/2015     |
-+---------+---------+--------------------------+-------------+
-| 2.6     | 11/2014 | 07/2015 (8 months)       | 01/2016     |
-+---------+---------+--------------------------+-------------+
-| **2.7** | 05/2015 | 05/2018 (36 months)      | 05/2019     |
-+---------+---------+--------------------------+-------------+
-| 2.8     | 11/2015 | 07/2016 (8 months)       | 01/2017     |
-+---------+---------+--------------------------+-------------+
-| ...     | ...     | ...                      | ...         |
-+---------+---------+--------------------------+-------------+
+=======  ==============  =======  ========================  ===========
+Version  Feature Freeze  Release  End of Maintenance        End of Life
+=======  ==============  =======  ========================  ===========
+2.0      05/2011         07/2011  03/2013 (20 months)       09/2013
+2.1      07/2012         09/2012  05/2013 (9 months)        11/2013
+2.2      01/2013         03/2013  11/2013 (8 months)        05/2014
+**2.3**  03/2013         05/2013  05/2016 (36 months)       05/2017
+2.4      09/2013         11/2013  09/2014 (10 months [1]_)  01/2015
+2.5      02/2014         05/2014  01/2015 (8 months)        07/2015
+2.6      09/2014         11/2014  07/2015 (8 months)        01/2016
+**2.7**  02/2015         05/2015  05/2018 (36 months)       05/2019
+2.8      09/2015         11/2015  07/2016 (8 months)        01/2017
+...      ...             ...      ...                       ...
+=======  ==============  =======  ========================  ===========
 
 .. [1] Symfony 2.4 maintenance has been `extended to September 2014`_.
 

cookbook/bundles/best_practices.rst

@@ -230,13 +230,20 @@ following standardized instructions in your ``README.md`` file.
     // app/AppKernel.php
 
     // ...
-
-    public function registerBundles()
+    class AppKernel extends Kernel
     {
-        $bundles = array(
+        public function registerBundles()
+        {
+            $bundles = array(
+                // ...
+   
+                new <vendor>\<bundle-name>\<bundle-long-name>(),
+            );
+   
             // ...
-            return new <vendor>\<bundle-name>\<bundle-long-name>(),
-        );
+        }
+        
+        // ...
     }
     ```
 

reference/configuration/twig.rst

@@ -51,7 +51,7 @@ TwigBundle Configuration ("twig")
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:twig="http://symfony.com/schema/dic/twig"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/doctrine/twig-1.0.xsd">
+                                http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
             <twig:config auto-reload="%kernel.debug%" autoescape="true" base-template-class="Twig_Template" cache="%kernel.cache_dir%/twig" charset="%kernel.charset%" debug="%kernel.debug%" strict-variables="false">
                 <twig:form>