Merge branch '4.0' into 4.1

* 4.0:
  Removed a short article about overriding bundle templates
  Fix configuration-block not working
  Change form.xxx_bind to form.xxx_submit

Author: weaverryan

_build/redirection_map

@@ -388,3 +388,4 @@
 /quick_tour/the_controller /quick_tour/the_big_picture
 /quick_tour/the_view /quick_tour/flex_recipes
 /service_container/service_locators /service_container/service_subscribers_locators
+/templating/overriding /bundles/override

bundles/override.rst

@@ -16,10 +16,33 @@ features of a bundle.
     and call the :ref:`locateResource() method <http-kernel-resource-locator>`
     to turn them into physical paths when needed.
 
+.. _override-templates:
+
 Templates
 ---------
 
-See :doc:`/templating/overriding`.
+Third-party bundle templates can be overridden in the
+``<your-project>/templates/bundles/<bundle-name>/`` directory. The new templates
+must use the same name and path (relative to ``<bundle>/Resources/views/``) as
+the original templates.
+
+For example, to override the ``Resources/views/Registration/confirmed.html.twig``
+template from the FOSUserBundle, create this template:
+``<your-project>/templates/bundles/FOSUserBundle/Registration/confirmed.html.twig``
+
+.. caution::
+
+    If you add a template in a new location, you *may* need to clear your
+    cache (``php bin/console cache:clear``), even if you are in debug mode.
+
+.. _templating-overriding-core-templates:
+
+.. tip::
+
+    Symfony internals use some bundles too, so you can apply the same technique
+    to override the core Symfony templates. For example, you can
+    :doc:`customize error pages </controller/error_pages>` overriding TwigBundle
+    templates.
 
 Routing
 -------

controller/error_pages.rst

@@ -65,8 +65,8 @@ logic to determine the template filename:
 
 .. _overriding-or-adding-templates:
 
-To override these templates, simply rely on the standard Symfony method for
-:doc:`overriding templates that live inside a bundle </templating/overriding>`:
+To override these templates, rely on the standard Symfony method for
+:ref:`overriding templates that live inside a bundle <override-templates>` and
 put them in the ``templates/bundles/TwigBundle/Exception/`` directory.
 
 A typical project that returns HTML and JSON pages, might look like this:

form/events.rst

@@ -252,9 +252,9 @@ Name                    ``FormEvents`` Constant        Event's Data
 ======================  =============================  ===============
 ``form.pre_set_data``   ``FormEvents::PRE_SET_DATA``   Model data
 ``form.post_set_data``  ``FormEvents::POST_SET_DATA``  Model data
-``form.pre_bind``       ``FormEvents::PRE_SUBMIT``     Request data
-``form.bind``           ``FormEvents::SUBMIT``         Normalized data
-``form.post_bind``      ``FormEvents::POST_SUBMIT``    View data
+``form.pre_submit``     ``FormEvents::PRE_SUBMIT``     Request data
+``form.submit``         ``FormEvents::SUBMIT``         Normalized data
+``form.post_submit``    ``FormEvents::POST_SUBMIT``    View data
 ======================  =============================  ===============
 
 Event Listeners

routing/redirect_in_config.rst

@@ -185,7 +185,7 @@ The :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController::u
 and :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController::redirectAction`
 methods accept an additional argument called ``keepRequestMethod``. When it's
 set to ``true``, temporary redirects use ``307`` code instead of ``302`` and
-permanent redirects use ``308`` code instead of ``301``::
+permanent redirects use ``308`` code instead of ``301``:
 
 .. configuration-block::
 

templating.rst

@@ -360,8 +360,7 @@ By default, templates can live in two different locations:
 ``templates/``
     The application's ``views`` directory can contain application-wide base templates
     (i.e. your application's layouts and templates of the application bundle) as
-    well as templates that override third party bundle templates
-    (see :doc:`/templating/overriding`).
+    well as templates that :ref:`override third party bundle templates <override-templates>`.
 
 ``vendor/path/to/CoolBundle/Resources/views/``
     Each third party bundle houses its templates in its ``Resources/views/``
@@ -405,10 +404,8 @@ for several types of templates, each which lives in a specific location:
   is missing (e.g. ``Blog``), the template lives at
   ``Resources/views/layout.html.twig`` inside AcmeBlogBundle.
 
-In the :doc:`/templating/overriding` section, you'll find out how each
-template living inside the AcmeBlogBundle, for example, can be overridden
-by placing a template of the same name in the ``templates/bundles/AcmeBlogBundle/``
-directory. This gives the power to override templates from any vendor bundle.
+Using this namespaced syntax instead of the real file paths allows applications
+to :ref:`override templates that live inside any bundle <override-templates>`.
 
 Template Suffix
 ~~~~~~~~~~~~~~~