Merge branch '6.4' into 7.0

* 6.4:
  Update Docker page with instructions for Mac users
  [Security] Fixing PHP example for limiting login attempts with rate limiter
  Fix heading capitalisation in dynamic_form_modification.rst

Author: javiereguiluz

form/dynamic_form_modification.rst

@@ -9,7 +9,7 @@ how to customize your form based on three common use-cases:
    Example: you have a "Product" form and need to modify/add/remove a field
    based on the data on the underlying Product being edited.
 
-2) :ref:`How to dynamically Generate Forms Based on user Data <form-events-user-data>`
+2) :ref:`How to Dynamically Generate Forms Based on User Data <form-events-user-data>`
 
    Example: you create a "Friend Message" form and need to build a drop-down
    that contains only users that are friends with the *current* authenticated
@@ -188,7 +188,7 @@ Great! Now use that in your form class::
 
 .. _form-events-user-data:
 
-How to dynamically Generate Forms Based on user Data
+How to Dynamically Generate Forms Based on User Data
 ----------------------------------------------------
 
 Sometimes you want a form to be generated dynamically based not only on data

security.rst

@@ -1639,7 +1639,7 @@ and set the ``limiter`` option to its service ID:
                     <!-- 2nd argument is the limiter for username+IP -->
                     <srv:argument type="service" id="limiter.username_ip_login"/>
                     <!-- 3rd argument is the app secret -->
-                    <srv:argument type="service" id="%kernel.secret%"/>
+                    <srv:argument type="string">%kernel.secret%</srv:argument>
                 </srv:service>
             </srv:services>
 
@@ -1683,7 +1683,7 @@ and set the ``limiter`` option to its service ID:
                     // 2nd argument is the limiter for username+IP
                     new Reference('limiter.username_ip_login'),
                     // 3rd argument is the app secret
-                    new Reference('kernel.secret'),
+                    param('kernel.secret'),
                 ]);
 
             $security->firewall('main')

setup/docker.rst

@@ -51,4 +51,10 @@ If you're using the :ref:`symfony binary web server <symfony-local-web-server>`
 then it can automatically detect your Docker services and expose them as environment
 variables. See :ref:`symfony-server-docker`.
 
+.. note::
+
+    macOS users need to explicitly allow the default Docker socket to be used
+    for the Docker integration to work `as explained in the Docker documentation`_.
+
 .. _`https://github.com/dunglas/symfony-docker`: https://github.com/dunglas/symfony-docker
+.. _`as explained in the Docker documentation`: https://docs.docker.com/desktop/mac/permission-requirements/