Merge branch '6.1' into 6

Author: github-actions[bot]

docs/en/09_broadening-the-scope-of-mfa.md

@@ -25,4 +25,4 @@ However, note that users without access to the CMS will be unable to access thei
 - removing, resetting, and changing default MFA methods; and
 - resetting recovery codes.
 
-A custom implementation would be required to provide this functionality. Otherwise it would be limited to Silverstripe CMS Administrators to [reset MFA settings](https://userhelp.silverstripe.org/en/optional_features/multi-factor_authentication/administrator_manual/resetting_accounts/) for a member on their behalf.
+A custom implementation would be required to provide this functionality. Otherwise it would be limited to Silverstripe CMS Administrators to [reset MFA settings](https://userhelp.silverstripe.org/en/optional_features/mfa/administrator_manual/resetting_accounts/) for a member on their behalf.

src/Authenticator/LoginHandler.php

@@ -65,7 +65,7 @@ class LoginHandler extends BaseLoginHandler
      * @var string
      */
     // phpcs:disable
-    private static $user_help_link = 'https://userhelp.silverstripe.org/en/6/optional_features/multi-factor_authentication/';
+    private static $user_help_link = 'https://userhelp.silverstripe.org/en/6/optional_features/mfa/';
     // phpcs:enable
 
     /**

src/BackupCode/RegisterHandler.php

@@ -30,7 +30,7 @@ class RegisterHandler implements RegisterHandlerInterface
      * @var string
      */
     // phpcs:disable
-    private static $user_help_link = 'https://userhelp.silverstripe.org/en/6/optional_features/multi-factor_authentication/user_manual/regaining_access/';
+    private static $user_help_link = 'https://userhelp.silverstripe.org/en/6/optional_features/mfa/user_manual/regaining_access/';
     // phpcs:enable
 
     /**

src/Extension/SiteConfigExtension.php

@@ -29,7 +29,7 @@ class SiteConfigExtension extends Extension
      * @var string
      */
     // phpcs:disable
-    private static $mfa_help_link = 'https://userhelp.silverstripe.org/en/6/optional_features/multi-factor_authentication/';
+    private static $mfa_help_link = 'https://userhelp.silverstripe.org/en/6/optional_features/mfa/';
     // phpcs:enable
 
     private static $db = [