Merge branch '6.1' into 6.2

* 6.1:
  Adding default PHP format
  Adding link to Kernel configuration
  add precision for stopwatch getEvent function

Author: javiereguiluz

configuration.rst

@@ -52,6 +52,8 @@ to change these files after package installation
     :doc:`Symfony Configuration Reference </reference/index>` or run the
     ``config:dump-reference`` command.
 
+.. _configuration-formats:
+
 Configuration Formats
 ~~~~~~~~~~~~~~~~~~~~~
 

performance.rst

@@ -278,7 +278,7 @@ information about the current event, even while it's still running. This
 object can be converted to a string for a quick summary::
 
     // ...
-    dump((string) $this->stopwatch->getEvent()); // dumps e.g. '4.50 MiB - 26 ms'
+    dump((string) $this->stopwatch->getEvent('export-data')); // dumps e.g. '4.50 MiB - 26 ms'
 
 You can also profile your template code with the :ref:`stopwatch Twig tag <reference-twig-tag-stopwatch>`:
 

routing.rst

@@ -159,9 +159,9 @@ the ``BlogController``:
 
 .. note::
 
-    By default Symfony only loads the routes defined in YAML format. If you
-    define routes in XML and/or PHP formats, update the ``src/Kernel.php`` file
-    to add support for the ``.xml`` and ``.php`` file extensions.
+    By default Symfony only loads the routes defined in YAML and PHP format.
+    If you define routes in XML, you need to
+    :ref:`update the ``src/Kernel.php`` file <configuration-formats>`.
 
 .. _routing-matching-http-methods: