resolving merge conflicts

Author: Qian Wen

.openpublishing.redirection.json

@@ -672,6 +672,21 @@
       "redirect_url": "/azure/machine-learning/samples-notebooks",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Content-Moderator/dotnet-sdk-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-csharp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Content-Moderator/java-sdk-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-java",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Content-Moderator/python-sdk-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-python",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md",
       "redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -1922,6 +1937,21 @@
       "redirect_url": "/azure/cognitive-services/bing-autosuggest/quickstarts/client-libraries?pivots=programming-language-go",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Face/Quickstarts/csharp-sdk.md",
+      "redirect_url": "/azure/cognitive-services/Face/Quickstarts/client-libraries?pivots=programming-language-csharp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Face/Quickstarts/python-sdk.md",
+      "redirect_url": "/azure/cognitive-services/Face/Quickstarts/client-libraries?pivots=programming-language-python",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Face/Quickstarts/go-sdk.md",
+      "redirect_url": "/azure/cognitive-services/Face/Quickstarts/client-libraries?pivots=programming-language-go",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
       "redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -3442,6 +3472,21 @@
       "redirect_url": "/azure/iot-edge/how-to-manage-device-certificates",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/iot-edge/how-to-deploy-monitor.md",
+      "redirect_url": "/azure/iot-edge/how-to-deploy-at-scale",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-edge/how-to-deploy-monitor-cli.md",
+      "redirect_url": "/azure/iot-edge/how-to-deploy-cli-at-scale",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-edge/how-to-deploy-monitor-vscode.md",
+      "redirect_url": "/azure/iot-edge/how-to-deploy-vscode-at-scale",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/cognitive-services/cognitive-services-recommendations-quick-start.md",
       "redirect_url": "/azure/cognitive-services/recommendations/overview",
@@ -7571,7 +7616,36 @@
       "redirect_url": "/azure/application-gateway/quick-create-cli",
       "redirect_document_id": false
     },
