Merge branch '3.4' into 4.0

* 3.4:
  Fix issue #9798

Author: javiereguiluz

security.rst

@@ -1069,10 +1069,10 @@ the User object, and use the ``isGranted()`` method (or
 
     An alternative way to get the current user in a controller is to type-hint
     the controller argument with
-    :class:`Symfony\\Component\\Security\\Core\\User\\UserInterface\\UserInterface`
+    :class:`Symfony\\Component\\Security\\Core\\User\\UserInterface`
     (and default it to ``null`` if being logged-in is optional)::
 
-        use Symfony\Component\Security\Core\User\UserInterface\UserInterface;
+        use Symfony\Component\Security\Core\User\UserInterface;
 
         public function index(UserInterface $user = null)
         {

service_container/factories.rst

@@ -70,11 +70,10 @@ configure the service container to use the
 
         // config/services.php
         use App\Email\NewsletterManager;
-        use App\NumberGenerator;
         use App\Email\NewsletterManagerStaticFactory;
         // ...
 
-        $container->register(NumberGenerator::class)
+        $container->register(NewsletterManager::class)
             // call the static method
             ->setFactory(array(NewsletterManagerStaticFactory::class, 'createNewsletterManager'));