Skip to content

Commit

Permalink
Merge branch '4.4' into 5.0
Browse files Browse the repository at this point in the history
* 4.4:
  adding the * to .xml in the Conf Env
  • Loading branch information
javiereguiluz committed Jan 15, 2020
2 parents 1e4d984 + 76204b7 commit 84e6d24
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ development), ``prod`` (for production servers) and ``test`` (for
the configuration files in this order (the last files can override the values
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/*.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);

Take the ``framework`` package, installed by default, as an example:
Expand Down

0 comments on commit 84e6d24

Please sign in to comment.