-

Author: javiereguiluz

security.rst

@@ -1426,7 +1426,7 @@ Frequently Asked Questions
 **Can I have Multiple Firewalls?**
     Yes! But it's usually not necessary. Each firewall is like a separate security
     system. And so, unless you have *very* different authentication needs, one
-    firewall usually works well. With :doc:`Guard authentication </security/guard_authentication>`,
+    firewall usually works well. With the :doc:`authenticator-based security </security/authenticator_manager>`,
     you can create various, diverse ways of allowing authentication (e.g. form login,
     API key authentication and LDAP) all under the same firewall.
 

security/authenticator_manager.rst

@@ -266,14 +266,6 @@ The authenticator-based system dropped support for these providers and
 introduced a new authenticator interface as a base for custom
 authentication methods.
 
-.. tip::
-
-    :doc:`Guard authenticators </security/guard_authentication>` are still
-    supported in the authenticator-based system. It is however recommended
-    to also update these when you're refactoring your application to the
-    new system. The new authenticator interface has many similarities with the
-    guard authenticator interface, making the rewrite easier.
-
 Authenticators should implement the
 :class:`Symfony\\Component\\Security\\Http\\Authenticator\\AuthenticatorInterface`.
 You can also extend

security/form_login_setup.rst

@@ -45,7 +45,7 @@ and your generated code may be slightly different:
     Support for login form authentication was added to ``make:auth`` in MakerBundle 1.8.
 
 This generates the following: 1) login/logout routes & controller, 2) a template that
-renders the login form, 3) a :doc:`Guard authenticator </security/guard_authentication>`
+renders the login form, 3) an :doc:`authenticator </security/authenticator_manager>`
 class that processes the login submit and 4) updates the main security config file.
 
 **Step 1.** The ``/login``/``/logout`` routes & controller::
@@ -405,9 +405,9 @@ you have:
 .. image:: /_images/security/symfony_loggedin_wdt.png
    :align: center
 
-The Guard authentication system is powerful, and you can customize your authenticator
+The authentication system is powerful, and you can customize your authenticator
 class to do whatever you need. To learn more about what the individual methods do,
-see :doc:`/security/guard_authentication`.
+see :doc:`/security/authenticator_manager`.
 
 Controlling Error Messages
 --------------------------

security/password_migration.rst

@@ -141,7 +141,7 @@ After this, you're done and passwords are always hashed as secure as possible!
 Provide the Password when using Guard
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When you're using a custom :doc:`guard authenticator </security/guard_authentication>`,
+When you're using a custom :doc:`authenticator </security/authenticator_manager>`,
 you need to implement :class:`Symfony\\Component\\Security\\Guard\\PasswordAuthenticatedInterface`.
 This interface defines a ``getPassword()`` method that returns the password
 for this login request. This password is used in the migration process::