Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit e19fd2ae2db2 · 2014-06-09T14:01:14.000-05:00
diff --git a/_exts b/_exts
@@ -1 +1 @@
-Subproject commit 6fea4b1c996bbbe5993232c37425222145de5380
+Subproject commit 74553741a70af2b862de77e1de12fb2f74ff33a4
diff --git a/components/form/form_events.rst b/components/form/form_events.rst
@@ -263,7 +263,6 @@ processed.
 +------------------------+-------------------------------+------------------+
 
 .. versionadded:: 2.3
-
     Before Symfony 2.3, ``FormEvents::PRE_SUBMIT``, ``FormEvents::SUBMIT``
     and ``FormEvents::POST_SUBMIT`` were called ``FormEvents::PRE_BIND``,
     ``FormEvents::BIND`` and ``FormEvents::POST_BIND``.
diff --git a/components/http_kernel/introduction.rst b/components/http_kernel/introduction.rst
@@ -571,7 +571,7 @@ each event has their own event object:
 
 +-----------------------+----------------------------------+-------------------------------------------------------------------------------------+
 | Name                  | ``KernelEvents`` Constant        | Argument passed to the listener                                                     |
-+-----------------------+----------------------------------+-------------------------------------------------------------------------------------+
++=======================+==================================+=====================================================================================+
 | kernel.request        | ``KernelEvents::REQUEST``        | :class:`Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent`                    |
 +-----------------------+----------------------------------+-------------------------------------------------------------------------------------+
 | kernel.controller     | ``KernelEvents::CONTROLLER``     | :class:`Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent`               |
