Merge branch '6.0' into 6.1

* 6.0:
  Fix second twig path reference to be consistent with the first reference on security documentation

Author: javiereguiluz

security.rst

@@ -911,7 +911,7 @@ be ``authenticate``:
 
 .. code-block:: html+twig
 
-    {# templates/security/login.html.twig #}
+    {# templates/login/index.html.twig #}
 
     {# ... #}
     <form action="{{ path('login') }}" method="post">