Merge branch '3.4' into 4.1

* 3.4:
  Updating security_checker.rst
  Update json_login_setup.rst
  Update the link to DynamicRouter documentation

Author: javiereguiluz

routing/routing_from_database.rst

@@ -38,4 +38,4 @@ loader, e.g. for another database type or a REST API or anything else.
 The DynamicRouter is explained in the `Symfony CMF documentation`_.
 
 .. _FrameworkExtraBundle: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
-.. _`Symfony CMF documentation`: https://symfony.com/doc/master/cmf/book/routing.html
+.. _`Symfony CMF documentation`: https://symfony.com/doc/current/cmf/bundles/routing/dynamic.html

security/json_login_setup.rst

@@ -55,12 +55,10 @@ First, enable the JSON login under your firewall:
 
 .. tip::
 
-    The ``check_path`` can also be a route name (but cannot have mandatory wildcards - e.g.
-    ``/login/{foo}`` where ``foo`` has no default value).
+    The ``check_path`` can also be a route name (but cannot have mandatory
+    wildcards - e.g. ``/login/{foo}`` where ``foo`` has no default value).
 
-Now, when a request is made to the ``/login`` URL, the security system initiates
-the authentication process. You just need to configure a route matching this
-path:
+The next step is to configure a route in your app matching this path:
 
 .. configuration-block::
 
@@ -123,11 +121,9 @@ path:
 
         return $routes;
 
-When you submit a ``POST`` request to the ``/login`` URL with the following JSON
-document as the body, the security system intercepts the requests.
-It takes care of authenticating the user with the submitted username and password
-or triggers an error in case the authentication process fails.
-If the authentication is successful, the controller defined earlier will be executed.
+Now, when you make a ``POST`` request, with the header ``Content-Type: application/json``,
+to the ``/login`` URL with the following JSON document as the body, the security
+system intercepts the request and initiates the authentication process:
 
 .. code-block:: json
 
@@ -136,6 +132,10 @@ If the authentication is successful, the controller defined earlier will be exec
         "password": "MyPassword"
     }
 
+Symfony takes care of authenticating the user with the submitted username and
+password or triggers an error in case the authentication process fails. If the
+authentication is successful, the controller defined earlier will be executed.
+
 If the JSON document has a different structure, you can specify the path to
 access the ``username`` and ``password`` properties using the ``username_path``
 and ``password_path`` keys (they default respectively to ``username`` and

security/security_checker.rst

@@ -30,7 +30,8 @@ FriendsOfPHP organization.
 
     The ``security:check`` command terminates with a non-zero exit code if
     any of your dependencies is affected by a known security vulnerability.
-    Therefore, you can easily integrate it in your build process.
+    This allows you to add it to your project build process and your continuous
+    integration workflows.
 
 .. tip::