Merge branch '4.0' into 4.1

javiereguiluz · javiereguiluz · commit 3420f0c3f07d · 2018-05-21T16:19:56.000+02:00
* 4.0: Grammar fix - Change "you're" to "your" Fix issue #9798
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -219,7 +219,7 @@ add *no* overhead! It also means that you get *great* errors: Symfony inspects a
 validates *everything* when the container is built.
 
 Now you might be wondering what happens when you update a file and the cache needs
-to rebuild? I like you're thinking! It's smart enough to rebuild on the next page
+to rebuild? I like your thinking! It's smart enough to rebuild on the next page
 load. But that's really the topic of the next section.
 
 Development Versus Production: Environments
diff --git a/security.rst b/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)
         {
diff --git a/service_container/factories.rst b/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'));
 
