Skip to content

Commit d50cd86

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: You need doctrine/annotations for route annotation support. tweak paragraph about multiple Docker Composer files
2 parents 23fd9b4 + c0ef5be commit d50cd86

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
@@ -27,7 +27,7 @@ Run this command once in your application to add support for annotations:
2727

2828
.. code-block:: terminal
2929
30-
$ composer require annotations
30+
$ composer require doctrine/annotations
3131
3232
In addition to installing the needed dependencies, this command creates the
3333
following configuration file:

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)