Skip to content

Commit 588e78b

Browse files
committed
Merge branch '5.1' into 5.x
* 5.1: You need doctrine/annotations for route annotation support. tweak paragraph about multiple Docker Composer files
2 parents d139051 + d50cd86 commit 588e78b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ once in your application to enable them:
3333

3434
.. code-block:: terminal
3535
36-
$ composer require annotations
36+
$ composer require doctrine/annotations
3737
3838
.. versionadded:: 5.2
3939

setup/symfony_server.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ its location, same as for ``docker-compose``:
375375
376376
.. note::
377377

378-
If you have more than one docker-compose files you can provide them all
379-
separated by ``:``, as explained in the `Docker compose CLI env var reference`_.
378+
If you have more than one Docker Compose file, you can provide them all
379+
separated by ``:`` as explained in the `Docker compose CLI env var reference`_.
380380

381381
SymfonyCloud Integration
382382
------------------------

0 commit comments

Comments
 (0)