Skip to content

Commit 4e81af5

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: Update Docker page with instructions for Mac users Fix heading capitalisation in dynamic_form_modification.rst
2 parents 0be9db9 + 024f3d8 commit 4e81af5

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

form/dynamic_form_modification.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ how to customize your form based on three common use-cases:
99
Example: you have a "Product" form and need to modify/add/remove a field
1010
based on the data on the underlying Product being edited.
1111

12-
2) :ref:`How to dynamically Generate Forms Based on user Data <form-events-user-data>`
12+
2) :ref:`How to Dynamically Generate Forms Based on User Data <form-events-user-data>`
1313

1414
Example: you create a "Friend Message" form and need to build a drop-down
1515
that contains only users that are friends with the *current* authenticated
@@ -188,7 +188,7 @@ Great! Now use that in your form class::
188188

189189
.. _form-events-user-data:
190190

191-
How to dynamically Generate Forms Based on user Data
191+
How to Dynamically Generate Forms Based on User Data
192192
----------------------------------------------------
193193

194194
Sometimes you want a form to be generated dynamically based not only on data

setup/docker.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,10 @@ If you're using the :ref:`symfony binary web server <symfony-local-web-server>`
5151
then it can automatically detect your Docker services and expose them as environment
5252
variables. See :ref:`symfony-server-docker`.
5353

54+
.. note::
55+
56+
macOS users need to explicitly allow the default Docker socket to be used
57+
for the Docker integration to work `as explained in the Docker documentation`_.
58+
5459
.. _`https://github.com/dunglas/symfony-docker`: https://github.com/dunglas/symfony-docker
60+
.. _`as explained in the Docker documentation`: https://docs.docker.com/desktop/mac/permission-requirements/

0 commit comments

Comments
 (0)