Merge branch '4.2'

* 4.2:
  use .yaml instead of .yml
  Fix console error event

components/console/events.rst

@@ -94,6 +94,17 @@ event listeners, the ``ConsoleEvents::ERROR`` event is dispatched. A listener
 can wrap or change the exception or do anything useful before the exception is
 thrown by the application.
 
+The ``ConsoleEvents::ERROR`` Event
+----------------------------------
+
+**Typical Purposes**: Handle exceptions thrown during the execution of a
+command.
+
+Whenever an exception is thrown by a command, including those triggered from
+event listeners, the ``ConsoleEvents::ERROR`` event is dispatched. A listener
+can wrap or change the exception or do anything useful before the exception is
+thrown by the application.
+
 Listeners receive a
 :class:`Symfony\\Component\\Console\\Event\\ConsoleErrorEvent` event::
 
@@ -111,7 +122,7 @@ Listeners receive a
         $exitCode = $event->getExitCode();
 
         // changes the exception to another one
-        $event->setException(new \LogicException('Caught exception', $exitCode, $event->getError()));
+        $event->setError(new \LogicException('Caught exception', $exitCode, $event->getError()));
     });
 
 The ``ConsoleEvents::TERMINATE`` Event

form/form_collections.rst

@@ -474,7 +474,7 @@ you will learn about next!).
 
         .. code-block:: yaml
 
-            # src/Resources/config/doctrine/Task.orm.yml
+            # src/Resources/config/doctrine/Task.orm.yaml
             App\Entity\Task:
                 type: entity
                 # ...