Merge branch 'master' into v9.6-documentation

Author: amyblais

source/about/install-mattermost-for-microsoft-teams-plugin.rst

@@ -158,7 +158,7 @@ Trobleshooting FAQ
 
 **Can I connect my Mattermost account to a Microsoft Teams account of a different email address?**
 
-No. Currently, only accounts with the same email addresses are allowed to be connected.
+No. Currently, only accounts with the same email addresses are allowed to be connected. Specify the email address that matches your Mattermost account.
 
 Get help
 --------

source/upgrade/version-archive.rst

@@ -8,7 +8,7 @@ If you want to check that the version of Mattermost you are installing is the of
 
 .. important::
 
-   Support for Mattermost Server v8.1 :doc:`Extended Support Release </upgrade/extended-support-release>` is coming to the end of its life cycle on May 15, 2024. Upgrading to Mattermost Server v8.1 :doc:`Extended Support Release </upgrade/extended-support-release>` or later is recommended.
+   Support for Mattermost Server v8.1 :doc:`Extended Support Release </upgrade/extended-support-release>` is coming to the end of its life cycle on May 15, 2024. Upgrading to Mattermost Server v9.5 :doc:`Extended Support Release </upgrade/extended-support-release>` or later is recommended.
 
 .. contents:: On this page
     :backlinks: top