Merge branch 'wip-77541-m311' into MOODLE_311_STABLE

# Conflicts:
#	repository/office365/lang/en/repository_office365.php

auth.php

@@ -272,7 +272,7 @@ class auth_plugin_oidc extends \auth_plugin_base {
     }
 
     /**
-     * Log out user from Office 365 if single sign off integration is enabled.
+     * Log out user from Microsoft 365 if single sign off integration is enabled.
      *
      * @param stdClass $user
      *

lang/en/auth_oidc.php

@@ -27,7 +27,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['pluginname'] = 'OpenID Connect';
-$string['auth_oidcdescription'] = 'The OpenID Connect plugin provides single-sign-on functionality using configurable identity providers.';
+$string['auth_oidcdescription'] = 'The OpenID Connect authentication plugin provides single-sign-on functionality using configurable identity providers.';
 
 $string['cfg_authendpoint_key'] = 'Authorization Endpoint';
 $string['cfg_authendpoint_desc'] = 'The URI of the Authorization endpoint from your identity provider to use.';
@@ -86,9 +86,9 @@ $string['cfg_userrestrictions_desc'] = 'Only allow users to log in that meet cer
 $string['cfg_userrestrictionscasesensitive_key'] = 'User Restrictions Case Sensitive';
 $string['cfg_userrestrictioncasesensitive_desc'] = 'This controls if the "/i" option in regular expression is used in the user restriction match.<br/>If enabled, all user restriction checks will be performed as with case sensitive. Note if this is disabled, any patterns on letter cases will be ignored.';
 $string['cfg_signoffintegration_key'] = 'Single sign off';
-$string['cfg_signoffintegration_desc'] = 'If enabled, when a Moodle user using OIDC authentication method signs off from Moodle, Moodle will attempt to log the user off from Office 365 as well.
+$string['cfg_signoffintegration_desc'] = 'When connecting to Azure AD, if this option is enabled, when a Moodle user using the OpenID Connect authentication method signs off from Moodle, Moodle will attempt to log the user off from Microsoft 365 as well.
 
-Note the URL of Moodle site ({$a}) needs to be added as a redirect URI in the Azure app created for Moodle Office 365 integration.';
+Note the URL of Moodle site ({$a}) needs to be added as a redirect URI in the Azure app created for Moodle Microsoft 365 integration.';
 $string['cfg_logoutendpoint_key'] = 'Logout Endpoint';
 $string['cfg_logoutendpoint_desc'] = 'The URI of the logout endpoint from your identity provider to use.';
 $string['cfg_tools'] = 'Tools';