merge conflict

Author: curtand

.openpublishing.redirection.json

@@ -4952,6 +4952,11 @@
       "redirect_url": "/azure/azure-resource-manager/management/view-activity-logs",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/event-grid/event-sources.md",
+      "redirect_url": "/azure/event-grid/overview#event-sources",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/event-grid/event-subscription-template.md",
       "redirect_url": "/azure/event-grid/template-samples",
@@ -5504,7 +5509,12 @@
     },
     {
       "source_path": "articles/managed-applications/publish-managed-app-definition-quickstart.md",
-      "redirect_url": "/azure/azure-resource-manager/managed-applications/publish-managed-app-definition-quickstart",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-resource-manager/managed-applications/publish-managed-app-definition-quickstart.md",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
       "redirect_document_id": false
     },
     {
@@ -38346,6 +38356,11 @@
       "redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/active-directory/authentication/concept-sspr-customization.md",
+      "redirect_url": "/azure/active-directory/authentication/howto-sspr-customization",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/active-directory/active-directory-passwords-reset-register.md",
       "redirect_url": "/azure/active-directory/user-help/active-directory-passwords-reset-register",
@@ -43781,6 +43796,76 @@
       "redirect_url": "/azure/cognitive-services/acoustics/what-is-acoustics",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/what-is-acoustics.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/what-is-acoustics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/unity-quickstart.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-quickstart",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/unreal-quickstart.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-quickstart",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/unity-baking.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-baking",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/unity-workflow.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-workflow",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/unreal-baking.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-baking",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/unreal-workflow.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-workflow",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/design-process.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/design-process",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/bake-resolution.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/bake-resolution",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/create-azure-account.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/create-azure-account",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/unity-integration.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/unity-integration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/unreal-integration.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/unreal-integration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/faq.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Acoustics/known-issues.md",
+      "redirect_url": "https://docs.microsoft.com/gaming/acoustics/known-issues",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/iot-central/howto-export-data.md",
       "redirect_url": "/azure/iot-central/core/howto-export-data-event-hubs-service-bus",

articles/active-directory-b2c/azure-monitor.md

@@ -80,8 +80,8 @@ To onboard your Azure AD tenant (the **Customer**), create an [Azure Resource Ma
 
 Download the Azure Resource Manager template and parameter files:
 
-- [rgDelegatedResourceManagement.json](https://raw.githubusercontent.com/Azure/Azure-Lighthouse-samples/master/Azure-Delegated-Resource-Management/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.json)
-- [rgDelegatedResourceManagement.parameters.json](https://raw.githubusercontent.com/Azure/Azure-Lighthouse-samples/master/Azure-Delegated-Resource-Management/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.parameters.json)
+- [rgDelegatedResourceManagement.json](https://github.com/Azure/Azure-Lighthouse-samples/blob/master/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.json)
+- [rgDelegatedResourceManagement.parameters.json](https://github.com/Azure/Azure-Lighthouse-samples/blob/master/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.parameters.json)
 
 Next, update the parameters file with the values you recorded earlier. The following JSON snippet shows an example of an Azure Resource Manager template parameters file. For `authorizations.value.roleDefinitionId`, use the [built-in role](../role-based-access-control/built-in-roles.md) value for the *Contributor role*, `b24988ac-6180-42a0-ab88-20f7382dd24c`.
 

articles/active-directory/authentication/TOC.yml

@@ -30,14 +30,12 @@
     items:
     - name: How password reset works
       href: concept-sspr-howitworks.md
-    - name: Password reset options
-      href: concept-sspr-customization.md
-    - name: Password reset policies
-      href: concept-sspr-policy.md
-    - name: What license do I need?
-      href: concept-sspr-licensing.md
     - name: On-premises integration
       href: concept-sspr-writeback.md
+    - name: Policies
+      href: concept-sspr-policy.md
+    - name: Licenses
+      href: concept-sspr-licensing.md
   - name: Multi-Factor Authentication
     items:
     - name: How MFA works
@@ -64,6 +62,8 @@
     items:
     - name: Deployment guide
       href: howto-sspr-deployment.md
+    - name: User customization options
+      href: howto-sspr-customization.md
     - name: Pre-register authentication data
       href: howto-sspr-authenticationdata.md
     - name: SSPR for Windows clients