Merge branch '7.4' into 8.0

* 7.4:
  fix default CSRF token input name

Author: javiereguiluz

security/csrf.rst

@@ -102,7 +102,7 @@ to do anything to be protected against CSRF attacks.
 
 .. _form-csrf-customization:
 
-By default Symfony adds the CSRF token in a hidden field called ``_csrf_token``, but
+By default Symfony adds the CSRF token in a hidden field called ``_token``, but
 this can be customized (1) globally for all forms and (2) on a form-by-form basis.
 Globally, you can configure it under the ``framework.form`` option:
 
@@ -151,7 +151,7 @@ method of each form::
                 // enable/disable CSRF protection for this form
                 'csrf_protection' => true,
                 // the name of the hidden HTML field that stores the token
-                'csrf_field_name' => '_token',
+                'csrf_field_name' => 'custom_token_name',
                 // an arbitrary string used to generate the value of the token
                 // using a different string for each form improves its security
                 // when using stateful tokens (which is the default)