Merge branch '6.0' into 6.1

* 6.0:
  Minor syntax issue
  Update security.rst
  [Mailer] Update mailer.rst
  Fixing link
  Typo
  Update filesystem.rst so backslash is displayed

Author: javiereguiluz

components/filesystem.rst

@@ -336,7 +336,7 @@ following rules iteratively until no further processing can be done:
 
 - "." segments are removed;
 - ".." segments are resolved;
-- backslashes ("\") are converted into forward slashes ("/");
+- backslashes ("\\") are converted into forward slashes ("/");
 - root paths ("/" and "C:/") always terminate with a slash;
 - non-root paths never terminate with a slash;
 - schemes (such as "phar://") are kept;

mailer.rst

@@ -286,6 +286,7 @@ and create an :class:`Symfony\\Component\\Mime\\Email` object::
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\Mailer\MailerInterface;
     use Symfony\Component\Mime\Email;
+    use Symfony\Component\Routing\Annotation\Route;
 
     class MailerController extends AbstractController
     {

reference/configuration/security.rst

@@ -248,6 +248,14 @@ URL and process the submitted login credentials.
 Be sure that this URL is covered by your main firewall (i.e. don't create
 a separate firewall just for ``check_path`` URL).
 
+failure_path
+............
+
+**type**: ``string`` **default**: ``/login``
+
+This is the route or path that the user is redirected to after a failed login attempt.
+It can be a relative/absolute URL or a Symfony route name.
+
 use_forward
 ...........
 

reference/forms/types/enum.rst

@@ -5,7 +5,7 @@ EnumType Field
 ==============
 
 A multi-purpose field used to allow the user to "choose" one or more options
-defined in a `PHP enumeration`_. It extends the :doc:`ChoiceType </reference/forms/types/enum>`
+defined in a `PHP enumeration`_. It extends the :doc:`ChoiceType </reference/forms/types/choice>`
 field and defines the same options.
 
 +---------------------------+----------------------------------------------------------------------+

security/voters.rst

@@ -55,7 +55,7 @@ which makes creating a voter even easier::
 
 .. tip::
 
-    Checking each voter several times can be time consumming for applications
+    Checking each voter several times can be time consuming for applications
     that perform a lot of permission checks. To improve performance in those cases,
     you can make your voters implement the :class:`Symfony\\Component\\Security\\Core\\Authorization\\Voter\\CacheableVoterInterface`.
     This allows the access decision manager to remember the attribute and type