Merge pull request #190628 from MicrosoftDocs/main

3/04 AM Publish

Author: huypub

.openpublishing.redirection.active-directory.json

@@ -3483,7 +3483,7 @@
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-enable.md",
             "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-faqs.md",
@@ -3498,7 +3498,7 @@
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-overview.md",
             "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-overview",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-troubleshooting.md",
@@ -3510,6 +3510,11 @@
             "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-windows-settings-reference",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/active-directory/devices/enterprise-state-roaming-overview.md",
+            "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/active-directory/device-management-faq.md",
             "redirect_url": "/azure/active-directory/devices/faq",

.openpublishing.redirection.json

@@ -32789,6 +32789,11 @@
       "redirect_url": "tutorial-app-containerization-java-kubernetes",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/migrate/migrate-appliance-architecture.md",
+      "redirect_url": "discovered-metadata",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/storage/common/storage-access-blobs-queues-portal.md",
       "redirect_url": "articles/storage/blobs/authorize-blob-access-portal",
@@ -43928,25 +43933,6 @@
         "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
         "redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
         "redirect_document_id": false
-      },
-      {   "source_path_from_root": "/articles/azure/marketplace/co-sell-requirements.md",
-          "redirect_url": "/partner-center/co-sell-requirements",
-          "redirect_document_id": false
-      },        
-      {
-        "source_path_from_root": "/articles/azure/marketplace/co-sell-status.md",
-        "redirect_url": "/partner-center/co-sell-status",
-        "redirect_document_id": false
-      },
-      {
-          "source_path_from_root": "/articles/azure/marketplace/co-sell-configure.md",
-          "redirect_url": "/partner-center/co-sell-configure",
-          "redirect_document_id": false
-      },
-      {
-          "source_path_from_root": "/articles/azure/marketplace/co-sell-overview.md",
-          "redirect_url": "/partner-center/co-sell-overview",
-          "redirect_document_id": false
       }
   ]
 }

articles/active-directory/authentication/concept-registration-mfa-sspr-combined.md

@@ -21,7 +21,8 @@ Before combined registration, users registered authentication methods for Azure
 
 > [!NOTE]
 > Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. 
-> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to utilize the separate legacy registration workflows for MFA and SSPR.
+> 
+> After Sept. 30th, 2022, all users will register security information through the combined registration experience. 
 
 This article outlines what combined security registration is. To get started with combined security registration, see the following article:
 

articles/active-directory/authentication/howto-mfa-getstarted.md

@@ -158,7 +158,7 @@ A major step in every multifactor authentication deployment is getting users reg
 
 > [!NOTE]
 > Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. Tenants created after this date will be unable to utilize the legacy registration workflows.
-> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to disable the combined registration experience.
+> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. 
 
 We recommend that organizations use the [combined registration experience for Azure AD Multi-Factor Authentication and self-service password reset (SSPR)](howto-registration-mfa-sspr-combined.md). SSPR allows users to reset their password in a secure way using the same methods they use for Azure AD Multi-Factor Authentication. Combined registration is a single step for end users. To make sure you understand the functionality and end-user experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
 

articles/active-directory/authentication/howto-registration-mfa-sspr-combined.md

@@ -21,7 +21,8 @@ Before combined registration, users registered authentication methods for Azure
 
 > [!NOTE]
 > Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. Tenants created after this date will be unable to utilize the legacy registration workflows.
-> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to utilize the separate legacy registration workflows for MFA and SSPR.
+> 
+> After Sept. 30th, 2022, all users will register security information through the combined registration experience. 
 
 To make sure you understand the functionality and effects before you enable the new experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
 

articles/active-directory/authentication/howto-sspr-deployment.md

@@ -112,7 +112,7 @@ Before deploying SSPR, you may opt to determine the number and the average cost
 
 > [!NOTE]
 > Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. Tenants created after this date will be unable to utilize the legacy registration workflows.
-> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to disable the combined registration experience.
+> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration.
 
 We recommend that organizations use the [combined registration experience for Azure AD Multi-Factor Authentication and self-service password reset (SSPR)](howto-registration-mfa-sspr-combined.md). SSPR allows users to reset their password in a secure way using the same methods they use for Azure AD Multi-Factor Authentication. Combined registration is a single step for end users. To make sure you understand the functionality and end-user experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
 

articles/active-directory/conditional-access/media/concept-conditional-access-conditions/conditional-access-conditions.png

@@ -1,6 +1,6 @@
 ---
 title: "Quickstart: Sign in users and call Microsoft Graph in a Windows desktop app | Azure"
-description: In this quickstart, learn how a Windows desktop .NET (XAML) application can get an access token and call an API protected by the Microsoft identity platform.
+description: Learn how a Windows Presentation Foundation (WPF) application can get an access token and call an API protected by the Microsoft identity platform.
 services: active-directory
 author: jmprieur
 manager: CelesteDG
@@ -79,6 +79,13 @@ Where:
 
     To find the values of **Directory (tenant) ID** and **Supported account types**, go to the app's **Overview** page in the Azure portal.
 
+#### Step 4: Run the application
+
+To build and run the sample application in Visual Studio, select the **Debug menu** > **Start Debugging**, or press the F5 key. Your application's MainWindow is displayed.
+
+When the app's main window appears, select the Call Microsoft Graph API button. You'll be prompted to sign in using your Azure Active Directory account (work or school account) or Microsoft account (live.com, outlook.com) credentials.
+
+If you're running the application for the first time, you'll be prompted to provide consent to allow the application to access your user profile and sign you in. After consenting to the requested permissions, the application displays that you've successfully logged in. You should see some basic token information and user data obtained from the call to the Microsoft Graph API.
 
 ## More information
 

articles/active-directory/develop/includes/desktop-app/quickstart-windows-desktop.md

@@ -72,8 +72,6 @@
     href: faq.yml
   - name: Enterprise state roaming
     items:
-    - name: What is enterprise state roaming?
-      href: enterprise-state-roaming-overview.md
     - name: Enable enterprise state roaming
       href: enterprise-state-roaming-enable.md
     - name: Enable enterprise state FAQs

articles/active-directory/devices/TOC.yml

@@ -60,3 +60,4 @@ Another user wants to access their organizational email on their personal Androi
 
 - [Manage device identities using the Azure portal](device-management-azure-portal.md)
 - [Manage stale devices in Azure AD](manage-stale-devices.md)
+- [Register your personal device on your work or school network](https://support.microsoft.com/account-billing/register-your-personal-device-on-your-work-or-school-network-8803dd61-a613-45e3-ae6c-bd1ab25bf8a8)