From 3b204c42631aecc3b29f4a80699083bf530d9789 Mon Sep 17 00:00:00 2001
From: Rob <alcohol@users.noreply.github.com>
Date: Tue, 31 Jan 2017 09:48:05 +0100
Subject: [PATCH 1/3] Update guard_authentication.rst

I still feel like the answer to "Can I have Multiple Authenticators?" is a bit confusing even with these adjustments, but I think it makes it more clear now at least what you have to adjust configuration wise. The original example simply shows the configuration for a single guard which is rather confusing considering the question it attempts to answer.

BTW; can someone else add or give me the XML change necessary? I never use XML configuration so I am not sure if it is supposed to be an attribute or another element or what not.
---
 security/guard_authentication.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
index 6ecc9b3aa56..a3b9ec4c3b6 100644
--- a/security/guard_authentication.rst
+++ b/security/guard_authentication.rst
@@ -502,8 +502,10 @@ Frequently Asked Questions
                         logout: ~
 
                         guard:
+                            entry_point: app.form_login_authenticator
                             authenticators:
                                 - app.token_authenticator
+                                - app.form_login_authenticator
 
                         # if you want, disable storing the user in the session
                         # stateless: true
@@ -531,6 +533,7 @@ Frequently Asked Questions
 
                         <guard>
                             <authenticator>app.token_authenticator</authenticator>
+                            <authenticator>app.form_login_authenticator</authenticator>
                         </guard>
 
                         <!-- ... -->
@@ -551,8 +554,10 @@ Frequently Asked Questions
                         'anonymous'      => true,
                         'logout'         => true,
                         'guard'          => array(
+                            'entry_point'     => 'app.form_login_authenticator',
                             'authenticators'  => array(
-                                'app.token_authenticator'
+                                'app.token_authenticator',
+                                'app.form_login_authenticator',
                             ),
                         ),
                         // ...

From 50de471e863c70466db06f6195702b1d13fb83eb Mon Sep 17 00:00:00 2001
From: Rob <alcohol@users.noreply.github.com>
Date: Tue, 31 Jan 2017 11:36:48 +0100
Subject: [PATCH 2/3] Update guard_authentication.rst

add guard attribute
---
 security/guard_authentication.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
index a3b9ec4c3b6..4dcdbc3f049 100644
--- a/security/guard_authentication.rst
+++ b/security/guard_authentication.rst
@@ -531,7 +531,7 @@ Frequently Asked Questions
                     >
                         <logout />
 
-                        <guard>
+                        <guard entry-point="app.form_login_authenticator"
                             <authenticator>app.token_authenticator</authenticator>
                             <authenticator>app.form_login_authenticator</authenticator>
                         </guard>

From f454f652b67b7c51118f1ba9d6d873b3483a5b8d Mon Sep 17 00:00:00 2001
From: Rob <alcohol@users.noreply.github.com>
Date: Tue, 31 Jan 2017 11:38:28 +0100
Subject: [PATCH 3/3] Update guard_authentication.rst

copy & paste is difficult...
---
 security/guard_authentication.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
index 4dcdbc3f049..25b81f4c5c3 100644
--- a/security/guard_authentication.rst
+++ b/security/guard_authentication.rst
@@ -531,7 +531,7 @@ Frequently Asked Questions
                     >
                         <logout />
 
-                        <guard entry-point="app.form_login_authenticator"
+                        <guard entry-point="app.form_login_authenticator">
                             <authenticator>app.token_authenticator</authenticator>
                             <authenticator>app.form_login_authenticator</authenticator>
                         </guard>