address merge conflict

Author: mrbullwinkle

.openpublishing.publish.config.json

@@ -825,6 +825,7 @@
     ".openpublishing.redirection.json",
     ".openpublishing.redirection.active-directory.json",
     ".openpublishing.redirection.data-factory.json",
+    ".openpublishing.redirection.defender-for-cloud.json",
     ".openpublishing.redirection.defender-for-iot.json",
     ".openpublishing.redirection.healthcare-apis.json",
     ".openpublishing.redirection.iot-hub.json",
@@ -853,6 +854,7 @@
     "articles/purview/.openpublishing.redirection.purview.json",
     "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
     "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
+    "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
     "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
     "articles/mysql/.openpublishing.redirection.mysql.json"
   ]

.openpublishing.redirection.defender-for-cloud.json

@@ -0,0 +1,199 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/security-center/azure-defender.md",
+            "redirect_url": "/azure/security-center/defender-for-cloud-introduction",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-introduction.md",
+            "redirect_url": "/azure/security-center/defender-for-cloud-introduction",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-os-coverage.md",
+            "redirect_url": "/azure/security-center/os-coverage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-just-in-time.md",
+            "redirect_url": "/azure/security-center/just-in-time-access-usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/just-in-time-explained.md",
+            "redirect_url": "/azure/security-center/just-in-time-access-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-adaptive-application.md",
+            "redirect_url": "/azure/security-center/adaptive-application-controls",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-file-integrity-monitoring.md",
+            "redirect_url": "/azure/security-center/file-integrity-monitoring-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-file-integrity-monitoring-baselines.md",
+            "redirect_url": "/azure/security-center/file-integrity-monitoring-usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/azure-defender-dashboard.md",
+            "redirect_url": "/azure/security-center/workload-protections-dashboard",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/enable-azure-defender.md",
+            "redirect_url": "/azure/security-center/enable-enhanced-security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-wdatp.md",
+            "redirect_url": "/azure/security-center/integration-defender-for-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/recommendations-compute-and-apps.md",
+            "redirect_url": "/azure/security-center/recommendations-reference#compute-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/defender-for-dns-usage.md",
+            "redirect_url": "/azure/security-center/defender-for-dns-introduction#respond-to-microsoft-defender-for-dns-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/defender-for-key-vault-usage.md",
+            "redirect_url": "/azure/security-center/defender-for-key-vault-introduction#respond-to-microsoft-defender-for-key-vault-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-services.md",
+            "redirect_url": "/azure/security-center/supported-machines-endpoint-solutions-clouds",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-threat-report.md",
+            "redirect_url": "/azure/security-center/threat-intelligence-reports",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-data-security.md",
+            "redirect_url": "/azure/security-center/data-security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-remediate-recommendations.md",
+            "redirect_url": "/azure/security-center/implement-security-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-permissions.md",
+            "redirect_url": "/azure/security-center/permissions",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-cross-tenant-management.md",
+            "redirect_url": "/azure/security-center/cross-tenant-management",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-management-groups.md",
+            "redirect_url": "/azure/security-center/management-groups-roles",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-info-protection-policy.md",
+            "redirect_url": "/azure/security-center/sql-information-protection-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-troubleshooting-guide.md",
+            "redirect_url": "/azure/security-center/troubleshooting-guide",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-endpoint-protection.md",
+            "redirect_url": "/azure/security-center/endpoint-protection-recommendations-technical",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-recommendations.md",
+            "redirect_url": "/azure/security-center/review-security-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-privacy.md",
+            "redirect_url": "/azure/security-center/privacy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-powershell-onboarding.md",
+            "redirect_url": "/azure/security-center/powershell-onboarding",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-partner-integration.md",
+            "redirect_url": "/azure/security-center/partner-integration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-provide-security-contacts.md",
+            "redirect_url": "/azure/security-center/configure-email-notifications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-get-started.md",
+            "redirect_url": "/azure/security-center/get-started",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-network-recommendations.md",
+            "redirect_url": "/azure/security-center/protect-network-resources",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-compliance-dashboard.md",
+            "redirect_url": "/azure/security-center/regulatory-compliance-dashboard",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-pricing.md",
+            "redirect_url": "/azure/security-center/enhanced-security-features-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-enable-data-collection.md",
+            "redirect_url": "/azure/security-center/enable-data-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-alerts-overview.md",
+            "redirect_url": "/azure/security-center/alerts-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-alert-validation.md",
+            "redirect_url": "/azure/security-center/alert-validation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-provide-security-contact-details.md",
+            "redirect_url": "/azure/security-center/configure-email-notifications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-managing-and-responding-alerts.md",
+            "redirect_url": "/azure/security-center/managing-and-responding-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-adaptive-network-hardening.md",
+            "redirect_url": "/azure/security-center/adaptive-network-hardening",
+            "redirect_document_id": false
+        }
+    ]
+}

.openpublishing.redirection.json

