Merge branch '6.0' into 6.1

* 6.0:
  [docker] fix composer `extra` variable name

Author: javiereguiluz

setup/docker.rst

@@ -26,7 +26,7 @@ your ``docker-compose.yml`` file will automatically be updated to include a
 
 The first time you install a recipe containing Docker config, Flex will ask you
 if you want to include it. Or, you can set your preference in ``composer.json``,
-by setting the ``symfony.extra.docker`` config to ``true`` or ``false``.
+by setting the ``extra.symfony.docker`` config to ``true`` or ``false``.
 
 Some recipes also include additions to your ``Dockerfile``. To get those changes,
 you need to already have a ``Dockerfile`` at the root of your app *with* the