resolving merge conflicts

Author: Qian Wen

.openpublishing.redirection.json

@@ -6242,14 +6242,9 @@
       "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
-      "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-users.md",
-      "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
+      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
       "redirect_document_id": false
     },
     {
@@ -20526,6 +20521,56 @@
       "redirect_url": "https://docs.microsoft.com/legal/marketplace/terms",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/setup-your-application-in-the-publishing-portal.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
+      "redirect_document_id": true
+    },    
+    {
+      "source_path": "articles/marketplace/enable-lead-sharing.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/commercial-marketplace-get-customer-leads",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/listing-type-requirements.md",
+      "redirect_url": "/azure/marketplace/publisher-guide-by-offer-type",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/promote-your-business-with-microsoft.md",
+      "redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/publishing-checklist-appsource.md",
+      "redirect_url": "/azure/marketplace/appsource-offer-publishing-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/publishing-checklist-azure-marketplace.md",
+      "redirect_url": "/azure/marketplace/publisher-guide-by-offer-type",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/support-appsource.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/support",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/store-your-appSource-package-to-azure-storage-and-generate-sas-key.md",
+      "redirect_url": "/azure/marketplace/marketplace-publishers-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/dynamics-365-solution-preparation.md",
+      "redirect_url": "/azure/marketplace/appsource-offer-publishing-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/request-to-publish-the-app.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/marketplace/marketplace-participation-policy.md",
       "redirect_url": "https://docs.microsoft.com/legal/marketplace/participation-policy",
@@ -20588,7 +20633,12 @@
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
-      "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cloud-partner-portal/cloud-partner-portal-manage-publisher-profile.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
       "redirect_document_id": false
     },
     {
@@ -20597,10 +20647,15 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-users.md",
-      "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-manage-users.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-manage-users.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/cloud-partner-portal-publish-cortana-intelligence-app.md",
       "redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
@@ -31681,29 +31736,64 @@
       "redirect_url": "/azure/service-fabric/service-fabric-tutorial-deploy-app-with-cicd-vsts",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/marketplace/add-bank-tax-info.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account#payout-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-automate-offer-publishing.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/azure-vm-create-offer",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/appsource-package-preparation.md",
+      "redirect_url": "/azure/marketplace/marketplace-publishers-guide",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/marketplace/enable-trial-using-azure-ad.md",
       "redirect_url": "/azure/marketplace/enable-appsource-marketplace-using-azure-ad",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/marketplace/gtm-promote-your-business.md",
-      "redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
+      "redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/become-publisher.md",
       "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
-      "redirect_document_id": true
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/deprecated/gtm-promote-your-business.md",
+      "redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/deprecated/become-publisher.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/guidelines.md",
-      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
-      "redirect_document_id": true
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/deprecated/guidelines.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/register-dev-center.md",
-      "redirect_url": "/azure/marketplace/partner-center-portal/manage-account",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/deprecated/register-dev-center.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
       "redirect_document_id": false
     },
     {
@@ -31719,7 +31809,7 @@
     {
       "source_path": "articles/marketplace/grow-your-business-with-appsource.md",
       "redirect_url": "/azure/marketplace/marketplace-publishers-guide",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/billing-options-azure-marketplace.md",
@@ -31793,7 +31883,22 @@
     },
     {
       "source_path": "articles/marketplace-publishing/marketplace-publishing-accounts-creation-registration.md",
-      "redirect_url": "https://docs.microsoft.com/azure/marketplace/cloud-partner-portal-orig/cloud-partner-portal-dev-center-accounts-registration",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-dev-center-accounts-registration.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-management-solution-publish.md",
+      "redirect_url": "/azure/marketplace",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-manage-publisher-profile.md",
+      "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
       "redirect_document_id": false
     },
     {
@@ -42738,9 +42843,14 @@
     },
     {
       "source_path": "articles/storage/common/storage-enable-and-view-metrics.md",
-      "redirect_url": "/azure/storage/common/storage-metrics-in-azure-monitor",
+      "redirect_url": "/azure/storage/common/monitor-storage",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/storage-metrics-in-azure-monitor.md",
+      "redirect_url": "/azure/storage/common/monitor-storage",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/azure-stack/partner/azure-stack-vaas-set-up-account.md",
       "redirect_url": "/azure/azure-stack/partner/azure-stack-vaas-set-up-resources",
@@ -51475,16 +51585,6 @@
       "redirect_url": "/azure/sql-database/sql-database-security-best-practice",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/healthcare-apis/configure-azure-rbac.md",
-      "redirect_url": "/azure/healthcare-apis/azure-api-for-fhir-additional-settings",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/healthcare-apis/configure-local-rbac.md",
-      "redirect_url": "/azure/healthcare-apis/azure-api-for-fhir-additional-settings",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/media-services/previous/media-services-configure-tricaster-live-encoder.md",
       "redirect_url": "/azure/media-services",
@@ -52079,6 +52179,16 @@
       "source_path": "articles/sql-database/sql-database-auditing-and-threat-detection-powershell.md",
       "redirect_url": "/azure/sql-database/scripts/sql-database-auditing-and-threat-detection-powershell",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/media-services/azure-media-player/azure-media-player-license.md",
+      "redirect_url": "/legal/azure-media-player/azure-media-player-license",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/load-balancer/azure-media-player/components-limitations.md",
+      "redirect_url": "/articles/load-balancer/concepts",
+      "redirect_document_id": false
     }
  ]
 }