-
+    {
+      "source_path": "articles/application-gateway/tutorial-multisite-cli.md",
+      "redirect_url": "/azure/application-gateway/tutorial-multiple-sites-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/tutorial-create-vmss-cli.md",
+      "redirect_url": "/azure/application-gateway/tutorial-url-redirect-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/application-gateway-create-url-route-cli.md",
+      "redirect_url": "/azure/application-gateway/tutorial-url-route-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/application-gateway-create-url-route-arm-ps.md",
+      "redirect_url": "/azure/application-gateway/tutorial-url-route-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/application-gateway-create-multisite-azureresourcemanager-powershell.md",
+      "redirect_url": "/azure/application-gateway/tutorial-multiple-sites-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/application-gateway-ssl.md",
+      "redirect_url": "/azure/application-gateway/tutorial-ssl-powershell",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/application-insights/app-insights-azure-diagnostics.md",
       "redirect_url": "/azure/azure-monitor/platform/diagnostics-extension-to-application-insights",
@@ -17277,6 +17351,11 @@
       "redirect_url": "/azure/monitoring/monitoring-container-insights-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-monitor/insights/container-insights-optout-openshift.md",
+      "redirect_url": "/azure/azure-monitor/insights/container-insights-optout-openshift-v3",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/mobile-engagement/mobile-engagement-send-personalized-notifications.md",
       "redirect_url": "/azure/azure-resource-manager/management/azure-subscription-service-limits#mobile-engagement-limits",
@@ -17592,6 +17671,16 @@
       "redirect_url": "/azure/storage/blobs/data-lake-storage-upgrade",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/storage/common/storage-migration-to-premium-storage.md",
+      "redirect_url": "/azure/virtual-machines/windows/migrate-to-managed-disks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/blobs/storage-troubleshoot-vhds.md",
+      "redirect_url": "/azure/virtual-machines/troubleshooting",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/blobs/data-lake-storage-upgrade.md",
       "redirect_url": "/azure/storage/blobs/data-lake-storage-migrate-gen1-to-gen2",
@@ -28292,6 +28381,16 @@
       "redirect_url": "/azure/storage/common/storage-java-hudson-continuous-integration-solution",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/storage-java-hudson-continuous-integration-solution.md",
+      "redirect_url": "/azure/storage/blobs/storage-blobs-introduction",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/common/storage-cors-support.md",
+      "redirect_url": "/azure/storage/common/storage-account-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/storage-java-jenkins-continuous-integration-solution.md",
       "redirect_url": "/azure/jenkins/storage-java-jenkins-continuous-integration-solution",
@@ -28397,6 +28496,11 @@
       "redirect_url": "/azure/storage/common/storage-powershell-guide-full",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/storage-powershell-guide-full.md",
+      "redirect_url": "https://docs.microsoft.com/powershell/module/az.storage",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/storage-premium-storage-performance.md",
       "redirect_url": "/azure/storage/common/storage-premium-storage-performance",
@@ -51490,6 +51594,146 @@
       "source_path": "articles/app-service-mobile/app-service-mobile-xamarin-ios-get-started.md",
       "redirect_url": "/previous-versions/azure/app-service-mobile/app-service-mobile-xamarin-ios-get-started",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/csharp-tutorial.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/image-classification",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/go-tutorial.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/image-classification",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/java-tutorial.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/image-classification",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/node-tutorial.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/image-classification",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/python-tutorial.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/image-classification",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/csharp-tutorial-od.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/object-detection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/go-tutorial-object-detection.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/object-detection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/java-tutorial-od.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/object-detection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/node-tutorial-object-detection.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/object-detection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/python-tutorial-od.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/quickstarts/object-detection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/develop/active-directory-graph-api-quickstart.md",
+      "redirect_url": "/azure/active-directory/develop/microsoft-graph-intro",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/container-instances-jenkins.md",
+      "redirect_url": "/azure/developer/jenkins/azure-container-instances-as-jenkins-build-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/tutorial-jenkins-dev-spaces.md",
+      "redirect_url": "/azure/developer/jenkins/azure-dev-spaces-and-aks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/storage-java-jenkins-continuous-integration-solution.md",
+      "redirect_url": "/azure/developer/jenkins/azure-storage-blobs-as-build-artifact-repository",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/install-solution-template-quickstart.md",
+      "redirect_url": "/azure/developer/jenkins/configure-on-linux-vm",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/install-solution-template-tutorial.md",
+      "redirect_url": "/azure/developer/jenkins/configure-on-linux-vm",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/jenkins-continuous-deployment.md",
+      "redirect_url": "/azure/developer/jenkins/deploy-from-github-to-aks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/tutorial-jenkins-deploy-web-app-azure-app-service.md",
+      "redirect_url": "/azure/developer/jenkins/deploy-from-github-to-azure-app-service",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/jenkins-aks-blue-green-deployment.md",
+      "redirect_url": "/azure/developer/jenkins/deploy-to-aks-using-blue-green-deployment-pattern",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/execute-cli-jenkins-pipeline.md",
+      "redirect_url": "/azure/developer/jenkins/deploy-to-azure-app-service-using-azure-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/deploy-jenkins-app-service-plugin.md",
+      "redirect_url": "/azure/developer/jenkins/deploy-to-azure-app-service-using-plugin",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/jenkins-azure-functions-deploy.md",
+      "redirect_url": "/azure/developer/jenkins/deploy-to-azure-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/tutorial-jenkins-deploy-cli-spring-cloud-service.md",
+      "redirect_url": "/azure/developer/jenkins/deploy-to-azure-spring-cloud-using-azure-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/tutorial-build-deploy-jenkins.md",
+      "redirect_url": "/azure/developer/jenkins/deploy-to-linux-vm-using-azure-devops-services",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/service-fabric-cicd-your-linux-applications-with-jenkins.md",
+      "redirect_url": "/azure/developer/jenkins/deploy-to-service-fabric-cluster",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/tutorial-jenkins-github-docker-cicd.md",
+      "redirect_url": "/azure/developer/jenkins/pipeline-with-github-and-docker",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/jenkins-plugins.md",
+      "redirect_url": "/azure/developer/jenkins/plug-ins-for-azure",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/jenkins/jenkins-azure-vm-agents.md",
+      "redirect_url": "/azure/developer/jenkins/scale-deployments-using-vm-agents",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/best-practices.md

@@ -39,7 +39,7 @@ Define your application and service architecture, inventory current systems, and
 | Create a migration plan |Planning ahead can make migration go more smoothly. Learn more about [user migration](user-migration.md).|
 | Usability vs. security | Your solution must strike the right balance between application usability and your organization's acceptable level of risk. |
 | Move on-premises dependencies to the cloud | To help ensure a resilient solution, consider moving existing application dependencies to the cloud. |
-| Migrate existing apps to b2clogin.com | The deprecation of login.microsoftonline.com went into effect for all Azure AD B2C tenants on 04 December 2020. [Learn more](b2clogin.md). |
+| Migrate existing apps to b2clogin.com | The deprecation of login.microsoftonline.com will go into effect for all Azure AD B2C tenants on 04 December 2020. [Learn more](b2clogin.md). |
 
 ## Implementation
 
@@ -88,4 +88,4 @@ Stay up to date with the state of the service and find support options.
 |--|--|
 | [Service updates](https://azure.microsoft.com/updates/?product=active-directory-b2c) |  Stay up to date with Azure AD B2C product updates and announcements. |
 | [Microsoft Support](support-options.md) | File a support request for Azure AD B2C technical issues. Billing and subscription management support is provided at no cost. |
-| [Azure status](https://status.azure.com/status) | View the current health status of all Azure services. |
+| [Azure status](https://status.azure.com/status) | View the current health status of all Azure services. |

articles/active-directory-b2c/code-samples.md

@@ -43,3 +43,9 @@ The following tables provide links to samples for applications including iOS, An
 | Sample | Description |
 |--------| ----------- |
 | [javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) | A single page application (SPA) calling a Web API. Authentication is done with Azure AD B2C by using MSAL.js. |
+
+## SAML test application
+
+| Sample | Description |
+|--------| ----------- |
+| [saml-sp-tester](https://github.com/azure-ad-b2c/saml-sp-tester/tree/master/source-code) | SAML test application to test Azure AD B2C configured to act as SAML identity provider. |