Merge branch '2.8' into 3.0

wouterj · wouterj · commit 744bed41cccb · 2015-12-12T16:09:42.000+01:00
diff --git a/book/forms.rst b/book/forms.rst
@@ -1186,7 +1186,7 @@ type. Create a constructor to your form type to receive the service::
     {
         private $myService;
 
-        public function __construct(MyService $mySevice)
+        public function __construct(MyService $myService)
         {
             $this->myService = $myService;
         }
diff --git a/components/dependency_injection/factories.rst b/components/dependency_injection/factories.rst
@@ -34,7 +34,7 @@ object::
 
 To make the ``NewsletterManager`` object available as a service, you can
 configure the service container to use the
-``NewsletterFactory::createNewsletterManager()`` factory method:
+``NewsletterManagerFactory::createNewsletterManager()`` factory method:
 
 .. configuration-block::
 
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
@@ -198,7 +198,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;

Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,7 @@ type. Create a constructor to your form type to receive the service::`
`1186`	`1186`	`{`
`1187`	`1187`	`private $myService;`
`1188`	`1188`
`1189`		`- public function __construct(MyService $mySevice)`
	`1189`	`+ public function __construct(MyService $myService)`
`1190`	`1190`	`{`
`1191`	`1191`	`$this->myService = $myService;`
`1192`	`1192`	`}`