@@ -7011,7 +7011,7 @@
     {
       "source_path_from_root": "/articles/application-insights/app-insights-how-do-i.md",
       "redirect_url": "/azure/azure-monitor/app/how-do-i",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/application-insights/app-insights-ip-addresses.md",
@@ -25471,11 +25471,6 @@
       "redirect_url": "/azure/security-center/quickstart-onboard-machines",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/security-center/recommendations-compute-and-apps.md",
-      "redirect_url": "/azure/security-center/recommendations-reference#recs-computeapp",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/security-center/recommendations-network.md",
       "redirect_url": "/azure/security-center/recommendations-reference#recs-network",
@@ -28211,6 +28206,16 @@
       "redirect_url": "/azure/storage/blobs/concurrency-manage",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/storage/blobs/manage-access-tier.md",
+      "redirect_url": "/azure/storage/blobs/access-tiers-online-manage",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/storage/common/manage-account-default-access-tier.md",
+      "redirect_url": "/azure/storage/blobs/access-tiers-online-manage",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/storage/blobs/data-lake-storage-quickstart-create-databricks-account.md",
       "redirect_url": "/azure/storage/blobs/data-lake-storage-use-databricks-spark",
@@ -41506,6 +41511,11 @@
       "redirect_url": "/azure/cognitive-services/speech-service/keyword-recognition-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/cognitive-services/Speech-Service/speech-devices-sdk-microphone.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/speech-sdk-microphone",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/cognitive-services/speech-service/how-to-custom-speech.md",
       "redirect_url": "/azure/cognitive-services/speech-service/custom-speech-overview",
@@ -46662,7 +46672,12 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/aks/open-service-mesh-deploy-add-on.md",
+      "source_path_from_root": "/articles/aks/open-service-mesh-customize-add-on-experience.md",
+      "redirect_url": "/azure/aks/open-service-mesh-binary",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/aks/open-service-mesh-disable-add-on.md",
       "redirect_url": "/azure/aks/open-service-mesh-deploy-addon-az-cli",
       "redirect_document_id": false
     },
@@ -46837,8 +46852,8 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/mariadb/concepts-performance-recommendations.md",
-      "redirect_url": "/azure/mariadb/overview",
+    "source_path_from_root": "/articles/applied-ai-services/form-recognizer/quickstarts/try-sdk-rest-api.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/how-to-guides/try-sdk-rest-api",
       "redirect_document_id": false
     }
   ]

.openpublishing.redirection.media-services.json

@@ -619,7 +619,12 @@
           "source_path_from_root": "/articles/media-services/video-indexer/index.yml",
           "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs",
           "redirect_document_id": false
-        },     
+        },
+        {
+            "source_path_from_root": "/articles/media-services/latest/security-private-link-how-to.md",
+            "redirect_url": "/azure/media-services/latest/security-private-link-arm-how-to",
+            "redirect_document_id": false
+          },     
         {
             "source_path_from_root": "/articles/media-services/latest/latest/questions-collection.md",
             "redirect_url": "/articles/media-services/latest/frequently-asked-questions.yml",

.openpublishing.redirection.synapse-analytics.json

@@ -59,6 +59,11 @@
             "source_path_from_root": "/articles/synapse-analytics/quickstart-sql-on-demand.md",
             "redirect_url": "/azure/synapse-analytics/quickstart-serverless-sql-pool",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/synapse-analytics/machine-learning/tutorial-spark-pool-filesystem-spec.md",
+            "redirect_url": "/azure/synapse-analytics/spark/tutorial-spark-pool-filesystem-spec",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory-b2c/microsoft-graph-operations.md

@@ -5,12 +5,11 @@ description: How to manage resources in an Azure AD B2C tenant by calling the Mi
 services: B2C
 author: kengaderdus
 manager: CelesteDG
-
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
 ms.date: 10/08/2021
-ms.custom: project-no-code
+ms.custom: project-no-code, ignite-fall-2021
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -19,7 +18,7 @@ ms.subservice: B2C
 Microsoft Graph allows you to manage resources in your Azure AD B2C directory. The following Microsoft Graph API operations are supported for the management of Azure AD B2C resources, including users, identity providers, user flows, custom policies, and policy keys. Each link in the following sections targets the corresponding page within the Microsoft Graph API reference for that operation. 
 
 > [!NOTE]
-> You can also programmatically create an Azure AD B2C directory itself, along with the corresponding Azure resource linked to an Azure subscription. This functionality isn't exposed through the Microsoft Graph API, but through the Azure REST API. For more information, see [B2C Tenants - Create](/rest/api/activedirectory/b2ctenants/create).
+> You can also programmatically create an Azure AD B2C directory itself, along with the corresponding Azure resource linked to an Azure subscription. This functionality isn't exposed through the Microsoft Graph API, but through the Azure REST API. For more information, see [B2C Tenants - Create](/rest/api/activedirectory/b2c-tenants/create).
 
 Watch this video to learn about Azure AD B2C user migration using Microsoft Graph API.
 
@@ -248,4 +247,4 @@ public static async Task ListUsers(GraphServiceClient graphClient)
 <!-- LINK -->
 
 [graph-objectIdentity]: /graph/api/resources/objectidentity
-[graph-user]: (https://docs.microsoft.com/graph/api/resources/user)
+[graph-user]: /graph/api/resources/user

articles/active-directory/authentication/TOC.yml

@@ -11,6 +11,8 @@
     href: tutorial-enable-sspr.md
   - name: Enable Azure AD Multi-Factor Authentication
     href: tutorial-enable-azure-mfa.md
+  - name: Enable cloud sync password writeback (preview)
+    href: tutorial-enable-cloud-sync-sspr-writeback.md
   - name: Enable password writeback to on-premises
     href: tutorial-enable-sspr-writeback.md
   - name: Configure custom banned password lists