Merge branch '4.4' into 5.0

* 4.4:
  Adjusts description of the `csrf_token_id` option
  Adjusts description of the csrf_token extension

Author: javiereguiluz

reference/configuration/security.rst

@@ -554,8 +554,7 @@ csrf_token_id
 
 **type**: ``string`` **default**: ``'logout'``
 
-An arbitrary string used to generate the token value (and check its validity
-afterwards).
+An arbitrary string used to identify the token (and check its validity afterwards).
 
 .. _reference-security-ldap:
 

reference/twig_reference.rst

@@ -131,7 +131,7 @@ csrf_token
     {{ csrf_token(intention) }}
 
 ``intention``
-    **type**: ``string`` - an arbitrary string used to generate the token value.
+    **type**: ``string`` - an arbitrary string used to identify the token.
 
 Renders a CSRF token. Use this function if you want :doc:`CSRF protection </security/csrf>`
 in a regular HTML form not managed by the Symfony Form component.