articles/active-directory/app-provisioning/application-provisioning-config-problem-no-users-provisioned.md

@@ -2,20 +2,15 @@
 title: Users are not being provisioned in my application
 description: How to troubleshoot common issues faced when you don't see users appearing in an Azure AD Gallery Application you have configured for user provisioning with Azure AD
 services: active-directory
-documentationcenter: ''
 author: msmimart
 manager: CelesteDG
-ms.assetid: 
 ms.service: active-directory
 ms.subservice: app-provisioning
 ms.workload: identity
-ms.tgt_pltfrm: na
-ms.devlang: na
 ms.topic: conceptual
 ms.date: 04/20/2020
 ms.author: mimart
 ms.reviewer: arvinh
-ms.collection: M365-identity-device-management
 ---
 
 # No users are being provisioned 

articles/active-directory/app-provisioning/application-provisioning-config-problem-scim-compatibility.md

@@ -2,22 +2,15 @@
 title: Known issues with SCIM 2.0 protocol compliance - Azure AD
 description: How to solve common protocol compatibility issues faced when adding a non-gallery application that supports SCIM 2.0 to Azure AD
 services: active-directory
-documentationcenter: ''
 author: msmimart
 manager: CelesteDG
-
-ms.assetid: 
 ms.service: active-directory
 ms.subservice: app-provisioning
 ms.workload: identity
-ms.tgt_pltfrm: na
-ms.devlang: na
 ms.topic: conceptual
 ms.date: 12/03/2018
 ms.author: mimart
 ms.reviewer: arvinh
-
-ms.collection: M365-identity-device-management
 ---
 
 # Known issues and resolutions with SCIM 2.0 protocol compliance of the Azure AD User Provisioning service

articles/active-directory/app-provisioning/application-provisioning-config-problem-storage-limit.md

@@ -2,22 +2,15 @@
 title: Problem saving admin credentials configuring Azure AD gallery app
 description: How to troubleshoot common issues faced when configuring user provisioning to an application already listed in the Azure AD Application Gallery
 services: active-directory
-documentationcenter: ''
 author: msmimart
 manager: CelesteDG
-
-ms.assetid: 
 ms.service: active-directory
 ms.subservice: app-provisioning
 ms.workload: identity
-ms.tgt_pltfrm: na
-ms.devlang: na
 ms.topic: conceptual
 ms.date: 02/21/2018
 ms.author: mimart
 ms.reviewer: arvinh
-
-ms.collection: M365-identity-device-management
 ---
 
 # Problem saving administrator credentials while configuring user provisioning to an Azure Active Directory Gallery application 

articles/active-directory/app-provisioning/application-provisioning-config-problem-wrong-users-provisioned.md

@@ -2,22 +2,15 @@
 title: Wrong set of users are provisioned to an Azure AD Gallery app
 description: Learn how to find out why a different set of users are being provisioned to an application than those you expected
 services: active-directory
-documentationcenter: ''
 author: msmimart
 manager: CelesteDG
-
-ms.assetid: 
 ms.service: active-directory
 ms.subservice: app-provisioning
 ms.workload: identity
-ms.tgt_pltfrm: na
-ms.devlang: na
 ms.topic: conceptual
 ms.date: 09/20/2018
 ms.author: mimart
 ms.reviewer: asteen
-
-ms.collection: M365-identity-device-management
 ---
 
 # Wrong set of users are being provisioned to an Azure AD Gallery application

articles/active-directory/app-provisioning/application-provisioning-config-problem.md

@@ -2,22 +2,15 @@
 title: Problem configuring user provisioning to an Azure AD Gallery app
 description: How to troubleshoot common issues faced when configuring user provisioning to an application already listed in the Azure AD Application Gallery
 services: active-directory
-documentationcenter: ''
 author: msmimart
 manager: CelesteDG
-
-ms.assetid: 
 ms.service: active-directory
 ms.subservice: app-provisioning
 ms.workload: identity
-ms.tgt_pltfrm: na
-ms.devlang: na
 ms.topic: conceptual
 ms.date: 09/03/2019
 ms.author: mimart
 ms.reviewer: asteen
-
-ms.collection: M365-identity-device-management
 ---
 
 # Problem configuring user provisioning to an Azure AD Gallery application

articles/active-directory/app-provisioning/application-provisioning-configure-api.md

@@ -2,22 +2,15 @@
 title: Use Microsoft Graph APIs to configure provisioning - Azure Active Directory | Microsoft Docs
 description: Need to set up provisioning for multiple instances of an application? Learn how to save time by using the Microsoft Graph APIs to automate the configuration of automatic provisioning.
 services: active-directory
-documentationcenter: ''
 author: msmimart
 manager: CelesteDG
-
-ms.assetid: 
 ms.service: active-directory
 ms.subservice: app-provisioning
 ms.workload: identity
-ms.tgt_pltfrm: na
-ms.devlang: na
 ms.topic: conceptual
 ms.date: 11/15/2019
 ms.author: mimart
 ms.reviewer: arvinh
-
-ms.collection: M365-identity-device-management
 ---
 
 # Configure provisioning using Microsoft Graph APIs