Merging changes synced from https://github.com/MicrosoftDocs/visualstudio-docs-pr (branch live)

Author: Learn Build Service GitHub App

docs/ide/default-keyboard-shortcuts-in-visual-studio.md

@@ -1,7 +1,7 @@
 ---
 title: Keyboard shortcuts
 description: Learn about the default keyboard shortcuts in Visual Studio that allow you to access a variety of commands and windows.
-ms.date: 06/19/2023
+ms.date: 05/21/2024
 ms.topic: reference
 helpviewer_keywords:
 - shortcut keys [Visual Studio], keyboard binding schemes
@@ -16,7 +16,7 @@ ms.subservice: general-ide
 ---
 # Keyboard shortcuts in Visual Studio
 
-You can access a variety of [commands](reference/visual-studio-commands.md) and windows in Visual Studio by choosing the appropriate keyboard shortcut. This page lists the default command shortcuts for the **General** profile, which you might have chosen when you installed Visual Studio. No matter which profile you chose, you can [identify the shortcut](identifying-and-customizing-keyboard-shortcuts-in-visual-studio.md) for a command by opening the **Options** dialog box, expanding the **Environment** node, and then choosing **Keyboard**. You can also customize your shortcuts by assigning a different shortcut to any given command.
+You can access a variety of [commands](reference/visual-studio-commands.md) and windows in Visual Studio by choosing the appropriate keyboard shortcut. This page lists the default command shortcuts for the **General** profile, which you might have chosen when you installed Visual Studio. No matter which profile you chose, you can [identify the shortcut](identifying-and-customizing-keyboard-shortcuts-in-visual-studio.md#identify-a-keyboard-shortcut) for a command by opening the **Options** dialog box, expanding the **Environment** node, and then choosing **Keyboard**. You can also [customize your shortcuts](identifying-and-customizing-keyboard-shortcuts-in-visual-studio.md#customize-a-keyboard-shortcut) by assigning a different shortcut to any given command.
 
 For a list of common keyboard shortcuts and other productivity information, see:
 

docs/ide/media/vs-2022/whats-new-visual-studio.png

@@ -2,7 +2,7 @@
 title: "What's new in Visual Studio 2022"
 titleSuffix: ""
 description: Discover new features in Visual Studio 2022, including answers to questions and AI consultations while you code with a subscription to GitHub Copilot.
-ms.date: 02/13/2024
+ms.date: 05/21/2024
 helpviewer_keywords:
   - "Visual Studio, what's new"
   - "what's new [Visual Studio]"
@@ -15,7 +15,7 @@ ms.topic: whats-new
 ---
 # What's new in Visual Studio 2022
 
-**Updated for the 17.9 release.** See [full release notes](/visualstudio/releases/2022/release-notes) | View [product roadmap](/visualstudio/productinfo/vs-roadmap/)
+**Updated for the 17.10 release.** See [full release notes](/visualstudio/releases/2022/release-notes) | View [product roadmap](/visualstudio/productinfo/vs-roadmap/)
 
 >[!div class="button"]
 >[Download Visual Studio 2022](https://visualstudio.microsoft.com/downloads/?cid=learn-onpage-download-cta)

docs/ide/media/vs-2022/work-with-multi-factor-authentication/change-authentication-mechanism-error.png

@@ -1,7 +1,7 @@
 ---
-title: Multi-factor authentication with Visual Studio sign-ins
+title: Multifactor authentication with Visual Studio sign-ins
 titleSuffix: "" 
-ms.date: 08/24/2023
+ms.date: 05/21/2024
 ms.topic: how-to
 description: Use Visual Studio with accounts that require multifactor authentication (MFA) to protect your apps and data with conditional access policies.
 author: anandmeg
@@ -10,13 +10,13 @@ manager: mijacobs
 ms.subservice: general-ide
 ---
 
-# Sign in to Visual Studio with accounts that require multi-factor authentication (MFA)
+# Sign in to Visual Studio with accounts that require multifactor authentication (MFA)
 
-In this article, you'll learn how to use Visual Studio with accounts that require multi-factor authentication (MFA).
+In this article, you'll learn how to use Visual Studio with accounts that require multifactor authentication (MFA).
 
 ## Why enable MFA policies?
 
-When collaborating with external guest users, it's a good idea to protect your apps and data with **conditional access (CA)** policies such as **multi-factor authentication (MFA)**.  
+When collaborating with external guest users, it's a good idea to protect your apps and data with **conditional access (CA)** policies such as **multifactor authentication (MFA)**.  
 
 Once enabled, guest users will need more than just a username and password to access your resources, and must satisfy additional security requirements. MFA policies can be enforced at the tenant, app, or individual guest user level, the same way that they are enabled for members of your own organization. 
 
@@ -47,13 +47,13 @@ You can access resources secured via CA policies such as MFA in Visual Studio. T
 ### Enabling Windows authentication broker
 
 >[!NOTE]
->Web Account Manager(WAM) is only available on Windows 10 and above, as well as Windows Server 2019 and above.
+>Web Account Manager (WAM) is only available on Windows 10 and above, as well as Windows Server 2019 and above.
 
 To enable this workflow, go to Visual Studio's Options dialog **(Tools > Options…)**, select the **Accounts** tab, and then select **Windows authentication broker** from the **Add and reauthenticate accounts using:** dropdown. 
 
 :::image type="content" source="media/vs-2022/windows-authentication-broker.png" alt-text="Select web authentication broker from the dropdown.":::
 
-Windows authentication broker uses [Web Account Manager(WAM)](/entra/msal/dotnet/acquiring-tokens/desktop-mobile/wam) and offers many benefits such as security, improved MFA support, and seamless integration between accounts added to the OS and Visual Studio.
+Windows authentication broker uses [Web Account Manager (WAM)](/entra/msal/dotnet/acquiring-tokens/desktop-mobile/wam) and offers many benefits such as security, improved MFA support, and seamless integration between accounts added to the OS and Visual Studio.
 
 ::: moniker-end
 
@@ -72,7 +72,7 @@ To enable this workflow, go to Visual Studio's Options dialog **(Tools > Options
 
 **Windows authentication broker**
 
-Once the Windows authentication broker workflow is enabled, you can sign in or add accounts to Visual Studio as you normally would, via the Account Settings dialog **(File > Account Settings…)**. Web Account Manager(WAM) simplifies the sign in experience by allowing users to log in with accounts known to Windows, such as the account signed into your Windows session.
+Once the Windows authentication broker workflow is enabled, you can sign in or add accounts to Visual Studio as you normally would, via the Account Settings dialog **(File > Account Settings…)**. Web Account Manager (WAM) simplifies the sign in experience by allowing users to log in with accounts known to Windows, such as the account signed into your Windows session.
 
 :::image type="content" source="media/vs-2022/add-personalization-account-web-account-manager.png" alt-text="Add additional accounts to Visual Studio with the Windows authentication broker workflow.":::
 
@@ -149,6 +149,17 @@ Starting with Visual Studio 2022 version 17.5, if you see the previous error dia
 
 <a name='how-to-opt-out-of-using-a-specific-azure-active-directory-tenant-in-visual-studio'></a>
 
+::: moniker range="=vs-2022"
+### Web Account Manager (WAM) errors
+
+If you run into errors when using the [Windows authentication broker workflow for signing in to Visual Studio](#enabling-windows-authentication-broker), follow the action listed on the error dialog to resolve or report the issue. Use the links on the dialog to learn more about the error or to see error logs.
+
+For example, if you see the following error dialog, you can resolve the issue by selecting **change authentication mechanism** to open **Sign-in options** and switch to the [system web browser](#enabling-system-web-browser).
+
+:::image type="content" source="media/vs-2022/work-with-multi-factor-authentication/change-authentication-mechanism-error.png" alt-text="Screenshot of a WAM error dialog with the change authentication mechanism option to resolve the error." border="false":::
+
+::: moniker-end
+
 ## How to opt out of using a specific Microsoft Entra tenant in Visual Studio
 
 Visual Studio 2019 version 16.6 and above offers the flexibility to filter out tenants individually or globally, effectively hiding them from Visual Studio. Filtering eliminates the need to authenticate with that tenant, but it also means that you won't be able to access any associated resources.