Merge branch '5.1' into 5.x

javiereguiluz · javiereguiluz · commit 37a4c9047962 · 2020-10-18T18:36:48.000+02:00
* 5.1:
  Update front_controllers_and_kernel.rst
  Wrong services path and addition services_environment-name
diff --git a/configuration.rst b/configuration.rst
@@ -383,7 +383,9 @@ set in the previous ones):
 
 #. ``config/packages/*.yaml`` (and ``*.xml`` and ``*.php`` files too);
 #. ``config/packages/<environment-name>/*.yaml`` (and ``*.xml`` and ``*.php`` files too);
-#. ``config/packages/services.yaml`` (and ``services.xml`` and ``services.php`` files too);
+#. ``config/services.yaml`` (and ``services.xml`` and ``services.php`` files too);
+#. ``config/services_<environment-name>.yaml`` (and ``services_<environment-name>.xml``
+   and ``services_<environment-name>.php`` files too).
 
 Take the ``framework`` package, installed by default, as an example:
 
diff --git a/configuration/front_controllers_and_kernel.rst b/configuration/front_controllers_and_kernel.rst
@@ -244,15 +244,15 @@ the directory of the environment you're using (most commonly ``dev/`` while
 developing and debugging). While it can vary, the ``var/cache/dev/`` directory
 includes the following:
 
-``appDevDebugProjectContainer.php``
+``srcApp_KernelDevDebugContainer.php``
     The cached "service container" that represents the cached application
     configuration.
 
-``appDevUrlGenerator.php``
+``UrlGenerator.php``
     The PHP class generated from the routing configuration and used when
     generating URLs.
 
-``appDevUrlMatcher.php``
+``UrlMatcher.php``
     The PHP class used for route matching - look here to see the compiled regular
     expression logic used to match incoming URLs to different routes.
 
