Merge branch '4.2'

* 4.2:
  Consistency

Author: javiereguiluz

doctrine/event_listeners_subscribers.rst

@@ -140,11 +140,10 @@ interface and have an event method for each event it subscribes to::
     // src/EventListener/SearchIndexerSubscriber.php
     namespace App\EventListener;
 
-    use AppBundle\Entity\Product;
+    use App\Entity\Product;
     use Doctrine\Common\EventSubscriber;
     // for Doctrine < 2.4: use Doctrine\ORM\Event\LifecycleEventArgs;
     use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
-    use App\Entity\Product;
     use Doctrine\ORM\Events;
 
     class SearchIndexerSubscriber implements EventSubscriber

forms.rst

@@ -693,8 +693,8 @@ the choice is ultimately up to you.
     The form name is automatically generated from the type class name. If you want
     to modify it, use the :method:`Symfony\\Component\\Form\\FormFactoryInterface::createNamed` method::
 
-        // src/AppBundle/Controller/DefaultController.php
-        use AppBundle\Form\TaskType;
+        // src/Controller/DefaultController.php
+        use App\Form\TaskType;
         use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
         class DefaultController extends AbstractController

logging/processors.rst

@@ -172,20 +172,17 @@ Symfony's MonologBridge provides processors that can be registered inside your a
 :class:`Symfony\\Bridge\\Monolog\\Processor\\WebProcessor`
     Overrides data from the request using the data inside Symfony's request
     object.
-	
+
 :class:`Symfony\\Bridge\\Monolog\\Processor\\RouteProcessor`
     Adds information about current route (controller, action, route parameters).
-	
+
 :class:`Symfony\\Bridge\\Monolog\\Processor\\ConsoleCommandProcessor`
     Adds information about current console command.
 
-.. versionadded:: 3.4
-
-    The ``TokenProcessor`` class was introduced in Symfony 3.4.
-	
 .. versionadded:: 4.3
 
-	The ``RouteProcessor`` and the ``ConsoleCommandProcessor`` were introduced in Symfony 4.3.
+    The ``RouteProcessor`` and the ``ConsoleCommandProcessor`` were introduced
+    in Symfony 4.3.
 
 Registering Processors per Handler
 ----------------------------------