Merge branch '6.0' into 6.1

* 6.0:
  [Routing] Fix link text

Author: OskarStark

routing.rst

@@ -151,9 +151,9 @@ the ``BlogController``:
 
 .. note::
 
-    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>`.
+    By default Symfony only loads the routes defined in YAML format. If you
+    define routes in XML and/or PHP formats, you need to
+    :ref:`update the src/Kernel.php file <configuration-formats>`.
 
 .. _routing-matching-http-methods: