Merge branch '4.2' into 4.3

* 4.2:
  Revamped the main configuration file

Author: javiereguiluz

_build/redirection_map

@@ -417,6 +417,10 @@
 /workflow/state-machines /workflow/introduction
 /workflow/usage /workflow
 /introduction/from_flat_php_to_symfony2 /introduction/from_flat_php_to_symfony
+/configuration/environment_variables /configuration/env_var_processors
+/configuration/configuration_organization /configuration
+/configuration/environments /configuration
+/configuration/configuration_organization /configuration
 /email/dev_environment /mailer
 /email/spool /mailer
 /email/testing /mailer

best_practices/configuration.rst

@@ -16,9 +16,8 @@ application behavior.
 .. best-practice::
 
     Define the infrastructure-related configuration options as
-    :doc:`environment variables </configuration/environment_variables>`. During
-    development, use the ``.env`` and ``.env.local`` files at the root of your
-    project to set these.
+    :ref:`environment variables <config-env-vars>`. During development, use the
+    ``.env`` and ``.env.local`` files at the root of your project to set these.
 
 By default, Symfony adds these types of options to the ``.env`` file when
 installing new dependencies in the app:
@@ -84,7 +83,7 @@ layer of configuration that's not needed because you don't need or want these
 configuration values to change on each server.
 
 The configuration options defined in the ``services.yaml`` may vary from one
-:doc:`environment </configuration/environments>` to another. That's why Symfony
+:ref:`environment <configuration-environments>` to another. That's why Symfony
 supports defining ``config/services_dev.yaml`` and ``config/services_prod.yaml``
 files so that you can override specific values for each environment.
 

bundles.rst

@@ -18,7 +18,7 @@ SecurityBundle, DebugBundle, etc.) They are also used to add new features in
 your application via `third-party bundles`_.
 
 Bundles used in your applications must be enabled per
-:doc:`environment </configuration/environments>` in the ``config/bundles.php``
+:ref:`environment <configuration-environments>` in the ``config/bundles.php``
 file::
 
     // config/bundles.php