Merge branch '2.3' into 2.7

wouterj · wouterj · commit a111d03d7bea · 2015-12-12T16:09:28.000+01:00
diff --git a/components/form/form_events.rst b/components/form/form_events.rst
@@ -194,10 +194,9 @@ View data        Same as in ``FormEvents::POST_SET_DATA``
 
 .. sidebar:: ``FormEvents::SUBMIT`` in the Form component
 
-    The ``Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener``
-    subscribes to the ``FormEvents::SUBMIT`` event in order to remove the
-    fields that need to be removed whenever manipulating a collection of forms
-    for which ``allow_delete`` has been enabled.
+    The ``Symfony\Component\Form\Extension\Core\EventListener\FixUrlProtocolListener``
+    subscribes to the ``FormEvents::SUBMIT`` event in order to prepend a default
+    protocol to URL fields that were submitted without a protocol.
 
 C) The ``FormEvents::POST_SUBMIT`` Event
 ........................................
diff --git a/cookbook/doctrine/registration_form.rst b/cookbook/doctrine/registration_form.rst
@@ -199,7 +199,7 @@ Handling the Form Submission
 Next, you need a controller to handle the form. Start by creating a simple
 controller for displaying the registration form::
 
-    // src/AppBundle/Controller/AccountController.php
+    // src/AppBundle/Controller/RegistrationController.php
     namespace AppBundle\Controller;
 
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
