Merge branch '2.4' into 2.5

symfony · Jun 9, 2014 · e19fd2a · e19fd2a
2 parents db48945 + 5a4eb57
commit e19fd2a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/_exts b/_exts
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`               |
+1 −0		.gitignore
+8 −3		README.md
+6 −3		composer.json
+0 −1		sensio/sphinx/configurationblock.py
+3 −4		sensio/sphinx/phpcode.py